diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index 92e6f73..ba35e96 100644
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -1,15 +1,15 @@
 {
     "modules-left": ["custom/notification", "battery", "clock#date", "clock","custom/updater", "custom/launcher"],
     "modules-center": ["hyprland/workspaces"],
-    "modules-right": ["network", "bluetooth", "pulseaudio", "custom/power"],
+    "modules-right": ["network", "bluetooth", "wireplumber", "wireplumber#microphone", "custom/power"],
 
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
     "network": {
-        "format-wifi": "<span color='#962fb5'>{icon}\u2002</span>{essid}\u2002({signalStrength}%)",
-        "format-ethernet": "<span color='#962fb5'font='bold'>{icon}</span>\u2009Ethernet",
-        "format-disconnected": "󰅛\u2002<span rise='1000'>Not Connected</span>",
+        "format-wifi": "<span color='#962fb5'>{icon}<span letter_spacing='500'> </span></span>{essid}({signalStrength}%)",
+        "format-ethernet": "<span color='#962fb5'font='bold'>{icon}<span letter_spacing='500'> </span></span>Ethernet",
+        "format-disconnected": "󰅛<span letter_spacing='500'> </span><span rise='1000'>Not Connected</span>",
         "tooltip-format": "{ipaddr} via {gwaddr}",
         "tooltip-format-disconnected": "Disconnected",
         "max-length": 50,
@@ -55,27 +55,30 @@
             "on-click-right": "mode"
             }
     },
-    "pulseaudio": {
-        "format": "{icon}  {volume}%   {format_source}",
-        "format-muted": " {format_source}",
-        "format-bluetooth": "{icon}  {volume}%   {format_source}",
-        "format-bluetooth-muted": " {format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "  {volume}%",
-        "format-icons": {
-            "default": [
-                "<span color='#808080'></span>",
-                "<span color='#ffff66'></span>",
-                "<span color='#00ff7f'> </span>"]
-        },
-        "on-click": "pavucontrol"
+    "wireplumber": {
+        "format": "{icon}{volume}%",
+        "format-muted": "",
+        "format-bluetooth": "{icon}{volume}%",
+        "format-bluetooth-muted": "",
+        "format-icons": [
+            "<span color='#808080'><span letter_spacing='500'> </span></span>",
+            "<span color='#ffff66'><span letter_spacing='500'> </span></span>",
+            "<span color='#00ff7f'><span letter_spacing='3000'> </span></span>"
+        ],
+        "on-click": "pwvucontrol"
+    },
+    "wireplumber#microphone": {
+        "node-type": "Audio/Source",
+        "format": "<span letter_spacing='100'> </span>{volume}%",
+        "format-muted": "<span letter_spacing='2000'> </span>{volume}%",
+        "on-click": "pwvucontrol"
     },
     "bluetooth": {
-        "format-on": "<span color='#00ff7f'></span> On",
+        "format-on": "<span color='#00ff7f'><span letter_spacing='500'> </span></span>On",
         "format-off": "<span color='#888888'>󰂲 Off</span>",
         "format-disabled": "<span color='#888888'>󰂲 Off</span>",
-        "format-connected": "<span color='#0478d6'>󰂱</span>  {device_alias}",
-        "format-connected-battery": "<span color='#0478d6'>󰂱 </span> {device_alias}  <span color='#0478d6'>󰥈 </span> {device_battery_percentage}%",
+        "format-connected": "<span color='#0478d6'>󰂱<span letter_spacing='500'> </span></span>{device_alias}",
+        "format-connected-battery": "<span color='#0478d6'>󰂱<span letter_spacing='500'> </span></span>{device_alias}<span letter_spacing='500'> </span><span color='#0478d6'>󰥈<span letter_spacing='500'> </span></span>{device_battery_percentage}%",
         "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
         "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
         "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css
index d81e2a1..d5d4b43 100644
--- a/dotfiles/.config/waybar/style.css
+++ b/dotfiles/.config/waybar/style.css
@@ -71,7 +71,8 @@ window#waybar {
     border-radius: 20px;
     margin: 5px 3px;
 }
-#pulseaudio {
+#wireplumber,
+#wireplumber-microphone {
     padding: 5px 10px 5px 15px;
     background-color: rgba(0, 43, 51, 0.85);
     border-radius: 20px;
@@ -121,7 +122,8 @@ window#waybar {
 #idle_inhibitor.activated {
     color: #2dcc36;
 }
-#pulseaudio.muted {
+#wireplumber.muted,
+#wireplumber-microphone.muted {
     color: #cc3436;
 }
 #battery.charging {