diff --git a/.config/puddletag/genres b/.config/puddletag/genres
index 2532adc..43a8837 100644
--- a/.config/puddletag/genres
+++ b/.config/puddletag/genres
@@ -45,4 +45,7 @@ Soundtrack
 Dubstep; Vocal; Liquid
 Electronic
 Piano
-Electronic; Vocal
\ No newline at end of file
+Electronic; Vocal
+Christian; Hip-Hop
+Theme; Ambient
+Theme; Ambiente
\ No newline at end of file
diff --git a/.config/puddletag/puddletag.conf b/.config/puddletag/puddletag.conf
index 71b9646..05bfacd 100644
--- a/.config/puddletag/puddletag.conf
+++ b/.config/puddletag/puddletag.conf
@@ -10,7 +10,8 @@
       "/home/janek/.local/share/puddletag/actions/Genre House.action",
       "/home/janek/.local/share/puddletag/actions/Genre Acoustic.action",
       "/home/janek/.local/share/puddletag/actions/Genre Canto.action",
-      "/home/janek/.local/share/puddletag/actions/Album Clear.action"
+      "/home/janek/.local/share/puddletag/actions/Album Clear.action",
+      "/home/janek/.local/share/puddletag/actions/Theme Titling.action"
     ]
   },
   "main": {
@@ -75,38 +76,38 @@
   },
   "tableheader": {
     "titles": [
-      "Dirpath",
       "Filename",
       "Artist",
       "Title",
       "Album",
       "Track",
-      "Length",
-      "Year",
       "Genre",
       "Path",
+      "Album Artist",
+      "Length",
+      "Year",
       "BPM",
       "Comment",
       "Bitrate",
-      "Album Artist",
-      "Tags"
+      "Tags",
+      "Dirpath"
     ],
     "tags": [
-      "__dirpath",
       "__filename",
       "artist",
       "title",
       "album",
       "track",
-      "__length",
-      "year",
       "genre",
       "__path",
+      "albumartist",
+      "__length",
+      "year",
       "bpm",
       "comment",
       "__bitrate",
-      "albumartist",
-      "version"
+      "version",
+      "__dirpath"
     ]
   },
   "editor": {
@@ -123,6 +124,8 @@
   },
   "actions": {
     "checked": [
+      "Standard",
+      "Artist splitting",
       "Genre: Canto"
     ]
   },
diff --git a/.config/puddletag/tagpanel b/.config/puddletag/tagpanel
index 0bfd2c1..4b891f4 100644
--- a/.config/puddletag/tagpanel
+++ b/.config/puddletag/tagpanel
@@ -29,10 +29,14 @@
   },
   "2": {
     "titles": [
-      "Al&bum"
+      "Al&bum",
+      "T&rack",
+      "Album Art&ist"
     ],
     "tags": [
-      "album"
+      "album",
+      "track",
+      "albumartist"
     ]
   },
   "4": {