Merge pull request #516 from JaKooLit/main

Main to development

77 files changed, 661 insertions, 242 deletions

diff --git a/config/ags/modules/.configuration/user_options.js b/config/ags/modules/.configuration/user_options.js
index db194395..cfd43b1e 100644
--- a/config/ags/modules/.configuration/user_options.js
+++ b/config/ags/modules/.configuration/user_options.js
@@ -75,6 +75,7 @@ let configOptions = {
             'Minecraft* 1.20.1': "minecraft",
             'gnome-tweaks': "org.gnome.tweaks",
             'pavucontrol-qt': "pavucontrol",
+            'eu.betterbird.Betterbird' : "thunderbird",
 			'thunderbird-esr': "thunderbird",
             'wps': "wps-office2019-kprometheus",
             'wpsoffice': "wps-office2019-kprometheus",
diff --git a/config/fastfetch/nixos.png b/config/fastfetch/nixos.png
deleted file mode 100644
index 11593f65..00000000
--- a/config/fastfetch/nixos.png
+++ /dev/null
diff --git a/config/hypr/UserConfigs/00-Readme b/config/hypr/UserConfigs/00-Readme
index fa4b9b85..1a20de3c 100644
--- a/config/hypr/UserConfigs/00-Readme
+++ b/config/hypr/UserConfigs/00-Readme
@@ -1,12 +1,12 @@
-www.github.com/JaKooLit
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
-Hyprland-Dots v2.2.2
+KooL's Hyprland-Dots
 
 1.) Suggest not to rename any files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr
 
 2.) This folder, along with UserScripts folder will NOT be touch when running upgrade.sh
 
-3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change.
+3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change yourself.
 
 4.) Guidance on the keybinds. Suggest NOT to assign a keybind which I set on the default Keybinds. Else will conflict. Once Hyprland decided to have a global keybinds, then I will adjust.
 
diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 4a9db143..831f3afd 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -17,6 +17,9 @@ env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 
+# hyprland-qt-support
+env = QT_QUICK_CONTROLS_STYLE,org.hyprland.style
+
 # xwayland apps scale fix (useful if you are use monitor scaling)
 # see https://wiki.hyprland.org/Configuring/XWayland/
 # toolkit-specific scale
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index b4dca898..edb68463 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -10,21 +10,21 @@ $UserConfigs = $HOME/.config/hypr/UserConfigs
 # for disabling Touchpad. hyprctl devices to get device name. 
 $Touchpad_Device=asue1209:00-04f3:319f-touchpad
 
-binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
-binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up
+binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec # decrease keyboard brightness
+binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc # increase keyboard brightness
 bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button
-bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile 
-bind = , xf86Launch4, exec, asusctl profile -n  #FN+F5 change of fan profiles (Quite, Balance, Performance)
-binde = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec 
-binde = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc 
-bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad
+bind = , xf86Launch3, exec, asusctl led-mode -n # FN+F4 Switch keyboard RGB profile 
+bind = , xf86Launch4, exec, asusctl profile -n  # FN+F5 change of fan profiles (Quite, Balance, Performance)
+binde = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec # decrease monitor brightness
+binde = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc # increase monitor brightness
+bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh # disable touchpad
 
-# Screenshot keybindings for Asus G15 (no PrinSrc button)
-bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # Fullscreen
-bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area 
-bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in 5 secs
-bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs
-bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active window
+# Screenshot keybindings using F6 (no PrinSrc button)
+bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # screenshot
+bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area # screenshot (area)
+bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # # screenshot (5 secs delay)
+bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # screenshot (10 secs delay)
+bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # screenshot (active window only)
 
 $TOUCHPAD_ENABLED = true
 device {
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 85f3c1c3..3975f60f 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -13,23 +13,25 @@ $UserScripts = $HOME/.config/hypr/UserScripts
 
 # rofi App launcher
 #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
-bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window #Main Menu
+
+bind = $mainMod CTRL, F, fullscreen, 1 # fake full screen
 
 # ags overview
 bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview'
 
-bind = $mainMod, Return, exec, $term  # Launch terminal
-bind = $mainMod, T, exec, $files # Launch file manager
+bind = $mainMod, Return, exec, $term  #terminal
+bind = $mainMod, T, exec, $files #file manager
 
 bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
 # pyprland
 bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
-bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
+bind = $mainMod, Z, exec, pypr zoom # Toggle Desktop Zoom
 
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
-bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Changing the keyboard layout
+bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout
 
 # For passthrough keyboard into a VM
 # bind = $mainMod ALT, P, submap, passthru
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 262401be..62289157 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -27,11 +27,12 @@ windowrulev2 = idleinhibit fullscreen, fullscreen:1
 
 # windowrule v2 move to workspace
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
+windowrulev2 = workspace 1, class:^(eu.betterbird.Betterbird)$
 windowrulev2 = workspace 1, class:^(org.gnome.Evolution)$
 windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
 windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 windowrulev2 = workspace 2, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
-windowrulev2 = workspace 2, class:^([Tt]horium-browser)$
+windowrulev2 = workspace 2, class:^([Tt]horium-browser|[Cc]achy-browser)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5, class:^([Ss]team)$
@@ -42,6 +43,7 @@ windowrulev2 = workspace 7, class:^([Ww]hatsapp-for-linux)$
 
 # windowrule v2 move to workspace (silent)
 windowrulev2 = workspace 6 silent, class:^(virt-manager)$
+windowrulev2 = workspace 6 silent, class:^(.virt-manager-wrapped)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
 # windowrule v2 - float
@@ -80,7 +82,7 @@ windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
 windowrulev2 = opacity 0.9 0.7, class:^(zen-alpha)$ # zen browser
-windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser)$
+windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser|[Cc]achy-browser)$
 windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme
index 1b6688f4..7dcd9881 100755
--- a/config/hypr/UserScripts/00-Readme
+++ b/config/hypr/UserScripts/00-Readme
@@ -1,3 +1,5 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
 # Place your new scripts here. 
 # If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. 
-# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
\ No newline at end of file
+# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is linked to it
\ No newline at end of file
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index ed5a4e1c..29ce3506 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -51,4 +51,9 @@ main() {
     $tty -e $edit "$file"
 }
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
 main
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 17ce645a..e615aadb 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -13,6 +13,7 @@ declare -A online_music=(
   ["Radio - Lofi Girl 🎧🎶"]="https://play.streamafrica.net/lofiradio"
   ["Radio - Chillhop 🎧🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
   ["FM - Easy Rock 96.3 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
+  ["FM - Easy Rock - Baguio 91.9 📻🎶"]="https://radio-stations-philippines.com/easy-rock-baguio" 
   ["FM - Love Radio 90.7 📻🎶"]="https://radio-stations-philippines.com/love"
   ["FM - WRock - CEBU 96.3 📻🎶"]="https://onlineradio.ph/126-96-3-wrock.html"
   ["FM - Fresh Philippines 📻🎶"]="https://onlineradio.ph/553-fresh-fm.html"
@@ -93,6 +94,12 @@ play_online_music() {
 # Check if an online music process is running and send a notification, otherwise run the main function
 pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || {
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
+
 # Prompt the user to choose between local and online music
 user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source")
 
diff --git a/config/hypr/UserScripts/RofiCalc.sh b/config/hypr/UserScripts/RofiCalc.sh
index 355130de..cef80b81 100755
--- a/config/hypr/UserScripts/RofiCalc.sh
+++ b/config/hypr/UserScripts/RofiCalc.sh
@@ -8,7 +8,6 @@ rofi_config="$HOME/.config/rofi/config-calc.rasi"
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
     pkill rofi
-    exit 0
 fi
 
 # main function
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 5b1f38e7..9a9d289c 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Wallpaper Effects using ImageMagick
-# Inspiration from ML4W - Stephan Raabe https://gitlab.com/stephan-raabe/dotfiles
+# Wallpaper Effects using ImageMagick (SUPER SHIFT W)
+# Inspiration from ML4W - Stephan Raabe https://github.com/mylinuxforwork/dotfiles
 
 # Variables
 current_wallpaper="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current"
@@ -95,7 +95,6 @@ main() {
 # Check if rofi is already running and kill it
 if pidof rofi > /dev/null; then
     pkill rofi
-    exit 0
 fi
 
 main
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index d74933a3..8daa4f28 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -97,7 +97,6 @@ main() {
 # Check if rofi is already running
 if pidof rofi > /dev/null; then
   pkill rofi
-  sleep 1  # Allow some time for rofi to close
 fi
 
 main
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index 57fbf37d..662a36bb 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -48,4 +48,9 @@ main() {
     fi
 }
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
 main
diff --git a/config/hypr/application-style.conf b/config/hypr/application-style.conf
new file mode 100644
index 00000000..7e67f106
--- /dev/null
+++ b/config/hypr/application-style.conf
@@ -0,0 +1,8 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# as per Hyprland wiki: hyprland-qt-support provides a QML style for hypr* qt6 apps                                                         
+
+roundess = 2
+
+border_width = 0
+
+reduce_motion = false
\ No newline at end of file
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 75406822..019ca11d 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -16,28 +16,29 @@ 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
-bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
+bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh # screen lock
+bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh # power menu
 
 # FEATURES / EXTRAS
-bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file
+bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # help file
 bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi
-bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji
-bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search from Rofi
+bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji menu
+bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search using rofi
 bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
-bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
+bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # Toggle animations ON/OFF
 bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
-bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
+bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC notification panel
 
 # FEATURES / EXTRAS (UserScripts)
 bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
-bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music
+bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music using rofi
 bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply
-bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagickWW
+bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagick
 bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
-bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle #disable opacity to active window
-bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # searchable keybinds
+bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle # disable opacity on active window
+bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # search keybinds via rofi
+
 # Waybar / Bar related
 bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
 bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
@@ -58,38 +59,38 @@ bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
 bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3
 
 # group
-bind = $mainMod, G, togglegroup
-bind = $mainMod CTRL, tab, changegroupactive  #change focus to another window
+bind = $mainMod, G, togglegroup # toggle group
+bind = $mainMod CTRL, tab, changegroupactive  # change focus to another window
 
  # Cycle windows if floating bring to top
 bind = ALT, tab, cyclenext
 bind = ALT, tab, bringactivetotop  
 
 # Special Keys / Hot Keys
-bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
-bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec #volume down
-bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic #mute mic
-bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle
+bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc # volume up
+bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec # volume down
+bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic # mic mute
+bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle # mute
 bindl = , xf86Sleep, exec, systemctl suspend  # sleep button 
-bindl = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh #Airplane mode
+bindl = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh # Airplane mode
 
 # media controls using keyboards
 bindl = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
 bindl = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
 bindl = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
+bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt 
 bindl = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
 bindl = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
 
 # Screenshot keybindings NOTE: You may need to press Fn key as well
-bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
-bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area
-bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs
-bind = $mainMod CTRL SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs
-bind = ALT, Print, exec, $scriptsDir/ScreenShot.sh --active #take screenshot of active window
+bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now  # screenshot
+bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area # screenshot (area)
+bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 # screenshot  (5 secs delay)
+bind = $mainMod CTRL SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --in10 # screenshot (10 secs delay)
+bind = ALT, Print, exec, $scriptsDir/ScreenShot.sh --active # screenshot (active window only)
 
 # screenshot with swappy (another screenshot tool)
-bind = $mainMod SHIFT, S, exec, $scriptsDir/ScreenShot.sh --swappy
+bind = $mainMod SHIFT, S, exec, $scriptsDir/ScreenShot.sh --swappy #screenshot (swappy)
 
 # Resize windows
 binde = $mainMod SHIFT, left, resizeactive,-50 0
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 4780de7e..2748d5e7 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -13,7 +13,7 @@ wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
 waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css"
 kvantum_theme="catppuccin-mocha-blue"
 color_scheme="prefer-dark"
-gtk_theme="Andromeda-dark"
+gtk_theme="Kali-Dark"
 icon_theme="Flat-Remix-Blue-Dark"
 cursor_theme="Bibata-Modern-Ice"
 
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index ddce2999..13f90a9e 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -6,6 +6,11 @@
 # CTRL Del to delete an entry
 # ALT Del to wipe clipboard contents
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
 while true; do
     result=$(
         rofi -i -dmenu \
diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh
index 4aca73d9..9e01a7c3 100755
--- a/config/hypr/scripts/KeyBinds.sh
+++ b/config/hypr/scripts/KeyBinds.sh
@@ -5,6 +5,11 @@
 # Kill yad to not interfere with this binds
 pkill yad || true
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
 # Define the config files
 KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf"
 USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf"
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index f5f91c34..78f76702 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -22,13 +22,11 @@ for _prs in "${_ps[@]}"; do
     fi
 done
 
+killall -SIGUSR2 waybar # added since wallust sometimes not applying
+
 # quit ags
 ags -q
 
-sleep 1
-#Restart waybar
-waybar &
-
 # relaunch swaync
 sleep 0.5
 swaync > /dev/null 2>&1 &
@@ -36,6 +34,16 @@ swaync > /dev/null 2>&1 &
 # relaunch ags
 ags &
 
+# Kill waybar (yet again) # added since wallust sometimes not applying
+if pidof waybar >/dev/null; then
+    pkill waybar
+fi
+
+
+sleep 1
+#Restart waybar
+waybar &
+
 # Relaunching rainbow borders if the script exists
 sleep 1
 if file_exists "${UserScripts}/RainbowBorders.sh"; then
@@ -43,4 +51,5 @@ if file_exists "${UserScripts}/RainbowBorders.sh"; then
 fi
 
 
+
 exit 0
\ No newline at end of file
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index 6bf6a5ab..fa27a341 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -2,6 +2,11 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi Emoticons. Not my own. Cant remember the source
 
+# Check if rofi is already running
+if pidof rofi > /dev/null; then
+  pkill rofi
+fi
+
 sed '1,/^# # DATA # #$/d' "$0" | \
 rofi -i -dmenu -config ~/.config/rofi/config-emoji.rasi | \
 awk -F'\t' '{print $1}' | \
@@ -10,6 +15,7 @@ wl-copy
 
 exit
 
+
 # # DATA # #
 😀	face	face | grin | grinning face
 😃	face with big eyes	face | grinning face with big eyes | mouth | open | smile
diff --git a/config/hypr/scripts/RofiSearch.sh b/config/hypr/scripts/RofiSearch.sh
index 9b7e4bd4..ccc73016 100755
--- a/config/hypr/scripts/RofiSearch.sh
+++ b/config/hypr/scripts/RofiSearch.sh
@@ -9,7 +9,7 @@ rofi_config="$HOME/.config/rofi/config-search.rasi"
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
     pkill rofi
-    exit 0
+    #exit 0
 fi
 
 # Open rofi with a dmenu and pass the selected item to xdg-open for Google search
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 76c06574..2d265e28 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -80,7 +80,7 @@ change_layout() {
         fi
         
         echo "Switching layout for $name to $new_layout..."
-        hyprctl switchxkblayout "$name" next
+	      hyprctl switchxkblayout "$name" "$next_index"
         if [ $? -ne 0 ]; then
             echo "Error while switching layout for $name." >&2
             error_found=true
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index 36cbeb10..738d34f4 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -50,7 +50,7 @@ main() {
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
     pkill rofi
-    exit 0
+    #exit 0
 fi
 
 main
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 95a348ba..096e4d7c 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -44,7 +44,7 @@ main() {
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
     pkill rofi
-    exit 0
+    #exit 0
 fi
 
 main
diff --git a/config/hypr/v2.3.8 b/config/hypr/v2.3.9
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.8
+++ b/config/hypr/v2.3.9
diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current
index e5236693..30f80bf7 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_current
+++ b/config/hypr/wallpaper_effects/.wallpaper_current
diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified
index 84ba415c..8c76007f 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_modified
+++ b/config/hypr/wallpaper_effects/.wallpaper_modified
diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf
index 6bdaa4cc..52ced087 100644
--- a/config/hypr/wallust/wallust-hyprland.conf
+++ b/config/hypr/wallust/wallust-hyprland.conf
@@ -1,18 +1,21 @@
-$background = rgb(0A0000)
-$foreground = rgb(FDEBE2)
-$color0 = rgb(0A0000)
-$color1 = rgb(654A37)
-$color2 = rgb(7B5D49)
-$color3 = rgb(906F5C)
-$color4 = rgb(A6826F)
-$color5 = rgb(BC9582)
-$color6 = rgb(BB9582)
-$color7 = rgb(F4DACE)
-$color8 = rgb(AB9990)
-$color9 = rgb(876349)
-$color10 = rgb(A37C62)
-$color11 = rgb(C0947B)
-$color12 = rgb(DDAD94)
-$color13 = rgb(FAC6AD)
-$color14 = rgb(FAC6AD)
-$color15 = rgb(F4DACE)
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  
+# /* wallust template - colors-hyprland */ 
+
+$background = rgb(212022)
+$foreground = rgb(FAF0E8)
+$color0 = rgb(474649)
+$color1 = rgb(1A171F)
+$color2 = rgb(143551)
+$color3 = rgb(99352B)
+$color4 = rgb(2B5C98)
+$color5 = rgb(0DB0B6)
+$color6 = rgb(B4A08E)
+$color7 = rgb(EFE2D6)
+$color8 = rgb(A79E95)
+$color9 = rgb(231F29)
+$color10 = rgb(1B466C)
+$color11 = rgb(CC463A)
+$color12 = rgb(3A7BCA)
+$color13 = rgb(12EBF3)
+$color14 = rgb(F0D5BD)
+$color15 = rgb(EFE2D6)
diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi
index c1137490..020bc959 100644
--- a/config/rofi/config-compact.rasi
+++ b/config/rofi/config-compact.rasi
@@ -33,8 +33,6 @@ entry {
 
 /* ---- Listview ---- */
 listview {
-  columns: 2;
-  lines: 6;
   spacing: 4px;
   border-radius: 12px;
 }
diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi
index 37aba113..206928cb 100644
--- a/config/rofi/config-keybinds.rasi
+++ b/config/rofi/config-keybinds.rasi
@@ -5,7 +5,7 @@
 
 /* ---- Entry ---- */
 entry {
-  width: 80%;
+  width: 85%;
   placeholder: " 🧮 Search Keybinds      ☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function";
 }
 
@@ -16,5 +16,5 @@ listview {
 }
 
 window {
-    width: 90%;
+    width: 95%;
 }
\ No newline at end of file
diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi
index 25dd2723..c499f2af 100644
--- a/config/rofi/config-wallpaper-effect.rasi
+++ b/config/rofi/config-wallpaper-effect.rasi
@@ -17,7 +17,6 @@ window {
 /* ---- Listview ---- */
 listview {
   fixed-columns: false;
-  colums: 2;
   lines: 8;
 }
 
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 2cfaa0e4..c90c2fa3 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -27,7 +27,7 @@ entry {
 
 /* ---- Listview ---- */
 listview {
-  columns: 4;
+  columns: 5;
   lines: 3;
   flow: horizontal;
 }
@@ -37,11 +37,11 @@ element {
   orientation: vertical;
   padding: 0px;
   spacing: 0px;
-  border-radius: 15px;
+  border-radius: 12px;
 }
 
 element-icon {
-  size: 20%;
+  size: 15%;
 }
 
 element-text {
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index 0760710c..ab150d0e 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -19,8 +19,3 @@ entry {
   placeholder: "🖼️  Choose Waybar Style";
 }
 
-/* ---- Listview ---- */
-listview {
-  columns: 2;
-  lines: 6;
-}
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index 936ce566..a735a7e6 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -49,7 +49,7 @@ element {
   border-radius: 10px;
 }
 
-/*****----- Message -----*****/
+/* ---- Message ---- */
 message {
   border-radius: 10px;
 }
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 7efc033d..4f30098d 100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -3,11 +3,6 @@
 
 @import "~/.config/rofi/master-config.rasi" 
 
-/* ---- Configuration ---- */
-configuration {
-	font: "Fira Code SemiBold 12";
-}
-
 /* ---- Window ---- */
 window {
     width:	60%;
@@ -24,7 +19,6 @@ element {
   orientation: vertical;
   padding: 12px 0px 0px 0px;
   spacing: 6px;
-  border-radius: 12px;
 }
 
 element-icon {
@@ -32,7 +26,6 @@ element-icon {
 }
 
 element-text {
-  font: "Fira Code SemiBold 12";
-  vertical-align: 0.5;
+  font: "Fira Code SemiBold 10";
   horizontal-align: 0.5;
 }
\ No newline at end of file
diff --git a/config/rofi/resolution/1080p/master-config.rasi b/config/rofi/resolution/1080p/master-config.rasi
index ceea4764..9a1fd0a9 100644
--- a/config/rofi/resolution/1080p/master-config.rasi
+++ b/config/rofi/resolution/1080p/master-config.rasi
@@ -55,7 +55,7 @@ window {
 
 /* ----- Main Box ----- */
 mainbox {
-	padding:					 15px;
+	padding:					 12px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -66,7 +66,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                     true;
-    padding:                     10px 10px 100px 10px;
+    padding:                     10px 10px 50px 10px;
     margin:                      10px;
     background-color:            transparent;
     border-radius:               25px;
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index 757b96ad..d8d3fe17 100755
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -8,11 +8,6 @@ window {
     width:	60%;
 }
 
-/* ---- Entry input ---- */
-entry {
-    width:	18%;
-}
-
 /* ---- Mode Switcher ---- */
 button {
     width:	110px;
@@ -30,7 +25,6 @@ element {
   orientation: vertical;
   padding: 12px 0px 0px 0px;
   spacing: 6px;
-  border-radius: 12px;
 }
 
 element-icon {
@@ -39,6 +33,5 @@ element-icon {
 
 element-text {
   font: "Fira Code SemiBold 12";
-  vertical-align: 0.5;
   horizontal-align: 0.5;
 }
diff --git a/config/rofi/resolution/1440p/master-config.rasi b/config/rofi/resolution/1440p/master-config.rasi
index 947870e6..908bf17a 100644
--- a/config/rofi/resolution/1440p/master-config.rasi
+++ b/config/rofi/resolution/1440p/master-config.rasi
@@ -55,7 +55,7 @@ window {
 
 /* ----- Main Box ----- */
 mainbox {
-	padding:					 15px;
+	padding:					 12px;
     enabled:                     true;
     orientation:                 vertical;
     children:                    [ "inputbar", "listbox" ];
@@ -66,7 +66,7 @@ mainbox {
 /* ---- Inputbar ---- */
 inputbar {
     enabled:                     true;
-    padding:                     10px 10px 100px 10px;
+    padding:                     10px 10px 50px 10px;
     margin:                      10px;
     background-color:            transparent;
     border-radius:               25px;
diff --git a/config/waybar/ModulesWorkspaces b/config/waybar/ModulesWorkspaces
index 12fbdb56..4c25cfd1 100644
--- a/config/waybar/ModulesWorkspaces
+++ b/config/waybar/ModulesWorkspaces
@@ -158,7 +158,7 @@
 		"title<.*amazon.*>": " ",
 		"title<.*reddit.*>": " ",
 		"title<.*Picture-in-Picture.*>": " ",
-		"class<firefox|org.mozilla.firefox|librewolf|floorp|mercury-browser>": " ",
+		"class<firefox|org.mozilla.firefox|librewolf|floorp|mercury-browser|[Cc]achy-browser>": " ",
 		"class<kitty|konsole>": " ",
 		"class<kitty-dropterm>": " ",
 		"class<Chromium|Thorium>": " ",
@@ -167,12 +167,14 @@
 		"class<VSCode|code-url-handler|code-oss|codium|codium-url-handler|VSCodium>": "󰨞 ",
 		"class<thunar>": "󰝰 ",
 		"class<[Tt]hunderbird|[Tt]hunderbird-esr>": " ",
+		"class<eu.betterbird.Betterbird>": " ",
 		"class<discord|[Ww]ebcord|Vesktop>": " ",
 		"class<subl>": "󰅳 ",
 		"class<mpv>": " ",
 		"class<celluloid|Zoom>": " ",
 		"class<Cider>": "󰎆 ",
 		"class<virt-manager>": " ",
+		"class<.virt-manager-wrapped>": " ",
 		"class<codeblocks>": "󰅩 ",
 		"class<mousepad>": " ",
 		"class<libreoffice-writer>": " ",
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index c3f5e882..9f586c79 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -183,8 +183,8 @@ tooltip label{
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Catppuccin] Frappe.css b/config/waybar/style/[Catppuccin] Frappe.css
new file mode 100644
index 00000000..fc30a476
--- /dev/null
+++ b/config/waybar/style/[Catppuccin] Frappe.css
@@ -0,0 +1,301 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Catppuccin Frappe */
+
+* {
+	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/frappe.css";
+
+window#waybar {
+  transition-property: background-color;
+  transition-duration: 0.5s;
+  border-top: 1px solid @rosewater;
+  border-bottom: 3px solid @sapphire;
+  background: alpha(@crust, 0.4);
+  border-radius: 10px;
+}
+
+window#waybar.hidden {
+  opacity: 0.2;
+}
+
+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,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-browser,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-file_manager,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-hint,
+#custom-hypridle,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-settings,
+#custom-spotify,
+#custom-swaync,
+#custom-tty,
+#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: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
+}
+
+/*-----Indicators----*/
+#custom-hypridle.notactive,
+#idle_inhibitor.activated {
+	color: #39FF14;
+}
+
+#backlight {
+  	color: @blue;
+}
+
+#battery {
+  	color: @green;
+}
+
+@keyframes blink {
+  to {
+    color: @surface0;
+  }
+}
+
+#battery.critical:not(.charging) {
+  	background-color: @red;
+  	color: @theme_text_color;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+  	box-shadow: inset 0 -3px transparent;
+}
+
+#bluetooth {
+	color: @blue;
+}
+
+#clock {
+  	color: @yellow;
+}
+
+#cpu {
+  	color: @green;
+}
+
+#custom-keyboard,
+#memory {
+  	color: @sky;
+}
+
+#disk {
+  	color: @sapphire;
+}
+
+#temperature {
+  	color: @teal;
+}
+
+#temperature.critical {
+  	background-color: @red;
+}
+
+#tray > .passive {
+  -gtk-icon-effect: dim;
+}
+#tray > .needs-attention {
+  -gtk-icon-effect: highlight;
+}
+
+#keyboard-state {
+  	color: @flamingo;
+}
+
+#custom-cava_mviz {
+	color: @pink;
+}
+
+#custom-menu {
+  	color: @rosewater;
+}
+
+#custom-power {
+  	color: @red;
+}
+
+#custom-updater {
+  	color: @red;
+}
+
+#custom-light_dark {
+  	color: @blue;
+}
+
+#custom-weather {
+  	color: @lavender;
+}
+
+#custom-lock {
+  	color: @maroon;
+}
+
+#pulseaudio {
+  	color: @sapphire;
+}
+
+#pulseaudio.bluetooth {
+  	color: @pink;
+}
+#pulseaudio.muted {
+  	color: @red;
+}
+
+#window {
+  	color: @mauve;
+}
+
+#mpris {
+  	color:@lavender;
+}
+
+#network {
+  	color: @teal;
+}
+#network.disconnected,
+#network.disabled {
+  	background-color: @surface0;
+  	color: @text;
+}
+#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;
+}
+
+#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 {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
\ No newline at end of file
diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css
index f7a3e856..50d224cd 100644
--- a/config/waybar/style/[Catppuccin] Latte.css
+++ b/config/waybar/style/[Catppuccin] Latte.css
@@ -15,8 +15,9 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 window#waybar {
   transition-property: background-color;
   transition-duration: 0.5s;
-  border-bottom: 2px solid @sapphire;
-  background: @theme_base_color;
+  border-top: 1px solid @flamingo;
+  border-bottom: 3px solid @lavender;
+  background: alpha(@overlay0, 0.3);
   border-radius: 10px;
 }
 
@@ -156,11 +157,11 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
   	background-color: @red;
   	color: @theme_text_color;
-  	animation-name: blink;
-  	animation-duration: 0.5s;
-  	animation-timing-function: linear;
-  	animation-iteration-count: infinite;
-  	animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
   	box-shadow: inset 0 -3px transparent;
 }
 
diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css
index 658f73f0..4c047f20 100644
--- a/config/waybar/style/[Catppuccin] Mocha.css
+++ b/config/waybar/style/[Catppuccin] Mocha.css
@@ -176,11 +176,11 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
   background-color: @red;
   color: @theme_text_color;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
   box-shadow: inset 0 -3px transparent;
 }
 
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index 633bb78c..9da333a7 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css
+++ b/config/waybar/style/[Colored] Chroma Glow.css
@@ -182,12 +182,12 @@ tooltip label{
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 label:focus {
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index 3cbaa8f4..4f4797f3 100644
--- a/config/waybar/style/[Colored] Translucent.css
+++ b/config/waybar/style/[Colored] Translucent.css
@@ -192,11 +192,11 @@ tooltip {
 
 #battery.critical:not(.charging) {
     color: @critical;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 label:focus {
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index 1fe53ebe..1b9ffff8 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -175,8 +175,8 @@ tooltip label{
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index e4776dc5..1c606aec 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -182,8 +182,8 @@ tooltip label{
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Colorful] Oglo Chicklets.css b/config/waybar/style/[Colorful] Oglo Chicklets.css
index e8044bbe..90353d62 100644
--- a/config/waybar/style/[Colorful] Oglo Chicklets.css
+++ b/config/waybar/style/[Colorful] Oglo Chicklets.css
@@ -181,6 +181,11 @@ button.active {
     background-color: #ee606a;
     color: #2d353b;
     border-bottom: 8px solid #ca4853;
+    animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 label:focus {
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index dfe5694c..d5fea008 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -154,8 +154,8 @@ tooltip label{
 	background-color: #f38ba8;
 	color: #f38ba8;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index 7baa7418..a1de885f 100644
--- a/config/waybar/style/[Dark] Golden Noir.css
+++ b/config/waybar/style/[Dark] Golden Noir.css
@@ -183,12 +183,12 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #pulseaudio-slider slider {
diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
index 9db07fa0..0cd39907 100644
--- a/config/waybar/style/[Dark] Half-Moon.css
+++ b/config/waybar/style/[Dark] Half-Moon.css
@@ -287,8 +287,8 @@ color: #F3F4F5;
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
index f80b494a..55fb7dfb 100644
--- a/config/waybar/style/[Dark] Latte-Wallust combined.css
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -222,15 +222,6 @@ tooltip {
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
-#battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
 #pulseaudio-slider slider {
     min-width: 0px;
     min-height: 0px;
@@ -302,14 +293,17 @@ tooltip {
 #temperature.critical {
     background-color: @red;
 }
+
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}#pulseaudio-slider slider {
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+
+#pulseaudio-slider slider {
 	min-width: 0px;
 	min-height: 0px;
 	opacity: 0;
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
index 47c1328f..8117fe1b 100644
--- a/config/waybar/style/[Dark] Purpl.css
+++ b/config/waybar/style/[Dark] Purpl.css
@@ -198,8 +198,8 @@ tooltip {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index d44f9e39..1e50cc63 100644
--- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -188,12 +188,12 @@ tooltip label {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 #pulseaudio-slider slider {
 	min-width: 0px;
diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css
index 86a17f71..8ff87132 100644
--- a/config/waybar/style/[Extra] Crimson.css
+++ b/config/waybar/style/[Extra] Crimson.css
@@ -180,8 +180,8 @@ tooltip {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Extra] EverForest.css b/config/waybar/style/[Extra] EverForest.css
index 9e64cd40..785acf01 100644
--- a/config/waybar/style/[Extra] EverForest.css
+++ b/config/waybar/style/[Extra] EverForest.css
@@ -177,8 +177,8 @@ window#waybar.empty #window {
   background-color: @red;
   color: @fg;
   animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
+  animation-duration: 3.0s;
+  animation-timing-function: steps(12);
   animation-iteration-count: infinite;
   animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
index c50e6a2d..1e5b702d 100644
--- a/config/waybar/style/[Extra] Mauve.css
+++ b/config/waybar/style/[Extra] Mauve.css
@@ -197,8 +197,8 @@ tooltip {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css
index 77c4f583..bfc58ec1 100644
--- a/config/waybar/style/[Extra] Rose Pine.css
+++ b/config/waybar/style/[Extra] Rose Pine.css
@@ -177,6 +177,23 @@ tooltip {
 	color: #39FF14;
 }
 
+@keyframes blink {
+  to {
+    color: @main-bg;
+  }
+}
+
+#battery.critical:not(.charging) {
+  background-color: red;
+  color: white;
+  animation-name: blink;
+  animation-duration: 3.0s;
+  animation-timing-function: steps(12);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  box-shadow: inset 0 -3px transparent;
+}
+
 #backlight {
 	padding-right: 2px;
 }
diff --git a/config/waybar/style/[Extra] Simple Pink.css b/config/waybar/style/[Extra] Simple Pink.css
index 6dfad5b7..95802b13 100644
--- a/config/waybar/style/[Extra] Simple Pink.css
+++ b/config/waybar/style/[Extra] Simple Pink.css
@@ -207,8 +207,8 @@ tooltip {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index cd2eb0ea..d9a6b391 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css
+++ b/config/waybar/style/[Light] Monochrome Contrast.css
@@ -187,8 +187,8 @@ tooltip label{
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index f860ce50..8306159e 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css
+++ b/config/waybar/style/[Light] Obsidian Glow.css
@@ -173,8 +173,8 @@ tooltip label {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Rainbow] RGB Bordered.css b/config/waybar/style/[Rainbow] RGB Bordered.css
index 6c7cb939..3ffbceea 100644
--- a/config/waybar/style/[Rainbow] RGB Bordered.css
+++ b/config/waybar/style/[Rainbow] RGB Bordered.css
@@ -173,8 +173,8 @@ window#waybar.empty #window {
   background-color: @red;
   color: @theme_text_color;
   animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
+  animation-duration: 3.0s;
+  animation-timing-function: steps(12);
   animation-iteration-count: infinite;
   animation-direction: alternate;
   box-shadow: inset 0 -3px transparent;
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index 27e9db98..ba23e25b 100644
--- a/config/waybar/style/[Retro] Simple Style.css
+++ b/config/waybar/style/[Retro] Simple Style.css
@@ -109,6 +109,23 @@ window#waybar {
   border-bottom: 3px solid yellow;
 }
 
+@keyframes blink {
+  to {
+    color: @background;
+  }
+}
+
+#battery.critical:not(.charging) {
+  background-color: @red;
+  color: white;
+  animation-name: blink;
+  animation-duration: 3.0s;
+  animation-timing-function: steps(12);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  box-shadow: inset 0 -3px transparent;
+}
+
 /*-----Indicators----*/
 #custom-hypridle.notactive,
 #idle_inhibitor.activated {
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index e8dbbf96..1c2c7de2 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Transparent] Crystal Clear.css
@@ -157,8 +157,8 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
index 8b2ae2bc..59de390f 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern-mixed.css
@@ -353,11 +353,11 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
     background-color: #f53c3c;
     color: @textcolor3;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #tray {
diff --git a/config/waybar/style/[WALLUST] ML4W-modern.css b/config/waybar/style/[WALLUST] ML4W-modern.css
index 62fafd1b..afd86c4a 100644
--- a/config/waybar/style/[WALLUST] ML4W-modern.css
+++ b/config/waybar/style/[WALLUST] ML4W-modern.css
@@ -353,11 +353,11 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
     background-color: #f53c3c;
     color: @textcolor3;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #tray {
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index 8885aa97..86790823 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -285,12 +285,12 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #pulseaudio-slider slider {
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
index 0196f85f..fed61902 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
@@ -259,6 +259,23 @@ tooltip {
 	border: 2px solid @color8;
 }
 
+@keyframes blink {
+  to {
+    color: @color12;
+  }
+}
+
+#battery.critical:not(.charging) {
+  background-color: red;
+  color: white;
+  animation-name: blink;
+  animation-duration: 3.0s;
+  animation-timing-function: steps(12);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  box-shadow: inset 0 -3px transparent;
+}
+
 #custom-weather {
     color: #8eacf3;
     border-right: 0px;
diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index d98da479..3efa0e87 100644
--- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -166,8 +166,8 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
 	color: @critical;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Wallust] Box type.css b/config/waybar/style/[Wallust] Box type.css
index 496c3c77..efdf11bf 100644
--- a/config/waybar/style/[Wallust] Box type.css
+++ b/config/waybar/style/[Wallust] Box type.css
@@ -174,11 +174,11 @@ window#waybar.empty #window {
 #battery.critical:not(.charging) {
     background-color: #ffffff;
     color: #000000;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
     border-bottom-width: 5px;
     border-bottom-color: @color12;
     border-bottom-style: solid;
diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index b58e607d..71d59bd5 100644
--- a/config/waybar/style/[Wallust] Chroma Edge.css
+++ b/config/waybar/style/[Wallust] Chroma Edge.css
@@ -258,8 +258,8 @@ tooltip label{
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;
-	animation-duration: 0.5s;
-	animation-timing-function: linear;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
 	animation-iteration-count: infinite;
 	animation-direction: alternate;
 }
diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index 78501aa2..99a6e031 100644
--- a/config/waybar/style/[Wallust] Chroma Fusion.css
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css
@@ -287,12 +287,12 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #pulseaudio-slider slider {
diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index dede0609..3200db39 100644
--- a/config/waybar/style/[Wallust] Chroma Tally.css
+++ b/config/waybar/style/[Wallust] Chroma Tally.css
@@ -163,11 +163,11 @@ tooltip {
 #battery.critical:not(.charging) {
     background: #bf616a;
     color: #eceff4;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #cpu {
diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css
index be6bae2a..07c366cd 100644
--- a/config/waybar/style/[Wallust] Colored.css
+++ b/config/waybar/style/[Wallust] Colored.css
@@ -196,12 +196,12 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #pulseaudio-slider slider {
diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css
index 510658d3..a5d122f3 100644
--- a/config/waybar/style/[Wallust] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -210,12 +210,12 @@ tooltip {
 }
 
 #battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 3.0s;
+	animation-timing-function: steps(12);
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
 }
 
 #pulseaudio-slider slider {
diff --git a/config/waybar/style/catppuccin-themes/frappe.css b/config/waybar/style/catppuccin-themes/frappe.css
new file mode 100644
index 00000000..c06b8fb7
--- /dev/null
+++ b/config/waybar/style/catppuccin-themes/frappe.css
@@ -0,0 +1,26 @@
+@define-color rosewater #f2d5cf;
+@define-color flamingo #eebebe;
+@define-color pink #f4b8e4;
+@define-color mauve #ca9ee6;
+@define-color red #e78284;
+@define-color maroon #ea999c;
+@define-color peach #ef9f76;
+@define-color yellow #e5c890;
+@define-color green #a6d189;
+@define-color teal #81c8be;
+@define-color sky #99d1db;
+@define-color sapphire #85c1dc;
+@define-color blue #8caaee;
+@define-color lavender #babbf1;
+@define-color text #c6d0f5;
+@define-color subtext1 #b5bfe2;
+@define-color subtext0 #a5adce;
+@define-color overlay2 #949cbb;
+@define-color overlay1 #838ba7;
+@define-color overlay0 #737994;
+@define-color surface2 #626880;
+@define-color surface1 #51576d;
+@define-color surface0 #414559;
+@define-color base #303446;
+@define-color mantle #292c3c;
+@define-color crust #232634;