diff --git a/os/linux/waybar/config b/os/linux/waybar/config
index 01a838a..fed6e5b 100644
--- a/os/linux/waybar/config
+++ b/os/linux/waybar/config
@@ -20,14 +20,14 @@
 		"tray"
 	],
 	"bluetooth": {
-		"format": "<span foreground=\"#666666\"></span>",
-		"format-connected": "<span foreground=\"#666666\"></span>",
-		"format-connected-battery": "<span foreground=\"#666666\"></span>",
+		"format": "<span</span>",
+		"format-connected": "<span></span>",
+		"format-connected-battery": "<span></span>",
 		// "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
 		"tooltip-format": "{controller_alias}@{controller_address} ({num_connections} connected)",
 		"tooltip-format-connected": "{controller_alias}@{controller_address} ({num_connections} connected)\n{device_enumerate}",
 		"tooltip-format-enumerate-connected": "{device_alias}@{device_address}",
-		"tooltip-format-enumerate-connected-battery": "{device_alias}@{device_address} ( {device_battery_percentage}%)"
+		"tooltip-format-enumerate-connected-battery": "{device_alias}@{device_address} (󰁹 {device_battery_percentage}%)"
 	},
     // "wireplumber": {
     //     "format": "{volume}% {icon}",
@@ -67,7 +67,7 @@
 		"format": "{:%a %b %d %H:%M:%S}"
 	},
 	"cpu": {
-		"format": "{usage} <span foreground=\"#666666\"></span>",
+		"format": "{usage} <span></span>",
 		"tooltip": true,
 		"interval": 3
 	},
@@ -113,18 +113,18 @@
 	},
 	"pulseaudio": {
 		// "scroll-step": 1, // %, can be a float
-		"format": "{volume} <span foreground=\"#666666\">{icon}</span> {format_source}",
+		"format": "{volume} {icon} <span>{format_source}</span>",
 		//"format": "{volume}% {icon} {format_source}",
 		//"format-bluetooth": "{volume}% {icon} {format_source}",
 		//"format-bluetooth-muted": " {icon} {format_source}",
 		//"format-muted": " {format_source}",
 		"format-muted": "󰝟  {format_source}",
-		"format-source": "<span foreground=\"#bf7998\"></span>",
-		"format-source-muted": "<span foreground=\"#6c88a6\"></span>",
+		"format-source": "",
+		"format-source-muted": "",
 		"format-icons": {
 			"headphones": "",
-			"handsfree": "",
-			"headset": "",
+			"handsfree": "󱥋",
+			"headset": "󰋎",
 			"phone": "",
 			"portable": "",
 			"car": "",
diff --git a/os/linux/waybar/style.css b/os/linux/waybar/style.css
index ae88ffe..d9c17fe 100644
--- a/os/linux/waybar/style.css
+++ b/os/linux/waybar/style.css
@@ -97,7 +97,7 @@ window#waybar.empty {
 }
 
 #battery.critical:not(.charging) {
-	background-color: #bf7998;
+	background-color: @red;
 	animation-name: blink;
 	animation-duration: 0.5s;
 	animation-timing-function: linear;
@@ -105,6 +105,13 @@ window#waybar.empty {
 	animation-direction: alternate;
 }
 
+#bluetooth,
+#bluetooth.connected-battery,
+#bluetooth.connected.battery,
+#bluetooth.connected {
+	color: @text;
+}
+
 label:focus {
 	/* background-color: #000000; */
 }