diff --git a/homeConfigurations/vinzenz/niri.nix b/homeConfigurations/vinzenz/niri.nix
index 4213ec3..ba835c9 100644
--- a/homeConfigurations/vinzenz/niri.nix
+++ b/homeConfigurations/vinzenz/niri.nix
@@ -66,7 +66,7 @@
             urgent.gradient = gradient-urgent;
           };
           focus-ring = {
-            enable = false;
+            enable = true;
             active.gradient = gradient-active;
             inactive.gradient = gradient-inactive;
             urgent.gradient = gradient-urgent;
diff --git a/homeConfigurations/vinzenz/swaylock.nix b/homeConfigurations/vinzenz/swaylock.nix
index 08a5cd2..2e298a6 100644
--- a/homeConfigurations/vinzenz/swaylock.nix
+++ b/homeConfigurations/vinzenz/swaylock.nix
@@ -18,38 +18,8 @@
         show-failed-attempts = true;
         ignore-empty-password = true;
         grace = 3.5;
+        color = "000000";
         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/swaync.nix b/homeConfigurations/vinzenz/swaync.nix
index 93be775..8221c5e 100644
--- a/homeConfigurations/vinzenz/swaync.nix
+++ b/homeConfigurations/vinzenz/swaync.nix
@@ -1,24 +1,6 @@
-{ pkgs, ... }:
 {
   services.swaync = {
     enable = true;
-    settings = {
-      "$schema" = "${pkgs.swaynotificationcenter}/etc/xdg/swaync/configSchema.json";
-
-      hide-on-clear = true;
-
-      positionX = "center";
-      fit-to-screen = false;
-      control-center-height = 750;
-
-      widgets = [
-        "mpris"
-        "volume"
-        "title"
-        "dnd"
-        "inhibitors"
-        "notifications"
-      ];
-    };
+    settings = { };
   };
 }
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index 87cfb21..a26ed9d 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -26,17 +26,16 @@
         spacing = "8";
         modules-left = [
           "niri/workspaces"
-          "tray"
           "niri/window"
         ];
         modules-center = [
           "privacy"
           "clock"
-          "custom/swaync"
         ];
         modules-right = [
           #"image"
           "group/status-infos"
+          "tray"
           "group/system-tray"
           "group/group-power"
         ];
@@ -50,6 +49,7 @@
             "backlight"
             "network"
             "power-profiles-daemon"
+            "custom/swaync"
             "idle_inhibitor"
           ];
         };
@@ -136,28 +136,24 @@
                   urgency ? null,
                   body ? null,
                   icon ? null,
-                  category ? null,
                 }:
                 let
                   body-part = if body != null then "'${body}'" else "";
                   urgency-part = if urgency != null then "--urgency ${urgency}" else "";
                   icon-part = if icon != null then "--icon ${icon}" else "";
-                  category-part = if category != null then "--category ${category}" else "";
                 in
-                "${lib.getBin pkgs.libnotify}/bin/notify-send ${urgency-part} ${icon-part} ${category-part} '${summary}' ${body-part}";
+                "${lib.getBin pkgs.libnotify}/bin/notify-send ${urgency-part} ${icon-part} '${summary}' ${body-part}";
             in
             {
               on-discharging-warning = mkNotifySendCommand {
                 summary = "Low Battery";
                 icon = "battery-caution";
-                category = "device";
               };
               on-discharging-critical = mkNotifySendCommand {
                 urgency = "critical";
                 summary = "Very Low Battery";
                 body = "Connect to power <i>now</i>!";
                 icon = "battery-low";
-                category = "device";
               };
             };
         };
@@ -291,7 +287,7 @@
           in
           {
             tooltip = true;
-            format = "{icon}  {0} ";
+            format = "{0}{icon} ";
             format-icons = {
               notification = "󱅫";
               none = "󰂜";