Merge pull request #73 from JaKooLit/Development

preliminary for v2.2

38 files changed, 806 insertions, 246 deletions

diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
index 74d500d9..6d00ba3f 100755
--- a/config/dunst/dunstrc
+++ b/config/dunst/dunstrc
@@ -17,19 +17,6 @@
     # will be ignored.
     follow = mouse
 
-    # The geometry of the window:
-    #   [{width}]x{height}[+/-{x}+/-{y}]
-    # The geometry of the message window.
-    # The height is measured in number of notifications everything else
-    # in pixels.  If the width is omitted but the height is given
-    # ("-geometry x2"), the message window expands over the whole screen
-    # (dmenu-like).  If width is 0, the window expands to the longest
-    # message displayed.  A positive x is measured from the left, a
-    # negative from the right side of the screen.  Y is measured from
-    # the top and down respectively.
-    # The width can be negative.  In this case the actual width is the
-    # screen width minus the width defined in within the geometry option.
-    #geometry = "300x60+15+46"
     width = (250, 350)
     height = 250
     origin = top-center
@@ -37,23 +24,20 @@
 
     notification_limit = 9
 
-    # Show how many messages are currently hidden (because of geometry).
+	progress_bar_corner_radius = 4
+    
+	# Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
 
     # Shrink window if it's smaller than the width.  Will be ignored if
     # width is 0.
     shrink = no
 
-    # The transparency of the window.  Range: [0; 100].
+    # The transparency of the window.  Range: [0; 100]. [x11 only]
     # This option will only work if a compositing window manager is
     # present (e.g. xcompmgr, compiz, etc.).
     #transparency = 100
 
-    # The height of the entire notification.  If the height is smaller
-    # than the font height and padding combined, it will be raised
-    # to the font height and padding.
-    notification_height = 15
-
     # Draw a line of "separator_height" pixel height between two
     # notifications.
     # Set to 0 to disable.
@@ -70,7 +54,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#3C27C7"
+    frame_color = "#6C89AE"
 
     # Define a color for the separator.
     # possible values are:
@@ -186,7 +170,7 @@
     ### Misc/Advanced ###
 
     # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
+    dmenu = /usr/bin/rofi -p dunst:
 
     # Browser for opening urls in context menu.
     browser = /usr/bin/firefox -new-tab
@@ -200,20 +184,6 @@
     # Define the class of the windows spawned by dunst
     class = Dunst
 
-    # Print a notification on startup.
-    # This is mainly for error detection, since dbus (re-)starts dunst
-    # automatically after a crash.
-    startup_notification = false
-
-    # Manage dunst's desire for talking
-    # Can be one of the following values:
-    #  crit: Critical features. Dunst aborts
-    #  warn: Only non-fatal warnings
-    #  mesg: Important Messages
-    #  info: all unimportant stuff
-    # debug: all less than unimportant stuff
-    verbosity = mesg
-
     # Define the corner radius of the notification window
     # in pixel size. If the radius is 0, you have no rounded
     # corners.
@@ -256,34 +226,13 @@
     # where there are multiple screens with very different dpi values.
     per_monitor_dpi = false
 
-[shortcuts]
-
-    # Shortcuts are specified as [modifier+][modifier+]...key
-    # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
-    # "mod3" and "mod4" (windows-key).
-    # Xev might be helpful to find names for keys.
-
-    # Close notification.
-    close = ctrl+space
-
-    # Close all notifications.
-    close_all = ctrl+shift+space
-
-    # Redisplay last message(s).
-    # On the US keyboard layout "grave" is normally above TAB and left
-    # of "1". Make sure this key actually exists on your keyboard layout,
-    # e.g. check output of 'xmodmap -pke'
-    history = ctrl+grave
-
-    # Context menu.
-    context = ctrl+shift+grave
 
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
     background = "#00000095"
     foreground = "#fafafa"
-    frame_color = "#3C27C7"
+    frame_color = "#6C89AE"
     timeout = 2
     # Icon for notifications with low urgency, uncomment to enable
     icon = $HOME/.config/dunst/images/bell.png
@@ -291,7 +240,7 @@
 [urgency_normal]
     background = "#00000095"
     foreground = "#fafafa"
-    frame_color = "#3C27C7"
+    frame_color = "#6C89AE"
     timeout = 5
     # Icon for notifications with normal urgency, uncomment to enable
     icon = $HOME/.config/dunst/images/bell.png
@@ -299,7 +248,7 @@
 [urgency_critical]
     background = "#00000095"
     foreground = "#fafafa"
-    frame_color = "#3C27C7"
+    frame_color = "#6C89AE"
     timeout = 0
     # Icon for notifications with critical urgency, uncomment to enable
     icon = $HOME/.config/dunst/images/bell.png
diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 85870f74..afcc5a14 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -35,7 +35,8 @@ exec-once = nm-applet --indicator &
 #exec-once = rog-control-center &
 
 #clipboard manager
-exec-once = wl-paste --watch cliphist store 
+exec-once = wl-paste --type text --watch cliphist store 
+exec-once = wl-paste --type image --watch cliphist store
 
 # Rainbow borders
 exec-once = $scriptsDir/RainbowBorders.sh
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 2c0b4341..39068ee0 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -18,8 +18,8 @@ $volume = $scriptsDir/Volume.sh
 
 # see https://wiki.hyprland.org/Configuring/Binds/ for more
 # rofi launcher
-bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun
-bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun
+bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, R, exec, hyprctl reload
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 556f651d..0d91de8d 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -10,9 +10,11 @@ for _prs in "${_ps[@]}"; do
     fi
 done
 
+sleep 0.1
 # Relaunch waybar
 waybar &
 
+sleep 0.1
 # Relaunch dunst with pywal-borders
 ${SCRIPTSDIR}/PywalDunst.sh &
 
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 5317feac..30e3aa74 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						700px;
+    width:						600px;
 	/*height:						450px;*/
     x-offset:                   0px;
     y-offset:                   0px;
@@ -48,23 +48,23 @@ mainbox {
     orientation:                vertical;
 	padding:					8px;
     background-image:           url("~/.config/rofi/.current_wallpaper", height);
-    children:                   [ "inputbar", "listbox" ];
+    children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
 
 /* ---- Imagebox ---- */
 imagebox {
     background-color:           transparent;
-    orientation:                vertical;
-    /*children:                   [ "inputbar"];*/
+    orientation:                horizontal;
+    children:                   [ "mode-switcher",  "listbox"];
 }
 
 /* ---- Listbox ---- */
 listbox {
     spacing:                    4px;
     orientation:                vertical;
-    children:                   [ "listview" ];
-	padding:					10px;
+    children:                   ["listview" ];
+	padding:					6px;
     border-radius:              12px;
     border:                     1px;
     border-color:               @active-background;
@@ -84,23 +84,23 @@ inputbar {
     border-radius:              12px;
     border-color:               @foreground;
 	background-color:		    @background;
-    children:                   [ "mode-switcher", "entry" ];
+    children:                   [ "textbox-prompt-colon","entry" ];
     border:                     1px;
     border-color:               @active-background;
 }
 
 textbox-prompt-colon {
     enabled:                    true;
-	padding:					10px 0px 10px 10px;
+	padding:					6px 0px 6px 10px;
     expand:                     false;
-    str:                        "🐧";
+    str:                           "🐧";
     text-color:                 inherit;
 	background-color:			transparent;
 }
 
 entry {
     enabled:                    true;
-	padding:					10px 0px 10px 0px;
+	padding:					6px 0px 0px 0px;
     text-color:                 inherit;
     cursor:                     text;
     placeholder:                "Search (ctrl tab to choose mode)";
@@ -110,14 +110,15 @@ entry {
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
+	orientation:				vertical;
     enabled:                    true;
-    spacing:                    10px;
+    spacing:                    12px;
     background-color:          	transparent;
     text-color:                 @foreground;
 }
 
 button {
-    padding:                   1px 12px 1px 12px;
+    padding:                   0px 10px 0px 10px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
@@ -139,7 +140,7 @@ listview {
 	enabled:					true;
 	columns:					2;
 	lines:						6;
-	spacing:                    5px;
+	spacing:                    2px;
 	padding:					6px;
 	dynamic:                    true;
 	cycle:                      true;
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 5317feac..30e3aa74 100644
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						700px;
+    width:						600px;
 	/*height:						450px;*/
     x-offset:                   0px;
     y-offset:                   0px;
@@ -48,23 +48,23 @@ mainbox {
     orientation:                vertical;
 	padding:					8px;
     background-image:           url("~/.config/rofi/.current_wallpaper", height);
-    children:                   [ "inputbar", "listbox" ];
+    children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
 
 /* ---- Imagebox ---- */
 imagebox {
     background-color:           transparent;
-    orientation:                vertical;
-    /*children:                   [ "inputbar"];*/
+    orientation:                horizontal;
+    children:                   [ "mode-switcher",  "listbox"];
 }
 
 /* ---- Listbox ---- */
 listbox {
     spacing:                    4px;
     orientation:                vertical;
-    children:                   [ "listview" ];
-	padding:					10px;
+    children:                   ["listview" ];
+	padding:					6px;
     border-radius:              12px;
     border:                     1px;
     border-color:               @active-background;
@@ -84,23 +84,23 @@ inputbar {
     border-radius:              12px;
     border-color:               @foreground;
 	background-color:		    @background;
-    children:                   [ "mode-switcher", "entry" ];
+    children:                   [ "textbox-prompt-colon","entry" ];
     border:                     1px;
     border-color:               @active-background;
 }
 
 textbox-prompt-colon {
     enabled:                    true;
-	padding:					10px 0px 10px 10px;
+	padding:					6px 0px 6px 10px;
     expand:                     false;
-    str:                        "🐧";
+    str:                           "🐧";
     text-color:                 inherit;
 	background-color:			transparent;
 }
 
 entry {
     enabled:                    true;
-	padding:					10px 0px 10px 0px;
+	padding:					6px 0px 0px 0px;
     text-color:                 inherit;
     cursor:                     text;
     placeholder:                "Search (ctrl tab to choose mode)";
@@ -110,14 +110,15 @@ entry {
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
+	orientation:				vertical;
     enabled:                    true;
-    spacing:                    10px;
+    spacing:                    12px;
     background-color:          	transparent;
     text-color:                 @foreground;
 }
 
 button {
-    padding:                   1px 12px 1px 12px;
+    padding:                   0px 10px 0px 10px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
@@ -139,7 +140,7 @@ listview {
 	enabled:					true;
 	columns:					2;
 	lines:						6;
-	spacing:                    5px;
+	spacing:                    2px;
 	padding:					6px;
 	dynamic:                    true;
 	cycle:                      true;
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index d092d23d..fa92f052 100644
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -24,7 +24,7 @@ configuration {
 
 /* ---- Window ---- */
 window {
-    width:						700px;
+    width:						650px;
 	/*height:						450px;*/
     x-offset:                   0px;
     y-offset:                   0px;
@@ -48,23 +48,23 @@ mainbox {
     orientation:                vertical;
 	padding:					8px;
     background-image:           url("~/.config/rofi/.current_wallpaper", height);
-    children:                   [ "inputbar", "listbox" ];
+    children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
 
 /* ---- Imagebox ---- */
 imagebox {
     background-color:           transparent;
-    orientation:                vertical;
-    /*children:                   [ "inputbar"];*/
+    orientation:                horizontal;
+    children:                   [ "mode-switcher",  "listbox"];
 }
 
 /* ---- Listbox ---- */
 listbox {
     spacing:                    4px;
     orientation:                vertical;
-    children:                   [ "listview" ];
-	padding:					10px;
+    children:                   ["listview" ];
+	padding:					6px;
     border-radius:              12px;
     border:                     1px;
     border-color:               @active-background;
@@ -84,23 +84,23 @@ inputbar {
     border-radius:              12px;
     border-color:               @foreground;
 	background-color:		    @background;
-    children:                   [ "mode-switcher", "entry" ];
+    children:                   [ "textbox-prompt-colon","entry" ];
     border:                     1px;
     border-color:               @active-background;
 }
 
 textbox-prompt-colon {
     enabled:                    true;
-	padding:					10px 0px 10px 10px;
+	padding:					6px 0px 6px 10px;
     expand:                     false;
-    str:                        "🐧";
+    str:                           "🐧";
     text-color:                 inherit;
 	background-color:			transparent;
 }
 
 entry {
     enabled:                    true;
-	padding:					10px 0px 10px 0px;
+	padding:					6px 0px 0px 0px;
     text-color:                 inherit;
     cursor:                     text;
     placeholder:                "Search (ctrl tab to choose mode)";
@@ -110,14 +110,15 @@ entry {
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
+	orientation:				vertical;
     enabled:                    true;
-    spacing:                    10px;
+    spacing:                    12px;
     background-color:          	transparent;
     text-color:                 @foreground;
 }
 
 button {
-    padding:                   1px 12px 1px 12px;
+    padding:                   0px 10px 0px 10px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
diff --git a/config/swaylock/config b/config/swaylock/config
index 03f5f819..53e0b0ab 100644
--- a/config/swaylock/config
+++ b/config/swaylock/config
@@ -24,30 +24,32 @@ effect-greyscale
 # effect-pixelate=5
 
 color=1f1d2e80
-font="Inter"
+font="Fira Code Medium"
 indicator
 indicator-radius=200
 indicator-thickness=20
+
+text-color=e0def4
+text-caps-lock-color=ffffff
+inside-color=000000
 line-color=1f1d2e
 ring-color=191724
-inside-color=1f1d2e
-key-hl-color=eb6f92
 separator-color=00000000
-text-color=e0def4
-text-caps-lock-color=""
-line-ver-color=eb6f92
-ring-ver-color=eb6f92
-inside-ver-color=1f1d2e
-text-ver-color=e0def4
-ring-wrong-color=31748f
-text-wrong-color=31748f
-inside-wrong-color=1f1d2e
-inside-clear-color=1f1d2e
-text-clear-color=e0def4
-ring-clear-color=9ccfd8
-line-clear-color=1f1d2e
-line-wrong-color=1f1d2e
-bs-hl-color=31748f
+text-ver-color=ffffff
+inside-ver-color=000000
+line-ver-color=0000ff
+ring-ver-color=2777ff
+text-wrong-color=ff0000
+inside-wrong-color=000000
+line-wrong-color=000000
+ring-wrong-color=ff8000
+text-clear-color=000000
+inside-clear-color=ffffff
+line-clear-color=00ff00
+ring-clear-color=0ffff0
+key-hl-color=ff0000
+bs-hl-color=ffffff
+
 grace=1
 grace-no-mouse
 grace-no-touch
diff --git a/config/wal/templates/colors-rofi-dark.rasi b/config/wal/templates/colors-rofi-dark.rasi
index 743e0432..7d1488b7 100644
--- a/config/wal/templates/colors-rofi-dark.rasi
+++ b/config/wal/templates/colors-rofi-dark.rasi
@@ -21,7 +21,7 @@
     selected-urgent-foreground: @foreground;
 
     background-color: @background;
-    background: rgba(0,0,0,0.5);
+    background: rgba(0,0,0,0.7);
     foreground: {foreground};
     border-color: @background;
     spacing: 2;
diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom]
index 8406c302..7f049c18 100644
--- a/config/waybar/configs/Peony [Bottom]
+++ b/config/waybar/configs/Peony [Bottom]
@@ -24,13 +24,14 @@
 "modules-center": ["clock#peony"], 
 	
 "modules-right": [
-	"pulseaudio",
-	"custom/separator#line",
+	"battery#peony",
+	"custom/separator#blank",
 	"backlight#peony",
-	"custom/separator#line",
+	"custom/separator#blank",
+	"pulseaudio",
+	"custom/separator#blank",
 	"temperature",
-	"custom/separator#line",
-	"battery#peony",
+	"custom/separator#blank",	
 	"network#peony"],
 
 
diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP]
index 037d05ad..83ec43f5 100644
--- a/config/waybar/configs/Peony [TOP]
+++ b/config/waybar/configs/Peony [TOP]
@@ -24,13 +24,14 @@
 "modules-center": ["clock#peony"], 
 	
 "modules-right": [
-	"pulseaudio",
-	"custom/separator#line",
+	"battery#peony",
+	"custom/separator#blank",
 	"backlight#peony",
-	"custom/separator#line",
+	"custom/separator#blank",
+	"pulseaudio",
+	"custom/separator#blank",
 	"temperature",
-	"custom/separator#line",
-	"battery#peony",
+	"custom/separator#blank",	
 	"network#peony"],
 
 
diff --git a/config/waybar/configs/SouthEast [BR] b/config/waybar/configs/SouthEast [BR]
index 27bec456..68629cbc 100644
--- a/config/waybar/configs/SouthEast [BR]
+++ b/config/waybar/configs/SouthEast [BR]
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### BOTTOM and LEFT PANEL
+// ### BOTTOM and RIGHT PANEL
 
 [{
 "include": "~/.config/waybar/modules",
@@ -46,12 +46,12 @@
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
-"position": "left",
+"position": "right",
 "height": 650,
 "margin-top": 8,
 "margin-bottom": 8,
-"margin-left": 3,
-//"margin-right": 3,
+//"margin-left": 3,
+"margin-right": 3,
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
diff --git a/config/waybar/configs/SouthWest [BR] b/config/waybar/configs/SouthWest [BL]
index 68629cbc..27bec456 100644
--- a/config/waybar/configs/SouthWest [BR]
+++ b/config/waybar/configs/SouthWest [BL]
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### BOTTOM and RIGHT PANEL
+// ### BOTTOM and LEFT PANEL
 
 [{
 "include": "~/.config/waybar/modules",
@@ -46,12 +46,12 @@
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
-"position": "right",
+"position": "left",
 "height": 650,
 "margin-top": 8,
 "margin-bottom": 8,
-//"margin-left": 3,
-"margin-right": 3,
+"margin-left": 3,
+//"margin-right": 3,
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
diff --git a/config/waybar/configs/SummitSplit [Top & Bot] b/config/waybar/configs/SummitSplit [Top & Bot]
index 5ea91ad7..c98b3514 100644
--- a/config/waybar/configs/SummitSplit [Top & Bot]
+++ b/config/waybar/configs/SummitSplit [Top & Bot]
@@ -12,7 +12,7 @@
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"margin-top": 2,
+"margin-top": 1,
 "margin-left": 8,
 "margin-right": 8,
 
@@ -44,16 +44,16 @@
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
-"mode": "dock",
+//"mode": "dock",
 "exclusive": true,
 "passthrough": false,
 "position": "bottom",
-"spacing": 3,
+"spacing": 5,
 "fixed-center": true,
 "ipc": true,
 "margin-left": 8,
 "margin-right": 8,
-"margin-bottom": 2,
+//"margin-bottom": 0,
 
 "modules-left": [
 	"custom/menu",  
diff --git a/config/waybar/style/Aurora Blossom.css b/config/waybar/style/Aurora Blossom.css
new file mode 100644
index 00000000..369300a7
--- /dev/null
+++ b/config/waybar/style/Aurora Blossom.css
@@ -0,0 +1,233 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* 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"';
+padding: 1px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.empty {
+	background-color: transparent;
+}
+
+window#waybar.empty #window {
+	background-color: transparent;
+}
+
+tooltip {
+	color: black;
+    background-image: linear-gradient(45deg, #7287fd 10%, #209fb5 54%, #8839ef 90%);
+	opacity: 0.8;
+	border-radius: 10px;
+}
+
+tooltip label{
+	color: black;
+}
+/*-----module groups----*/
+.modules-right {
+    background-image: linear-gradient(45deg, #7287fd 10%, #209fb5 54%, #8839ef 90%);
+	color: black;
+	border-radius: 6px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+.modules-center {
+    background-image: linear-gradient(0deg, #7287fd 10%, #209fb5 54%, #8839ef 90%);
+	color: black;
+	border-radius: 6px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+.modules-left {
+    background-image: linear-gradient(225deg, #7287fd 10%, #209fb5 54%, #8839ef 90%);
+	color: black;
+	border-radius: 6px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+/*-----modules indv----*/
+#workspaces button {
+	color: black;
+    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 {
+	color: grey;
+	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);
+}
+
+#workspaces button.active {
+	color: grey;
+    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.persistent {
+	border-radius: 10px;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-speaker,
+#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-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+#custom-power {
+	padding: 1px 3px;
+}
+/*-----Indicators----*/
+#idle_inhibitor.activated {
+	color: #2dcc36;
+}
+#pulseaudio.muted {
+	color: #cc3436;
+}
+#temperature.critical {
+	color: #cc3436;
+}
+
+@keyframes blink {
+	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;
+}
+
+#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;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
diff --git a/config/waybar/style/Aurora.css b/config/waybar/style/Aurora.css
new file mode 100644
index 00000000..f09b6117
--- /dev/null
+++ b/config/waybar/style/Aurora.css
@@ -0,0 +1,225 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* 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"';
+padding: 1px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.empty {
+	background-color: transparent;
+}
+
+window#waybar.empty #window {
+	background-color: transparent;
+}
+
+tooltip {
+	color: black;
+    background-image: linear-gradient(45deg, #7287fd 10%, #209fb5 54%, #8839ef 90%);
+	opacity: 0.8;
+	border-radius: 10px;
+}
+
+tooltip label{
+	color: black;
+}
+/*-----module groups----*/
+.modules-right {
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+.modules-center {
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+.modules-left {
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+/*-----modules indv----*/
+#workspaces button {
+	color: black;
+    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 {
+	color: grey;
+	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);
+}
+
+#workspaces button.active {
+	color: grey;
+    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.persistent {
+	border-radius: 10px;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-speaker,
+#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 {
+    background-image: linear-gradient(45deg, #14e81e 10%, #017ed5 54%, #8d00c4 90%);
+	color: black;
+	border: 1px;
+	border-style: solid;
+	border-radius: 4px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 6px;
+	padding-left: 6px;
+}
+/*-----Indicators----*/
+#idle_inhibitor.activated {
+	color: #2dcc36;
+}
+#pulseaudio.muted {
+	color: #cc3436;
+}
+#temperature.critical {
+	color: #cc3436;
+}
+
+@keyframes blink {
+	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;
+}
+
+#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;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index 8b8b090b..c1a251b4 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -89,10 +89,10 @@ window#waybar.hidden {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #idle_inhibitor {
diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css
index 5efb9437..63075eff 100644
--- a/config/waybar/style/Catppuccin-Mocha.css
+++ b/config/waybar/style/Catppuccin-Mocha.css
@@ -95,10 +95,10 @@ window#waybar.hidden {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #idle_inhibitor {
diff --git a/config/waybar/style/Chroma Edge.css b/config/waybar/style/Chroma Edge.css
index 897619d5..e8762401 100644
--- a/config/waybar/style/Chroma Edge.css
+++ b/config/waybar/style/Chroma Edge.css
@@ -130,15 +130,12 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
 	color: #e5e5e5;
 	/* color: #bf616a; */
 	border-radius: 12px;
 	background-color: rgba(50, 50, 50, 0.1);
 	border: 2px solid @color2;
+	padding: 5px;
 }
 
 #workspaces {
diff --git a/config/waybar/style/Chroma Fusion Edge.css b/config/waybar/style/Chroma Fusion Edge.css
index 1c8a6454..0ae1be5b 100644
--- a/config/waybar/style/Chroma Fusion Edge.css
+++ b/config/waybar/style/Chroma Fusion Edge.css
@@ -22,7 +22,7 @@
 * {
 	font-family: "JetBrains Mono Nerd Font";
 	font-weight: bold;
-	min-height: 0;
+	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"';
diff --git a/config/waybar/style/Chroma Glow.css b/config/waybar/style/Chroma Glow.css
index 7d41e5cd..e28973a3 100644
--- a/config/waybar/style/Chroma Glow.css
+++ b/config/waybar/style/Chroma Glow.css
@@ -1,6 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Chroma Glow */
-/* Translucent Chromatic */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
@@ -110,7 +109,6 @@ tooltip label{
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -139,10 +137,10 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-    padding-left: 4px;
-	padding-right: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #window,
diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css
index 12aaf470..7009c5dc 100644
--- a/config/waybar/style/Chroma Tally.css
+++ b/config/waybar/style/Chroma Tally.css
@@ -67,7 +67,6 @@ window#waybar {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -98,8 +97,8 @@ window#waybar {
 #custom-weather.sunnyDay {
 	padding-top: 3px;
 	padding-bottom: 3px;
-    padding-left: 4px;
-	padding-right: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
  
 /* -----------------------------------------------------------------------------
diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css
index b7a5bb4c..acf8048d 100644
--- a/config/waybar/style/Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -7,7 +7,6 @@
 *{
 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"';
@@ -123,7 +122,6 @@ tooltip {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -153,10 +151,10 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: wheat;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 		 
 #temperature.critical {
diff --git a/config/waybar/style/Crystal Clear.css b/config/waybar/style/Crystal Clear.css
index 0eea7bb3..27cd99a4 100644
--- a/config/waybar/style/Crystal Clear.css
+++ b/config/waybar/style/Crystal Clear.css
@@ -7,7 +7,7 @@
 *{
 	font-family: "JetBrains Mono Nerd Font";
 	font-weight: bold;
-	min-height: 0;
+	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"';
@@ -108,7 +108,6 @@ tooltip {
 #mpris,
 #network,
 #pulseaudio,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -136,10 +135,10 @@ tooltip {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-    padding-left: 4px;
-	padding-right: 4px;	
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 	 
 #temperature.critical {
diff --git a/config/waybar/style/Golden Noir.css b/config/waybar/style/Golden Noir.css
index 19e7379e..25be8e80 100644
--- a/config/waybar/style/Golden Noir.css
+++ b/config/waybar/style/Golden Noir.css
@@ -8,7 +8,7 @@
 * {
     font-family: "JetBrainsMono Nerd Font";
     font-weight: bold;
-    min-height: 0;
+	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"';
@@ -135,7 +135,6 @@ tooltip {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -165,10 +164,10 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
     color: #e5d9f5;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #temperature.critical {
diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css
index 8c44538d..b3630088 100644
--- a/config/waybar/style/Monochrome Contrast.css
+++ b/config/waybar/style/Monochrome Contrast.css
@@ -122,7 +122,6 @@ tooltip label{
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -151,10 +150,10 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 #custom-power {
 	padding: 1px 3px;
@@ -213,6 +212,7 @@ tooltip label{
 	min-width: 80px;
 	min-height: 5px;
 	border-radius: 5px;
+	background-color: grey;
 }
 
 #pulseaudio-slider highlight {
diff --git a/config/waybar/style/Monochrome Manifest.css b/config/waybar/style/Monochrome Manifest.css
index d586459a..fd92aefc 100644
--- a/config/waybar/style/Monochrome Manifest.css
+++ b/config/waybar/style/Monochrome Manifest.css
@@ -40,7 +40,7 @@ tooltip label{
 .modules-right {
 	background-color: black;
 	color: white;
-	border-bottom: 2px;
+	border-bottom: 1px;
 	border-style: solid;
 	border-color: white;
 	border-radius: 10px;
@@ -52,7 +52,7 @@ tooltip label{
 .modules-center {
 	background-color: black;
 	color: white;
-	border-bottom: 2px;
+	border-bottom: 1px;
 	border-style: solid;
 	border-color: white;
 	border-radius: 10px;
@@ -64,7 +64,7 @@ tooltip label{
 .modules-left {
 	background-color: black;
 	color: white;
-	border-bottom: 2px;
+	border-bottom: 1px;
 	border-style: solid;
 	border-color: white;
 	border-radius: 10px;
@@ -121,7 +121,6 @@ tooltip label{
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -150,10 +149,10 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 #custom-power {
 	padding: 1px 3px;
diff --git a/config/waybar/style/Obsidian Edge.css b/config/waybar/style/Obsidian Edge.css
index cbeb8f9d..e1d63402 100644
--- a/config/waybar/style/Obsidian Edge.css
+++ b/config/waybar/style/Obsidian Edge.css
@@ -128,7 +128,6 @@ tooltip label {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -158,11 +157,11 @@ tooltip label {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
     color: @foreground;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
     border-radius: 8px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #temperature.critical {
diff --git a/config/waybar/style/Obsidian Glow.css b/config/waybar/style/Obsidian Glow.css
index fe797836..2ffc148c 100644
--- a/config/waybar/style/Obsidian Glow.css
+++ b/config/waybar/style/Obsidian Glow.css
@@ -97,7 +97,6 @@ tooltip label {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -127,11 +126,11 @@ tooltip label {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: #000000;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
 	border-radius: 8px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #temperature.critical {
@@ -182,7 +181,7 @@ tooltip label {
 	min-width: 80px;  
 	min-height: 5px; 
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: grey;
 }
 	
 #pulseaudio-slider highlight {
@@ -204,7 +203,7 @@ tooltip label {
 	min-width: 80px;  
 	min-height: 10px; 
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: grey;
 }
 	
 #backlight-slider highlight {
diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css
index 067de9b1..e3a35731 100644
--- a/config/waybar/style/Purpl.css
+++ b/config/waybar/style/Purpl.css
@@ -7,7 +7,7 @@
 * {
 	font-family: "JetBrains Mono Nerd Font";
 	font-weight: bold;
-	min-height: 0;
+	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"';
@@ -132,7 +132,6 @@ tooltip {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -162,10 +161,10 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: whitesmoke;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-	padding-left: 4px;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-right: 6px;
+	padding-left: 6px;
 
 }
 
@@ -216,7 +215,7 @@ tooltip {
 	min-width: 80px;
 	min-height: 5px;
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: #6E6A86;
 }
 
 #pulseaudio-slider highlight {
@@ -238,7 +237,7 @@ tooltip {
 	min-width: 80px;
 	min-height: 10px;
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: #6E6A86;
 }
 
 #backlight-slider highlight {
diff --git a/config/waybar/style/Pywallete Chroma.css b/config/waybar/style/Pywallete Chroma.css
index 3c375942..57ef72f0 100644
--- a/config/waybar/style/Pywallete Chroma.css
+++ b/config/waybar/style/Pywallete Chroma.css
@@ -1,13 +1,13 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywal */
+/* pywallete Chroma*/
 
 @import '../../.cache/wal/colors-waybar.css';
 
 * {
     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 */
+	min-height: 0;	
+     /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
     font-size: 96%;
     font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
     padding: 1px;
@@ -129,7 +129,6 @@ tooltip {
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -159,8 +158,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: @foreground;
-	padding-top: 2px;
-	padding-bottom: 2px;
+	padding-top: 1px;
+	padding-bottom: 1px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/Pywallete.css b/config/waybar/style/Pywallete.css
index bf529e29..fe08c193 100644
--- a/config/waybar/style/Pywallete.css
+++ b/config/waybar/style/Pywallete.css
@@ -1,3 +1,6 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* pywallete */
+
 *{
 font-family: "JetBrainsMono Nerd Font";
 font-weight: bold;
@@ -143,8 +146,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: @color2;
-	padding-top: 2px;
-	padding-bottom: 2px;
+	padding-top: 3px;
+	padding-bottom: 3px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
@@ -179,6 +182,7 @@ tooltip {
 }
 
 #taskbar button.active {
+	color: @foreground;
     background-color: @color2;
 	border-radius: 30px;
     animation: gradient_f 20s ease-in infinite;
diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/Rainbow Spectrum.css
index ba91af44..407e226c 100644
--- a/config/waybar/style/Rainbow Spectrum.css
+++ b/config/waybar/style/Rainbow Spectrum.css
@@ -94,11 +94,12 @@ tooltip label{
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	border-radius: 10px;
-	padding: 0px 4px;
-	padding-top: 2px;
-	padding-bottom: 2px;
   	color: #3A3B3C;
   	border: 1px solid #b4befe;
+	padding-top: 3px;
+	padding-bottom: 3px;
+    padding-left: 6px;
+    padding-right: 6px;
 }
 
 #backlight {
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index 2093c329..eb4d3f60 100644
--- a/config/waybar/style/Rose Pine.css
+++ b/config/waybar/style/Rose Pine.css
@@ -13,9 +13,8 @@
 * {
 	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: 96%;
+	font-size: 97%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 	border-radius: 12px;
 }
@@ -143,14 +142,14 @@ tooltip {
     color: @main-fg;
     background: @main-bg;
     opacity: 1;
-	padding-top: 3px;
-	padding-bottom: 3px;
-    padding-left: 6px;
-    padding-right: 6px;
 	border-bottom: 2px;
 	border-color: #2B5D34;
 	border-style: solid;
 	border-radius: 10px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #temperature.critical {
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index b36162f5..f449e7ad 100644
--- a/config/waybar/style/Simple Pink.css
+++ b/config/waybar/style/Simple Pink.css
@@ -7,7 +7,7 @@
 * {
 	font-family: "JetBrains Mono Nerd Font";
 	font-weight: bold;
-	min-height: 0;
+	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"';
@@ -166,8 +166,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: whitesmoke;
-	padding-top: 2px;
-	padding-bottom: 2px;
+	padding-top: 1px;
+	padding-bottom: 1px;
 	padding-right: 4px;
 	padding-left: 4px;
 
diff --git a/config/waybar/style/Simple Style.css b/config/waybar/style/Simple Style.css
new file mode 100644
index 00000000..0d6a36fe
--- /dev/null
+++ b/config/waybar/style/Simple Style.css
@@ -0,0 +1,159 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Simple Style */
+
+
+@define-color background #1d2021;
+@define-color foreground #ebdbb2;
+@define-color dim        #928374;
+@define-color yellow     #fabd2f;
+@define-color red        #fb4934;
+@define-color green      #b8bb26;
+
+* {
+  background: @background;
+  border: none;
+  border-radius: 0;
+  font-family: "JetBrainsMono Nerd Font";
+  font-size: 97%;
+}
+
+window#waybar {
+  background: @background;
+  color: @foreground;
+  transition-property: background-color;
+  transition-duration: 0.5s;
+}
+
+#workspaces button {
+  padding: 0 10px;
+  color: @foreground;
+}
+
+#workspaces button.active {
+  border-bottom: 1px solid @green;
+}
+
+#workspaces button.urgent {
+  border-bottom: 2px solid @yellow;
+}
+
+#submap {
+  border-bottom: 1px solid @red;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-speaker,
+#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: @foreground;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
+}
+
+#battery.warning,
+#disk.warning,
+#memory.warning,
+#cpu.warning {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @yellow;
+}
+
+#battery.critical,
+#disk.critical,
+#memory.critical,
+#cpu.critical {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @red;
+}
+
+#battery.charging {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @green;
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#pulseaudio-slider trough {
+	min-width: 80px;  
+	min-height: 5px; 
+	border-radius: 5px;
+	background-color: @dim;
+}
+	
+#pulseaudio-slider highlight {
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: @green;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#backlight-slider trough {
+	min-width: 80px;  
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: @dim;
+}
+	
+#backlight-slider highlight {
+	min-width: 10px; 
+	border-radius: 5px;
+	background-color: @green;
+}
diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css
index 7ac3dc02..6d028155 100644
--- a/config/waybar/style/Translucent Chromatic.css
+++ b/config/waybar/style/Translucent Chromatic.css
@@ -26,7 +26,7 @@ padding: 1px;
 }
 
 window#waybar {
-    background-color: rgba(0,0,0,0.2);
+    background-color: rgba(0,0,0,0.3);
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -123,7 +123,6 @@ tooltip label{
 #network,
 #pulseaudio,
 #pulseaudio-slider,
-#taskbar button,
 #taskbar,
 #temperature,
 #tray,
@@ -152,14 +151,10 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-    padding-left: 4px;
-	padding-right: 4px;
-}
-
-#window,
-#workspaces {
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
diff --git a/config/wlogout/layout b/config/wlogout/layout
index 5f006580..4c6b5c42 100644
--- a/config/wlogout/layout
+++ b/config/wlogout/layout
@@ -18,7 +18,7 @@
 }
 {
     "label" : "logout",
-    "action" : "hyprctl dispatch exit 0",
+    "action" : "hyprctl dispatch exit",
     "text" : "Logout",
     "keybind" : "e"
 }