diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
index c3d49a3..2961395 100644
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@@ -7,6 +7,7 @@
     ./hypridle
     ./hyprlock
     ./hyprpanel
+    ./hyprpaper.nix
     ./hyprshot.nix
     ./settings.nix
     ./swaync
diff --git a/home-manager/hyprland/hypridle/default.nix b/home-manager/hyprland/hypridle/default.nix
index aa9b4fe..111fea1 100644
--- a/home-manager/hyprland/hypridle/default.nix
+++ b/home-manager/hyprland/hypridle/default.nix
@@ -1,6 +1,7 @@
 let
   # Time in seconds
   lockAfter = 1200;
+  screenOffAfter = 1500;
   suspendAfter = 7200;
 in
 {
@@ -19,12 +20,12 @@ in
           timeout = lockAfter;
           on-timeout = "loginctl lock-session";
         }
-        # Turn off screens TODO buggy main monitor, turns off and on after resume
-        #        {
-        #          timeout = 120;
-        #          on-timeout = "hyprctl dispatch dpms off";
-        #          on-resume = "hyprctl dispatch dpms on";
-        #        }
+        # Turn off screens
+        {
+          timeout = screenOffAfter;
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
         # Suspend
         {
           timeout = suspendAfter;
diff --git a/home-manager/hyprland/hyprlock/default.nix b/home-manager/hyprland/hyprlock/default.nix
index 4582442..3d083bb 100644
--- a/home-manager/hyprland/hyprlock/default.nix
+++ b/home-manager/hyprland/hyprlock/default.nix
@@ -8,6 +8,12 @@ in
     settings = {
       "$font" = "${theme.nerdFont} Nerd Font";
 
+      background = [
+        {
+          path = "${../../../wallpapers/tropic_island_night.jpg}";
+        }
+      ];
+
       # GENERAL
       general = {
         disable_loading_bar = true;
diff --git a/home-manager/hyprland/hyprpaper.nix b/home-manager/hyprland/hyprpaper.nix
new file mode 100644
index 0000000..0abd59e
--- /dev/null
+++ b/home-manager/hyprland/hyprpaper.nix
@@ -0,0 +1,34 @@
+# Wallpapers
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    hyprpaper
+  ];
+
+  services.hyprpaper = {
+    enable = true;
+    settings =
+      let
+        wallpaperDir = ../../wallpapers;
+        monitor1 = "${wallpaperDir}/nixos_waves.png";
+        monitor2 = "${wallpaperDir}/ekg_v2.png";
+      in
+      {
+        ipc = "on";
+        splash = false;
+        splash_offset = 2.0;
+
+        preload = [
+          monitor1
+          monitor2
+        ];
+
+        wallpaper = [
+          "DP-1,${monitor1}"
+          "DP-3,${monitor2}"
+          w
+        ];
+      };
+  };
+}
diff --git a/home-manager/hyprland/hyprshot.nix b/home-manager/hyprland/hyprshot.nix
index 51088d9..67dbb6b 100644
--- a/home-manager/hyprland/hyprshot.nix
+++ b/home-manager/hyprland/hyprshot.nix
@@ -2,15 +2,14 @@ let
   common = import ../../common.nix;
 in
 {
-  # TODO not working?
-  home.sessionVariables = {
-    HYPRSHOT_DIR = "${common.dir.pictures}/screenshots"; # Store screenshots here
-  };
-
   wayland.windowManager.hyprland.settings = {
     "$mainMod" = "SUPER";
     "$shiftMod" = "$mainMod SHIFT";
 
+    env = [
+      "HYPRSHOT_DIR,${common.dir.pictures}/screenshots" # Store screenshots here
+    ];
+
     bind = [
       "$mainMod, PRINT, exec, hyprshot -m window" # Window
       ", PRINT, exec, hyprshot -m output" # Monitor
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 1f96c46..15d19c8 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -2,15 +2,10 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./wallpaper.nix
-  ];
-
   environment.systemPackages = with pkgs; [
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
-    # waybar
   ];
 
   programs = {
diff --git a/modules/hyprland/wallpaper.nix b/modules/hyprland/wallpaper.nix
deleted file mode 100644
index 8577301..0000000
--- a/modules/hyprland/wallpaper.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    swww
-    waypaper
-  ];
-}
diff --git a/wallpapers/ekg_v2.png b/wallpapers/ekg_v2.png
new file mode 100644
index 0000000..b0e091e
Binary files /dev/null and b/wallpapers/ekg_v2.png differ
diff --git a/wallpapers/nixos_waves.png b/wallpapers/nixos_waves.png
new file mode 100644
index 0000000..b562b85
Binary files /dev/null and b/wallpapers/nixos_waves.png differ