1 files changed, 26 insertions, 20 deletions

diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 68c5219..eced638 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -38,6 +38,7 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd, #battery,
+#window,
 #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
@@ -45,8 +46,10 @@ window#waybar.PCSX2 #window {
 	border-radius: 26px;
 }
 
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
+#workspaces, #mpd, #battery, #clock,
+#window,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
+	border: solid @background 2px;
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
@@ -55,28 +58,29 @@ window#waybar.PCSX2 #window {
 #battery {
 	color: @color6;
 	background: @background;
+	border-color: @color4;
 }
 
 #workspaces {
 	margin-left: 12px;
 	border-radius: 26px;
-	background: @background;
+	background: @color3;
 }
 
 #workspaces button {
 	transition: none;
-	color: @foreground;
 	background: transparent;
 	font-size: 16px;
+	color: @background;
 }
 
 #workspaces button.active {
-	color: @color12;
+	text-shadow: 1px 0px 1px @background;
 }
 
 #workspaces button:hover {
 	transition: none;
-	color: @color11;
+	color: @color8;
 }
 
 #mpd {
@@ -88,56 +92,58 @@ window#waybar.PCSX2 #window {
 #mpd.stopped {
 	color: @foreground;
 	background: @background;
+	border-color: @color4;
 }
 
-#window {
+#clock {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @color6;
-	color: @color4;
+	color: @color3;
 	background: @background;
+	border-color: @color4;
+}
+
+#window {
+	color: @background;
+	background: @color4;
 }
 
 #network {
 	color: @background;
-	background: @color12;
+	background: @color5;
 }
 
 #pulseaudio {
 	color: @background;
-	background: @color14;
+	background: @color4;
 }
 
 #temperature {
 	color: @background;
-	background: @color7;
+	background: @color3;
 }
 
 #cpu {
 	color: @background;
-	background: @color3;
+	background: @color4;
 }
 
 #custom-memory {
-	color: @background;
-	background: @color2;
-}
-
-#clock {
 	margin-left: 8px;
 	margin-right: 12px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @foreground;
-	background: @background;
+	color: @background;
+	background: @color5;
 }
 
 #tray {
+	border: none;
 	margin-right: 12px;
 	color: @foreground;
 	background: transparent;