Merge pull request #516 from JaKooLit/main

Main to development

27 files changed, 141 insertions, 81 deletions

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)