diff --git a/homeManagerModules/niri/waybar.css b/homeManagerModules/niri/waybar.css
index 214ab01..f19dc40 100644
--- a/homeManagerModules/niri/waybar.css
+++ b/homeManagerModules/niri/waybar.css
@@ -4,18 +4,26 @@
 }
 
 window#waybar {
-	background: #292b2e;
+	background-color: transparent;
 	color: #fdf6e3;
+	padding: 1px 0;
+	min-height: 25px;
+}
+
+.modules-right {
+    margin: 2px 10px 0 0;
+}
+.modules-center {
+    margin: 2px 0 0 0;
+}
+.modules-left {
+    margin: 2px 0 0 5px;
 }
 
 #custom-right-arrow-dark,
 #custom-left-arrow-dark {
 	color: #1a1a1a;
-}
-#custom-right-arrow-light,
-#custom-left-arrow-light {
-	color: #292b2e;
-	background: #1a1a1a;
+	font-size: 23px;
 }
 
 #workspaces,
@@ -60,6 +68,12 @@ window#waybar {
 #battery {
 	color: #859900;
 }
+#battery.warning {
+	color: #d08535;
+}
+#battery.critical {
+	color: #ca4238;
+}
 #disk {
 	color: #b58900;
 }
diff --git a/homeManagerModules/niri/waybar.json b/homeManagerModules/niri/waybar.json
index c3592f2..fae8528 100644
--- a/homeManagerModules/niri/waybar.json
+++ b/homeManagerModules/niri/waybar.json
@@ -3,53 +3,42 @@
 	"position": "top",
 
 	"modules-left": [
+		"custom/left-arrow-dark",
+		"niri/workspaces",
 		"custom/right-arrow-dark"
 	],
 	"modules-center": [
 		"custom/left-arrow-dark",
 		"clock#1",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
 		"clock#2",
-		"custom/right-arrow-dark",
-		"custom/right-arrow-light",
 		"clock#3",
 		"custom/right-arrow-dark"
 	],
 	"modules-right": [
 		"custom/left-arrow-dark",
 		"pulseaudio",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
 		"memory",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
 		"cpu",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
 		"battery",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
 		"disk",
-		"custom/left-arrow-light",
-		"custom/left-arrow-dark",
-		"tray"
+		"tray",
+		"custom/right-arrow-dark"
 	],
 
 	"custom/left-arrow-dark": {
-		"format": "",
+		"format": "",
 		"tooltip": false
 	},
 	"custom/left-arrow-light": {
-		"format": "",
+		"format": "",
 		"tooltip": false
 	},
 	"custom/right-arrow-dark": {
-		"format": "",
+		"format": "",
 		"tooltip": false
 	},
 	"custom/right-arrow-light": {
-		"format": "",
+		"format": "",
 		"tooltip": false
 	},
 
@@ -73,8 +62,8 @@
 
 	"pulseaudio": {
 		"format": "{icon} {volume:2}%",
-		"format-bluetooth": "{icon}  {volume}%",
-		"format-muted": "MUTE",
+		"format-bluetooth": "{icon}    {volume}% ",
+		"format-muted": "",
 		"format-icons": {
 			"headphones": "",
 			"default": [
@@ -83,8 +72,9 @@
 			]
 		},
 		"scroll-step": 5,
-		"on-click": "pamixer -t",
-		"on-click-right": "pavucontrol"
+		"on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+		"on-click-right": "pwvucontrol",
+		"reverse-scrolling": true
 	},
 	"memory": {
 		"interval": 5,
@@ -100,7 +90,7 @@
 			"warning": 30,
 			"critical": 15
 		},
-		"format": "{icon} {capacity}%",
+		"format": "{icon}    {capacity}%",
 		"format-icons": [
 			"",
 			"",
@@ -115,6 +105,7 @@
 		"path": "/"
 	},
 	"tray": {
-		"icon-size": 20
+		"icon-size": 20,
+		"spacing": 4
 	}
 }
\ No newline at end of file