diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 25c4774..e8db069 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -7,7 +7,8 @@
   "modules-left": ["hyprland/workspaces", "cpu", "memory", "network#speed"],
   "modules-center": ["clock"],
   "modules-right": [
-    "custom/cava",
+    // "custom/cava",
+    "hyprland/window",
     "temperature#gpu",
     "custom/transparency",
     "custom/wallpaper",
@@ -18,7 +19,23 @@
     "battery"
   ],
   "hyprland/window": {
-    "format": "󰣇 {}"
+    "format": "{initialClass}",
+    "icon": true,
+    "icon-size": 19,
+    "seperate-outputs": true,
+    "rewrite": {
+      "": "  Arch",
+      "Mozilla Firefox": "Firefox",
+      "(.*) Thunar": "Thunar",
+      "(.*)obs(.*)": "OBS",
+      "Spotify (.*)": "Spotify",
+      "discord(.*)": " Discord",
+      "Code": "VS Code",
+      "Docker Desktop": "Docker",
+      "kitty": "Kitty",
+      "zen-alpha": "Zen"
+    },
+    "on-click-middle": "pkill waybar && hyprctl dispatch exec waybar"
   },
   "custom/cava": {
     "format": "{}",
@@ -77,15 +94,33 @@
     "on-click": "kitty btop",
     "tooltip-format": "{used}/{total} GiB"
   },
+  // "hyprland/workspaces": {
+  //   "all-outputs": true,
+  //   "warp-on-scroll": true,
+  //   "enable-bar-scroll": true,
+  //   "disable-scroll-wraparound": false,
+  //   "format": " {icon} ",
+  //   "format-icons": {
+  //     "active": "●",
+  //     "default": "○"
+  //   },
+  //   "persistent-workspaces": {
+  //     "*": 3
+  //   },
+  //   "on-click": "activate",
+  //   "on-scroll-up": "hyprctl dispatch workspace e-1",
+  //   "on-scroll-down": "hyprctl dispatch workspace e+1"
+  // },
   "hyprland/workspaces": {
     "all-outputs": true,
-    "warp-on-scroll": true,
-    "enable-bar-scroll": true,
-    "disable-scroll-wraparound": false,
-    "format": " {icon} ",
+    "active-only": false,
+    "on-scroll-up": "hyprctl dispatch workspace e+1",
+    "on-scroll-down": "hyprctl dispatch workspace e-1",
+    "format": "{icon}",
     "format-icons": {
-      "active": "●",
-      "default": "○"
+      "active": "󰮯",
+      "default": "󰊠",
+      "special": "S"
     },
     "persistent-workspaces": {
       "*": 3
diff --git a/waybar/mocha.css b/waybar/mocha.css
index 1bae828..cd3f0eb 100644
--- a/waybar/mocha.css
+++ b/waybar/mocha.css
@@ -6,7 +6,7 @@
 @define-color antiflash     #F1F2F6;
 /* black */
 @define-color onyx          #313638;
-@define-color raisin-black  rgba(30, 30, 46,0.9);
+@define-color raisin-black  rgba(30, 30, 46,0.8);
 @define-color gunmetal      #333745;
 @define-color charcoal       #424651;
 /* blue */
diff --git a/waybar/style.css b/waybar/style.css
index 851bbbd..7784cbf 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -12,6 +12,20 @@
   text-shadow: none;
   background-color: transparent;
 }
+window#waybar {
+  /* background: rgba(0, 0, 0, 0.45); */
+  /* color: @text; */
+  border-radius: 6px;
+  padding: 2px;
+  box-shadow: none;
+}
+
+#window {
+  color: @text;
+  background: @raisin-black;
+  padding: 6px;
+  margin: 0px 2px;
+}
 
 #custom-cava {
   color: #cba6f7;
@@ -122,9 +136,10 @@ menu,
   font-size: 18px;
   background: @raisin-black;
   color: #94e2d5;
-  padding: 0px 14px;
-  /* margin-right: 2px; */
-  border-radius: 6px 0 0 6px;
+  padding: 0px 10px;
+  margin-right: 2px;
+  border-radius: 6px;
+  /* border-radius: 6px 0 0 6px; */
   /* border-radius: 0 6px 6px 0; */
 }
 
@@ -135,7 +150,8 @@ menu,
   margin-right: 1px;
   color: #f38ba8;
   background: @raisin-black;
-  border-radius: 0 6px 6px 0;
+  /* border-radius: 0 6px 6px 0; */
+  border-radius: 6px;
 }
 
 #pulseaudio,