diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix
index 209165e..ab60166 100644
--- a/modules/desktop/bspwm/default.nix
+++ b/modules/desktop/bspwm/default.nix
@@ -43,7 +43,7 @@
       };
       startupPrograms = [
         "${pkgs.systemd}/bin/systemctl --user start polybar.service"
-        "feh --bg-fill ~/.config/wallpaper/dracula.png"
+        "randomWallpaper"
         "synology-drive"
       ];
       extraConfig = builtins.readFile ./bspwmrc;
@@ -54,10 +54,6 @@
       extraConfig = builtins.readFile ./sxhkdrc;
     };
 
-    xdg = {
-      enable = true;
-      configFile = { "wallpaper/dracula.png" = { source = ./dracula.png; }; };
-    };
     home.packages = with pkgs; [ feh playerctl pamixer brightnessctl ];
   };
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index ebad6d5..e1b7efb 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -2,7 +2,19 @@
 
 {
   imports = [ ./apps ./bspwm ./polybar ./gtk.nix ];
-  home-manager.users.moritz = { services.unclutter.enable = true; };
+  home-manager.users.moritz = {
+    services.unclutter.enable = true;
+
+    xdg = {
+      enable = true;
+      configFile = {
+        "wallpapers/" = {
+          source = ./wallpapers;
+          recursive = true;
+        };
+      };
+    };
+  };
   # Remap capslock to esc and shift + capslock to capslock
   services.xserver.xkbOptions =
     "terminate:ctrl_alt_bksp,caps:escape_shifted_capslock";