diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index 31db074..c4de733 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}   </span>{essid} ({signalStrength}%)",
-        "format-ethernet": "<span color='#962fb5'>   </span>Ethernet",
-        "format-disconnected": "󰅛  Not Connected",
+        "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><span rise='1000'>Ethernet</span>",
+        "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,
@@ -17,7 +17,7 @@
         "on-click-right": "kitty -e nmtui",
         "format-icons": {
             "wifi": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
-            "ethernet": "",
+            "ethernet": "󰈀",
             "disconnected": "󰅛"
         }
     },
@@ -33,10 +33,10 @@
         "spacing": 10
     },
     "clock": {
-		"format": "  {:%H:%M}"
+		"format": " <span rise='300'>{:%H:%M}</span>"
     },
     "clock#date": {
-		"format": "  {:%A, %B %d, %Y}",
+		"format": " <span rise='300'>{:%A, %B %d, %Y}</span>",
         "tooltip-format": "<tt><small>{calendar}</small></tt>",
         "calendar": {
             "mode"          : "year",
@@ -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": "<span rise='300'>{icon}</span>{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><span rise='300'>{volume}%</span>",
+        "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}",
@@ -97,7 +100,7 @@
         "on-click-right": "swaymsg 'move scratchpad'"
     },
     "custom/launcher": {
-        "format":"    ",
+        "format":"  ",
         "tooltip-format": "Click To Launch Bitwarden",
         "on-click": "exec bitwarden-desktop"
     },
@@ -106,11 +109,11 @@
                 "warning": 30,
                 "critical": 15
         },
-        "format": "{icon} {capacity}%",
-        "format-charging": "{icon}  {capacity}%",
-        "format-plugged": "{icon}  {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-full": "󰁹 {capacity}%",
+        "format": "{icon}<span letter_spacing='1'> </span>{capacity}%",
+        "format-charging": "{icon}<span letter_spacing='1'> </span>{capacity}%",
+        "format-plugged": "{icon}<span letter_spacing='1'> </span>{capacity}%",
+        "format-alt": "{time}<span letter_spacing='1'> </span>{icon}",
+        "format-full": "󰁹<span letter_spacing='1'> </span>{capacity}%",
         "format-icons": {
             "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂"],
             "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋"],
@@ -137,13 +140,13 @@
         "sort-by-number": true
     },
     "custom/updater": {
-        "format": "󰏖  {}",
+        "format": "󰏖 <span rise='300'>{}</span>",
         "exec": "checkupdates | wc -l",
         "exec-if": "[[ $(checkupdates | wc -l) ]]",
         "interval": 1300,
         "on-click": "$HOME/.config/waybar/scripts/update-distro.sh",
         "tooltip": true,
-        "tooltip-format": "Left Click: Update System\nArch (w/ notification)\nFedora, OpenSuse, Debian/Ubuntu click to update"
+        "tooltip-format": "Left Click: Update System\nRight Click: Update Package Count\nArch (w/ notification)"
     },
 
     "custom/notification": {
diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css
index 9b9e025..d752665 100644
--- a/dotfiles/.config/waybar/style.css
+++ b/dotfiles/.config/waybar/style.css
@@ -3,7 +3,8 @@
     font-family:
         Font Awesome,
         Roboto,
-        "NotoSansMono Nerd Font", 
+        "NotoSansM Nerd Font",
+        "NotoSansMono Nerd Font",
         "Font Awesome 6 Free",
         Arial,
         sans-serif;
@@ -18,10 +19,11 @@ window#waybar {
 /*-----module groups----*/
 .modules-right {
     margin: 2px 10px 0 0;
+    padding-top: 1px;
 }
 
 #custom-notification {
-    font-family: "NotoSansMono Nerd Font";
+    font-family: "NotoSansM Nerd Font", "NotoSansMono Nerd Font";
     font-size: 13px;
     background-color: rgba(0, 43, 51, 0.85);
     border-radius: 20px;
@@ -39,6 +41,7 @@ window#waybar {
 
 .modules-left {
     margin: 2px 0 0 5px;
+    padding-top: 1px;
 }
 /*-----modules indv----*/
 #workspaces button {
@@ -70,7 +73,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;
@@ -120,7 +124,8 @@ window#waybar {
 #idle_inhibitor.activated {
     color: #2dcc36;
 }
-#pulseaudio.muted {
+#wireplumber.muted,
+#wireplumber-microphone.muted {
     color: #cc3436;
 }
 #battery.charging {