diff --git a/hypr/modules/theme.conf b/hypr/modules/theme.conf
index 42e31d9..230b6e6 100644
--- a/hypr/modules/theme.conf
+++ b/hypr/modules/theme.conf
@@ -12,8 +12,7 @@ general {
     border_size = 3
 
     # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    # col.active_border = rgba(cba6f7ee) rgba(f38ba8ee) 45deg
-    col.active_border = $red $blue 30deg
+    col.active_border = $mauve $lavender 45deg
     col.inactive_border = rgb($surface2Alpha)
 
     # Set to true enable resizing windows by clicking and dragging on borders and gaps
@@ -101,13 +100,35 @@ misc {
 }
 
 group {
-	groupbar {
-		font_size = 14
-		text_color = $text
-		text_color_inactive = $text
-		col.active = $blue
-		col.inactive = $surface2
-	}
-    col.border_active = $red $blue 45deg
-    col.border_inactive = $surface2
+    # The border around the grouped windows
+    col.border_active = $mauve $lavender 45deg
+    col.border_inactive = $surface1
+
+    groupbar {
+        font_family = JetBrainsMono Nerd Font
+        font_size = 11
+        
+        # Increase the height so the text has room to breathe
+        height = 24 
+        
+        # Disable the default 3D gradient for a modern flat look
+        gradients = false 
+
+        # --- Active Tab ---
+        # Bright background with very dark text for perfect readability
+        col.active = $mauve
+        text_color = $crust 
+
+        # --- Inactive Tab ---
+        # Dark surface background with dimmed, soft text
+        col.inactive = $surface0
+        text_color_inactive = $subtext0
+        height = 1
+        font_size = 11
+        # about half the indicator height
+        text_offset = -7
+        
+        # Make the indicator tall enough to render text inside
+        indicator_height = 15
+    }
 }
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 9ab7848..8910815 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -154,10 +154,10 @@
             "return-type": "json",
             "exec": "fluxo-rs bt",
             "on-click": "fluxo-rs bt menu",
-            "on-click-right": "fluxo-rs bt disconnect",
-            "interval": 3
+            "on-click-right": "fluxo-rs bt cycle_mode",
+            "interval": 5,
+            "tooltip": true
         }
-
         // --- Commented Out Modules ---
         /*
         "custom/gpu": {
@@ -173,7 +173,7 @@
             "exec": "fluxo-rs pool",
             "interval": 30
         },
-        "custom/pixelbuds_pro": {
+        "custom/buds": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs buds",
diff --git a/waybar/style.css b/waybar/style.css
index 0623ea3..655c80d 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -36,6 +36,7 @@ window#waybar.bottom {
 #custom-disk-root,
 #custom-bluetooth-audio,
 #custom-volume,
+#custom-buds,
 #custom-mic,
 #custom-gamemode,
 #custom-power_status {
@@ -68,6 +69,8 @@ window#waybar.bottom {
   background-color: @mauve; /* Signature Catppuccin accent */
 }
 
+#workspaces button.active:hover { min-width: 30px; background-color: @mauve; }
+
 #workspaces button:hover {
   background-color: @lavender;
   min-width: 20px;
@@ -80,7 +83,7 @@ window#waybar.bottom {
 /* --- Clock (Centered Pill) --- */
 #clock {
   background: linear-gradient(45deg, @mauve, @lavender); /* Cohesive pastel gradient */
-  color: @base; 
+  color: @surface0; 
   font-weight: 900;
   margin: 4px 6px;
   padding: 4px 20px;
@@ -141,17 +144,43 @@ window#waybar.bottom {
 /* --- Center Bottom Utilities --- */
 #custom-gamemode.active {
   color: @mauve; /* Matches the workspace accent */
-  padding-left: 9px;
+  /* padding-left: 9px; */
 }
 
 /* --- Right Bottom Controls Semantic Alerts --- */
 #custom-volume.muted,
 #custom-mic.muted {
-  color: @overlay0; /* Dims when muted */
+  color: @overlay1; /* Dims when muted */
+}
+
+
+#custom-bluetooth-audio.disabled {
+    color: @overlay1; /* Green for active ANC */
+}
+
+#custom-bluetooth-audio.connected {
+    color: @blue; /* Green for active ANC */
+}
+
+#custom-bluetooth-audio.anc-off {
+    color: @blue; /* Green for active ANC */
+}
+
+#custom-bluetooth-audio.anc-active {
+    color: @blue; /* Green for active ANC */
+}
+
+#custom-bluetooth-audio.anc-aware {
+    color: @blue; /* Yellow for transparency mode */
+}
+
+#custom-bluetooth-audio.disconnected {
+    color: @text; /* Gray when off */
 }
 
 /* --- Hover States --- */
 #custom-volume:hover,
+#custom-buds:hover,
 #custom-mic:hover,
 #custom-bluetooth-audio:hover,
 #custom-power_status:hover {
@@ -159,6 +188,7 @@ window#waybar.bottom {
   color: @mauve; /* Subtle accent color on hover instead of jarring borders */
 }
 
+
 /* --- Tooltip --- */
 tooltip {
   background-color: alpha(@base, 0.9);