2 files changed, 54 insertions, 20 deletions

diff --git a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
index 0daa8a5f..8b2ae2bc 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
@@ -7,7 +7,7 @@
 @define-color backgrounddark #FFFFFF;
 @define-color workspacesbackground1 @color12;
 @define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color12;
+@define-color bordercolor @color11;
 @define-color textcolor1 @color12;
 @define-color textcolor2 #FFFFFF;
 @define-color textcolor3 #FFFFFF;
@@ -128,6 +128,29 @@ window#waybar.empty #window {
     margin-right: 0;
 }
 
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
 #custom-backlight,
 #custom-browser,
 #custom-cava_mviz,
@@ -158,15 +181,15 @@ window#waybar.empty #window {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-    margin-right: 16px;
+    margin-right: 8px;
+	margin-left: 6px;
     font-size: 100%;
-    font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
 }
 
 #custom-swaync {
-	margin-left: 6px;
+	margin-left: 12px;
 }
 
 #idle_inhibitor {
@@ -234,12 +257,6 @@ window#waybar.empty #window {
     color: #FFFFFF;
 }
 
-#disk,#memory,#cpu,#language {
-    margin:0px;
-    padding:0px;
-    color:@iconcolor;
-}
-
 #keyboard-state {
     margin-right:10px;
 }
diff --git a/config/waybar/style/[WALLUST] ML4W-modern.css b/config/waybar/style/[WALLUST] ML4W-modern.css
index dbf1cefa..62fafd1b 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern.css
@@ -7,7 +7,7 @@
 @define-color backgrounddark @color12;
 @define-color workspacesbackground1 @color5;
 @define-color workspacesbackground2 @color12;
-@define-color bordercolor @color12;
+@define-color bordercolor @color11;
 @define-color textcolor1 #FFFFFF;
 @define-color textcolor2 #FFFFFF;
 @define-color textcolor3 #FFFFFF;
@@ -128,6 +128,29 @@ window#waybar.empty #window {
     margin-right: 0;
 }
 
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
 #custom-backlight,
 #custom-browser,
 #custom-cava_mviz,
@@ -158,15 +181,15 @@ window#waybar.empty #window {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-    margin-right: 16px;
+    margin-right: 8px;
+	margin-left: 6px;
     font-size: 100%;
-    font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
 }
 
 #custom-swaync {
-	margin-left: 6px;
+	margin-left: 12px;
 }
 
 #idle_inhibitor {
@@ -234,12 +257,6 @@ window#waybar.empty #window {
     color: #FFFFFF;
 }
 
-#disk,#memory,#cpu,#language {
-    margin:0px;
-    padding:0px;
-    color:@iconcolor;
-}
-
 #keyboard-state {
     margin-right:10px;
 }