diff --git a/home/user/.config/waybar/config b/home/user/.config/waybar/config
index 6d3d08b..1670ee8 100644
--- a/home/user/.config/waybar/config
+++ b/home/user/.config/waybar/config
@@ -13,7 +13,6 @@
 
     "modules-right": [
         "custom/wireless",
-        "custom/bluetooth",
         "custom/diskroot",
         "custom/diskhome",
         "memory",
@@ -21,7 +20,8 @@
         "custom/cpu_temp",
         "custom/battery",
         "custom/pomodoro",
-        "custom/volume",
+        "custom/bluetooth",
+        "pulseaudio",
         "custom/language",
         "custom/userhost",
         "clock",
@@ -56,7 +56,7 @@
     },
     "cpu": {
         "interval": 1,
-        "format": "{icons} {usage:>2}% ",
+        "format": "{icon} ",
         "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
     },
     "custom/cpu_temp": {
@@ -69,11 +69,24 @@
         "interval": 5,
         "return-type": "text"
     },
-    "custom/volume": {
-        "exec": "~/.config/waybar/scripts/builder.sh volume",
-        "interval": 1,
-        "return-type": "text",
-        "signal": 1
+    "pulseaudio": {
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-muted": "",
+        "format-icons": {
+            "alsa_output.pci-0000_00_1f.3.analog-stereo": "",
+            "alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
+            "headphone": "",
+            "hands-free": "󰂑",
+            "headset": "󰂑",
+            "phone": "",
+            "phone-muted": "",
+            "portable": "",
+            "car": "",
+            "default": ["", ""]
+        },
+        "scroll-step": 1,
+        "on-click": "pavucontrol"
     },
     "custom/pomodoro": {
         "exec": "~/.config/waybar/scripts/builder.sh pomodoro",