diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix
index 4082253..2a08949 100644
--- a/home-manager/modules/hyprland/default.nix
+++ b/home-manager/modules/hyprland/default.nix
@@ -9,12 +9,7 @@ let
   # rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ../sway/powermenu.sh);
   # powerMenu = "${rofiPower}/bin/rofi-power";
 
-  # wallpapers = {
-  #   hd = ../sway/wallpapers/river-1920.png;
-  #   qhd = ../sway/wallpapers/river-2560.png;
-  #   uhd = ../sway/wallpapers/river-3840.png;
-  # };
-  # swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill";
+  # swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${../../../wallpapers/river-2560.png} --scaling fill";
 
 in
 {
@@ -136,7 +131,7 @@ in
 
     #         exec = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
 
-    #         exec-once = ${pkgs.swaybg}/bin/swaybg -i ${wallpapers.qhd} -m fill
+    #         exec-once = ${pkgs.swaybg}/bin/swaybg -i ${../../../wallpapers/river-2560.png} -m fill
     #         exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24
     #         exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync
     #         exec-once = ${pkgs.systemd}/bin/systemctl --user start fcitx5-daemon
diff --git a/home-manager/modules/i3/default.nix b/home-manager/modules/i3/default.nix
index 3b3603b..9d8ff9f 100644
--- a/home-manager/modules/i3/default.nix
+++ b/home-manager/modules/i3/default.nix
@@ -6,7 +6,7 @@
 with lib; let
   cfg = config.eboskma.programs.i3;
   mod = "Mod4";
-  i3lockcmd = "${pkgs.i3lock-color}/bin/i3lock-color --image ${toString ./wallpapers/river-3840.png} --color=333333ff --tiling --ignore-empty-password --show-failed-attempts --screen=0 --clock --pass-volume-keys";
+  i3lockcmd = "${pkgs.i3lock-color}/bin/i3lock-color --image ${toString ../../../wallpapers/river-3840.png} --color=333333ff --tiling --ignore-empty-password --show-failed-attempts --screen=0 --clock --pass-volume-keys";
   rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
   left = "n";
   down = "e";
@@ -242,14 +242,12 @@ in
     eboskma.wallpapers = {
       enable = true;
       images = [
-        ./wallpapers/river-3840.png
-        ./wallpapers/jwst-pillars-of-creation-3840.jpg
+        ../../../wallpapers/river-3840.png
+        ../../../wallpapers/jwst-pillars-of-creation-3840.jpg
       ];
     };
 
     home = {
-      file.".wallpapers".source = ./wallpapers;
-
       packages = with pkgs; [
         dunst
       ];
diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index 2a085da..1ea9e15 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -6,18 +6,16 @@
 with lib; let
   cfg = config.eboskma.programs.sway;
   mod = "Mod4";
-  wallpapers = {
-    hd = ./wallpapers/river-1920.png;
-    qhd = ./wallpapers/river-2560.png;
-    uhd = ./wallpapers/river-3840.png;
-  };
-  # swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
-  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill";
+  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${cfg.lock-wallpaper} --scaling fill";
   rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
 in
 {
   options.eboskma.programs.sway = {
     enable = mkEnableOption "Enable sway";
+    lock-wallpaper = mkOption {
+      description = "Wallpaper to use for the lockscreen";
+      type = types.path;
+    };
     output = mkOption {
       description = "An attribute set that defines output modules. See the sway-output(5) manpage for options";
       type = types.attrsOf (types.attrsOf types.str);
@@ -303,16 +301,6 @@ in
       };
     };
 
-    home = {
-      file.".wallpapers".source = ./wallpapers;
-
-      packages = with pkgs; [
-        # dunst
-        # swayidle
-        # swaylock-effects
-      ];
-    };
-
     services = {
       swayidle = {
         enable = true;
diff --git a/home-manager/modules/sway/wallpapers/black-panther-2560.jpg b/home-manager/modules/sway/wallpapers/black-panther-2560.jpg
deleted file mode 100644
index 2b3299d..0000000
Binary files a/home-manager/modules/sway/wallpapers/black-panther-2560.jpg and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/black-panther-3840.jpg b/home-manager/modules/sway/wallpapers/black-panther-3840.jpg
deleted file mode 100644
index f154d6b..0000000
Binary files a/home-manager/modules/sway/wallpapers/black-panther-3840.jpg and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png b/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png
deleted file mode 100644
index 391990d..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png b/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png
deleted file mode 100644
index ae05dff..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png b/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png
deleted file mode 100644
index bb09674..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png b/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png
deleted file mode 100644
index 6d82274..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-1920.jpg b/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-1920.jpg
deleted file mode 100644
index f8974b9..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-1920.jpg and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-2560.jpg b/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-2560.jpg
deleted file mode 100644
index 31eccb8..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-2560.jpg and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-3840.jpg b/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-3840.jpg
deleted file mode 100644
index 72ee840..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-pillars-of-creation-3840.jpg and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png b/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png
deleted file mode 100644
index 3744d70..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png b/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png
deleted file mode 100644
index 62349f9..0000000
Binary files a/home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/river-1920.png b/home-manager/modules/sway/wallpapers/river-1920.png
deleted file mode 100644
index d63e8b2..0000000
Binary files a/home-manager/modules/sway/wallpapers/river-1920.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/river-2560.png b/home-manager/modules/sway/wallpapers/river-2560.png
deleted file mode 100644
index cf295cc..0000000
Binary files a/home-manager/modules/sway/wallpapers/river-2560.png and /dev/null differ
diff --git a/home-manager/modules/sway/wallpapers/river-3840.png b/home-manager/modules/sway/wallpapers/river-3840.png
deleted file mode 100644
index acf5af4..0000000
Binary files a/home-manager/modules/sway/wallpapers/river-3840.png and /dev/null differ
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index 7010e2c..8617a0f 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -7,8 +7,6 @@ with lib; let
   cfg = config.eboskma.greetd;
   steamCfg = config.programs.steam;
 
-  # style = builtins.replaceStrings [ "{WALLPAPER}" ] [ (builtins.toString ../../home-manager/modules/sway/wallpapers/river-2560.png) ] (builtins.readFile ./greetd.css);
-  wallpaper = ../../home-manager/modules/sway/wallpapers/river-2560.png;
   style = builtins.readFile ./greetd.css;
 
   swaySession = pkgs.writeShellScript "sway-session" ''
@@ -23,6 +21,8 @@ with lib; let
       ${builtins.concatStringsSep "\n" exports}
       gamescope --steam ${toString steamCfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
     '';
+
+  envVars = concatStringsSep " " (builtins.attrNames config.environment.sessionVariables);
 in
 {
   options.eboskma.greetd = {
@@ -30,6 +30,10 @@ in
     sway = mkEnableOption "sway";
     steam = mkEnableOption "steam";
     wayvnc = mkEnableOption "wayvnc";
+    wallpaper = mkOption {
+      description = "Path to an image to use as wallpaper";
+      type = types.path;
+    };
   };
 
   config =
@@ -49,7 +53,7 @@ in
           enable = false;
           settings = {
             background = {
-              path = ../../home-manager/modules/sway/wallpapers/river-2560.png;
+              path = cfg.wallpaper;
               fit = "Cover";
             };
 
@@ -83,7 +87,7 @@ in
                 ((lib.optional cfg.wayvnc "exec ${pkgs.wayvnc}/bin/wayvnc -g 0.0.0.0") ++
                   [
                     ''
-                      exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -s /etc/greetd/gtkgreet.css -b ${wallpaper}; swaymsg exit"
+                      exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -s /etc/greetd/gtkgreet.css -b ${cfg.wallpaper}; swaymsg exit"
                       include /etc/sway/config.d/*
                     ''
                   ]);
@@ -106,8 +110,8 @@ in
             };
             "sway/config.d/systemd-env.conf" = {
               text = ''
-                exec_always --no-startup-id systemctl --user import-environment _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
-                exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
+                exec_always --no-startup-id systemctl --user import-environment ${envVars}
+                exec_always --no-startup-id dbus-update-activation-environment --systemd ${envVars}
               '';
             };
             "xdg/gtk-3.0/settings.ini" = {
diff --git a/modules/greetd/sway-config b/modules/greetd/sway-config
index a6c0955..efc1806 100644
--- a/modules/greetd/sway-config
+++ b/modules/greetd/sway-config
@@ -1,4 +1,3 @@
-exec "gtkgreet -l; swaymsg exit"
 
 bindsym Mod4+shift+e exec swaynag -t warning -m 'What would you like to do?' -b 'Poweroff' 'systemctl poweroff' -b 'Reboot' 'systemctl reboot'
 
diff --git a/modules/lightdm/default.nix b/modules/lightdm/default.nix
index e1ce872..3181684 100644
--- a/modules/lightdm/default.nix
+++ b/modules/lightdm/default.nix
@@ -16,7 +16,7 @@ in
         defaultSession = "none+i3";
         lightdm = {
           enable = true;
-          background = ../../home-manager/modules/i3/wallpapers/river-3840.png;
+          background = ../../wallpapers/river-3840.png;
           greeters.pantheon = {
             enable = true;
           };
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index d906cc6..b34334e 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -102,9 +102,10 @@ in
             starship.enable = true;
             sway = {
               enable = true;
+              lock-wallpaper = ../../wallpapers/river-2560.png;
               output = {
                 "DP-2" = {
-                  bg = "${../../home-manager/modules/sway/wallpapers/jwst-saturn-nircam-2560.png} fill";
+                  bg = "${../../wallpapers/jwst-saturn-nircam-2560.png} fill";
                   mode = "2560x1440@165Hz";
                   adaptive_sync = "on";
                   max_render_time = "2";
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index c487b81..d42bb1b 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -146,14 +146,15 @@ in
           starship.enable = true;
           sway = {
             enable = true;
+            lock-wallpaper = ../../wallpapers/river-2560.png;
             output = {
               "DP-1" = {
-                bg = "${../../home-manager/modules/sway/wallpapers/river-3840.png} fill";
+                bg = "${../../wallpapers/river-3840.png} fill";
                 mode = "3840x2160@60Hz";
                 position = "0 0";
               };
               "DP-3" = {
-                bg = "${../../home-manager/modules/sway/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png} fill";
+                bg = "${../../wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png} fill";
                 mode = "3840x2160@60Hz";
                 position = "3840 0";
               };
@@ -170,7 +171,7 @@ in
             };
             startup = [
               { command = "${ewwDaemon} --restart open bar-work"; always = true; }
-              { command = "${pkgs.wayvnc}/bin/wayvnc -g 0.0.0.0"; }
+              { command = "${pkgs.wayvnc}/bin/wayvnc -g 0.0.0.0"; always = true; }
             ];
             workspaceOutputs = workspacePartition;
           };
@@ -249,6 +250,7 @@ in
           procs
           qgis
           recursive
+          remmina
           ripgrep
           s-tui
           solo2-cli
@@ -272,6 +274,8 @@ in
           gtk.enable = true;
           x11.enable = true;
         };
+
+        file.".wallpapers".source = ../../wallpapers;
       };
 
 
diff --git a/home-manager/modules/i3/wallpapers/black-panther-2560.jpg b/wallpapers/black-panther-2560.jpg
similarity index 100%
rename from home-manager/modules/i3/wallpapers/black-panther-2560.jpg
rename to wallpapers/black-panther-2560.jpg
diff --git a/home-manager/modules/i3/wallpapers/black-panther-3840.jpg b/wallpapers/black-panther-3840.jpg
similarity index 100%
rename from home-manager/modules/i3/wallpapers/black-panther-3840.jpg
rename to wallpapers/black-panther-3840.jpg
diff --git a/home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png b/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png
rename to wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png b/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png
rename to wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png b/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png
rename to wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-2560.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png b/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png
rename to wallpapers/jwst-carina-cosmic-cliffs-nircam-miri-composite-3840.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-1920.jpg b/wallpapers/jwst-pillars-of-creation-1920.jpg
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-1920.jpg
rename to wallpapers/jwst-pillars-of-creation-1920.jpg
diff --git a/home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-2560.jpg b/wallpapers/jwst-pillars-of-creation-2560.jpg
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-2560.jpg
rename to wallpapers/jwst-pillars-of-creation-2560.jpg
diff --git a/home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-3840.jpg b/wallpapers/jwst-pillars-of-creation-3840.jpg
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-pillars-of-creation-3840.jpg
rename to wallpapers/jwst-pillars-of-creation-3840.jpg
diff --git a/home-manager/modules/sway/wallpapers/jwst-saturn-nircam-2560.png b/wallpapers/jwst-saturn-nircam-2560.png
similarity index 100%
rename from home-manager/modules/sway/wallpapers/jwst-saturn-nircam-2560.png
rename to wallpapers/jwst-saturn-nircam-2560.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png b/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png
rename to wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png
diff --git a/home-manager/modules/i3/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png b/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png
rename to wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png
diff --git a/home-manager/modules/i3/wallpapers/river-1920.png b/wallpapers/river-1920.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/river-1920.png
rename to wallpapers/river-1920.png
diff --git a/home-manager/modules/i3/wallpapers/river-2560.png b/wallpapers/river-2560.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/river-2560.png
rename to wallpapers/river-2560.png
diff --git a/home-manager/modules/i3/wallpapers/river-3840.png b/wallpapers/river-3840.png
similarity index 100%
rename from home-manager/modules/i3/wallpapers/river-3840.png
rename to wallpapers/river-3840.png