diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix
index 785afe7..cdc5fde 100644
--- a/homeConfigurations/vinzenz/default.nix
+++ b/homeConfigurations/vinzenz/default.nix
@@ -14,7 +14,6 @@
     ./swaync.nix
     ./vscode.nix
     ./waybar.nix
-    ./wlogout.nix
     ./zsh.nix
     # keep-sorted end
   ];
diff --git a/homeConfigurations/vinzenz/niri.nix b/homeConfigurations/vinzenz/niri.nix
index 4c382d2..4213ec3 100644
--- a/homeConfigurations/vinzenz/niri.nix
+++ b/homeConfigurations/vinzenz/niri.nix
@@ -16,8 +16,6 @@
       name = "adwaita-dark";
     };
 
-    services.wpaperd.enable = true;
-
     programs.niri.settings = {
       outputs = {
         "BOE 0x0A3B Unknown" = {
@@ -55,10 +53,10 @@
             from = pink_dark;
             to = pink_light;
           };
-          gap-size = 8;
+          gap-size = 10;
         in
         {
-          background-color = "transparent";
+          background-color = "#000000";
           gaps = gap-size;
           border = {
             enable = true;
diff --git a/homeConfigurations/vinzenz/swaylock.nix b/homeConfigurations/vinzenz/swaylock.nix
index 1b756ff..08a5cd2 100644
--- a/homeConfigurations/vinzenz/swaylock.nix
+++ b/homeConfigurations/vinzenz/swaylock.nix
@@ -2,16 +2,12 @@
 { pkgs, config, ... }:
 {
   config = {
-    stylix.targets.swaylock = {
-      enable = true;
-      useWallpaper = true;
-    };
     programs.swaylock = {
       enable = true;
       package = pkgs.swaylock-effects;
       # https://github.com/jirutka/swaylock-effects/blob/master/swaylock.1.scd
       settings = {
-        screenshot = false;
+        screenshot = true;
         effect-blur = "9x9";
         effect-vignette = "0.2:0.2";
         fade-in = 0.5;
@@ -23,6 +19,37 @@
         ignore-empty-password = true;
         grace = 3.5;
         indicator-thickness = 20;
+
+        # https://github.com/catppuccin/swaylock/blob/main/themes/mocha.conf
+        color = "1e1e2e";
+        bs-hl-color = "f5e0dc";
+        caps-lock-bs-hl-color = "f5e0dc";
+        caps-lock-key-hl-color = "a6e3a1";
+        inside-color = "00000000";
+        inside-clear-color = "00000000";
+        inside-caps-lock-color = "00000000";
+        inside-ver-color = "00000000";
+        inside-wrong-color = "00000000";
+        key-hl-color = "a6e3a1";
+        layout-bg-color = "00000000";
+        layout-border-color = "00000000";
+        layout-text-color = "cdd6f4";
+        line-color = "00000000";
+        line-clear-color = "00000000";
+        line-caps-lock-color = "00000000";
+        line-ver-color = "00000000";
+        line-wrong-color = "00000000";
+        ring-color = "b4befe";
+        ring-clear-color = "f5e0dc";
+        ring-caps-lock-color = "fab387";
+        ring-ver-color = "89b4fa";
+        ring-wrong-color = "eba0ac";
+        separator-color = "00000000";
+        text-color = "cdd6f4";
+        text-clear-color = "f5e0dc";
+        text-caps-lock-color = "fab387";
+        text-ver-color = "89b4fa";
+        text-wrong-color = "eba0ac";
       };
     };
 
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index 73c0ef8..87cfb21 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -38,7 +38,7 @@
           #"image"
           "group/status-infos"
           "group/system-tray"
-          "custom/wlogout"
+          "group/group-power"
         ];
 
         "group/system-tray" = {
@@ -57,7 +57,6 @@
           orientation = "inherit";
           modules = [
             "battery"
-            "custom/weather"
             "temperature"
             "cpu"
             "memory"
@@ -164,7 +163,7 @@
         };
         backlight = {
           device = "intel_backlight";
-          format = "{percent}%  ";
+          format = "{percent}% ";
           on-scroll-down = "light -U 1";
           on-scroll-up = "light -A 1";
         };
@@ -175,14 +174,46 @@
         disk = {
           format = "{free}/{total}";
         };
-        "custom/wlogout" = {
-          format = " ";
-          tooltip = false;
-          on-click = "wlogout";
+        "group/group-power" = {
+          "orientation" = "inherit";
+          "drawer" = {
+            "transition-duration" = 500;
+            "children-class" = "not-power";
+            "transition-left-to-right" = false;
+          };
+          "modules" = [
+            "custom/power" # First element is the "group leader" and won't ever be hidden
+            "custom/quit"
+            "custom/lock"
+            "custom/reboot"
+          ];
+        };
+        "custom/quit" = {
+          "format" = "󰗼 ";
+          "tooltip" = false;
+          "on-click" = "niri msg action quit";
+          min-width = 20;
+        };
+        "custom/lock" = {
+          "format" = "󰍁 ";
+          "tooltip" = false;
+          "on-click" = "${lib.getBin config.programs.swaylock.package}/bin/swaylock";
+          min-width = 20;
+        };
+        "custom/reboot" = {
+          "format" = "󰜉 ";
+          "tooltip" = false;
+          "on-click" = "systemctl reboot";
+          min-width = 20;
+        };
+        "custom/power" = {
+          "format" = " ";
+          "tooltip" = false;
+          "on-click" = "systemctl shutdown";
           min-width = 20;
         };
         idle_inhibitor = {
-          format = "{icon} ";
+          format = "{icon}";
           format-icons = {
             activated = "";
             deactivated = "";
@@ -216,7 +247,7 @@
           };
         };
         memory = {
-          format = "{}%  ";
+          format = "{}% ";
         };
         power-profiles-daemon = {
           format = "{icon}";
@@ -277,13 +308,6 @@
             on-click-right = "${swaync-client} --toggle-dnd --skip-wait";
             escape = true;
           };
-        "custom/weather" = {
-          format = "{}°";
-          tooltip = true;
-          interval = 3600;
-          exec = "${lib.getBin pkgs.wttrbar}/bin/wttrbar --nerd";
-          return-type = "json";
-        };
       };
     };
   };
diff --git a/homeConfigurations/vinzenz/wlogout.nix b/homeConfigurations/vinzenz/wlogout.nix
deleted file mode 100644
index bfd39f5..0000000
--- a/homeConfigurations/vinzenz/wlogout.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  config.programs.wlogout = {
-    enable = true;
-    style = ''
-      * {
-        /*background-image: none;*/
-        box-shadow: none;
-      }
-
-      window {
-        background-color: rgba(30, 30, 46, 0.90);
-      }
-
-      button {
-        border-radius: 0;
-        border-color: #cba6f7;
-        text-decoration-color: #cdd6f4;
-        color: #cdd6f4;
-        background-color: #181825;
-        border-style: solid;
-        border-width: 1px;
-        background-repeat: no-repeat;
-        background-position: center;
-        background-size: 25%;
-      }
-
-      button:focus, button:active, button:hover {
-        /* 20% Overlay 2, 80% mantle */
-        background-color: rgb(48, 50, 66);
-        outline-style: none;
-      }
-    '';
-  };
-}
diff --git a/nixosModules/stylix.nix b/nixosModules/stylix.nix
index 66fcc96..62bc062 100644
--- a/nixosModules/stylix.nix
+++ b/nixosModules/stylix.nix
@@ -1,9 +1,8 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    image = config.lib.stylix.pixel "base00";
     polarity = "dark";
     targets = {
       gnome.enable = false;