resolved merge conflict

waybar/style.css

@@ -10,7 +10,6 @@
 }
 
 window#waybar {
-  /* background-color: alpha(@crust, 0.9); */
   background-color: alpha(@base, 0.4);
   padding: 10px;
   transition-property: background-color;
@@ -41,7 +40,7 @@ window#waybar.hidden {
 
 #workspaces button.active {
   color: @text;
-  border-bottom: 3px solid @green;
+  border-bottom: 3px solid @teal;
 }
 
 #workspaces button:hover {
@@ -68,6 +67,7 @@ window#waybar.hidden {
 #clock,
 #tray,
 #custom-pixelbuds_pro,
+#custom-bluetooth-audio,
 #custom-audio-output,
 #custom-gpu-screen-recorder {
   border-radius: 4px;
@@ -77,20 +77,35 @@ window#waybar.hidden {
   color: @text;
 }
 
+#wireplumber.muted, #custom-pixelbuds_pro {
+	background-color: @base;
+	color: @subtext1;
+	border-bottom: 3px solid @subtext1;
+}
+
+#custom-pixelbuds_pro.disconnected {
+	padding-right: 16px;
+	padding-left: 12px;	
+}
+
 #custom-pixelbuds_pro.anc-active {
-    color: @teal; 
+    color: @sapphire; 
+	border-bottom: 3px solid @sapphire;
+}
+
+#custom-bluetooth-audio {
+	color: @sapphire;
+	border-bottom: 3px solid @sapphire;
 }
 
 #custom-pixelbuds_pro.anc-aware {
-    color: @yellow; 
+    color: @sapphire; 
+	border-bottom: 3px solid @sapphire;
 }
 
 #custom-pixelbuds_pro.anc-off {
     color: @text; 
-}
-
-#custom-pixelbuds_pro.disconnected {
-    color: @subtext1;
+	border-bottom: 3px solid @text;
 }
 
 #custom-gpu-screen-recorder,
@@ -114,18 +129,22 @@ window#waybar.hidden {
 
 #custom-tlp.charging {
     color: @teal; 
+	border-bottom: 3px solid @teal;
 }
 
 #custom-tlp.bat {
 	color: @sapphire;
+	border-bottom: 3px solid @sapphire;
 }
 
 #custom-tlp.warning {
     color: @yellow; 
+	border-bottom: 3px solid @yellow;
 }
 
 #custom-tlp.critical {
     color: @red; 
+	border-bottom: 3px solid @red;
 	animation-name: blink;
 	animation-duration: 0.8s;
 	animation-timing-function: linear;
@@ -136,6 +155,7 @@ window#waybar.hidden {
 @keyframes blink {
   to {
     color: @yellow;
+	border-bottom: 3px solid @yellow;
     opacity: 0.6;
   }
 }
@@ -155,9 +175,9 @@ window#waybar.hidden {
   border-bottom: 3px solid @teal;
 }
 
-#memory, #cpu {
-  color: @teal;
-  border-bottom: 3px solid @teal;
+#memory, #cpu, #network {
+  color: @mauve;
+  border-bottom: 3px solid @mauve;
 }
 
 
@@ -166,23 +186,20 @@ window#waybar.hidden {
 }
 
 #wireplumber {
-  color: @mauve;
   padding-right: 15px;
 }
 
-#custom-audio-output {
-  color: @mauve;
+#custom-audio-output, #wireplumber {
+  color: @teal;
+  border-bottom: 3px solid @teal;
 }
 
 #network {
-  color: @mauve;
   padding-right: 15px;
-  border-bottom: 3px solid @mauve;
 }
 
 #clock {
-  font-family: JetBrainsMono Nerd Font;
-  color: @green;
+  color: @teal;
 }
 
 tooltip {
@@ -195,23 +212,3 @@ tooltip label {
   padding: 5px;
   background-color: @base;
 }
-
-#battery.charging {
-  color: @green;
-  border-bottom: 3px solid @green;
-}
-
-#battery.critical {
-  color: @red;
-  border-bottom: 3px solid @red;
-}
-
-#battery.warning {
-  color: @yellow;
-  border-bottom: 3px solid @yellow;
-}
-
-#battery.bat {
-  color: @text;
-  border-bottom: 3px solid @text;
-}