diff --git a/config.jsonc b/config.jsonc
index 4c5795f..650af88 100644
--- a/config.jsonc
+++ b/config.jsonc
@@ -1,21 +1,75 @@
+
 {
     "layer": "top",
     "position": "top",
-    "mod": "dock",
-    "exclusive": true,
-    "passthrough": false,
-    "gtk-layer-shell": true,
-    "height": 45,
-    "modules-left": ["clock","custom/weather","custom/wallpaper","hyprland/window"],
+    "modules-left": ["clock", "custom/weather","custom/wallpaper","hyprland/window"],
     "modules-center": ["hyprland/workspaces"],
-    "modules-right": ["network", "bluetooth", "temperature","custom/power_profile","custom/battery","backlight","pulseaudio","pulseaudio#microphone","tray","idle_inhibitor"],
+    "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": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "custom/weather": {
+        "tooltip": true,
+        "format": "{}",
+        "interval": 30,
+        "exec": "~/.config/waybar/scripts/waybar-wttr.py",
+        "return-type": "json",
+        "on-click": "xdg-open https://wttr.in"
+    },
     "hyprland/window": {
         "format": "{}",
         "max-length": 60,
         "tooltip": true
     },
-
-
+    "custom/wallpaper": {
+        "format": "Wallpaper",
+        "interval": 1,
+        "tooltip": true,
+        "on-click": "~/scripts/pywal/wallpapermenu.sh",
+        "return-type": "json"
+    },
+    "custom/power_profile": {
+        "exec": "powerprofilesctl get || echo 'Unknown'",
+        "interval": 5,
+        "format": "󰈐 {}",
+        "on-click": "pp=$(powerprofilesctl get 2>/dev/null || echo 'balanced'); case \"$pp\" in performance) n=balanced;; balanced) n=powersave;; *) n=performance;; esac; powerprofilesctl set \"$n\" 2>/dev/null || echo 'powerprofilesctl not available'; pkill -SIGRTMIN+8 waybar",
+        "signal": 8,
+        "return-type": "string"
+    },
+    "custom/battery": {
+        "exec": "/home/Nicholai/.config/waybar/scripts/battery.sh",
+        "interval": 10,
+        "return-type": "json",
+        "format": "{}",
+        "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 ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
     "hyprland/workspaces": {
 		"format": "{name} : {icon}",
 		"format-icons": {
@@ -30,68 +84,38 @@
         "persistent-workspaces": {
       		"Virtual-1": [1, 2, 3, 4, 5]
     		}
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "󰒳",
+            "deactivated": "󰒲"
         },
-
-    "custom/wallpaper": {
-        "format": "Wallpaper",
-        "interval": 1,
-        "tooltip": true,
- //       "exec": "~/scripts/pywal/wallpapermenu.sh",
-        "on-click": "~/scripts/pywal/wallpapermenu.sh",
-        "return-type" : "json"
-    },
-
-    
-    "custom/power_profile": {
-        "exec": "powerprofilesctl get || echo 'Unknown'",
-        "interval": 5,
-        "format": "󰈐 {}",
-        "on-click": "pp=$(powerprofilesctl get 2>/dev/null || echo 'balanced'); case \"$pp\" in performance) n=balanced;; balanced) n=powersave;; *) n=performance;; esac; powerprofilesctl set \"$n\" 2>/dev/null || echo 'powerprofilesctl not available'; pkill -SIGRTMIN+8 waybar",
-        "signal": 8,
-        "return-type": "string"
-    },
-
-   "custom/weather" : {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
-        "return-type" : "json",
-        "on-click": "xdg-open https://wttr.in"
-    },
-
-    "custom/battery": {
-        "exec": "/home/Nicholai/.config/waybar/scripts/battery.sh",
-        "interval": 10,
-        "return-type": "json",
-        "format": "{}",
         "tooltip": true
     },
-
-"tray": {
+    "tray": {
         "icon-size": 18,
         "spacing": 10
     },
-
-//  "clock": {
-//      "format": "{: %I:%M %p   %a, %b %e}",
-//      "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-//  },
-"clock": {
-  "format": "{:%I:%M %p}",
-  "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-},
-"idle_inhibitor": {
-  "format": "{icon}",
-  "format-icons": {
-    "activated": "󰒳",
-    "deactivated": "󰒲"
-  },
-  "tooltip": true
-},
-
-
+    "clock": {
+        "format": "{: %I:%M %p   %a, %b %e}",
+        "format-alt": "{:%Y-%m-%d}",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        "thermal-zone": 1,
+        "critical-threshold": 80,
+        "format": "{temperatureF}°F ",
+        "format-critical": "{temperatureF}°F ",
+        "tooltip": true
+    },
     "backlight": {
         "format": "{icon} {percent}%",
         "format-icons": ["󰃞", "󰃟", "󰃠"],
@@ -99,7 +123,6 @@
         "on-scroll-down": "brightnessctl set 5%-",
         "min-length": 6
     },
-
     "battery": {
         "bat": "BAT1",
         "adapter": "ACAD",
@@ -118,7 +141,26 @@
         "tooltip-format": "{status} • {capacity}%\n{timeTo}\nHealth: {health}",
         "max-length": 15
     },
-
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interfac
+        "format-wifi": "  {signalStrength}%",
+        "format-ethernet": "{ipaddr}/{cidr}",
+        "tooltip-format": "{essid} - {ifname} via {gwaddr}",
+        "format-linked": "{ifname} (No IP)",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}:{essid} {ipaddr}/{cidr}"
+    },
+    "bluetooth": {
+        "format": " {status}",
+        "format-connected": " {num_connections}",
+        "tooltip-format": "{controller_alias}",
+        "tooltip-format-connected": "{device_enumerate}",
+        "tooltip-format-enumerate-connected": "{device_alias}",
+        "on-click": "blueman-manager"
+    },
     "pulseaudio": {
         "format": "{icon} {volume}%",
         "tooltip": false,
@@ -137,7 +179,6 @@
             "default": ["", "", ""]
         }
     },
-
     "pulseaudio#microphone": {
         "format": "{format_source}",
         "format-source": " {volume}%",
@@ -147,31 +188,12 @@
         "on-scroll-down": "pamixer --default-source -d 5",
         "scroll-step": 5
     },
-    
-    "temperature": {
-        "thermal-zone": 1,
-        "format": "{temperatureF}°F ",
-        "critical-threshold": 80,
-        "format-critical": "{temperatureF}°F ",
-        "tooltip": true
-    },
-
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "  {signalStrength}%",
-        "format-ethernet": "{ipaddr}/{cidr}",
-        "tooltip-format": "{essid} - {ifname} via {gwaddr}",
-        "format-linked": "{ifname} (No IP)",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}:{essid} {ipaddr}/{cidr}"
-    },
-
-    "bluetooth": {
-  "format": " {status}",
-  "format-connected": " {num_connections}",
-  "tooltip-format": "{controller_alias}",
-  "tooltip-format-connected": "{device_enumerate}",
-  "tooltip-format-enumerate-connected": "{device_alias}",
-  "on-click": "blueman-manager"       // launch the GUI when you left‑click
-}
+    "custom/media": {
+        "format": " {}",
+        "return-type": "json",
+        "max-length": 40,
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
 }
diff --git a/config.jsonc.bak b/config.jsonc.bak
new file mode 100644
index 0000000..4c5795f
--- /dev/null
+++ b/config.jsonc.bak
@@ -0,0 +1,177 @@
+{
+    "layer": "top",
+    "position": "top",
+    "mod": "dock",
+    "exclusive": true,
+    "passthrough": false,
+    "gtk-layer-shell": true,
+    "height": 45,
+    "modules-left": ["clock","custom/weather","custom/wallpaper","hyprland/window"],
+    "modules-center": ["hyprland/workspaces"],
+    "modules-right": ["network", "bluetooth", "temperature","custom/power_profile","custom/battery","backlight","pulseaudio","pulseaudio#microphone","tray","idle_inhibitor"],
+    "hyprland/window": {
+        "format": "{}",
+        "max-length": 60,
+        "tooltip": true
+    },
+
+
+    "hyprland/workspaces": {
+		"format": "{name} : {icon}",
+		"format-icons": {
+			"1": "",
+			"2": "",
+			"3": "",
+			"4": "",
+			"5": "",
+			"active": "",
+			"default": ""
+    		},
+        "persistent-workspaces": {
+      		"Virtual-1": [1, 2, 3, 4, 5]
+    		}
+        },
+
+    "custom/wallpaper": {
+        "format": "Wallpaper",
+        "interval": 1,
+        "tooltip": true,
+ //       "exec": "~/scripts/pywal/wallpapermenu.sh",
+        "on-click": "~/scripts/pywal/wallpapermenu.sh",
+        "return-type" : "json"
+    },
+
+    
+    "custom/power_profile": {
+        "exec": "powerprofilesctl get || echo 'Unknown'",
+        "interval": 5,
+        "format": "󰈐 {}",
+        "on-click": "pp=$(powerprofilesctl get 2>/dev/null || echo 'balanced'); case \"$pp\" in performance) n=balanced;; balanced) n=powersave;; *) n=performance;; esac; powerprofilesctl set \"$n\" 2>/dev/null || echo 'powerprofilesctl not available'; pkill -SIGRTMIN+8 waybar",
+        "signal": 8,
+        "return-type": "string"
+    },
+
+   "custom/weather" : {
+        //shows the current weather and forecast
+        "tooltip" : true,
+        "format" : "{}",
+        "interval" : 30,
+        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
+        "return-type" : "json",
+        "on-click": "xdg-open https://wttr.in"
+    },
+
+    "custom/battery": {
+        "exec": "/home/Nicholai/.config/waybar/scripts/battery.sh",
+        "interval": 10,
+        "return-type": "json",
+        "format": "{}",
+        "tooltip": true
+    },
+
+"tray": {
+        "icon-size": 18,
+        "spacing": 10
+    },
+
+//  "clock": {
+//      "format": "{: %I:%M %p   %a, %b %e}",
+//      "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+//  },
+"clock": {
+  "format": "{:%I:%M %p}",
+  "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+},
+"idle_inhibitor": {
+  "format": "{icon}",
+  "format-icons": {
+    "activated": "󰒳",
+    "deactivated": "󰒲"
+  },
+  "tooltip": true
+},
+
+
+    "backlight": {
+        "format": "{icon} {percent}%",
+        "format-icons": ["󰃞", "󰃟", "󰃠"],
+        "on-scroll-up": "brightnessctl set 5%+",
+        "on-scroll-down": "brightnessctl set 5%-",
+        "min-length": 6
+    },
+
+    "battery": {
+        "bat": "BAT1",
+        "adapter": "ACAD",
+        "interval": 10,
+        "states": {
+            "good": 95,
+            "warning": 30,
+            "critical": 20
+        },
+        "format": "{icon} {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{time} {icon}",
+        "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+        "tooltip": true,
+        "tooltip-format": "{status} • {capacity}%\n{timeTo}\nHealth: {health}",
+        "max-length": 15
+    },
+
+    "pulseaudio": {
+        "format": "{icon} {volume}%",
+        "tooltip": false,
+        "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": ["", "", ""]
+        }
+    },
+
+    "pulseaudio#microphone": {
+        "format": "{format_source}",
+        "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",
+        "scroll-step": 5
+    },
+    
+    "temperature": {
+        "thermal-zone": 1,
+        "format": "{temperatureF}°F ",
+        "critical-threshold": 80,
+        "format-critical": "{temperatureF}°F ",
+        "tooltip": true
+    },
+
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "  {signalStrength}%",
+        "format-ethernet": "{ipaddr}/{cidr}",
+        "tooltip-format": "{essid} - {ifname} via {gwaddr}",
+        "format-linked": "{ifname} (No IP)",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}:{essid} {ipaddr}/{cidr}"
+    },
+
+    "bluetooth": {
+  "format": " {status}",
+  "format-connected": " {num_connections}",
+  "tooltip-format": "{controller_alias}",
+  "tooltip-format-connected": "{device_enumerate}",
+  "tooltip-format-enumerate-connected": "{device_alias}",
+  "on-click": "blueman-manager"       // launch the GUI when you left‑click
+}
+}
diff --git a/darkmode.css b/darkmode.css
new file mode 100644
index 0000000..271df85
--- /dev/null
+++ b/darkmode.css
@@ -0,0 +1,204 @@
+
+@import 'colors.css';
+
+* {
+  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;
+}
+
+window#waybar {
+  background-color: rgba(0, 0, 0, 0.9);
+  color: #ffffff;
+}
+
+#workspaces button {
+  color: #ffffff;
+  box-shadow: inset 0 -3px transparent;
+}
+
+#workspaces button:hover {
+  background: rgba(0, 0, 0, 0.9);
+  box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.focused {
+  background-color: #64727d;
+}
+
+#workspaces button.urgent {
+  background-color: #eb4d4b;
+}
+
+#mode {
+  background-color: #64727d;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#mpd {
+  padding: 0 10px;
+  margin: 6px 3px;
+  color: #000000;
+}
+
+#window,
+#workspaces {
+  margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.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;
+}
+
+#clock {
+  background-color: #000000;
+  color: white;
+}
+
+#battery {
+  background-color: #000000;
+  color: white;
+}
+
+#battery.charging {
+  color: #ffffff;
+  background-color: #000000;
+}
+
+@keyframes blink {
+  to {
+    background-color: #ffffff;
+    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;
+}
+
+label:focus {
+  background-color: #000000;
+}
+
+#cpu {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#memory {
+  background-color: #000000;
+  color: white;
+}
+
+#backlight {
+  background-color: #000000;
+  color: white;
+}
+
+#network {
+  background-color: #000000;
+  color: white;
+}
+
+#network.disconnected {
+  background-color: #f53c3c;
+}
+
+#pulseaudio {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#pulseaudio.muted {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#custom-media {
+  background-color: #66cc99;
+  color: #2a5c45;
+  min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+  background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+  background-color: #ffa000;
+}
+
+#temperature {
+  background-color: #f0932b;
+}
+
+#temperature.critical {
+  background-color: #eb4d4b;
+}
+
+#tray {
+  background-color: #2980b9;
+}
+
+#idle_inhibitor {
+  background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+  background-color: #ecf0f1;
+  color: #2d3436;
+}
+
+#mpd {
+  background-color: #66cc99;
+  color: #2a5c45;
+}
+
+#mpd.disconnected {
+  background-color: #f53c3c;
+}
+
+#mpd.stopped {
+  background-color: #90b1b1;
+}
+
+#mpd.paused {
+  background-color: #51a37a;
+}
+
+#language {
+  background: #bbccdd;
+  color: #333333;
+  padding: 0 5px;
+  margin: 6px 3px;
+  min-width: 16px;
+}
\ No newline at end of file
diff --git a/style.css b/style.css
index 331bbc7..6af4038 100644
--- a/style.css
+++ b/style.css
@@ -1,185 +1,274 @@
 
-@import 'colors.css';
-
 * {
-    background: transparent;
-    border: none;
-    border-radius: 3px;
-    font-family: "JetBrainsMono Nerd Font";
-    font-weight: bold;
-    font-size: 14px;
-    min-height: 0;
+  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;
 }
 
 window#waybar {
-    background: transparent;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: #ffffff;
 }
 
-
-
-
 #workspaces button {
-    padding: 5px;
-    color: @color4;
-    margin-right: 5px;
-}
-
-#workspaces button.active {
-    color: @color11;
-}
-
-#workspaces button.focused {
-    color: @color12;
-    background: @color2;
-    border-radius: 5px;
-}
-
-#workspaces button.urgent {
-    color: @color12;
-    background: @color8;
-    border-radius: 5px;
+  color: #ffffff;
+  box-shadow: inset 0 -3px transparent;
 }
 
 #workspaces button:hover {
-    background: @background;
-    color: @color12;
-    border-radius: 10px;
-    font-size: 18px;
+  background: rgba(0, 0, 0, 0.9);
+  box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.focused {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#workspaces button.urgent {
+  background-color: #eb4d4b;
+}
+
+#mode {
+  background-color: #64727d;
 }
 
-#custom-power_profile,
-#custom-weather,
-#window,
 #clock,
 #battery,
-#custom-battery,
-#pulseaudio,
-#network,
-#bluetooth,
+#cpu,
+#memory,
 #temperature,
-#workspaces,
-#tray,
 #backlight,
-#idle_inhibitor {
-    background: @background;
-    color: @color12;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
-    border: 1px solid #181825;
-}
-
-#temperature {
-    background: @background;
-    border-radius: 5px 0px 0px 5px;
-}
-
-#temperature.critical {
-    color: #d13a3a;
-}
-
-#backlight {
-    background: @background;
-    border-radius: 5px 0px 0px 5px;
-}
-
-#tray {
-    border-radius: 5px;
-    margin-right: 10px;
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#mpd {
+  padding: 0 10px;
+  margin: 6px 3px;
+  color: #000000;
 }
 
+#window,
 #workspaces {
-    background: @background;
-    color: @color11;
-    border-radius: 5px;
-    margin-left: 10px;
-    padding-right: 0px;
-    padding-left: 5px;
+  margin: 0 4px;
 }
 
-#custom-power_profile {
-    color: @color9;
-    border-left: 0px;
-    border-right: 0px;
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+  margin-left: 0;
 }
 
-#window {
-    background: @background;
-    border-radius: 5px;
-    margin-left: 60px;
-    margin-right: 60px;
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+  margin-right: 0;
 }
 
 #clock {
-    background: @background;
-    color: @color12;
-    border-radius: 5px;
-    margin-left: 10px;
-    border-right: 0px;
-}
-
-#custom-wallpaper {
-    background: @background;
-    color: @color12;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
-    border-radius: 5px;
-    margin-left: 10px;
-    border-right: 0px;
-}
-
-#network {
-    color: @color5;
-    background: @background;
-    border-radius: 5px 0px 0px 5px;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#bluetooth {
-    color: @color5;
-    background: @background;
-    border-radius: 0px 5px 5px 0px;
-    margin-right: 10px;
-} 
-
-#pulseaudio {
-    color: @color10;
-    background: @background;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: @color11;
-    background: @background;
-    border-left: 0px;
-    border-right: 0px;
-    border-radius: 0px 5px 5px 0px;
-    margin-right: 10px;
+  background-color: #000000;
+  color: white;
 }
 
 #battery {
-    color: @color12;
-    background: @background;
-    border-radius: 0 5px 5px 0;
-    margin-right: 10px;
-    border-left: 0px;
+  background-color: #000000;
+  color: white;
 }
 
-#custom-battery {
-    color: @color12;
-    background: @background;
-    border-radius: 0 5px 5px 0;
-    margin-right: 10px;
-    border-left: 0px;
+#battery.charging {
+  color: #ffffff;
+  background-color: #000000;
+}
+
+@keyframes blink {
+  to {
+    background-color: #ffffff;
+    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;
+}
+
+label:focus {
+  background-color: #000000;
+}
+
+#cpu {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#memory {
+  background-color: #000000;
+  color: white;
+}
+
+#backlight {
+  background-color: #000000;
+  color: white;
+}
+
+#network {
+  background-color: #000000;
+  color: white;
+}
+
+#network.disconnected {
+  background-color: #f53c3c;
+}
+
+#pulseaudio {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#pulseaudio.muted {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#custom-media {
+  background-color: #000000;
+  color: #ffffff;
+  min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#custom-media.custom-vlc {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#temperature {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#temperature.critical {
+  background-color: #eb4d4b;
+  color: #ffffff;
+}
+
+#tray {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#idle_inhibitor {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#idle_inhibitor.activated {
+  background-color: #ffffff;
+  color: #000000;
+}
+
+#mpd {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#mpd.disconnected {
+  background-color: #f53c3c;
+  color: #ffffff;
+}
+
+#mpd.stopped {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#mpd.paused {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#language {
+  background: #000000;
+  color: #ffffff;
+  padding: 0 5px;
+  margin: 6px 3px;
+  min-width: 16px;
+}
+
+#custom-weather,
+#custom-wallpaper,
+#custom-power_profile,
+#custom-battery,
+#bluetooth,
+#pulseaudio-microphone,
+#battery-bat2 {
+  padding: 0 10px;
+  margin: 6px 3px;
+  color: #000000;
 }
 
 #custom-weather {
-    border-radius: 0px 5px 5px 0px;
-    border-right: 0px;
-    margin-left: 0px;
+  background-color: #000000;
+  color: white;
+}
+
+#custom-wallpaper {
+  background-color: #000000;
+  color: white;
+}
+
+#custom-power_profile {
+  background-color: #000000;
+  color: white;
+}
+
+#bluetooth {
+  background-color: #000000;
+  color: white;
+}
+
+#pulseaudio-microphone {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#pulseaudio-microphone.muted {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+#battery-bat2 {
+  background-color: #000000;
+  color: white;
+}
+
+#battery-bat2.charging {
+  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;
 }
diff --git a/style.css.bak b/style.css.bak
new file mode 100644
index 0000000..331bbc7
--- /dev/null
+++ b/style.css.bak
@@ -0,0 +1,185 @@
+
+@import 'colors.css';
+
+* {
+    background: transparent;
+    border: none;
+    border-radius: 3px;
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+    font-size: 14px;
+    min-height: 0;
+}
+
+window#waybar {
+    background: transparent;
+}
+
+
+
+
+#workspaces button {
+    padding: 5px;
+    color: @color4;
+    margin-right: 5px;
+}
+
+#workspaces button.active {
+    color: @color11;
+}
+
+#workspaces button.focused {
+    color: @color12;
+    background: @color2;
+    border-radius: 5px;
+}
+
+#workspaces button.urgent {
+    color: @color12;
+    background: @color8;
+    border-radius: 5px;
+}
+
+#workspaces button:hover {
+    background: @background;
+    color: @color12;
+    border-radius: 10px;
+    font-size: 18px;
+}
+
+#custom-power_profile,
+#custom-weather,
+#window,
+#clock,
+#battery,
+#custom-battery,
+#pulseaudio,
+#network,
+#bluetooth,
+#temperature,
+#workspaces,
+#tray,
+#backlight,
+#idle_inhibitor {
+    background: @background;
+    color: @color12;
+    opacity: 0.8;
+    padding: 0px 10px;
+    margin: 3px 0px;
+    margin-top: 10px;
+    border: 1px solid #181825;
+}
+
+#temperature {
+    background: @background;
+    border-radius: 5px 0px 0px 5px;
+}
+
+#temperature.critical {
+    color: #d13a3a;
+}
+
+#backlight {
+    background: @background;
+    border-radius: 5px 0px 0px 5px;
+}
+
+#tray {
+    border-radius: 5px;
+    margin-right: 10px;
+}
+
+#workspaces {
+    background: @background;
+    color: @color11;
+    border-radius: 5px;
+    margin-left: 10px;
+    padding-right: 0px;
+    padding-left: 5px;
+}
+
+#custom-power_profile {
+    color: @color9;
+    border-left: 0px;
+    border-right: 0px;
+}
+
+#window {
+    background: @background;
+    border-radius: 5px;
+    margin-left: 60px;
+    margin-right: 60px;
+}
+
+#clock {
+    background: @background;
+    color: @color12;
+    border-radius: 5px;
+    margin-left: 10px;
+    border-right: 0px;
+}
+
+#custom-wallpaper {
+    background: @background;
+    color: @color12;
+    opacity: 0.8;
+    padding: 0px 10px;
+    margin: 3px 0px;
+    margin-top: 10px;
+    border-radius: 5px;
+    margin-left: 10px;
+    border-right: 0px;
+}
+
+#network {
+    color: @color5;
+    background: @background;
+    border-radius: 5px 0px 0px 5px;
+    border-left: 0px;
+    border-right: 0px;
+}
+
+#bluetooth {
+    color: @color5;
+    background: @background;
+    border-radius: 0px 5px 5px 0px;
+    margin-right: 10px;
+} 
+
+#pulseaudio {
+    color: @color10;
+    background: @background;
+    border-left: 0px;
+    border-right: 0px;
+}
+
+#pulseaudio.microphone {
+    color: @color11;
+    background: @background;
+    border-left: 0px;
+    border-right: 0px;
+    border-radius: 0px 5px 5px 0px;
+    margin-right: 10px;
+}
+
+#battery {
+    color: @color12;
+    background: @background;
+    border-radius: 0 5px 5px 0;
+    margin-right: 10px;
+    border-left: 0px;
+}
+
+#custom-battery {
+    color: @color12;
+    background: @background;
+    border-radius: 0 5px 5px 0;
+    margin-right: 10px;
+    border-left: 0px;
+}
+
+#custom-weather {
+    border-radius: 0px 5px 5px 0px;
+    border-right: 0px;
+    margin-left: 0px;
+}