diff --git a/.config/waybar/config b/.config/waybar/config
index 824a44d..8549eac 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,15 +1,18 @@
 {
     "layer": "top", // Waybar at top layer
     "position": "top", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
+    "height": 22, // Waybar height (to be removed for auto height)
+		// "width": 1280, // Waybar width
     "spacing": 4, // Gaps between modules (4px)
     "margin-top": 5,
+		"reload_style_on_change": true,
     // Choose the order of the modules
     "modules-left": ["tray"],
     //"modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
     //"modules-center": [""],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "clock", "custom/power"],
+    "modules-center": ["pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery"],
+		"modules-right": ["clock", "custom/power"],
+    //"modules-right": ["tray", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "clock", "custom/power"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -97,6 +100,10 @@
     },
     "memory": {
         "format": "{}% "
+					"states": {
+						"warning": 80,
+						"critical": 90
+					}
     },
     "temperature": {
         "thermal-zone": 6,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index d4a6870..1c14e17 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -93,6 +93,7 @@ button:hover {
     border-radius: 10px;
     padding: 0 10px;
     color: #ffffff;
+    background-color: rgba(80, 80, 80, 0.5);
 }
 
 #window,
@@ -111,9 +112,8 @@ button:hover {
 }
 
 #custom-power { 
-    background-color: rgba(80, 80, 80, 0.8);
-    margin-right: 7px;
-	padding: 0 10px 0 7px;
+    background-color: rgba(10, 10, 10, 0.95);
+		padding: 0 13px 0 7px;
 }
 
 #window {
@@ -122,17 +122,17 @@ button:hover {
 }
 
 #clock {
-    background-color: rgba(80, 80, 80, 0.8);
+    background-color: rgba(10, 10, 10, 0.95);
 }
 
 #battery {
-    background-color: #ffffff;
-    color: #000000;
+    background-color: rgba(10, 10, 10, 0.95);
+    transition-property: background-color;
+    transition-duration: .5s;
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+    background-color: #29ad60;
 }
 
 @keyframes blink {
@@ -157,38 +157,42 @@ label:focus {
 }
 
 #cpu {
-    background-color: #2ecc71;
-    color: #000000;
+    background-color: rgba(10, 10, 10, 0.95);
 }
 
 #memory {
-    background-color: #9b59b6;
+    background-color: rgba(10, 10, 10, 0.95);
 }
 
-#disk {
-    background-color: #964B00;
+#memory.warning {
+    background-color: #ffa000;
 }
 
-#backlight {
-    background-color: #90b1b1;
-}
-
-#network {
-    background-color: #2980b9;
-}
-
-#network.disconnected {
+#memory.critical {
     background-color: #f53c3c;
 }
 
+#disk {
+    background-color: rgba(10, 10, 10, 0.95);
+}
+
+#backlight {
+    background-color: rgba(10, 10, 10, 0.95);
+}
+
+#network {
+    background-color: rgba(10, 10, 10, 0.95);
+}
+
+#network.disconnected {
+    background-color: rgba(10, 10, 10, 0.95);
+}
+
 #pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
+    background-color: rgba(10, 10, 10, 0.95);
 }
 
 #pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
 }
 
 #wireplumber {
@@ -215,7 +219,9 @@ label:focus {
 }
 
 #temperature {
-    background-color: #f0932b;
+    background-color: rgba(10, 10, 10, 0.95);
+    transition-property: background-color;
+    transition-duration: .5s;
 }
 
 #temperature.critical {
@@ -224,8 +230,7 @@ label:focus {
 
 #tray {
     margin-left: 10px;
-    /*background-color: #2980b9; */
-    background-color: rgba(80, 80, 80, 0.5);
+    background-color: rgba(10, 10, 10, 0.95);
 }
 
 #tray > .passive {