diff --git a/home/config/waybar/config b/home/config/waybar/config
index b62ea20..e89630a 100644
--- a/home/config/waybar/config
+++ b/home/config/waybar/config
@@ -4,18 +4,20 @@
     "spacing": 5,
     "modules-left": [
         "group/sys",
-        "hyprland/workspaces",
-        "tray"       
+        "niri/workspaces",
+        "tray",
+
+        "wlr/taskbar",
+        "niri/window"
     ],
     "modules-center": [
-        "mpris",
-        "wlr/taskbar"
+        
     ],
     "modules-right": [
+        "mpris",
         "custom/cpugov",
         "group/net",
         "group/sound",
-        "cava",
         "group/indicators"
     ],
     "group/indicators": {
@@ -25,7 +27,6 @@
             "custom/updates",
             "idle_inhibitor",
             "custom/screenshader",
-            "custom/dnd",
             "privacy"
         ]
     },
@@ -197,7 +198,7 @@
     },
     "wlr/taskbar": {
         "markup": true,
-        "format": "{icon} {title:.10}",
+        "format": "{icon}",
         "icon-size": 20,
         "tooltip-format": "{title:.100}",
         // "sort-by-app-id": true,
@@ -272,14 +273,10 @@
         "sort-by-number": true
     },
     "hyprland/window": {
-        "format": "{}",
-        "rewrite": {
-            "(.*) — firefox": "🌎 $1",
-            "(.*) - zsh": "> [$1]",
-            "(.*) - kitty": "> [$1]",
-            "(.*) - alacritty": "> [$1]"
-        },
-        "separate-outputs": false
+        "format": "{title}",
+        "icon": false,
+        "icon-size": 16,
+        "separate-outputs": true
     },
     "custom/updates": {
         "format": "{icon}",
@@ -304,9 +301,9 @@
         "menu": "on-click",
         "menu-file": "~/.config/waybar/screenshader.xml",
         "menu-actions": {
-            "blue-light-heavy": "hyprshade on blue-light-filter",
-            "blue-light-soft": "hyprshade on blue-light-alt",
-            "off": "hyprshade off"
+            "blue-light-heavy": "hyprctl hyprsunset temperature 5000",
+            "blue-light-soft": "hyprctl hyprsunset temperature 5500",
+            "off": "hyprctl hyprsunset identity"
         },
         "exec-if": "hyprshade",
         "exec": "hyprshade-waybar",
@@ -327,7 +324,7 @@
             "dnd-inhibited-none": "󰂛"
         },
         "return-type": "json",
-        "exec-if": "which swaync-client",
+        "exec-if": "which sync-client",
         "exec": "swaync-client -swb",
         "on-click": "sh -c 'sleep 0.1s; swaync-client -t -sw; sleep 0.1s'",
         "on-click-right": "swaync-client -d -sw",
@@ -500,8 +497,8 @@
             "chat": "<b></b>",
 
             // Icons by state
-            "active": "",
-            "default": ""
+            "active": "",
+            "default": ""
         }
     },
     "niri/window": {