diff --git a/.config/waybar/config b/.config/waybar/config
index 3fc2f4f..4772269 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,4 +1,4 @@
-// vim:ft=json
+// vim:ft=jsonc
 {
     // "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)
@@ -96,18 +96,21 @@
         "interval": 5
     },
     "cpu": {
-        "format": "{usage}% ",
+        //"format": "{usage}% ",
+        "format": "CPU: {usage}%",
         "tooltip": false
     },
     "memory": {
-        "format": "{}% "
+        //"format": "{}% "
+        "format": "RAM: {}%"
     },
     "temperature": {
         "thermal-zone": 10,
         // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
         // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
+        //"format": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C",
         "format-icons": ["", "", ""]
     },
     "backlight": {
@@ -134,7 +137,8 @@
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
+        //"format-ethernet": "{ipaddr}/{cidr} ",
+        "format-ethernet": "{ipaddr}/{cidr}",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 7f5a172..ab76fa7 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -129,7 +129,7 @@ button:hover {
 
 #battery {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #battery.warning {
@@ -168,27 +168,27 @@ label:focus {
 
 #cpu {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #memory {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #disk {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #backlight {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #network {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #network.disconnected {
@@ -198,7 +198,7 @@ label:focus {
 
 #pulseaudio {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #pulseaudio.muted {
@@ -208,7 +208,7 @@ label:focus {
 
 #wireplumber {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #wireplumber.muted {
@@ -232,7 +232,7 @@ label:focus {
 
 #temperature {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #temperature.critical {
@@ -254,7 +254,7 @@ label:focus {
 
 #idle_inhibitor {
     background-color: @crust;
-    color: @green;
+    color: @text;
 }
 
 #idle_inhibitor.activated {
@@ -281,14 +281,14 @@ label:focus {
 
 #language {
     background: @crust;
-    color: @green;
+    color: @text;
     padding: 0 5px;
     min-width: 16px;
 }
 
 #keyboard-state {
     background: @crust;
-    color: @green;
+    color: @text;
     padding: 0 0px;
     min-width: 16px;
 }