diff --git a/config b/config
index 56c7339..6329dd0 100644
--- a/config
+++ b/config
@@ -2,11 +2,11 @@
 	"reload_style_on_change": true,
 	"layer": "top", // Waybar at top layer
 	"position": "top", // Waybar at the bottom of your screen
-	"height": 10, // Waybar height
+	"height": 20, // Waybar height
 	// "width": 1366, // Waybar width
 	// Choose the order of the modules
-	"modules-left": ["hyprland/workspaces", "hyprland/language"],
-	"modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "tray", "clock", "group/power"],
+	"modules-left": ["hyprland/workspaces", "tray", "hyprland/language"],
+	"modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "clock", "group/power"],
 	"modules-center": ["hyprland/window"],
 
 	"hyprland/language": {
@@ -25,6 +25,7 @@
 		"spacing": 10
 	},
 	"clock": {
+		"interval": 5,
 		"format-alt": "{:%Y-%m-%d}",
 		"tooltip-format": "<tt><small>{calendar}</small></tt>",
 		"calendar": {
@@ -38,7 +39,7 @@
 									  "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
 									  "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
 									  "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-							}
+					}
 		}
 	},
 	"cpu": {
@@ -48,6 +49,7 @@
 		"format": "{}% "
 	},
 	"battery": {
+		"interval": 5,
 		"states": {
 			"good": 90,
 			"warning": 30,
@@ -61,7 +63,7 @@
 	"network": {
 		// "interface": "wlp2s0", // (Optional) To force the use of this interface
 		"format-wifi": "{essid} ({signalStrength}%) ",
-		"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+		"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
 		"format-disconnected": "Disconnected ⚠"
 	},
 	"pulseaudio": {
@@ -111,7 +113,7 @@
 		"on-click": "reboot"
 	},
 	"custom/power": {
-		"format": " ",
+		"format": "  ",
 		"tooltip": false,
 		"on-click": "shutdown now"
 	}
diff --git a/style.css b/style.css
index 66eaf42..fe42d47 100644
--- a/style.css
+++ b/style.css
@@ -1,25 +1,27 @@
 @import "mocha.css";
 
+@define-color text @teal;
+
 * {
-    border: none;
-    border-radius: 0;
-    font-family: "Noto Nerd Font";
-    font-size: 13px;
-    min-height: 0;
+	border: none;
+	border-radius: 0;
+	font-family: "Noto Nerd Font";
+	font-size: 13px;
+	min-height: 0;
 }
 
 window#waybar {
-    background: alpha(@surface0, 0.7);
-    color: @text;
+	background: @surface0;
+	color: @text;
 }
 
 #window {
-    font-weight: bold;
-    font-family: "Noto";
+	font-weight: bold;
+	font-family: "Noto";
 }
 /*
 #workspaces {
-    padding: 0 5px;
+	padding: 0 5px;
 }
 */
 .modules-left {
@@ -63,65 +65,86 @@ window#waybar {
 }
 
 #workspaces button {
-    padding: 0 5px;
-    background: transparent;
-    color: @text;
-    border-top: 2px solid @surface0;
+	padding: 0 5px;
+	background: transparent;
+	color: @text;
+	border-top: 2px solid @surface0;
 }
 
 #workspaces button.focused {
-    color: @text;
-    border-top: 2px solid @text;
+	color: @text;
+	border-top: 2px solid @text;
 }
 
 #workspaces button.active {
 	color: @green;
-    border-top: 2px solid @green;
+	border-top: 2px solid @green;
 }
 
 #workspaces button.urgent {
-    border-color: @red;
-    color: @red;
-    border-top: 2px solid @red;
-}
-
-#modules-right {
-	background: @base;
-}
-
-#language, #clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
-    padding: 0 5px;
-    margin: 0 2px;
+	border-color: @red;
+	color: @red;
+	border-top: 2px solid @red;
 }
 
 #clock {
-    font-weight: bold;
+	padding: 0 10px;
+	margin: 0 1px;
+	background: alpha(@mauve,0.2);
+	border-radius: 5px;
+	font-weight: bold;
+}
+
+#language, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+	padding: 0 10px;
+	margin: 0 1px;
+}
+
+#clock {	
 }
 
 #battery {
 }
 
 #battery icon {
-    color: red;
+	color: @red;
+}
+
+@keyframes critical {
+	to {
+		color: @red;
+	}
+}
+@keyframes good {
+	to {
+		color: @blue;
+	}
 }
 
 #battery.charging {
-}
-
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: black;
-    }
+	color: @text;
+	animation-name: good;
+	animation-duration: 3.5s;
+	animation-timing-function: ease-out;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #battery.warning:not(.charging) {
-    color: white;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: @text;
+	animation-name: critical;
+	animation-duration: 1.5s;
+	animation-timing-function: ease-out;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+#battery.critical:not(.charging) {
+	color: @text;
+	animation-name: critical;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #cpu {
@@ -134,7 +157,7 @@ window#waybar {
 }
 
 #network.disconnected {
-    color: @red;
+	color: @red;
 }
 
 #pulseaudio {
@@ -143,10 +166,6 @@ window#waybar {
 #pulseaudio.muted {
 }
 
-#custom-spotify {
-    color: rgb(102, 220, 105);
-}
-
 #tray {
 }