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/.sops.yaml b/nixos/.sops.yaml
index 62f72a2..5380b68 100644
--- a/nixos/.sops.yaml
+++ b/nixos/.sops.yaml
@@ -1,12 +1,15 @@
 keys:
   - &tdpeuter age1fva6s64s884z0q2w7de024sp69ucvqu0pg9shrhhqsn3ewlpjfpsh6md7y
+  - &tdpeuter_gpg 08a9c1c8cf9159c9172aba129b11f5243089db5b
 
   - &server_H4G0 age1d4gvqz3anf082ja6xt03hnkzazfum80um9t45m4rerl4n3va2yuqgnsg03
 
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
-    - age:
+    - pgp:
+      - *tdpeuter_gpg
+      age:
       - *tdpeuter
 
       - *server_H4G0
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 63e1d07..71f27bb 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758589230,
-        "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=",
+        "lastModified": 1759143472,
+        "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0",
+        "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "lastModified": 1759036355,
+        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758425756,
-        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
+        "lastModified": 1759188042,
+        "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
+        "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758859571,
-        "narHash": "sha256-/DPe2RNgIzTBHm1tLUF31YswssT7Uz+HJI6VIkmHN6w=",
+        "lastModified": 1759205174,
+        "narHash": "sha256-LMfGQsy3OibEqr3WtLCOqUVdOy5/6DJKWHV8h+1Vapk=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "58e5a7b019aa1584ca46e909b011c1f6a91081f0",
+        "rev": "afd770119e0f9fbb085665738f3fa4c28ff42f78",
         "type": "github"
       },
       "original": {
diff --git a/nixos/modules/desktop/hyprland/default.nix b/nixos/modules/desktop/hyprland/default.nix
index d4ed030..8476c54 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
 
@@ -49,6 +50,8 @@ in {
       waybar.enable = true;
     };
 
+    security.polkit.enable = true;
+
     services = {
       dbus.enable = true;
       displayManager.ly.enable = true;
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/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix
index 6435828..e3d6514 100644
--- a/nixos/users/tdpeuter/default.nix
+++ b/nixos/users/tdpeuter/default.nix
@@ -35,25 +35,26 @@ in {
       shell = pkgs.zsh;
 
       packages = (with pkgs; [
-        cmdtime               # Zsh plugin
-        icosystem             # Personal icon theme
-        nextcloud-client
-        spotify-adblock
+        bitwarden-desktop
         brave                 # Internet browser
         chafa                 # Terminal image viewer
+        cmdtime               # Zsh plugin
         duf                   # Df alternative
         feishin               # Jellyfin music client
         foot
         fzf
         gh                    # GitHub CLI tool
         glow                  # Terminal Markdown renderer
+        icosystem             # Personal icon theme
         jellyfin-media-player
         libreoffice-fresh     # Office tools
         librewolf             # Internet browser
         mpv                   # Media player
+        nextcloud-client
         nsxiv                 # Lightweight image viewer
         qalculate-gtk         # Calculator
         spotify
+        spotify-adblock
         unzip
         vifm                  # File manager
         zathura               # PDF viewer
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": {