2 files changed, 8 insertions, 24 deletions
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index d2bad38..0fc585f 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,28 +1,14 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "clock", "hyprland/workspaces", "mpd"],
-	"modules-center": ["hyprland/window"],
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
 	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
-	"hyprland/workspaces": {
-		"format": "{icon}",
-		"format-icons": {
-			"1": "I",
-			"2": "II",
-			"3": "III",
-			"4": "IV",
-			"5": "V",
-			"6": "VI",
-			"7": "VII",
-			"8": "VIII",
-			"9": "IX",
-		},
-	},
 	"mpd": {
 		"tooltip": false,
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
-		"format-disconnected": "",
-		"format-stopped": "",
+		"format-disconnected": "s",
+		"format-stopped": "s",
 		"state-icons": {
 			"playing": "",
 			"paused": "",
@@ -78,8 +64,8 @@
 		"restart-interval": 3,
 	},
 	"clock": {
-		"format": "{:%H:%M}",
-		"format-alt": "{:(%R) %A %d %B}",
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
 		"interval": 1,
 	},
 	"tray": {
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 589cc12..61378fd 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -38,7 +38,6 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd, #battery,
-#window,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
@@ -47,7 +46,6 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces, #mpd, #battery, #clock,
-#window,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
 	border: solid @background 2px;
 	margin-top: 4px;
@@ -108,8 +106,8 @@ window#waybar.PCSX2 #window {
 }
 
 #window {
-	color: @background;
-	background: @color4;
+	padding-left: 16px;
+	color: @color4;
 }
 
 #custom-wireguard {