diff --git a/configs/home-manager/foo-dogsquared/config/yt-dlp/audio.conf b/configs/home-manager/foo-dogsquared/config/yt-dlp/audio.conf
index 601809cb..375a8195 100644
--- a/configs/home-manager/foo-dogsquared/config/yt-dlp/audio.conf
+++ b/configs/home-manager/foo-dogsquared/config/yt-dlp/audio.conf
@@ -6,7 +6,7 @@
 --format bestaudio
 --audio-format opus
 
---output '%(track_number,playlist_autonumber)d-%(track,title)s.%(ext)s'
+--output '%(artist,uploader)s/%(album,playlist)s/%(track_number,playlist_index)d-%(track,title)s.%(ext)s'
 --download-archive archive
 
 # Add all sorts of metadata.
diff --git a/configs/home-manager/foo-dogsquared/modules/setups/music.nix b/configs/home-manager/foo-dogsquared/modules/setups/music.nix
index 2b0c1256..a1efdb1f 100644
--- a/configs/home-manager/foo-dogsquared/modules/setups/music.nix
+++ b/configs/home-manager/foo-dogsquared/modules/setups/music.nix
@@ -121,9 +121,9 @@ in
               "~/library/music|Library"
             ]
             ++ lib.optional (attrs?nixosConfig.suites.filesystem.setups.external-hdd.enable)
-              "/mnt/external-storage/library/music|External storage"
+              "/mnt/external-storage/Music|External storage"
             ++ lib.optional (attrs?nixosConfig.suites.filesystem.setups.archive.enable)
-              "/mnt/archives/music|Archive";
+              "/mnt/archives/Music|Archive";
           };
 
           internetarchive = {