diff --git a/Droidnix/README.org b/Droidnix/README.org
index d0740f032..61eab131c 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -735,9 +735,9 @@ in
   # Packages
   ############################
   environment.systemPackages = with pkgs; [
-    swww      # For setting wallpapers
-    waypaper  # Optional, if you use it
-    jq        # Needed by the script
+    swww
+    waypaper
+    jq
   ];
 
   ############################
@@ -753,20 +753,19 @@ in
       chown -R ${username}:${username} ${wallpaperDst}
       chmod +x ${wallpaperDst}/set-wallpapers-per-workspace.sh
     '';
-    install.wantedBy = [ "default.target" ];
+    enable = true;
   };
 
   ############################
-  # Optional: Auto-run script at login
+  # Auto-run script at login
   ############################
-  # This assumes you want it to run for your user automatically
   systemd.user.services.wallpaperPerWorkspace = {
     description = "Set wallpapers per workspace on login";
     after = [ "copyWallpapers.service" ];
     wants = [ "copyWallpapers.service" ];
     serviceConfig.Type = "oneshot";
     serviceConfig.ExecStart = "${wallpaperDst}/set-wallpapers-per-workspace.sh";
-    install.wantedBy = [ "default.target" ];
+    enable = true;
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix
index 8611815cc..0940f643f 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix
@@ -11,9 +11,9 @@ in
   # Packages
   ############################
   environment.systemPackages = with pkgs; [
-    swww      # For setting wallpapers
-    waypaper  # Optional, if you use it
-    jq        # Needed by the script
+    swww
+    waypaper
+    jq
   ];
 
   ############################
@@ -29,19 +29,18 @@ in
       chown -R ${username}:${username} ${wallpaperDst}
       chmod +x ${wallpaperDst}/set-wallpapers-per-workspace.sh
     '';
-    install.wantedBy = [ "default.target" ];
+    enable = true;
   };
 
   ############################
-  # Optional: Auto-run script at login
+  # Auto-run script at login
   ############################
-  # This assumes you want it to run for your user automatically
   systemd.user.services.wallpaperPerWorkspace = {
     description = "Set wallpapers per workspace on login";
     after = [ "copyWallpapers.service" ];
     wants = [ "copyWallpapers.service" ];
     serviceConfig.Type = "oneshot";
     serviceConfig.ExecStart = "${wallpaperDst}/set-wallpapers-per-workspace.sh";
-    install.wantedBy = [ "default.target" ];
+    enable = true;
   };
 }