diff --git a/.config/beets/config.yaml b/.config/beets/config.yaml
index f75ff40..03091d0 100644
--- a/.config/beets/config.yaml
+++ b/.config/beets/config.yaml
@@ -1,32 +1,46 @@
 directory: ~/Music
 library: ~/Music/musiclibrary.db
-plugins: inline edit fetchart embedart mbsync albumtypes smartplaylist lyrics the info lastimport types ftintitle scrub fuzzy chroma limit replaygain random summarize musicbrainz
 format_item: %the{$artist} - %the{$album} ($original_year)$atypes - %the{$title}
 format_album: %the{$albumartist} - %the{$album} ($original_year)$atypes
 sort_item: artist+ original_year+ original_month+ album+ disc+ track+
 sort_album: albumartist+ original_year+ original_month+ album+
 original_date: yes
-item_fields:
-  multidisc: 1 if disctotal > 1 else 0
-type:
-  play_count: int
 import:
   move: yes
   timid: yes
 paths:
   default: $albumartist/[$original_year]$atypes $album%aunique{}/%if{$multidisc,$disc-}$track $title
   singleton: $artist/$title
-musicbrainz:
-  searchlimit: 10
+plugins: albumtypes autobpm chroma edit embedart fetchart ftintitle fuzzy info inline lastgenre lastimport limit lyrics mbsync musicbrainz random replaygain scrub smartplaylist summarize the types
+chroma:
+  auto: no
+embedart:
+  auto: no
+  remove_art_file: yes
 fetchart:
   cautious: yes
   minwidth: 250
   maxwidth: 1000
   enforce_ratio: 1%
   sources: filesystem wikipedia coverart amazon albumart
-embedart:
+ftintitle:
+  drop: yes
+fuzzy:
+  threshold: 0.8
+item_fields:
+  multidisc: 1 if disctotal > 1 else 0
+lastgenre:
+  canonical: yes
+  fallback: ''
+  force: yes
+  keep_existing: no
+  whitelist: ~/.config/beets/genres.txt
+musicbrainz:
+  searchlimit: 10
+replaygain:
+  command: mp3gain
+scrub:
   auto: no
-  remove_art_file: yes
 smartplaylist:
   relative_to: ~/Music
   playlist_dir: ~/.local/share/mpd/playlists
@@ -47,15 +61,7 @@ smartplaylist:
       query: ['genre:"Symphonic Black Metal"', 'genre:"Melodic Black Metal"']
 the:
   patterns: ^Il\s ^La\s ^Lo\s ^Gli\s ^Le\s
-ftintitle:
-  drop: yes
-scrub:
-  auto: no
-fuzzy:
-  threshold: 0.8
-chroma:
-  auto: no
-replaygain:
-  command: mp3gain
+type:
+  play_count: int
 include: [ lyrics.yaml, lastfm.yaml ]