diff --git a/.config/puddletag/genres b/.config/puddletag/genres
index 43a8837..e81f039 100644
--- a/.config/puddletag/genres
+++ b/.config/puddletag/genres
@@ -48,4 +48,5 @@ Piano
 Electronic; Vocal
 Christian; Hip-Hop
 Theme; Ambient
-Theme; Ambiente
\ No newline at end of file
+Theme; Ambiente
+Minecraft; Theme; Liquid
\ No newline at end of file
diff --git a/.config/puddletag/gensettings b/.config/puddletag/gensettings
index a2bf656..97c6a80 100644
--- a/.config/puddletag/gensettings
+++ b/.config/puddletag/gensettings
@@ -9,7 +9,7 @@
     "value": true
   },
   "Su&bfolders": {
-    "value": false
+    "value": true
   },
   "&Preserve file modification times (if supported)": {
     "value": false
diff --git a/.config/puddletag/puddletag.conf b/.config/puddletag/puddletag.conf
index f4d34a9..745cdbd 100644
--- a/.config/puddletag/puddletag.conf
+++ b/.config/puddletag/puddletag.conf
@@ -16,8 +16,8 @@
   },
   "main": {
     "lang": "auto",
-    "lastfolder": "/home/janek/data/music/Canto/Minecraft",
-    "maximized": false
+    "lastfolder": "/home/janek/data/music/Ambient/C418",
+    "maximized": true
   },
   "playlist": {
     "extinfo": 1,
@@ -43,7 +43,7 @@
     "fontsize": 10,
     "rowsize": 43,
     "sort_fields": [
-      "__path"
+      "album"
     ],
     "sort_reverse": false
   },
@@ -118,7 +118,7 @@
       "$num(%track%,2) %title%",
       "%title%"
     ],
-    "index": 0
+    "index": 3
   },
   "functions": {
     "last_used": "regex"
@@ -134,4 +134,4 @@
       "Artist splitting"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/.config/puddletag/usertags b/.config/puddletag/usertags
index 064027c..1fdae5c 100644
--- a/.config/puddletag/usertags
+++ b/.config/puddletag/usertags
@@ -1,11 +1,15 @@
+REPLAYGAIN_TRACK_GAIN
 album
+albumartist
 albumsortorder
 arranger
 artist
+artists
 audiodelay
 audiolength
 audiosize
 author
+band
 bpm
 comment
 composer
@@ -27,7 +31,6 @@ isrc
 itunesalbumsortorder
 itunescompilationflag
 itunescomposersortorder
-just nothing to do with this
 language
 lyricist
 mediatype
@@ -47,6 +50,7 @@ radioowner
 radiostationname
 recordingdates
 releasetime
+replaygain_track_gain
 setsubtitle
 taggingtime
 time
@@ -64,4 +68,4 @@ wwwpayment
 wwwpublisher
 wwwradio
 wwwsource
-year
\ No newline at end of file
+year
diff --git a/.local/bin/scripts/focus b/.local/bin/scripts/focus
index ff1f467..4b58253 100755
--- a/.local/bin/scripts/focus
+++ b/.local/bin/scripts/focus
@@ -7,10 +7,12 @@ mpc -q clear
 if test -z "$1"
 then mp -q "$PLAYLISTS/focus.m3u"
 else
-  (find -L $PLAYLISTS -iname "focus-$1.m3u" -print0 | grep --null-data . ||
-    find -L $PLAYLISTS -iname "$1.m3u*" -print0 | grep --null-data . ||
-    find -L $MUSIC $(echo "$@" | sed 's/\w\+/-iname *\0*/g') -prune -exec find {} -size +2M -type f -not -iregex ".*.\(jpe?g\|png\)" -print0 \; ) |
-    xargs -0 mp -q
+	(find -L $PLAYLISTS -iname "focus-$1.m3u" -print0 | grep --null-data . ||
+		find -L $PLAYLISTS -iname "$1.m3u*" -print0 | grep --null-data . ||
+		find -L $MUSIC $(echo "$@" | sed 's/\w\+/-iname *\0*/g') -prune -exec find {} -size +1M -type f -not -iregex ".*.\(jpe?g\|png\)" -print0 \; ) |
+		xargs -0 mp -q
+fi
+if test $(mpc playlist | wc -l) -gt 1; then
+	mpc -q shuffle
+	mpc next
 fi
-mpc -q shuffle
-mpc next