diff --git a/home/user/.config/waybar/config b/home/user/.config/waybar/config
index 6d3d08b..78790dc 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",
@@ -32,60 +32,74 @@
     "clock": {
         "format": " {:%d.%m.%y %a  %H:%M}",
         "format-alt": "{:%H:%M}",
-        "interval": 30
+        "interval": 30,
     },
 
     "custom/wireless": {
         "exec": "~/.config/waybar/scripts/builder.sh wireless",
         "interval": 10,
-        "return-type": "text"
+        "return-type": "text",
     },
     "custom/diskroot": {
         "exec": "~/.config/waybar/scripts/builder.sh disk_root",
         "interval": 30,
-        "return-type": "text"
+        "return-type": "text",
     },
     "custom/diskhome": {
         "exec": "~/.config/waybar/scripts/builder.sh disk_home",
         "interval": 30,
-        "return-type": "text"
+        "return-type": "text",
     },
     "memory": {
         "interval": 5,
-        "format": "{used:0.1f}G/{total:0.1f}G "
+        "format": "{used:0.1f}G/{total:0.1f}G ",
     },
     "cpu": {
         "interval": 1,
-        "format": "{icons} {usage:>2}% ",
+        "format": "{icon} ",
         "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
     },
     "custom/cpu_temp": {
         "exec": "~/.config/waybar/scripts/builder.sh cpu_temp",
         "interval": 5,
-        "return-type": "text"
+        "return-type": "text",
     },
     "custom/bluetooth": {
         "exec": "~/.config/waybar/scripts/builder.sh bluetooth_battery",
         "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",
         "interval": 1,
         "return-type": "text",
-        "signal": 2
+        "signal": 2,
+        "on-click": "pomodoro toggle",
     },
     "custom/language": {
         "exec": "~/.config/waybar/scripts/builder.sh language",
         "return-type": "text",
         "on-click": "swaymsg input type:keyboard xkb_switch_layout next",
-        "signal": 3
+        "signal": 3,
     },
     "custom/userhost": {
         "exec": "~/.config/waybar/scripts/builder.sh userhost",
@@ -94,12 +108,12 @@
     "custom/battery": {
         "exec": "~/.config/waybar/scripts/builder.sh battery",
         "interval": 30,
-        "return-type": "text"
+        "return-type": "text",
     },
     "custom/time": {
         "exec": "~/.config/waybar/scripts/builder.sh time",
         "interval": 30,
-        "return-type": "text"
+        "return-type": "text",
     },
     "custom/power": {
         "format" : "⏻",
diff --git a/home/user/.config/waybar/style.css b/home/user/.config/waybar/style.css
index f19f898..2d6e33c 100644
--- a/home/user/.config/waybar/style.css
+++ b/home/user/.config/waybar/style.css
@@ -38,7 +38,7 @@ window#waybar {
 #cpu,
 #custom-cpu_temp,
 #custom-bluetooth,
-#custom-volume,
+#pulseaudio,
 #custom-pomodoro,
 #custom-language,
 #custom-userhost,
@@ -52,7 +52,7 @@ window#waybar {
     color: #64B5F6;
 }
 
-#custom-volume {
+#pulseaudio {
     color: #81C784;
 }