diff --git a/home/linux/gui/base/desktop/conf/waybar/config.jsonc b/home/linux/gui/base/desktop/conf/waybar/config.jsonc
index 7c6d0f44..7b448334 100644
--- a/home/linux/gui/base/desktop/conf/waybar/config.jsonc
+++ b/home/linux/gui/base/desktop/conf/waybar/config.jsonc
@@ -1,16 +1,15 @@
 {
   "position": "top",
   "layer": "top",
-
-  "modules-left": ["custom/launcher", "temperature", "backlight", "hyprland/workspaces"],
+  "modules-left": ["custom/launcher", "temperature", "backlight", "network"],
   "modules-center": ["custom/playerctl"],
   "modules-right": [
-    "pulseaudio",
-    "memory",
+    "wireplumber",
+    "wireplumber#source",
     "cpu",
-    "network",
-    "battery",
+    "memory",
     "clock",
+    "battery",
     "idle_inhibitor",
     "custom/powermenu",
     "tray",
@@ -33,7 +32,6 @@
       "default": "",
     },
   },
-
   "clock": {
     "interval": 60,
     "align": 0,
@@ -102,14 +100,11 @@
     "on-click-middle": "nm-connection-editor",
     "on-click-right": "foot nmtui",
   },
-  "pulseaudio": {
-    //"format": "{volume}% {icon} {format_source}",
+  "wireplumber": {
     "format": "{icon} {volume}%",
     "format-muted": " Mute",
-    "format-bluetooth": " {volume}% {format_source}",
+    "format-bluetooth": " {volume}%",
     "format-bluetooth-muted": " Mute",
-    "format-source": " {volume}%",
-    "format-source-muted": "",
     "format-icons": {
       "headphone": "",
       "hands-free": "",
@@ -120,11 +115,19 @@
       "default": ["", "", ""],
     },
     "scroll-step": 5.0,
-    // Commands to execute on events
-    "on-click": "amixer set Master toggle",
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
     "on-click-right": "GSK_RENDERER=opengl pavucontrol",
     "smooth-scrolling-threshold": 1,
   },
+  "wireplumber#source": {
+    "node-type": "Audio/Source",
+    "format": " {volume}%",
+    "format-muted": " Muted",
+    "tooltip": false,
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
+    "on-click-right": "GSK_RENDERER=opengl pavucontrol",
+    "scroll-step": 5,
+  },
   "temperature": {
     "format": "\uf2c9 {temperatureC}\u00b0C",
     "tooltip": false,
diff --git a/home/linux/gui/base/desktop/conf/waybar/style.css b/home/linux/gui/base/desktop/conf/waybar/style.css
index 35fbb4bb..011ed4dc 100644
--- a/home/linux/gui/base/desktop/conf/waybar/style.css
+++ b/home/linux/gui/base/desktop/conf/waybar/style.css
@@ -76,10 +76,10 @@ tooltip label {
 #memory,
 #temperature,
 #cpu,
-#custom-wall,
-#temperature,
+#custom-playerctl,
 #backlight,
-#pulseaudio,
+#wireplumber,
+#wireplumber-source,
 #network,
 #battery,
 #custom-powermenu {
@@ -123,18 +123,23 @@ tooltip label {
   animation-iteration-count: infinite;
   animation-direction: alternate;
 }
-#custom-wall {
-  color: #33ccff;
-}
 #temperature {
   color: rgb(150, 205, 251);
 }
 #backlight {
   color: rgb(248, 189, 150);
 }
-#pulseaudio {
+#wireplumber {
   color: rgb(245, 224, 220);
 }
+
+#wireplumber-source {
+  color: rgb(181, 232, 224);
+}
+
+#custom-playerctl {
+  color: rgb(166, 227, 161);
+}
 #network {
   color: #abe9b3;
 }