diff --git a/waybar/.config/waybar/common.jsonc b/waybar/.config/waybar/common.jsonc
index 54325c1..1c1da57 100644
--- a/waybar/.config/waybar/common.jsonc
+++ b/waybar/.config/waybar/common.jsonc
@@ -116,9 +116,9 @@
 		"path": "/home"
 	},
 	"battery": {
-		"format": "{capacity}% {icon}",
-		"format-discharging": "{icon}",
-		"format-charging": "{icon}",
+		"format": "{icon} {capacity}% ",
+		"format-discharging": "{icon} {capacity}%",
+		"format-charging": "{icon} {time}",
 		"format-plugged": "",
 		"format-icons": {
 			"charging": [
@@ -146,9 +146,9 @@
 				"󰁹"
 			]
 		},
-		"format-full": "󰂅",
-		"tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
-		"tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
+		"format-full": "󰂅 {capacity}%",
+		"tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}% - {time} remaining",
+		"tooltip-format-charging": "{power:>1.0f}W↑ {capacity}% - {time} until full",
 		"interval": 5,
 		"states": {
 			"warning": 20,
@@ -157,7 +157,7 @@
 	},
 	"pulseaudio": {
 		"format": "{icon}",
-		"on-click": "$TERMINAL --class=Wiremix -e wiremix",
+		"on-click": "pavucontrol",
 		"on-click-right": "pamixer -t",
 		"tooltip-format": "Playing at {volume}%",
 		"scroll-step": 5,
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 6e0f96a..e535440 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -29,6 +29,7 @@
     "modules-right": [
       "custom/screenrecording-indicator",
       "custom/randwall",
+      "pulseaudio",
       "clock",
       "group/tray-expander"
     ],