diff --git a/assets/bluescreen.png b/assets/bluescreen.png
new file mode 100644
index 0000000..ef36cd9
Binary files /dev/null and b/assets/bluescreen.png differ
diff --git a/nixos/modules/desktop/hyprland/default.nix b/nixos/modules/desktop/hyprland/default.nix
index d4ed030..b77946b 100644
--- a/nixos/modules/desktop/hyprland/default.nix
+++ b/nixos/modules/desktop/hyprland/default.nix
@@ -11,6 +11,7 @@ in {
         # Hint Electron apps to use wayland
         NIXOS_OZONE_WL = "1";
 
+        ASSETS_DIR = ../../../../assets;
         SCRIPT_DIR = ../../../../scripts;
       };
 
@@ -27,7 +28,7 @@ in {
         wl-mirror # Mirror an output
         wdisplays # Tool to configure displays
 
-        swaylock-effects
+        swaylock
 
         glib
 
diff --git a/nixos/modules/desktop/sway/default.nix b/nixos/modules/desktop/sway/default.nix
index 3dc3547..ebc0202 100644
--- a/nixos/modules/desktop/sway/default.nix
+++ b/nixos/modules/desktop/sway/default.nix
@@ -96,6 +96,7 @@ in {
     ]);
 
     environment.sessionVariables = {
+      ASSETS_DIR = ../../../../assets;
       SCRIPT_DIR = ../../../../scripts;
     };
 
diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf
index b9629db..cdcf89e 100644
--- a/stow/hyprland/.config/hypr/hyprland.conf
+++ b/stow/hyprland/.config/hypr/hyprland.conf
@@ -266,7 +266,7 @@ $right = l
 
 $term = foot
 $menu = j4-dmenu-desktop --dmenu="rofi -dmenu -i" --no-generic --usage-log="/home/tdpeuter/.local/state/dmenu.log" --term=$term
-$lock = swaylock
+$lock = swaylock --daemonize
 
 source = /home/tdpeuter/.config/hypr/input-output.conf
 source = /home/tdpeuter/.config/hypr/keybinds.conf
diff --git a/stow/swaylock/.config/swaylock/config b/stow/swaylock/.config/swaylock/config
index 96b053f..a5ecd8a 100644
--- a/stow/swaylock/.config/swaylock/config
+++ b/stow/swaylock/.config/swaylock/config
@@ -2,21 +2,23 @@
 # .config/swaylock/config
 # 
 
-indicator
-indicator-radius=200
+#indicator
+#indicator-radius=200
+#
+#clock
+#datestr=%A, %B %d %Y
+#
+#show-failed-attempts
+#
+#screenshots
+#effect-pixelate=10
+#effect-vignette=0.75:0 # Darken the whole screen.
+#fade-in=0.25
+#
+#grace=7 # Allow to unlock without password for duration
+#grace-no-mouse
 
-clock
-datestr=%A, %B %d %Y
-
-show-failed-attempts
-
-screenshots
-effect-pixelate=10
-effect-vignette=0.75:0 # Darken the whole screen.
-fade-in=0.25
-
-grace=7 # Allow to unlock without password for duration
-grace-no-mouse
+image=${ASSETS_DIR}/bluescreen.png
 
 # Styling
 
diff --git a/stow/waybar/.config/waybar/modules.json b/stow/waybar/.config/waybar/modules.json
index 21b3534..ab8551b 100644
--- a/stow/waybar/.config/waybar/modules.json
+++ b/stow/waybar/.config/waybar/modules.json
@@ -90,21 +90,21 @@
         "format": "\uf09c", /*  */
         "tooltip": true,
         "tooltip-format": "Lock device",
-        "on-click": "swaylock -f"
+        "on-click": "swaylock --daemonize"
     },
 
     "custom/system-sleep": {
         "format": "\uf186", /*  */
         "tooltip": true,
         "tooltip-format": "Put device to sleep",
-        "on-click": "swaylock -f; systemctl suspend"
+        "on-click": "swaylock --daemonize; systemctl suspend"
     },
 
     "custom/system-hibernate": {
         "format": "\uf2dc", /*  */
         "tooltip": true,
         "tooltip-format": "Hibernate device",
-        "on-click": "swaylock -f; systemctl hibernate"
+        "on-click": "swaylock --daemonize; systemctl hibernate"
     },
 
     "custom/system-reboot": {