diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index dbec4d1..30486de 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -12,8 +12,8 @@ $UserScripts = $HOME/.config/hypr/UserScripts
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod, Q, killactive,
-bind = $mainMod, F, fullscreen
-bind = $mainMod SHIFT, Q, closewindow, 
+bind = $mainMod, F, fullscreen 
+bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh
 bind = $mainMod SHIFT, F, togglefloating,
 bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 612038d..85fb1dc 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -45,7 +45,7 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " T" "Open File Manager" "(Thunar)" \
 " S" "Google Search" "(rofi)" \
 " Q" "close active window" "(not kill)" \
-" Shift Q " "closes a specified window" "(window)" \
+" Shift Q " "kills an active window" "(kill)" \
 " Z" "Desktop Zoom" "(pyprland)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(Wallpaper Menu)" \
diff --git a/config/hypr/scripts/KillActiveProcess.sh b/config/hypr/scripts/KillActiveProcess.sh
new file mode 100755
index 0000000..bee146d
--- /dev/null
+++ b/config/hypr/scripts/KillActiveProcess.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+
+# Copied from Discord post. Thanks to @Zorg
+
+
+# Get id of an active window
+active_pid=$(hyprctl activewindow | grep -o 'pid: [0-9]*' | cut -d' ' -f2)
+
+# Close active window
+kill $active_pid
\ No newline at end of file
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index 44b509c..13f6cdf 100644
--- a/config/waybar/style/[Black & White] Monochrome.css	
+++ b/config/waybar/style/[Black & White] Monochrome.css	
@@ -2,24 +2,20 @@
 /*  Black & White MonoChrome */
 
 * {
-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: 97%;
-font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-}
-
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.empty {
-	background-color: transparent;
+	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: 97%;
+	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
+window#waybar,
+window#waybar.empty,
 window#waybar.empty #window {
-	background-color: transparent;
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
@@ -73,7 +69,9 @@ tooltip label{
 	padding-left: 4px;
 }
 /*-----modules indv----*/
+#taskbar button,
 #workspaces button {
+	color: dimgrey;
     box-shadow: none;
 	text-shadow: none;
     padding: 0px;
@@ -83,15 +81,17 @@ tooltip label{
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
+#taskbar button:hover,
 #workspaces button:hover {
 	color: white;
-	background-color: rgba(0,153,153,0.2);
+	background-color: #7f849c;
     padding-left: 2px;
     padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
 	color: white;
     padding-left: 8px;
@@ -161,7 +161,7 @@ tooltip label{
 	color: #cc3436;
 }
 #temperature.critical {
-	color: #cc3436;
+	color: red;
 }
 
 @keyframes blink {
@@ -179,21 +179,6 @@ tooltip label{
 	animation-direction: alternate;
 }
 
-#taskbar button.active {
-	background-color: #7f849c;
-    padding-left: 6px;
-    padding-right: 6px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #pulseaudio-slider slider {
 	min-width: 0px;
 	min-height: 0px;
diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css
index 8ee01c1..92eac7f 100644
--- a/config/waybar/style/[Catppuccin] Latte.css	
+++ b/config/waybar/style/[Catppuccin] Latte.css	
@@ -15,7 +15,6 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 window#waybar {
   transition-property: background-color;
   transition-duration: 0.5s;
-  /*background: transparent;*/
   border-bottom: 2px solid @sapphire;
   background: @theme_base_color;
   border-radius: 10px;
@@ -25,8 +24,54 @@ window#waybar.hidden {
   opacity: 0.2;
 }
 
-#waybar.empty #window {
-  background: transparent;
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
+}
+
+#taskbar button,
+#workspaces button {
+    box-shadow: none;
+	text-shadow: none;
+    padding: 0px;
+    border-radius: 9px;
+    padding-left: 4px;
+    padding-right: 4px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+	border-radius: 10px;
+	color: @overlay0;
+	background-color: @surface0;
+ 	padding-left: 2px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.persistent {
+	color: @surface1;
+	border-radius: 10px;
+}
+
+#taskbar button.active,
+#workspaces button.active {
+	color: @peach;
+  	border-radius: 10px;
+    padding-left: 8px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.urgent {
+	color: @red;
+ 	border-radius: 0px;
 }
 
 #backlight,
@@ -149,59 +194,6 @@ window#waybar.hidden {
   	color: @flamingo;
 }
 
-#workspaces button {
-    box-shadow: none;
-	text-shadow: none;
-    padding: 0px;
-    border-radius: 9px;
-    padding-left: 4px;
-    padding-right: 4px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button:hover {
-	border-radius: 10px;
-	color: @overlay0;
-	background-color: @surface0;
- 	padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.persistent {
-	color: @surface1;
-	border-radius: 10px;
-}
-
-#workspaces button.active {
-	color: @peach;
-  	border-radius: 10px;
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.urgent {
-	color: @red;
- 	border-radius: 0px;
-}
-
-#taskbar button.active {
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
 #custom-cava_mviz {
 	color: @pink;
 }
diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css
index 3461bb8..98a4240 100644
--- a/config/waybar/style/[Catppuccin] Mocha.css	
+++ b/config/waybar/style/[Catppuccin] Mocha.css	
@@ -2,31 +2,76 @@
 /* Catppuccin Mocha */
 
 * {
-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: 97%;
-font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+	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: 97%;
+	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
 @import "../waybar/style/catppuccin-themes/mocha.css";
 
 window#waybar {
-  transition-property: background-color;
-  transition-duration: 0.5s;
-  background: transparent;
-  /*border: 2px solid @overlay0;*/
-  /*background: @theme_base_color;*/
-  border-radius: 10px;
+  	transition-property: background-color;
+  	transition-duration: 0.5s;
+  	background: transparent;
+  	border-radius: 10px;
 }
 
 window#waybar.hidden {
-  opacity: 0.2;
+  	opacity: 0.2;
+}
+
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
+}
+
+#taskbar button,
+#workspaces button {
+	color: @overlay1;
+    box-shadow: none;
+	text-shadow: none;
+    padding: 0px;
+    border-radius: 9px;
+    padding-left: 4px;
+    padding-right: 4px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+	border-radius: 10px;
+	color: @peach;
+	background-color: @surface0;
+ 	padding-left: 2px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
-#waybar.empty #window {
-  background: transparent;
+#workspaces button.persistent {
+	color: @surface1;
+	border-radius: 10px;
+}
+
+#taskbar button.active,
+#workspaces button.active {
+	color: @mauve;
+  	border-radius: 10px;
+    padding-left: 8px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.urgent {
+	color: @red;
+ 	border-radius: 0px;
 }
 
 /* This section can be use if you want to separate waybar modules */
@@ -166,60 +211,6 @@ window#waybar.hidden {
   color: @flamingo;
 }
 
-#workspaces button {
-    box-shadow: none;
-	text-shadow: none;
-    padding: 0px;
-    border-radius: 9px;
-    padding-left: 4px;
-    padding-right: 4px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button:hover {
-	border-radius: 10px;
-	color: @overlay0;
-	background-color: @surface0;
- 	padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.persistent {
-	color: @surface1;
-	border-radius: 10px;
-}
-
-#workspaces button.active {
-	color: @peach;
-  	border-radius: 10px;
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.urgent {
-	color: @red;
- 	border-radius: 0px;
-}
-
-#taskbar button.active {
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #custom-cava_mviz {
 	color: @pink;
 }
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index 35ee062..05a3013 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css	
+++ b/config/waybar/style/[Colored] Chroma Glow.css	
@@ -2,12 +2,12 @@
 /* Chroma Glow */
 
 * {
-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: 97%;
-font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+	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: 97%;
+	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
 window#waybar {
@@ -22,10 +22,7 @@ window#waybar.hidden {
     opacity: 0.1;
 }
 
-window#waybar.empty {
-    background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
@@ -46,6 +43,7 @@ tooltip label{
     color: #cdd6f4;
 }
 
+#taskbar button,
 #workspaces button {
     background-color: transparent;
     color: grey;
@@ -59,6 +57,7 @@ tooltip label{
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
     background-color: transparent;
     color: #D3D3D3;
@@ -68,6 +67,7 @@ tooltip label{
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
     background: rgba(0, 0, 0, 0.2);
 	color: #D3D3D3;
@@ -80,7 +80,6 @@ tooltip label{
 #workspaces button.focused {
     background-color: #bbccdd;
     color: #323232;
-    /* box-shadow: inset 0 -3px #ffffff; */
 }
 
 #workspaces button.urgent {
@@ -142,10 +141,6 @@ tooltip label{
 	padding-left: 6px;
 }
 
-#window,
-#workspaces {
-}
-
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
 }
@@ -280,21 +275,6 @@ label:focus {
     /*color: #2d3436;*/
 }
 
-#taskbar button.active {
-    background-color: #7f849c;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #mpd {
     color: #2a5c45;
 }
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index edddce4..8d6aab1 100644
--- a/config/waybar/style/[Colored] Translucent.css	
+++ b/config/waybar/style/[Colored] Translucent.css	
@@ -36,14 +36,10 @@ window#waybar.hidden {
     opacity: 0.1;
 }
 
-window#waybar.empty {
-    background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
-    /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
     background-color: transparent;
 }
 
@@ -69,6 +65,7 @@ tooltip {
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
     background-color: transparent;
     color: @accent1;
@@ -78,6 +75,7 @@ tooltip {
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
     background: rgba(0, 0, 0, 0.2);
 	color: @accent3;
@@ -185,7 +183,7 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
+    color: @critical;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -295,21 +293,6 @@ label:focus {
     /*color: #2d3436;*/
 }
 
-#taskbar button.active {
-    background-color: #7f849c;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #mpd {
     color: #2a5c45;
 }
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index b7fd25d..e29ab9a 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css	
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css	
@@ -2,23 +2,22 @@
 /* Aurora Blossom */
 
 * {
-font-family: "JetBrainsMono Nerd Font";
-font-weight: bold;
-/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-font-size: 97%;
-font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+	font-family: "JetBrainsMono Nerd Font";
+	font-weight: bold;
+	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+	font-size: 97%;
+	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
 window#waybar {
 	background: transparent;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-}
-
+window#waybar.empty ,
 window#waybar.empty #window {
 	background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index f6d4af5..55dffc6 100644
--- a/config/waybar/style/[Colorful] Aurora.css	
+++ b/config/waybar/style/[Colorful] Aurora.css	
@@ -9,16 +9,12 @@ font-size: 97%;
 font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.empty {
-	background-color: transparent;
-}
-
+window#waybar,
+window#waybar.empty,
 window#waybar.empty #window {
-	background-color: transparent;
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
@@ -51,8 +47,9 @@ tooltip label{
 	padding-left: 4px;
 }
 /*-----modules indv----*/
+#taskbar button,
 #workspaces button {
-	color: black;
+	color: grey;
     box-shadow: none;
 	text-shadow: none;
     padding: 0px;
@@ -62,17 +59,18 @@ tooltip label{
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
+#taskbar button:hover,
 #workspaces button:hover {
-	color: grey;
+	color: black;
 	background-color: rgba(0,153,153,0.2);
     padding-left: 2px;
     padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
-
+#taskbar button.active,
 #workspaces button.active {
-	color: grey;
+	color: black;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
@@ -181,24 +179,6 @@ tooltip label{
 	animation-direction: alternate;
 }
 
-#taskbar button.active {
-	color: black;
-	background-color: #7f849c;
-    padding-left: 6px;
-    padding-right: 6px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button,
-#taskbar button:hover {
-	color:	black;
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #pulseaudio-slider slider {
 	min-width: 0px;
 	min-height: 0px;
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index 0a6ea26..0309635 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css	
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css	
@@ -11,10 +11,7 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
 window#waybar {
-	/* Transparent waybar. Make sure to comment out background-color: and border: */
   	background-color: rgba(0,0,0,0);
-  	/* background-color: #1e1e2e; */
-  	/* border: 2px solid #313244; */
   	transition-property: background-color;
   	transition-duration: .5s;
 }
@@ -23,14 +20,10 @@ window#waybar.hidden {
   	opacity: 0.5;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
 	background-color: transparent;
 }
 
@@ -47,6 +40,40 @@ tooltip label{
 	color: #cdd6f4;
 }
 
+#taskbar button,
+#workspaces button {
+  	background-color: #d9e0ee;
+  	color: #3A3B3C;
+    box-shadow: none;
+	text-shadow: none;
+    padding: 0px;
+    border-radius: 9px;
+    padding-left: 4px;
+    padding-right: 4px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button.active,
+#workspaces button.active {
+  	background-color: #eba0ac;
+  	color: #3A3B3C;
+    padding-left: 8px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+    background: #eb6f92;
+    color: #f6c177;
+    padding-left: 3px;
+    padding-right: 3px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
 #backlight,
 #backlight-slider,
 #battery,
@@ -105,14 +132,6 @@ tooltip label{
 	background-color: #cba6f7;
 }
 
-#taskbar {
-	color: #ffffff;
-}
-
-#taskbar button.active {
-	background-color: #7f849c;
-}
-
 #battery {
 	background-color: #f9e2af;
 }
@@ -167,59 +186,6 @@ tooltip label{
 		-gtk-icon-effect: highlight;
 }
 
-#workspaces button {
-  	background-color: #d9e0ee;
-  	color: #3A3B3C;
-    box-shadow: none;
-	text-shadow: none;
-    padding: 0px;
-    border-radius: 9px;
-    padding-left: 4px;
-    padding-right: 4px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.active {
-  	background-color: #eba0ac;
-  	color: #3A3B3C;
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button:hover {
-    background: #eb6f92;
-    color: #f6c177;
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button {
-  	border-radius: 8px;
-  	background-color: #74c7ec;
-  	color: #3A3B3C;
-}
-
-#taskbar button.active {
-  	background-color: #b4befe;
-  	color: #3A3B3C;
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #custom-menu {
 	background-color: #f5c2e7;
 	/*padding: 1px;*/
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index a0e0ace..96ac0b9 100644
--- a/config/waybar/style/[Dark] Golden Noir.css	
+++ b/config/waybar/style/[Dark] Golden Noir.css	
@@ -4,7 +4,6 @@
 /* .......................................... */
 /* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
-
 * {
     font-family: "JetBrainsMono Nerd Font";
     font-weight: bold;
@@ -25,19 +24,13 @@ window#waybar.hidden {
     opacity: 0.5;
 }
 
-window#waybar.empty {
-    background-color: #040406;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
-    /*  background-color: rgba(66,66,66,0.5); */
-    /* transparent */
     background-color: transparent;
 }
 
-
 tooltip {
     background: #1e1e2e;
     border-radius: 10px;
@@ -85,6 +78,7 @@ tooltip {
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
     color: #ffd700;
     border-radius: 50%;
@@ -105,6 +99,7 @@ tooltip {
     border-radius: 10px;
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
     color: #ffd700;
     border-radius: 15px;
@@ -114,10 +109,6 @@ tooltip {
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
-#clock#2 {
-    color: #cba6f7;
-}
-
 #backlight,
 #backlight-slider,
 #battery,
@@ -180,21 +171,6 @@ tooltip {
     }
 }
 
-#taskbar button.active {
-    background-color: rgb(47, 46, 46);
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #battery.critical:not(.charging) {
     color: #f53c3c;
     animation-name: blink;
diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
index 28976f7..67cb4f9 100644
--- a/config/waybar/style/[Dark] Half-Moon.css	
+++ b/config/waybar/style/[Dark] Half-Moon.css	
@@ -5,11 +5,15 @@
 /* --- 👍 shared by https://github.com/TomekBobrowicz  👍 --- */
 
 * {
-font-size: 97%;
-font-family: "JetBrainsMono Nerd Font", "Font Awesome", sans-serif;
-font-weight: bold;
+    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: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
+
 window#waybar {
   background-color: rgba(26,27,38,0);
   border-bottom: 1px solid rgba(26,27,38,0);
@@ -21,6 +25,11 @@ window#waybar {
 	background-color: transparent;
 }
 
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+}
+
 #taskbar,
 #workspaces {
   background: #0F1419;
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
index efae52a..c0cf90a 100644
--- a/config/waybar/style/[Dark] Latte-Wallust combined.css	
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css	
@@ -39,10 +39,7 @@ window#waybar.hidden {
     opacity: 0;
 }
 
-window#waybar.empty {
-    background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
@@ -74,8 +71,6 @@ tooltip {
     background-color: @background-module;
     border-radius:15px;
     border-bottom:2px solid @border-color;
-    /*border-right: 2px solid #ffd700;*/
-    /*border:@teal-trans;*/
 	padding-top: 2px;
 	padding-bottom: 0px;
 	padding-right: 4px;
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
index 3dbd99d..ed06d3b 100644
--- a/config/waybar/style/[Dark] Purpl.css	
+++ b/config/waybar/style/[Dark] Purpl.css	
@@ -22,16 +22,10 @@ window#waybar.hidden {
 	opacity: 0.5;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-	background: #100214;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */
-	/* transparent */
 	background-color: transparent;
 }
 
@@ -60,8 +54,6 @@ tooltip {
 	padding-bottom: 2px;
 	padding-right: 4px;
 	padding-left: 4px;
-
-
 }
 
 .modules-left {
@@ -165,7 +157,6 @@ tooltip {
 	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
-
 }
 
 #temperature.critical {
diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index d841e3c..06385e4 100644
--- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css	
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css	
@@ -21,10 +21,7 @@ window#waybar.hidden {
     opacity: 0.5;
 }
 
-window#waybar.empty {
-    background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
@@ -72,6 +69,7 @@ tooltip label {
     padding-left: 4px;    
 }
 
+#taskbar button,
 #workspaces button {
     color: @color12;
     box-shadow: none;
@@ -84,6 +82,7 @@ tooltip label {
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
     color: @foreground;
     border-radius: 15px 15px 15px 15px;
@@ -102,8 +101,9 @@ tooltip label {
     border-radius: 10px;
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
-    color: #9CCFD8;
+    color: @color9;
     border-radius: 15px;
  	padding-left: 2px;
     padding-right: 2px;
@@ -174,21 +174,6 @@ tooltip label {
     }
 }
 
-#taskbar button.active {
-    background-color: #7f849c;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #battery.critical:not(.charging) {
     color: #f53c3c;
     animation-name: blink;
diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css
index 6399251..89dbb93 100644
--- a/config/waybar/style/[Extra] Crimson.css	
+++ b/config/waybar/style/[Extra] Crimson.css	
@@ -22,14 +22,10 @@ window#waybar {
 window#waybar.hidden {
 	opacity: 0.5;
 }
-window#waybar.empty {
-	
-}
-	
+window#waybar.empty,	
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
-    /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
     background-color: transparent;
 }	   
 
@@ -75,7 +71,8 @@ tooltip {
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
-	   
+
+#taskbar button.active,	   
 #workspaces button.active {
 	color: rgb(108, 18, 18);
 	background-color: #000000;
@@ -95,7 +92,8 @@ tooltip {
 	color: #11111b;
 	border-radius: 10px;
 }
-		   
+
+#taskbar button:hover,		   
 #workspaces button:hover {
 	color: rgb(71, 14, 14);
 	background-color: #000000;
@@ -166,24 +164,7 @@ tooltip {
 	color: #000000;
 	   }
 }
-	   
-#taskbar button.active {
-	background-color: rgb(128, 31, 31);
-	border-radius: 8px;
-	border: 1px solid grey;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-		   
+	   	   
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
index cfdec9a..120b538 100644
--- a/config/waybar/style/[Extra] Mauve.css	
+++ b/config/waybar/style/[Extra] Mauve.css	
@@ -16,23 +16,16 @@
 window#waybar {
 	background: #11111b;
 	color: #cba6f7;
-	/* background-color: transparent; */
 }
 
 window#waybar.hidden {
 	opacity: 0.5;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-	background: #11111b;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */
-	/* transparent */
 	background-color: transparent;
 }
 
@@ -49,7 +42,7 @@ tooltip {
 .modules-right {
 	border: 3px solid #11111b;
 	border-radius: 10px 10px 10px 10px;
-	background-color: #1e1e2e;
+	background-color: #313244;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	padding-right: 4px;
@@ -67,7 +60,7 @@ tooltip {
 	/*background-color: #1e1e2e;*/
 	border: 3px solid #11111b;
 	border-radius: 10px 10px 10px 10px;
-	background-color: #1e1e2e;
+	background-color: #313244;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	padding-right: 4px;
@@ -86,6 +79,7 @@ tooltip {
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
 	color: #1e1e1e;
 	border-radius: 30%;
@@ -100,7 +94,6 @@ tooltip {
 	color: #1e1e1e;
 	border-radius: 30%;
 	background-color: #cba6f7;
-	border: 0px solid #1e1e2e;
     padding-left: 6px;
     padding-right: 8px;
 }
@@ -115,6 +108,7 @@ tooltip {
 	color: #1e1e1e;
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
 	color: #1e1e1e;
 	border: 3px solid #1e1e2e;
@@ -189,21 +183,6 @@ tooltip {
 	}
 }
 
-#taskbar button.active {
-	background-color: purple;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css
index b468aac..411c96e 100644
--- a/config/waybar/style/[Extra] Rose Pine.css	
+++ b/config/waybar/style/[Extra] Rose Pine.css	
@@ -23,8 +23,11 @@ window#waybar {
     background: @bar-bg;
 }
 
+window#waybar.empty,
 window#waybar.empty #window {
-	background-color: transparent;
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
diff --git a/config/waybar/style/[Extra] Simple Pink.css b/config/waybar/style/[Extra] Simple Pink.css
index df7056b..45cd0da 100644
--- a/config/waybar/style/[Extra] Simple Pink.css	
+++ b/config/waybar/style/[Extra] Simple Pink.css	
@@ -11,7 +11,6 @@
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
 	font-size: 97%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-
 }
 
 window#waybar {
@@ -24,15 +23,10 @@ window#waybar.hidden {
 	opacity: 0.5;
 }
 
-window#waybar.empty {
-	background-color: black;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */
-	/* transparent */
 	background-color: transparent;
 }
 
@@ -63,8 +57,6 @@ tooltip {
 	padding-bottom: 2px;
 	padding-right: 4px;
 	padding-left: 4px;
-
-
 }
 
 .modules-left {
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index b188f99..83524d3 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css	
+++ b/config/waybar/style/[Light] Monochrome Contrast.css	
@@ -10,16 +10,12 @@ font-size: 97%;
 font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
-window#waybar {
-	background: transparent;
-}
-
-window#waybar.empty {
-	background-color: transparent;
-}
-
+window#waybar,
+window#waybar.empty,
 window#waybar.empty #window {
-	background-color: transparent;
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
@@ -73,6 +69,7 @@ tooltip label{
 	padding-left: 4px;
 }
 /*-----modules indv----*/
+#taskbar button,
 #workspaces button {
 	color: black;
     box-shadow: none;
@@ -84,6 +81,7 @@ tooltip label{
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
+#taskbar button:hover,
 #workspaces button:hover {
 	color: grey;
 	background-color: rgba(0,153,153,0.2);
@@ -93,8 +91,10 @@ tooltip label{
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
-	color: grey;
+	background-color: grey;
+	color: black;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
@@ -183,21 +183,6 @@ tooltip label{
 	animation-direction: alternate;
 }
 
-#taskbar button.active {
-	background-color: #7f849c;
-    padding-left: 6px;
-    padding-right: 6px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #pulseaudio-slider slider {
 	min-width: 0px;
 	min-height: 0px;
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index 5b6fe9b..001117f 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css	
+++ b/config/waybar/style/[Light] Obsidian Glow.css	
@@ -19,10 +19,7 @@ window#waybar.hidden {
 	opacity: 0.7;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
@@ -54,6 +51,7 @@ tooltip label {
 }
 
 #workspaces button.active {
+	background-color: dimgrey;
 	color: #000000;
     border-radius: 15px 15px 15px 15px;
     padding-left: 8px;
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index 7857484..f966b85 100644
--- a/config/waybar/style/[Retro] Simple Style.css	
+++ b/config/waybar/style/[Retro] Simple Style.css	
@@ -1,7 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Simple Style */
 
-
 @define-color background #1d2021;
 @define-color foreground #ebdbb2;
 @define-color dim        #928374;
@@ -10,11 +9,13 @@
 @define-color green      #b8bb26;
 
 * {
-  background: @background;
-  border: none;
-  border-radius: 0;
-  font-family: "JetBrainsMono Nerd Font";
-  font-size: 97%;
+	font-family: "JetBrains Mono 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: 97%;
+	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+
 }
 
 window#waybar {
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index fb2710a..7bf67f9 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css	
+++ b/config/waybar/style/[Transparent] Crystal Clear.css	
@@ -22,30 +22,14 @@ window#waybar {
 window#waybar.hidden {
 	opacity: 0.5;
 }
-window#waybar.empty {
-	background-color: transparent;
-}
-	
+
+window#waybar.empty	
 window#waybar.empty #window {
    padding: 0px;
    border: 0px;
    background-color: transparent;
 }
 	   
-
-/*-----module groups----*/
-.modules-right {
-	
-}
-
-.modules-center {
-		
-}
-
-.modules-left {
-	   
-}
-
 #workspaces button {
 	color: #6E6A86;
    	box-shadow: none;
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index 4a9ddca..198fd45 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css	
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css	
@@ -40,10 +40,11 @@ window#waybar {
     border:2px solid black;
 }
 
-window#waybar.empty #window {    
+window#waybar.empty,
+window#waybar.empty #window {
     background-color: transparent;
+    padding: 0px;
     border: 0px;
-
 }
 
 tooltip {
@@ -101,7 +102,7 @@ tooltip {
 	background-color: @background-module;
     border-radius: 25px;
     padding: 0px 10px 0px 10px;
-    margin: 5px 5px 5px 5px;
+    margin: 5px;
     opacity:0.8;
     border:2px solid @border-color;
 
@@ -134,11 +135,16 @@ tooltip {
 #clock {
 	color: @sapphire;
 }
-#network,
+
 #temperature {
     color: @rosewater;
 }
 
+#network {
+	padding-left: 2px;
+	color: @rosewater;
+}
+
 #custom-swaync,
 #custom-hint,
 #tray {
@@ -167,19 +173,15 @@ tooltip {
 	color: @color2;
 }
 #workspaces {
-    margin: 1px 1px 1px 1px;
-    padding: 0px 1px;
     border-radius: 25px;
     border:2px solid @border-color;
-    font-weight: bold;
-    font-style: normal;
     opacity:0.8;
     color:#FFFFFF;
+    margin: 6px;
     
 }
 
 #workspaces button {
-    margin: 1px 1px;
     border-radius: 15px;
     border:0px;
     color: @color13;
@@ -190,12 +192,10 @@ tooltip {
     opacity:0.8;
 }
 
-#workspaces button.active,
-#workspaces button.visible {
+#workspaces button.active {
     color: #FFFFFF;
     background: @button-color;
-    border-radius: 15px;
-    border: 1px solid @border-color;
+    border-radius: 25px;
     padding-left: 4px;
     padding-right: 4px;
     animation: gradient_f 20s ease-in infinite;
@@ -211,7 +211,6 @@ tooltip {
 #workspaces button:hover {
     color: #FFFFFF;
     background: @button-hover;
-    border: 1px solid @border-color;
     border-radius: 15px;
     opacity:1.0;
     padding-left: 2px;
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
index ce5f3fc..047a91c 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css	
+++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css	
@@ -19,11 +19,11 @@ window#waybar {
     padding-right: 15px;
 }
 
+window#waybar.empty,
 window#waybar.empty #window {
     background-color: transparent;
-    border-color: transparent;
-    padding-left: 15px;
-    padding-right: 15px;
+    padding: 0px;
+    border: 0px;
 }
 
 tooltip {
@@ -91,6 +91,7 @@ tooltip {
 #keyboard-state,
 #memory,
 #mode,
+#mpris,
 #network,
 #power-profiles-daemon,
 #pulseaudio,
@@ -181,7 +182,7 @@ tooltip {
 }
 
 #mpris {
-    padding-left: 15px;	
+    padding-left: 16px;	
 }
 #tray.empty {
     background-color: transparent;
diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index b873991..d606040 100644
--- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css	
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css	
@@ -38,8 +38,7 @@ window#waybar.empty #window {
    padding: 0px;
    border: 0px;
    background-color: transparent;
-}
-	   
+} 
 
 /*-----module groups----*/
 .modules-right {
diff --git a/config/waybar/style/[Wallust] Box type.css b/config/waybar/style/[Wallust] Box type.css
index cfb5444..0bdf607 100644
--- a/config/waybar/style/[Wallust] Box type.css	
+++ b/config/waybar/style/[Wallust] Box type.css	
@@ -22,11 +22,11 @@ window#waybar.hidden {
 }
 
 
-window#waybar.empty #window {  
- background:none;  
- border-bottom-width: 5px;
- border-bottom-color: transparent;
- border-bottom-style: solid;
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
 }
 
 #window {
@@ -91,6 +91,7 @@ window#waybar.empty #window {
 #keyboard-state,
 #memory,
 #mode,
+#mpris,
 #network,
 #power-profiles-daemon,
 #pulseaudio,
@@ -150,7 +151,7 @@ window#waybar.empty #window {
 }
 
 #mpris {
-	padding-right: 8px;
+	padding-right: 2px;
 	padding-left: 8px;
 }
 #backlight {
diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index 6be6abb..6dea294 100644
--- a/config/waybar/style/[Wallust] Chroma Edge.css	
+++ b/config/waybar/style/[Wallust] Chroma Edge.css	
@@ -22,13 +22,11 @@ window#waybar {
 	border-radius: 0px;
 	transition-duration: 0.5s;
 }
-window#waybar.empty {
-	background-color: transparent;
-}
+
+window#waybar.empty
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */ /* transparent */
 	background-color: transparent;
 }
 
diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index 4275fba..cb1abdf 100644
--- a/config/waybar/style/[Wallust] Chroma Fusion.css	
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css	
@@ -39,10 +39,11 @@ window#waybar {
     border-top-right-radius: 20px;
 }
 
-window#waybar.empty #window {    
+window#waybar.empty,
+window#waybar.empty #window {
     background-color: transparent;
+    padding: 0px;
     border: 0px;
-
 }
 
 tooltip {
@@ -185,20 +186,19 @@ tooltip {
     border-radius: 15px;
     border:0px;
     color: @color13;
-    padding-left: 4px;
-    padding-right: 4px;
+    padding-left: 2px;
+    padding-right: 2px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
     opacity:0.8;
 }
 
-#workspaces button.active,
-#workspaces button.visible {
+#workspaces button.active {
     color: #FFFFFF;
     background: @button-color;
     border-radius: 15px;
-    padding-left: 8px;
-    padding-right: 8px;
+    padding-left: 4px;
+    padding-right: 4px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
     opacity:1.0;
diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index d22c918..ec6b6e1 100644
--- a/config/waybar/style/[Wallust] Chroma Tally.css	
+++ b/config/waybar/style/[Wallust] Chroma Tally.css	
@@ -20,6 +20,13 @@ window#waybar {
 	border-color: @color12; 
 }
 
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
+}
+
 #workspaces {
 	background: transparent;
 	padding: 0px 1px;
diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css
index 8d73d52..ba4e316 100644
--- a/config/waybar/style/[Wallust] Colored.css	
+++ b/config/waybar/style/[Wallust] Colored.css	
@@ -12,18 +12,11 @@
     font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 }
 
-window#waybar {
-    background: transparent;
-}
-
 window#waybar.hidden {
     opacity: 0.5;
 }
 
-window#waybar.empty {
-    background-color: @background;
-}
-
+window#waybar,
 window#waybar.empty #window {
     padding: 0px;
     border: 0px;
diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css
index e2a2763..d68d3a6 100644
--- a/config/waybar/style/[Wallust] Simple.css	
+++ b/config/waybar/style/[Wallust] Simple.css	
@@ -12,14 +12,18 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
-window#waybar {
-	background: transparent;
-}
-
 #waybar.empty, #waybar.tiled, #waybar.floating {
 	background-color: transparent;
 }
 
+window#waybar,
+window#waybar.empty,
+window#waybar.empty #window {
+    background-color: transparent;
+    padding: 0px;
+    border: 0px;
+}
+
 tooltip {
 	color: @color15;
 	background: @color0;