lots of fixes

8 files changed, 833 insertions, 805 deletions

diff --git a/config/waybar/style/style-b&w.css b/config/waybar/style/style-b&w.css
index f7750f78..d2edbb31 100644
--- a/config/waybar/style/style-b&w.css
+++ b/config/waybar/style/style-b&w.css
@@ -11,26 +11,26 @@ margin-bottom: 1px;
 }
 
 window#waybar {
- background: transparent;
+	background: transparent;
 }
 
 window#waybar.empty {
-  background-color: transparent;
+	background-color: transparent;
 }
 
 window#waybar.empty #window {
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-  background-color: transparent;
+	padding: 0px;
+	margin: 0px;
+	border: 0px;
+	/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
+	background-color: transparent;
 }
 
 window > box {
-   /*margin: 1px 2px 2px;*/
-    background: rgba(0, 0, 0, 0);
-    border-bottom: 1px solid rgba(0, 0, 0, 0);
-    color: white;
+	/*margin: 1px 2px 2px;*/
+	background: rgba(0, 0, 0, 0);
+	border-bottom: 1px solid rgba(0, 0, 0, 0);
+	color: white;
 }
 
 window {
@@ -38,43 +38,43 @@ window {
 }
 
 tooltip {
-    background: #1e1e2e;
-    opacity: 0.8;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
+	background: #1e1e2e;
+	opacity: 0.8;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: #11111b;
 }
 
 tooltip label{
-    color: #cdd6f4;
+	color: #cdd6f4;
 }
 /*-----module groups----*/
 .modules-right {
 	background-color: rgba(0,43,51,0.3);
-    /*margin: 2px 10px 0 0;*/
-    border: 1px solid #cba6f7;
+	/*margin: 2px 10px 0 0;*/
+	border: 1px solid #cba6f7;
 	border-radius: 8px;
 }
 .modules-center {
 	background-color: rgba(0,43,51,0.3);
-    /*margin: 2px 0 0 0;*/
-    border: 1px solid #cba6f7;
-    border-radius: 8px;
+	/*margin: 2px 0 0 0;*/
+	border: 1px solid #cba6f7;
+	border-radius: 8px;
 }
 .modules-left {
-    /*margin: 2px 0 0 5px;*/
+	/*margin: 2px 0 0 5px;*/
 	background-color: rgba(0,43,51,0.3);
-    border: 1px solid #cba6f7;
-    border-radius: 8px;
+	border: 1px solid #cba6f7;
+	border-radius: 8px;
 }
 /*-----modules indv----*/
 #workspaces button {
-    padding: 0px 0px;
-    background-color: transparent;
+	padding: 0px 0px;
+	background-color: transparent;
 }
 #workspaces button:hover {
-    box-shadow: inherit;
+	box-shadow: inherit;
 	background-color: rgba(0,153,153,0);
 }
 
@@ -86,96 +86,94 @@ tooltip label{
 	/*box-shadow:inherit;*/
 }
 
-#clock,
+#backlight,
 #battery,
+#bluetooth,
+#cava,
+#clock,
 #cpu,
-#memory,
 #disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#mode,
-#tray,
-#cava,
 #idle_inhibitor,
-#keyboard-state,
 #keyboard-state label,
 #keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
 #mpd,
+#network,
+#pulseaudio,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
 #window,
+#wireplumber,
 #workspaces,
-#taskbar,
-#bluetooth,
-#taskbar,
-#taskbar button,
-#custom-light_dark,
 #custom-cycle_wall,
-#custom-updater,
+#custom-light_dark,
+#custom-lock,
 #custom-menu,
+#custom-power_vertical,
 #custom-power,
 #custom-spotify,
+#custom-updater,
 #custom-weather,
-#custom-power,
-#custom-lock,
-#custom-weather.severe,
-#custom-weather.sunnyDay,
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,
 #custom-weather.cloudyFoggyNight,
+#custom-weather.default 
 #custom-weather.rainyDay,
 #custom-weather.rainyNight,
+#custom-weather.severe,
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
-#custom-weather.default 
-#idle_inhibitor {
+#custom-weather.sunnyDay {
 	padding: 0px 6px;
 }
 #mode {
-    color: #cc3436;
-    font-weight: bold;
+	color: #cc3436;
+	font-weight: bold;
 }
 #custom-power {
-     /*background-color: rgba(0,119,179,0.6);*/
-    /*border-radius: 50px;*/
-    margin: 5px 5px;
-    padding: 1px 3px;
+	/*background-color: rgba(0,119,179,0.6);*/
+	/*border-radius: 50px;*/
+	margin: 5px 5px;
+	padding: 1px 3px;
 }
 /*-----Indicators----*/
 #idle_inhibitor.activated {
-    color: #2dcc36;
+	color: #2dcc36;
 }
 #pulseaudio.muted {
-    color: #cc3436;
+	color: #cc3436;
 }
 #temperature.critical {
-    color: #cc3436;
+	color: #cc3436;
 }
 
 #waybar {
-    background-color: #282828;
-    color: #d8d8d8;
+	background-color: #282828;
+	color: #d8d8d8;
 }
 
 @keyframes blink {
-    to {
-        color: #000000;
-    }
+	to {
+		color: #000000;
+	}
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #taskbar button.active {
-    background-color: #7f849c;
+	background-color: #7f849c;
 }
 #waybar.empty, #waybar.tiled, #waybar.floating {
-    background-color: transparent;
+	background-color: transparent;
 }
diff --git a/config/waybar/style/style-dark.css b/config/waybar/style/style-dark.css
index 565b6391..acb3e7ee 100644
--- a/config/waybar/style/style-dark.css
+++ b/config/waybar/style/style-dark.css
@@ -1,156 +1,155 @@
 *{
-    font-family: "JetBrainsMono Nerd Font";
-    font-weight: bold;
-    min-height: 0;
-    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-    font-size: 98%;
-    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-    padding: 1px;
-    margin-top: 1px;
-    margin-bottom: 1px;
-    }
-    
-    window#waybar {
-        background: rgba(0, 0, 0, 0);
-    }
-    
-    window#waybar.hidden {
-        opacity: 0.5;
-    }
-    
-    window#waybar.empty {
-        background-color: transparent;
-    }
-    
-    window#waybar.empty #window {
-        padding: 0px;
-        margin: 0px;
-        border: 0px;
+font-family: "JetBrainsMono Nerd Font";
+font-weight: bold;
+min-height: 0;
+/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+font-size: 98%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 1px;
+margin-top: 1px;
+margin-bottom: 1px;
+}
+
+window#waybar {
+    background: rgba(0, 0, 0, 0);
+}
+
+window#waybar.hidden {
+    opacity: 0.5;
+}
+
+window#waybar.empty {
+    background-color: transparent;
+}
+
+window#waybar.empty #window {
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
     /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-        background-color: transparent;
-    }
-       
-    tooltip {
-        background: rgba(0, 0, 0, 0.6);
-        border-radius: 10px;
-    }
-    
-    tooltip label {
-        color: #cba6f7;
-        margin-right: 2px;
-        margin-left: 2px;
-    }
-    
-    /*-----module groups----*/
-    .modules-right {
-        background-color: rgba(0, 0, 0, 0.6);
-        border: 0px solid #b4befe;
-        border-radius: 10px;
-    }
-    
-    .modules-center {
-        background-color: rgba(0, 0, 0, 0.6);
-        border: 0px solid #b4befe;
-        border-radius: 10px;
-    }
+    background-color: transparent;
+}
+
+tooltip {
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 10px;
+}
+
+tooltip label {
+    color: #cba6f7;
+    margin-right: 2px;
+    margin-left: 2px;
+}
+
+/*-----module groups----*/
+.modules-right {
+    background-color: rgba(0, 0, 0, 0.6);
+    border: 0px solid #b4befe;
+    border-radius: 10px;
+}
+
+.modules-center {
+    background-color: rgba(0, 0, 0, 0.6);
+    border: 0px solid #b4befe;
+    border-radius: 10px;
+}
+
+.modules-left {
+    background-color: rgba(0, 0, 0, 0.6);
+    border: 0px solid #b4befe;
+    border-radius: 10px;
     
-    .modules-left {
-        background-color: rgba(0, 0, 0, 0.6);
-        border: 0px solid #b4befe;
-        border-radius: 10px;
-       
-    }
-    
-    #workspaces button {
-        color: #6E6A86;
-    }
-       
-    #workspaces button.active {
-        color: #cba6f7;
-        border-radius: 15px 15px 15px 15px;
-    }
-      
-    #workspaces button.focused {
-        color: #d8dee9;
-    }
-       
-    #workspaces button.urgent {
-        color: #11111b;
-        border-radius: 10px;
-    }
-           
-    #workspaces button:hover {
-        color: #9CCFD8;
-        border-radius: 15px;
-    }
-    
-  #clock,
-  #battery,
-  #cpu,
-  #memory,
-  #disk,
-  #temperature,
-  #network,
-  #pulseaudio,
-  #wireplumber,
-  #mode,
-  #tray,
-  #cava,
-  #backlight,
-  #window,
-  #idle_inhibitor,
-  #keyboard-state,
-  #keyboard-state label,
-  #keyboard-state label.locked,
-  #mpd,
-  #bluetooth,
-  #taskbar,
-  #taskbar button,
-  #workspaces,
-  #custom-light_dark,
-  #custom-updater,
-  #custom-menu,
-  #custom-cycle_wall,
-  #custom-power,
-  #custom-spotify,
-  #custom-weather,
-  #custom-power,
-  #custom-lock,
-  #custom-weather.severe,
-  #custom-weather.sunnyDay,
-  #custom-weather.clearNight,
-  #custom-weather.cloudyFoggyDay,
-  #custom-weather.cloudyFoggyNight,
-  #custom-weather.rainyDay,
-  #custom-weather.rainyNight,
-  #custom-weather.showyIcyDay,
-  #custom-weather.snowyIcyNight,
-  #custom-weather.default, 
-  #idle_inhibitor {
-      color: #cba7f7;
-      padding: 0px 10px;
-      border-radius: 10px;
-    }
-    
-    #temperature.critical {
-      background-color: #ff0000;
-    }
-    
-    @keyframes blink {
-      to {
+}
+
+#workspaces button {
+    color: #6E6A86;
+}
+
+#workspaces button.active {
+    color: #cba6f7;
+    border-radius: 15px 15px 15px 15px;
+}
+
+#workspaces button.focused {
+    color: #d8dee9;
+}
+
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#workspaces button:hover {
+    color: #9CCFD8;
+    border-radius: 15px;
+}
+
+#backlight,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state label,
+#keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
+#mpd,
+#network,
+#pulseaudio,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-cycle_wall,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-spotify,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+    color: #cba7f7;
+    padding: 0px 10px;
+    border-radius: 10px;
+}
+
+#temperature.critical {
+    background-color: #ff0000;
+}
+
+@keyframes blink {
+    to {
         color: #000000;
-      }
     }
-    
-    #taskbar button.active {
-      background-color: #7f849c;
-    }
-    
-    #battery.critical:not(.charging) {
-      color: #f53c3c;
-      animation-name: blink;
-      animation-duration: 0.5s;
-      animation-timing-function: linear;
-      animation-iteration-count: infinite;
-      animation-direction: alternate;
-    }
\ No newline at end of file
+}
+
+#taskbar button.active {
+    background-color: #7f849c;
+}
+
+#battery.critical:not(.charging) {
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
\ No newline at end of file
diff --git a/config/waybar/style/style-default.css b/config/waybar/style/style-default.css
index 5d2e40f3..28558be4 100644
--- a/config/waybar/style/style-default.css
+++ b/config/waybar/style/style-default.css
@@ -1,321 +1,327 @@
 *{
-  font-family: "JetBrainsMono Nerd Font";
-  font-weight: bold;
-  min-height: 0;
-  /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-  font-size: 98%;
-  font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-  padding: 0px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  }
-  
-  
-  window#waybar {
-    /* background-color: rgba(26, 27, 38, 0.5); */
-    background-color: transparent;
-    color: #ffffff;
-    transition-property: background-color;
-    transition-duration: 0.5s;
-    /* border-top: 8px transparent; */
-    border-radius: 0px;
-    transition-duration: 0.5s;
-    margin: 0px 0px;
-  }
-  window#waybar.empty {
-    background-color: transparent;
-  }
-  window#waybar.empty #window {
-    padding: 0px;
-    margin: 0px;
-    border: 0px;
-  /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-    background-color: transparent;
-  }
-  
-  window#waybar.hidden {
-    opacity: 0.1;
-  }
-  
-  tooltip {
-      background: #1e1e2e;
-      opacity: 0.8;
-      border-radius: 10px;
-      border-width: 2px;
-      border-style: solid;
-      border-color: #11111b;
-  }
-  
-  tooltip label{
-      color: #cdd6f4;
-  }
-  #workspaces button {
-    padding: 0 0px;
-    color: #7984a4;
-    background-color: transparent;
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
-    /* Avoid rounded borders under each workspace name */
-    border: none;
-    border-radius: 0;
-  }
-  
-  #workspaces button.focused {
-    background-color: transparent;
-  }
-  #workspace button.hover {
-    background-color: transparent;
-  }
-  #workspaces button.active {
-    color: white;
-  }
-  
-  #workspaces button.urgent {
-    background-color: #eb4d4b;
-  }
-  
-  #clock,
-  #battery,
-  #cpu,
-  #memory,
-  #disk,
-  #temperature,
-  #backlight,
-  #network,
-  #pulseaudio,
-  #wireplumber,
-  #mode,
-  #tray,
-  #idle_inhibitor,
-  #keyboard-state,
-  #mpd,
-  #cava,
-  #bluetooth,
-  #taskbar,
-  #workspaces,
-  #custom-light_dark,
-  #custom-updater,
-  #custom-power,
-  #custom-lock,
-  #custom-weather,
-  #window,
-  #custom-weather.severe,
-  #custom-weather.sunnyDay,
-  #custom-weather.clearNight,
-  #custom-weather.cloudyFoggyDay,
-  #custom-weather.cloudyFoggyNight,
-  #custom-weather.rainyDay,
-  #custom-weather.rainyNight,
-  #custom-weather.showyIcyDay,
-  #custom-weather.snowyIcyNight,
-  #custom-weather.default {
-    padding: 0px 10px;
-    color: #e5e5e5;
-    /* color: #bf616a; */
-    border-radius: 8px;
-    background-color: rgba(50, 50, 50, 0.1);
-    border: 1px solid #b4befe;
-  }
-  
-  #workspaces {
-    border-radius: 6px;
-    padding: 0px 6px;
-    border: 1px solid #b4befe;
-  }
-  
-  #cpu {
-    color: #fb958b;
-    padding: 3px;
-    border-radius: 8px;
-    background-color: rgba(50, 50, 50, 0.1);
-    border: 1px solid #b4befe;
-  }
-  
-  #custom-cycle_wall,
-  #custom-updater {
-    color: #cba7f7;
-    padding: 3px;
-    border-radius: 8px;
-    background-color: rgba(50, 50, 50, 0.1);
-    border: 1px solid #b4befe;
-    
-  }
-  
-  #custom-menu {
-    color: #FFFFFF;
-    padding: 6px;
-    padding-right: 6px;
-    border-radius: 8px;
-    background-color: rgba(50, 50, 50, 0.1);
-    border: 1px solid #b4befe;
-  }
-    
-  #memory {
-    color: #ebcb8b;
-  }
-  
-  #custom-power {
-    color: #cc3436;
-  }
-  
-  #custom-launcher {
-    background-color: #1b242b;
-    color: #6a92d7;
-    border-radius: 6px;
-    padding: 0 0px;
-  }
-  
-  #custom-weather.severe {
-    color: #eb937d;
-  }
-  
-  #custom-weather.sunny {
-    color: #c2ca76;
-  }
-  
-  #custom-weather.clearNight {
-    color: #cad3f5;
-  }
-  
-  #custom-weather.cloudyFoggyDay,
-  #custom-weather.cloudyFoggyNight {
-    color: #c2ddda;
-  }
-  
-  #custom-weather.rainyDay,
-  #custom-weather.rainyNight {
-    color: #5aaca5;
-  }
-  
-  #custom-weather.showyIcyDay,
-  #custom-weather.snowyIcyNight {
-    color: #d6e7e5;
-  }
-  
-  #custom-weather.default {
-    color: #ebecf0;
-  }
-  
-  /* 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;
-  }
-  
-  #pulseaudio {
-    color: #FFD580;
-  }
-  
-  #wireplumber {
-    color: #FFD580;
-  }
-  #backlight {
-    /* color: #EBCB8B; */
-    color: #8fbcbb;
-  }
-  
-  #clock {
-    color: #90EE90;
-    /* background-color: #14141e; */
-  }
-  
-  #battery {
-    color: #c0caf5;
-    /* background-color: #90b1b1; */
-  }
-  
-  #battery.charging,
-  #battery.full,
-  #battery.plugged {
-    color: #26a65b;
-    /* background-color: #26a65b; */
-  }
-  
-  @keyframes blink {
-    to {
-      background-color: rgba(30, 34, 42, 0.5);
-      color: #abb2bf;
-    }
-  }
-  
-  #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-  }
-  
-  label:focus {
-    background-color: #000000;
-  }
-  
-  #disk {
-    color: #f38ba8;
-  }
-  
-  #bluetooth {
-    color: #7287fd;
-  }
-  
-  #bluetooth.disconnected {
-    color: #f53c3c;
-  }
-  
-  #network {
-    color: #b48ead;
-  }
-  
-  #network.disconnected {
-    color: #f53c3c;
-  }
-  
-  #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.critical {
-    background-color: #eb4d4b;
-  }
-  
-  #tray > .passive {
-    -gtk-icon-effect: dim;
-  }
-  
-  #tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-  }
-  
-  #idle_inhibitor {
-    /*background-color: #2d3436;*/
-  }
-  
-  #idle_inhibitor.activated {
-    /*background-color: #ecf0f1;*/
-    color: #2dcc36;
-  }
-  
-  #temperature {
-    color: #ADD8E6;
-  }
-  
-  #taskbar button.active {
-    background-color: #7f849c;
-  }
-  
\ No newline at end of file
+font-family: "JetBrainsMono Nerd Font";
+font-weight: bold;
+min-height: 0;
+/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+font-size: 98%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 0px;
+margin-top: 1px;
+margin-bottom: 1px;
+}
+
+
+window#waybar {
+	/* background-color: rgba(26, 27, 38, 0.5); */
+	background-color: transparent;
+	color: #ffffff;
+	transition-property: background-color;
+	transition-duration: 0.5s;
+	/* border-top: 8px transparent; */
+	border-radius: 0px;
+	transition-duration: 0.5s;
+	margin: 0px 0px;
+}
+window#waybar.empty {
+	background-color: transparent;
+}
+window#waybar.empty #window {
+	padding: 0px;
+	margin: 0px;
+	border: 0px;
+	/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
+	background-color: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.1;
+}
+
+tooltip {
+	background: #1e1e2e;
+	opacity: 0.8;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: #11111b;
+}
+
+tooltip label{
+	color: #cdd6f4;
+}
+#workspaces button {
+	padding: 0 0px;
+	color: #7984a4;
+	background-color: transparent;
+	/* Use box-shadow instead of border so the text isn't offset */
+	box-shadow: inset 0 -3px transparent;
+	/* Avoid rounded borders under each workspace name */
+	border: none;
+	border-radius: 0;
+}
+
+#workspaces button.focused {
+	background-color: transparent;
+}
+#workspace button.hover {
+	background-color: transparent;
+}
+#workspaces button.active {
+	color: white;
+}
+
+#workspaces button.urgent {
+	background-color: #eb4d4b;
+}
+
+#backlight,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state label,
+#keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
+#mpd,
+#network,
+#pulseaudio,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-cycle_wall,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-spotify,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+	padding: 0px 10px;
+	color: #e5e5e5;
+	/* color: #bf616a; */
+	border-radius: 8px;
+	background-color: rgba(50, 50, 50, 0.1);
+	border: 1px solid #b4befe;
+}
+
+#workspaces {
+	border-radius: 6px;
+	padding: 0px 6px;
+	border: 1px solid #b4befe;
+}
+
+#cpu {
+	color: #fb958b;
+	padding: 3px;
+	border-radius: 8px;
+	background-color: rgba(50, 50, 50, 0.1);
+	border: 1px solid #b4befe;
+}
+
+#custom-cycle_wall,
+#custom-updater {
+	color: #cba7f7;
+	padding: 3px;
+	border-radius: 8px;
+	background-color: rgba(50, 50, 50, 0.1);
+	border: 1px solid #b4befe;
+	
+}
+
+#custom-menu {
+	color: #FFFFFF;
+	padding: 6px;
+	padding-right: 6px;
+	border-radius: 8px;
+	background-color: rgba(50, 50, 50, 0.1);
+	border: 1px solid #b4befe;
+}
+
+#memory {
+	color: #ebcb8b;
+}
+
+#custom-power {
+	color: #cc3436;
+}
+
+#custom-launcher {
+	background-color: #1b242b;
+	color: #6a92d7;
+	border-radius: 6px;
+	padding: 0 0px;
+}
+
+#custom-weather.severe {
+	color: #eb937d;
+}
+
+#custom-weather.sunny {
+	color: #c2ca76;
+}
+
+#custom-weather.clearNight {
+	color: #cad3f5;
+}
+
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight {
+	color: #c2ddda;
+}
+
+#custom-weather.rainyDay,
+#custom-weather.rainyNight {
+	color: #5aaca5;
+}
+
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight {
+	color: #d6e7e5;
+}
+
+#custom-weather.default {
+	color: #ebecf0;
+}
+
+/* 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;
+}
+
+#pulseaudio {
+	color: #FFD580;
+}
+
+#wireplumber {
+	color: #FFD580;
+}
+#backlight {
+	/* color: #EBCB8B; */
+	color: #8fbcbb;
+}
+
+#clock {
+	color: #90EE90;
+	/* background-color: #14141e; */
+}
+
+#battery {
+	color: #c0caf5;
+	/* background-color: #90b1b1; */
+}
+
+#battery.charging,
+#battery.full,
+#battery.plugged {
+	color: #26a65b;
+	/* background-color: #26a65b; */
+}
+
+@keyframes blink {
+	to {
+		background-color: rgba(30, 34, 42, 0.5);
+		color: #abb2bf;
+	}
+}
+
+#battery.critical:not(.charging) {
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+
+label:focus {
+	background-color: #000000;
+}
+
+#disk {
+	color: #f38ba8;
+}
+
+#bluetooth {
+	color: #7287fd;
+}
+
+#bluetooth.disconnected {
+	color: #f53c3c;
+}
+
+#network {
+	color: #b48ead;
+}
+
+#network.disconnected {
+	color: #f53c3c;
+}
+
+#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.critical {
+	background-color: #eb4d4b;
+}
+
+#tray > .passive {
+	-gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+	-gtk-icon-effect: highlight;
+	background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+	/*background-color: #2d3436;*/
+}
+
+#idle_inhibitor.activated {
+	/*background-color: #ecf0f1;*/
+	color: #2dcc36;
+}
+
+#temperature {
+	color: #ADD8E6;
+}
+
+#taskbar button.active {
+	background-color: #7f849c;
+}
diff --git a/config/waybar/style/style-default_alter.css b/config/waybar/style/style-default_alter.css
index 08f6a7b7..03124b84 100644
--- a/config/waybar/style/style-default_alter.css
+++ b/config/waybar/style/style-default_alter.css
@@ -45,11 +45,11 @@ window#waybar.empty {
 }
 
 window#waybar.empty #window {
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-  background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
+    background-color: transparent;
 }
 
 tooltip {
@@ -72,7 +72,7 @@ tooltip label{
     color: #ffffff;
     /*min-width: 36px;*/
     /* Use box-shadow instead of border so the text isn't offset */
-/*    box-shadow: inset 0 -3px transparent;*/
+    /*    box-shadow: inset 0 -3px transparent;*/
     /* border-radius: 0px; */
 }
 
@@ -83,7 +83,7 @@ tooltip label{
     color: #D3D3D3;
     /*min-width: 36px;*/
     /* Use box-shadow instead of border so the text isn't offset */
-/*    box-shadow: inset 0 -3px transparent;*/
+    /*    box-shadow: inset 0 -3px transparent;*/
     /* border-radius: 0px; */
 }
 
@@ -108,30 +108,48 @@ tooltip label{
     border-bottom: 3px solid #ffffff;
 }
 
-#clock,
+#backlight,
 #battery,
+#bluetooth,
+#cava,
+#clock,
 #cpu,
-#memory,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#keyboard-state,
+#disk,
+#idle_inhibitor,
 #keyboard-state label,
 #keyboard-state label.locked,
-#tray,
-#cava,
+#keyboard-state,
+#memory,
 #mode,
-#custom-light_dark,
-#taskbar,
+#mpd,
+#network,
+#pulseaudio,
 #taskbar button,
-#idle_inhibitor,
-#custom-updater,
+#taskbar,
+#temperature,
+#tray,
 #window,
+#wireplumber,
+#workspaces,
 #custom-cycle_wall,
-#custom-screen_locker,
-#custom-weather {
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-spotify,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
     padding: 0px 10px;
     /*margin: 4px 3px 5px 3px;*/
     /*color: @fgcolor;*/
@@ -155,7 +173,7 @@ tooltip label{
 }
 
 #clock {
-     color: @accent2;
+    color: @accent2;
 }
 
 #custom-updater {
@@ -179,12 +197,12 @@ tooltip label{
 }
 
 #battery.critical:not(.charging) {
-        color: #f53c3c;
-        animation-name: blink;
-        animation-duration: 0.5s;
-        animation-timing-function: linear;
-        animation-iteration-count: infinite;
-        animation-direction: alternate;
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
 }
 
 label:focus {
@@ -201,7 +219,7 @@ label:focus {
 }
 
 #memory {
-     color: @accent3;
+    color: @accent3;
 }
 
 #backlight {
@@ -247,7 +265,7 @@ label:focus {
     color: @accent5;
 }
 #custom-power_profile {
-     color: @accent3;
+    color: @accent3;
 }
 #custom-media {
     background-color: #66cc99;
diff --git a/config/waybar/style/style-light.css b/config/waybar/style/style-light.css
index 99f34c0d..2a7a0a5f 100644
--- a/config/waybar/style/style-light.css
+++ b/config/waybar/style/style-light.css
@@ -11,147 +11,146 @@ margin-bottom: 1px;
 }
 
 window#waybar {
-  background: rgba(0, 0, 0, 0)
+	background: rgba(0, 0, 0, 0)
 }
 
 window#waybar.hidden {
-  opacity: 0.7;
+	opacity: 0.7;
 }
 
 window#waybar.empty {
-  background-color: transparent;
+	background-color: transparent;
 }
 
 window#waybar.empty #window {
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-  background-color: transparent;
+	padding: 0px;
+	margin: 0px;
+	border: 0px;
+	/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
+	background-color: transparent;
 }
 
 tooltip {
-  background: rgba(236, 236, 236, 0.8);
-  border-radius: 10px;
+	background: rgba(236, 236, 236, 0.8);
+	border-radius: 10px;
 }
 
 tooltip label {
-  color: #373737;
-  margin-right: 2px;
-  margin-left: 2px;
+	color: #373737;
+	margin-right: 2px;
+	margin-left: 2px;
 }
 
 /*-----module groups----*/
 .modules-right {
-  background-color: rgba(232, 236, 241, 0.8);
-  border: 0px solid #b4befe;
-  border-radius: 10px;
+	background-color: rgba(232, 236, 241, 0.8);
+	border: 0px solid #b4befe;
+	border-radius: 10px;
 }
 
 .modules-center {
-  background-color: rgba(232, 236, 241, 0.8);
-  border: 0px solid #b4befe;
-  border-radius: 10px;
+	background-color: rgba(232, 236, 241, 0.8);
+	border: 0px solid #b4befe;
+	border-radius: 10px;
 }
 
 .modules-left {
-  background-color: rgba(232, 236, 241, 0.8);
-  border: 0px solid #b4befe;
-  border-radius: 10px;
-
+	background-color: rgba(232, 236, 241, 0.8);
+	border: 0px solid #b4befe;
+	border-radius: 10px;
+	
 }
 
 #workspaces button {
-  color: #585b70;
+	color: #585b70;
 }
 
 #workspaces button.active {
-  color: #000000;
-  border-radius: 15px 15px 15px 15px;
+	color: #000000;
+	border-radius: 15px 15px 15px 15px;
 }
 
 #workspaces button.focused {
-  color: #000000;
+	color: #000000;
 }
 
 #workspaces button.urgent {
-  color: #000000;
-  border-radius: 10px;
+	color: #000000;
+	border-radius: 10px;
 }
 
 #workspaces button:hover {
-  color: #000000;
-  border-radius: 15px;
+	color: #000000;
+	border-radius: 15px;
 }
 
-#clock,
+#backlight,
 #battery,
+#bluetooth,
+#cava,
+#clock,
 #cpu,
-#memory,
 #disk,
-#temperature,
-#network,
-#pulseaudio,
-#wireplumber,
-#mode,
-#tray,
-#cava,
-#backlight,
-#window,
 #idle_inhibitor,
-#keyboard-state,
 #keyboard-state label,
 #keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
 #mpd,
-#bluetooth,
-#taskbar,
+#network,
+#pulseaudio,
 #taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
 #workspaces,
+#custom-cycle_wall,
 #custom-light_dark,
-#custom-updater,
+#custom-lock,
 #custom-menu,
-#custom-cycle_wall,
+#custom-power_vertical,
 #custom-power,
 #custom-spotify,
+#custom-updater,
 #custom-weather,
-#custom-power,
-#custom-lock,
-#custom-weather.severe,
-#custom-weather.sunnyDay,
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,
 #custom-weather.cloudyFoggyNight,
+#custom-weather.default 
 #custom-weather.rainyDay,
 #custom-weather.rainyNight,
+#custom-weather.severe,
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
-#custom-weather.default, 
-#idle_inhibitor {
-  color: #000000;
-  padding: 0px 10px;
-  border-radius: 10px;
+#custom-weather.sunnyDay {
+	color: #000000;
+	padding: 0px 10px;
+	border-radius: 10px;
 }
 
 #temperature.critical {
-  background-color: #ff0000;
+	background-color: #ff0000;
 }
 
 @keyframes blink {
-  to {
-    color: #000000;
-  }
+	to {
+		color: #000000;
+	}
 }
 
 #taskbar button.active {
-  background-color: #585b70;
-  color: #cdd6f4;
+	background-color: #585b70;
+	color: #cdd6f4;
 }
 
 #battery.critical:not(.charging) {
-  color: #f53c3c;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
diff --git a/config/waybar/style/style-mauve.css b/config/waybar/style/style-mauve.css
index e4cd8e92..849aa448 100644
--- a/config/waybar/style/style-mauve.css
+++ b/config/waybar/style/style-mauve.css
@@ -11,19 +11,19 @@ margin-bottom: 1px;
 }
 
 window#waybar {
-    background: transparent;
-    border-radius: 10px;
-    color: #cba6f7;
-    border-style: solid;
-    border-width: 2px;
-    border-color: #cba6f7;
+	background: transparent;
+	border-radius: 10px;
+	color: #cba6f7;
+	border-style: solid;
+	border-width: 2px;
+	border-color: #cba6f7;
 }
 
 window#waybar.hidden {
-    opacity: 0.5;
+	opacity: 0.5;
 }
 window#waybar.empty {
-    background-color: transparent;
+	background-color: transparent;
 }
 
 window#waybar.empty #window {
@@ -36,126 +36,125 @@ window#waybar.empty #window {
   
    
 tooltip {
-    background: #1e1e2e;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
-    color: #cba6f7;
+	background: #1e1e2e;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: #11111b;
+	color: #cba6f7;
 }
 /*-----module groups----*/
 .modules-right {
-    /*background-color: #1e1e2e;*/
-    border: 0px solid #b4befe;
-    border-radius: 10px;
+	/*background-color: #1e1e2e;*/
+	border: 0px solid #b4befe;
+	border-radius: 10px;
 }
 
 .modules-center {
-    /*background-color: #1e1e2e;*/
-    border: 0px solid #b4befe;
-    border-radius: 10px;
+	/*background-color: #1e1e2e;*/
+	border: 0px solid #b4befe;
+	border-radius: 10px;
 }
 
 .modules-left {
-    /*background-color: #1e1e2e;*/
-    border: 0px solid #b4befe;
-    border-radius: 10px;
+	/*background-color: #1e1e2e;*/
+	border: 0px solid #b4befe;
+	border-radius: 10px;
    
 }
 
 #workspaces button {
-    padding: 2px;
-    color: #6E6A86;
-    margin-right: 5px;
+	padding: 2px;
+	color: #6E6A86;
+	margin-right: 5px;
 }
    
 #workspaces button.active {
-    color: #cba6f7;
-    border-radius: 15px 15px 15px 15px;
+	color: #cba6f7;
+	border-radius: 15px 15px 15px 15px;
 }
   
 #workspaces button.focused {
-    color: #d8dee9;
+	color: #d8dee9;
 }
    
 #workspaces button.urgent {
-    color: #11111b;
-    border-radius: 10px;
+	color: #11111b;
+	border-radius: 10px;
 }
-       
+	   
 #workspaces button:hover {
-    color: #9CCFD8;
-    border-radius: 15px;
+	color: #9CCFD8;
+	border-radius: 15px;
 }
    
-#clock,
+#backlight,
 #battery,
+#bluetooth,
+#cava,
+#clock,
 #cpu,
-#memory,
 #disk,
-#temperature,
-#network,
-#pulseaudio,
-#wireplumber,
-#mode,
-#tray,
-#cava,
-#backlight,
-#window,
 #idle_inhibitor,
-#keyboard-state,
 #keyboard-state label,
 #keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
 #mpd,
-#bluetooth,
-#taskbar,
+#network,
+#pulseaudio,
 #taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
 #workspaces,
+#custom-cycle_wall,
 #custom-light_dark,
-#custom-updater,
+#custom-lock,
 #custom-menu,
-#custom-cycle_wall,
+#custom-power_vertical,
 #custom-power,
 #custom-spotify,
+#custom-updater,
 #custom-weather,
-#custom-power,
-#custom-lock,
-#custom-weather.severe,
-#custom-weather.sunnyDay,
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,
 #custom-weather.cloudyFoggyNight,
+#custom-weather.default 
 #custom-weather.rainyDay,
 #custom-weather.rainyNight,
+#custom-weather.severe,
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
-#custom-weather.default 
-#idle_inhibitor {
-    color: #cba7f7;
-    padding: 0px 10px;
-    border-radius:10px;
+#custom-weather.sunnyDay {
+	color: #cba7f7;
+	padding: 0px 10px;
+	border-radius:10px;
 }
-     
+	 
 #temperature.critical {
-    background-color: #ff0000;
+	background-color: #ff0000;
 }
    
 @keyframes blink {
-    to {
-    color: #000000;
-       }
+	to {
+	color: #000000;
+	   }
 }
    
 #taskbar button.active {
-    background-color: #7f849c;
+	background-color: #7f849c;
 }
-       
+	   
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
  
\ No newline at end of file
diff --git a/config/waybar/style/style-rgb.css b/config/waybar/style/style-rgb.css
index 7cc496da..f1224be7 100644
--- a/config/waybar/style/style-rgb.css
+++ b/config/waybar/style/style-rgb.css
@@ -36,52 +36,60 @@ window#waybar.empty #window {
 }
 
 tooltip {
-    background: #1e1e2e;
-    opacity: 0.8;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
+	background: #1e1e2e;
+	opacity: 0.8;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: #11111b;
 }
 
 tooltip label{
-    color: #cdd6f4;
+	color: #cdd6f4;
 }
 
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
 #backlight,
-#network,
-#pulseaudio,
+#battery,
 #bluetooth,
-#wireplumber,
-#mode,
-#tray,
 #cava,
-#window,
+#clock,
+#cpu,
+#disk,
 #idle_inhibitor,
-#keyboard-state,
 #keyboard-state label,
 #keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
 #mpd,
-#custom-light_dark,
-#workspaces,
-#taskbar,
+#network,
+#pulseaudio,
 #taskbar button,
-#bluetooth,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
 #workspaces,
+#custom-cycle_wall,
+#custom-light_dark,
+#custom-lock,
 #custom-menu,
+#custom-power_vertical,
 #custom-power,
-#custom-cycle_wall,
-#custom-media,
+#custom-spotify,
 #custom-updater,
-#custom-lock,
-#custom-weather, 
-#idle_inhibitor {
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
 	border-radius: 8px;
 	margin: 4px 1px;
 	padding: 0px 4px;
@@ -98,7 +106,7 @@ tooltip label{
 }
 
 #taskbar button.active {
-    background-color: #7f849c;
+	background-color: #7f849c;
 }
 
 #battery {
@@ -106,19 +114,19 @@ tooltip label{
 }
 
 @keyframes blink {
-    	to {
-        	color: #000000;
-    	}
+		to {
+			color: #000000;
+		}
 }
 
 #battery.critical:not(.charging) {
 	background-color: #f38ba8;
-    color: #f38ba8;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f38ba8;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #clock {
@@ -144,10 +152,10 @@ tooltip label{
 	background-color: #b4befe;
 }
 #tray > .passive {
-    	-gtk-icon-effect: dim;
+		-gtk-icon-effect: dim;
 }
 #tray > .needs-attention {
-    	-gtk-icon-effect: highlight;
+		-gtk-icon-effect: highlight;
 }
 
 #workspaces button {
@@ -213,6 +221,7 @@ tooltip label{
   	background-color: #86b4fa;
 }
 
+#custom-power_vertical,
 #custom-light_dark,
 #idle_inhibitor {
   	background-color: #86b4fa;
diff --git a/config/waybar/style/style-simple.css b/config/waybar/style/style-simple.css
index e40f0b95..80c6441b 100644
--- a/config/waybar/style/style-simple.css
+++ b/config/waybar/style/style-simple.css
@@ -1,83 +1,83 @@
 *{
-  font-family: "JetBrainsMono Nerd Font";
-  font-weight: bold;
-  min-height: 0;
-  /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-  font-size: 98%;
-  font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-  padding: 0px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  }
-  
-  window#waybar {
+font-family: "JetBrainsMono Nerd Font";
+font-weight: bold;
+min-height: 0;
+/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+font-size: 98%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 0px;
+margin-top: 1px;
+margin-bottom: 1px;
+}
+
+window#waybar {
     background: rgba(0, 0, 0, 0.7);
     border-radius: 10px;
-  }
-  window#waybar.empty {
+}
+window#waybar.empty {
     background-color: transparent;
 }
-  window#waybar.empty #window {
+window#waybar.empty #window {
     padding: 0px;
     margin: 0px;
     border: 0px;
     /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-   background-color: transparent;
+    background-color: transparent;
 }
 
-  #custom-menu, #workspaces {
+#custom-menu, #workspaces {
     border-radius: 10px;
     /*background-color: #11111b;*/
     color: #b4befe;
     margin-right: 15px;
     padding-left: 10px;
     padding-right: 10px;
-  }
-  
-  #workspaces button {
+}
+
+#workspaces button {
     /*background: #11111b;*/
     color: #b4befe;
-  }
-  
-  
-  #clock, #backlight, #pulseaudio, #bluetooth, #network, #battery {
+}
+
+
+#clock, #backlight, #pulseaudio, #bluetooth, #network, #battery {
     border-radius: 10px;
     /*background-color: #11111b;*/
     color: #cdd6f4;
     padding-left: 10px;
     padding-right: 10px;
     margin-right: 15px;
-  }
-  
-  #backlight, #bluetooth {
+}
+
+#backlight, #bluetooth {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     padding-right: 5px;
     margin-right: 0
-  }
-  
-  #pulseaudio, #network {
+}
+
+#pulseaudio, #network {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     padding-left: 5px;
-  }
-  
-  #clock, #custom-light_dark {
+}
+
+#clock, #custom-light_dark {
     margin-right: 0;
-  }
-  
-  @keyframes blink {
+}
+
+@keyframes blink {
     to {
         color: #000000;
     }
-  }
-  
-  #battery.critical:not(.charging) {
-  background-color: #f38ba8;
-  color: #f38ba8;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-  }
\ No newline at end of file
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f38ba8;
+    color: #f38ba8;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
\ No newline at end of file