diff --git a/config.jsonc b/config.jsonc
index 650af88..9f7781f 100644
--- a/config.jsonc
+++ b/config.jsonc
@@ -2,8 +2,8 @@
 {
     "layer": "top",
     "position": "top",
-    "modules-left": ["clock", "custom/weather","custom/wallpaper","hyprland/window"],
-    "modules-center": ["hyprland/workspaces"],
+    "modules-left": ["hyprland/workspaces", "custom/weather","custom/wallpaper","hyprland/window"],
+    "modules-center": ["clock"],
     "modules-right": ["network", "bluetooth", "temperature","custom/power_profile","custom/battery","backlight","pulseaudio","pulseaudio#microphone","tray","idle_inhibitor","cpu","memory","battery#bat2"],
     // "modules-left": [],
     "sway/mode": {
@@ -45,45 +45,45 @@
         "tooltip": true
     },
     "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
         "unknown-tag": "N/A",
         "interval": 2,
         "consume-icons": {
-            "on": " "
+            "on": " "
         },
         "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
         },
         "repeat-icons": {
-            "on": " "
+            "on": " "
         },
         "single-icons": {
-            "on": "1 "
+            "on": "1 "
         },
         "state-icons": {
-            "paused": "",
-            "playing": ""
+            "paused": "",
+            "playing": ""
         },
         "tooltip-format": "MPD (connected)",
         "tooltip-format-disconnected": "MPD (disconnected)"
     },
     "hyprland/workspaces": {
-		"format": "{name} : {icon}",
+		"format": "{icon}",
 		"format-icons": {
-			"1": "",
-			"2": "",
-			"3": "",
-			"4": "",
-			"5": "",
-			"active": "",
-			"default": ""
-    		},
+			"1": "1",
+			"2": "2",
+			"3": "3",
+			"4": "4",
+			"5": "5",
+			"default": "●"
+   		},
         "persistent-workspaces": {
-      		"Virtual-1": [1, 2, 3, 4, 5]
-    		}
+     		"Virtual-1": [1, 2, 3, 4, 5]
+   		},
+        "on-click": "activate"
     },
     "idle_inhibitor": {
         "format": "{icon}",
@@ -98,7 +98,7 @@
         "spacing": 10
     },
     "clock": {
-        "format": "{: %I:%M %p   %a, %b %e}",
+        "format": "{:%I:%M %p   %a, %b %e}",
         "format-alt": "{:%Y-%m-%d}",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
     },
@@ -112,8 +112,8 @@
     "temperature": {
         "thermal-zone": 1,
         "critical-threshold": 80,
-        "format": "{temperatureF}°F ",
-        "format-critical": "{temperatureF}°F ",
+        "format": "{temperatureF}°F ",
+        "format-critical": "{temperatureF}°F ",
         "tooltip": true
     },
     "backlight": {
@@ -133,8 +133,8 @@
             "critical": 20
         },
         "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
         "format-alt": "{time} {icon}",
         "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
         "tooltip": true,
@@ -146,7 +146,7 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interfac
-        "format-wifi": "  {signalStrength}%",
+        "format-wifi": "  {signalStrength}%",
         "format-ethernet": "{ipaddr}/{cidr}",
         "tooltip-format": "{essid} - {ifname} via {gwaddr}",
         "format-linked": "{ifname} (No IP)",
@@ -154,8 +154,8 @@
         "format-alt": "{ifname}:{essid} {ipaddr}/{cidr}"
     },
     "bluetooth": {
-        "format": " {status}",
-        "format-connected": " {num_connections}",
+        "format": " {status}",
+        "format-connected": " {num_connections}",
         "tooltip-format": "{controller_alias}",
         "tooltip-format-connected": "{device_enumerate}",
         "tooltip-format-enumerate-connected": "{device_alias}",
@@ -164,25 +164,25 @@
     "pulseaudio": {
         "format": "{icon} {volume}%",
         "tooltip": false,
-        "format-muted": " Muted",
+        "format-muted": " Muted",
         "on-click": "pamixer -t",
         "on-scroll-up": "pamixer -i 5",
         "on-scroll-down": "pamixer -d 5",
         "scroll-step": 5,
         "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
         }
     },
     "pulseaudio#microphone": {
         "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": " Muted",
+        "format-source": " {volume}%",
+        "format-source-muted": " Muted",
         "on-click": "pamixer --default-source -t",
         "on-scroll-up": "pamixer --default-source -i 5",
         "on-scroll-down": "pamixer --default-source -d 5",
diff --git a/style.css b/style.css
index 6af4038..95c4b6c 100644
--- a/style.css
+++ b/style.css
@@ -1,42 +1,51 @@
-
 * {
-  border: none;
-  border-radius: 4px;
-  /* `ttf-font-awesome` is required to be installed for icons */
-  font-family: "JetBrainsMono Nerd Font";
+    border: none;
+    border-radius: 4px;
+    /* `ttf-font-awesome` is required to be installed for icons */
+    font-family: "JetBrainsMono Nerd Font";
 
-  /* adjust font-size value to your liking: */
-  font-size: 10px;
-  font-weight: bold;
-  min-height: 0;
+    /* adjust font-size value to your liking: */
+    font-size: 16px;
+    font-weight: bold;
+    min-height: 0;
 }
 
 window#waybar {
-  background-color: rgba(0, 0, 0, 0.9);
-  color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.9);
+    color: #ffffff;
 }
 
 #workspaces button {
-  color: #ffffff;
-  box-shadow: inset 0 -3px transparent;
+    padding: 2px 8px;
+    margin: 0 2px;
+    background-color: rgba(255, 255, 255, 0.1);
+    color: rgba(255, 255, 255, 0.6);
+    border-radius: 6px;
+    transition: all 0.3s ease;
+    border: 1px solid transparent;
 }
 
 #workspaces button:hover {
-  background: rgba(0, 0, 0, 0.9);
-  box-shadow: inset 0 -3px #ffffff;
+    background-color: rgba(255, 255, 255, 0.2);
+    color: #000000;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
 }
 
-#workspaces button.focused {
-  background-color: #000000;
-  color: #ffffff;
+#workspaces button.active {
+    background-color: rgba(255, 255, 255, 0.3);
+    color: #000000;
+    border: 1px solid rgba(255, 255, 255, 0.5);
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.4);
 }
 
 #workspaces button.urgent {
-  background-color: #eb4d4b;
+    background-color: #eb4d4b;
+    color: #ffffff;
+    box-shadow: 0 0 12px rgba(235, 77, 75, 0.8);
 }
 
 #mode {
-  background-color: #64727d;
+    background-color: #64727d;
 }
 
 #clock,
@@ -52,163 +61,158 @@ window#waybar {
 #mode,
 #idle_inhibitor,
 #mpd {
-  padding: 0 10px;
-  margin: 6px 3px;
-  color: #000000;
+    padding: 0 10px;
+    margin: 6px 3px;
+    color: #000000;
+}
+
+#window {
+    margin: 0 4px;
 }
 
-#window,
 #workspaces {
-  margin: 0 4px;
+    margin: 0 6px;
+    padding: 2px 6px;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 8px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 0;
+.modules-left>widget:first-child>#workspaces {
+    margin-left: 0;
 }
 
 /* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-  margin-right: 0;
+.modules-right>widget:last-child>#workspaces {
+    margin-right: 0;
 }
 
 #clock {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #battery {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #battery.charging {
-  color: #ffffff;
-  background-color: #000000;
-}
-
-@keyframes blink {
-  to {
-    background-color: #ffffff;
-    color: #000000;
-  }
+    color: #ffffff;
+    background-color: #000000;
 }
 
 #battery.critical:not(.charging) {
-  background-color: #f53c3c;
-  color: #ffffff;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
+    background-color: #f53c3c;
+    color: #ffffff;
+    box-shadow: 0 0 12px rgba(245, 60, 60, 0.8);
 }
 
 label:focus {
-  background-color: #000000;
+    background-color: #000000;
 }
 
 #cpu {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #memory {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #backlight {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #network {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #network.disconnected {
-  background-color: #f53c3c;
+    background-color: #f53c3c;
 }
 
 #pulseaudio {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #pulseaudio.muted {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #custom-media {
-  background-color: #000000;
-  color: #ffffff;
-  min-width: 100px;
+    background-color: #000000;
+    color: #ffffff;
+    min-width: 100px;
 }
 
 #custom-media.custom-spotify {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #custom-media.custom-vlc {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #temperature {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #temperature.critical {
-  background-color: #eb4d4b;
-  color: #ffffff;
+    background-color: #eb4d4b;
+    color: #ffffff;
 }
 
 #tray {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #idle_inhibitor {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #idle_inhibitor.activated {
-  background-color: #ffffff;
-  color: #000000;
+    background-color: #ffffff;
+    color: #000000;
 }
 
 #mpd {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #mpd.disconnected {
-  background-color: #f53c3c;
-  color: #ffffff;
+    background-color: #f53c3c;
+    color: #ffffff;
 }
 
 #mpd.stopped {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #mpd.paused {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #language {
-  background: #000000;
-  color: #ffffff;
-  padding: 0 5px;
-  margin: 6px 3px;
-  min-width: 16px;
+    background: #000000;
+    color: #ffffff;
+    padding: 0 5px;
+    margin: 6px 3px;
+    min-width: 16px;
 }
 
 #custom-weather,
@@ -218,57 +222,53 @@ label:focus {
 #bluetooth,
 #pulseaudio-microphone,
 #battery-bat2 {
-  padding: 0 10px;
-  margin: 6px 3px;
-  color: #000000;
+    padding: 0 10px;
+    margin: 6px 3px;
+    color: #000000;
 }
 
 #custom-weather {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #custom-wallpaper {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #custom-power_profile {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #bluetooth {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #pulseaudio-microphone {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #pulseaudio-microphone.muted {
-  background-color: #000000;
-  color: #ffffff;
+    background-color: #000000;
+    color: #ffffff;
 }
 
 #battery-bat2 {
-  background-color: #000000;
-  color: white;
+    background-color: #000000;
+    color: white;
 }
 
 #battery-bat2.charging {
-  color: #ffffff;
-  background-color: #000000;
+    color: #ffffff;
+    background-color: #000000;
 }
 
 #battery-bat2.critical:not(.charging) {
-  background-color: #f53c3c;
-  color: #ffffff;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
+    background-color: #f53c3c;
+    color: #ffffff;
+    box-shadow: 0 0 12px rgba(245, 60, 60, 0.8);
 }