Merge branch 'development' into rofi

48 files changed, 318 insertions, 127 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 4437c641..b9d20480 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 #environment-variables
 env = CLUTTER_BACKEND,wayland
diff --git a/config/hypr/UserConfigs/LaptopDisplay.conf b/config/hypr/UserConfigs/LaptopDisplay.conf
index d50c9119..9f766582 100644
--- a/config/hypr/UserConfigs/LaptopDisplay.conf
+++ b/config/hypr/UserConfigs/LaptopDisplay.conf
@@ -1,4 +1,4 @@
-## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
-## See notes on Laptops.conf
+# NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
+# See notes on Laptops.conf
 
 #monitor = eDP-1, preferred, auto, 1
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index 20a6c6f9..00d8b8c6 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
 # These configs are mostly for laptops. This is addemdum to Keybinds.conf
@@ -30,8 +30,8 @@ bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active win
 #bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1"
 #bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
 
-#############################################################################
-### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
+
+# WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
 # CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper.
 # CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor
 # One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!!
@@ -44,4 +44,4 @@ bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active win
 
 # for laptop-lid action (to erase the last entry)
 #exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
-##############################################################################
+#
diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
index 3e758c0a..36781f99 100644
--- a/config/hypr/UserConfigs/Monitors.conf
+++ b/config/hypr/UserConfigs/Monitors.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 # Monitor Configuration
 # See Hyprland wiki for more details
diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 7f2d600d..ee387d8f 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 #Commands & Apps to be executed at launch
 
 $scriptsDir = $HOME/.config/hypr/scripts
@@ -9,7 +9,7 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $UserScripts/WallpaperAutoChange.sh
 
 # wallpaper stuff / More wallpaper options below
-exec-once = swww query || swww init
+exec-once = swww query || swww-daemon --format xrgb
 exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes 
 
 # Startup
@@ -34,15 +34,11 @@ exec-once = wl-paste --type image --watch cliphist store
 # Rainbow borders
 exec-once = $UserScripts/RainbowBorders.sh
 
-# sway-idle with lock only
-exec-once = swayidle -w timeout 900 '$lock'
-# sway-idle with lock and sleep
-#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# sway idle without lock
-#exec-once = swayidle -w  timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+# Starting hypridle to start hyprlock
+exec-once = hypridle -q
 
-## Here are list of features available but disabled by default
-#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+# Here are list of features available but disabled by default
+# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index f55f0d5e..41b61456 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # This is where you put your own keybinds. Be Mindful to check as well ~/.config/hypr/configs/Keybinds.conf to avoid conflict
 # if you think I should replace the Pre-defined Keybinds in ~/.config/hypr/configs/Keybinds.conf , submit an issue or let me know in DC and present me a valid reason as to why, such as conflicting with global shortcuts, etc etc
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index fa2e55a9..6c801f7f 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -1,8 +1,8 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # User Settings
 # This is where you put your own settings as this will not be touched during update
 
-## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
+# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
 # Sourcing colors generated by pywal
 source = $HOME/.cache/wal/colors-hyprland
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index a3a77cfb..6d13c8c2 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
 windowrule = float, org.kde.polkit-kde-authentication-agent-1
@@ -11,6 +11,8 @@ windowrule = float, zoom
 windowrule = float, rofi
 windowrule = float, gnome-system-monitor
 windowrule = float, yad
+windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
+windowrule = float, ^(evince)$ # document viewer
 
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
@@ -48,6 +50,14 @@ windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
 windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
+windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
+windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
+windowrulev2 = opacity 0.9 0.8, class:^(code-url-handler)$
+windowrulev2 = opacity 0.9 0.8, class:^(VSCode)$
+windowrulev2 = opacity 0.94 0.86, class:^(discord)$
+windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
 
 
 #layerrule = unset,class:^([Rr]ofi)$
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index 163101e2..658d7b03 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -17,7 +17,7 @@ menu(){
 }
 
 main() {
-    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
+    choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
             kitty -e nano "$UserConfigs/ENVariables.conf"
diff --git a/config/hypr/UserScripts/Sounds.sh b/config/hypr/UserScripts/Sounds.sh
index 0d2bfff7..fb8a1f57 100755
--- a/config/hypr/UserScripts/Sounds.sh
+++ b/config/hypr/UserScripts/Sounds.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This script is used to play system sounds.
 
 theme="freedesktop" # Set the theme for the system sounds.
@@ -31,8 +31,12 @@ else
 fi
 
 # Set the directory defaults for system sounds.
+if [ -d "/run/current-system/sw/share/sounds" ]; then
+    systemDIR="/run/current-system/sw/share/sounds" # NixOS
+else
+    systemDIR="/usr/share/sounds"
+fi
 userDIR="$HOME/.local/share/sounds"
-systemDIR="/usr/share/sounds"
 defaultTheme="freedesktop"
 
 # Prefer the user's theme, but use the system's if it doesn't exist.
@@ -62,4 +66,4 @@ if ! test -f "$sound_file"; then
         fi
     fi
 fi
-pw-play "$sound_file"
+pw-play "$sound_file"
\ No newline at end of file
diff --git a/config/hypr/UserScripts/WallpaperAutoChange.sh b/config/hypr/UserScripts/WallpaperAutoChange.sh
index 56f2ee05..e52b7e90 100755
--- a/config/hypr/UserScripts/WallpaperAutoChange.sh
+++ b/config/hypr/UserScripts/WallpaperAutoChange.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # source https://wiki.archlinux.org/title/Hyprland#Using_a_script_to_change_wallpaper_every_X_minutes
 
 # This script will randomly go through the files of a directory, setting it
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index f8cc54f9..52fc819d 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for Random Wallpaper ( CTRL ALT W)
 
 wallDIR="$HOME/Pictures/wallpapers"
@@ -17,7 +17,7 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
 
 
-swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS
+swww query || swww-daemon --format xrgb && swww img ${RANDOMPICS} $SWWW_PARAMS
 
 
 ${scriptsDir}/PywalSwww.sh
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 663fb540..8aa9bdd8 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This script for selecting wallpapers (SUPER W)
 
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
@@ -40,7 +40,7 @@ menu() {
   printf "$RANDOM_PIC_NAME\n"
 }
 
-swww query || swww init
+swww query || swww-daemon --format xrgb
 
 main() {
   choice=$(menu | ${rofi_command})
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index 154c1589..2b13a977 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # From https://raw.githubusercontent.com/rxyhn/dotfiles/main/home/rxyhn/modules/desktop/waybar/scripts/waybar-wttr.py
 
-## ensure to insert city inside ""
+# ensure to insert city inside ""
 city = ""
 import json
 import requests
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 3ecc4a37..1946cc27 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # Default Keybinds
 # visit https://wiki.hyprland.org/Configuring/Binds/ for more info
 
@@ -23,12 +23,13 @@ bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
 bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small 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 SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
 bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
-bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 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 = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
 
 # FEATURES / EXTRAS (UserScripts)
 bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
@@ -106,43 +107,45 @@ bind = $mainMod SHIFT, tab, workspace, m-1
 bind = $mainMod SHIFT, U, movetoworkspace, special
 bind = $mainMod, U, togglespecialworkspace,
 
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+# The following mappings use the key codes to better support various keyboard layouts
+# 1 is code:10, 2 is code 11, etc
+# Switch workspaces with mainMod + [0-9] 
+bind = $mainMod, code:10, workspace, 1
+bind = $mainMod, code:11, workspace, 2
+bind = $mainMod, code:12, workspace, 3
+bind = $mainMod, code:13, workspace, 4
+bind = $mainMod, code:14, workspace, 5
+bind = $mainMod, code:15, workspace, 6
+bind = $mainMod, code:16, workspace, 7
+bind = $mainMod, code:17, workspace, 8
+bind = $mainMod, code:18, workspace, 9
+bind = $mainMod, code:19, workspace, 10
 
-# Move active window and follow to workspace
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+# Move active window and follow to workspace mainMod + SHIFT [0-9]
+bind = $mainMod SHIFT, code:10, movetoworkspace, 1
+bind = $mainMod SHIFT, code:11, movetoworkspace, 2
+bind = $mainMod SHIFT, code:12, movetoworkspace, 3
+bind = $mainMod SHIFT, code:13, movetoworkspace, 4
+bind = $mainMod SHIFT, code:14, movetoworkspace, 5
+bind = $mainMod SHIFT, code:15, movetoworkspace, 6
+bind = $mainMod SHIFT, code:16, movetoworkspace, 7
+bind = $mainMod SHIFT, code:17, movetoworkspace, 8
+bind = $mainMod SHIFT, code:18, movetoworkspace, 9
+bind = $mainMod SHIFT, code:19, movetoworkspace, 10
 bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [ or ]
 bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
 
-# Move active window to a workspace silently
-bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
-bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
-bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
-bind = $mainMod CTRL, 4, movetoworkspacesilent, 4
-bind = $mainMod CTRL, 5, movetoworkspacesilent, 5
-bind = $mainMod CTRL, 6, movetoworkspacesilent, 6
-bind = $mainMod CTRL, 7, movetoworkspacesilent, 7
-bind = $mainMod CTRL, 8, movetoworkspacesilent, 8
-bind = $mainMod CTRL, 9, movetoworkspacesilent, 9
-bind = $mainMod CTRL, 0, movetoworkspacesilent, 10
+# Move active window to a workspace silently mainMod + CTRL [0-9]
+bind = $mainMod CTRL, code:10, movetoworkspacesilent, 1
+bind = $mainMod CTRL, code:11, movetoworkspacesilent, 2
+bind = $mainMod CTRL, code:12, movetoworkspacesilent, 3
+bind = $mainMod CTRL, code:13, movetoworkspacesilent, 4
+bind = $mainMod CTRL, code:14, movetoworkspacesilent, 5
+bind = $mainMod CTRL, code:15, movetoworkspacesilent, 6
+bind = $mainMod CTRL, code:16, movetoworkspacesilent, 7
+bind = $mainMod CTRL, code:17, movetoworkspacesilent, 8
+bind = $mainMod CTRL, code:18, movetoworkspacesilent, 9
+bind = $mainMod CTRL, code:19, movetoworkspacesilent, 10
 bind = $mainMod CTRL, bracketleft, movetoworkspacesilent, -1 # brackets [ or ]
 bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1
 
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 96f6f1e9..e96d85e3 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -1,8 +1,8 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 # Default Settings. avoid changing this file as during update, this will be replaced
 
-## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
+# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
 # Initial boot script enable to apply initial wallpapers, theming, new settings etc.
 exec-once = $HOME/.config/hypr/initial-boot.sh
\ No newline at end of file
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
new file mode 100644
index 00000000..549f1b1c
--- /dev/null
+++ b/config/hypr/hypridle.conf
@@ -0,0 +1,33 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Hypridle 
+# Original config submitted by https://github.com/SherLock707                                                       
+                                                      
+
+general {
+    # lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session) 
+    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
+    before_sleep_cmd = hyprlock    # command ran before sleep
+    # after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
+    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+# Warn
+listener {
+    timeout = 540                            # 9 min
+    on-timeout = notify-send "You are idle!" # command to run when timeout has passed
+    on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
+}
+
+# Screenlock
+listener {
+    timeout = 600                     # 10 min
+    on-timeout = hyprlock # command to run when timeout has passed
+    # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+}
+
+# Suspend # disabled by default
+# listener {
+   # timeout = 1200                            # 20 min
+   # on-timeout = systemctl suspend # command to run when timeout has passed
+    # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+# }
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 69f421cf..343b887b 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,12 +1,12 @@
 # Sourcing external config files
 
-###### Default Configs
+# Default Configs
 $configs = $HOME/.config/hypr/configs
 
 source=$configs/Settings.conf
 source=$configs/Keybinds.conf
 
-#### User Configs
+# User Configs
 $UserConfigs = $HOME/.config/hypr/UserConfigs
 
 source= $UserConfigs/Startup_Apps.conf
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
new file mode 100644
index 00000000..1e50cbd6
--- /dev/null
+++ b/config/hypr/hyprlock.conf
@@ -0,0 +1,132 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Hyprlock                                                          
+# Original config submitted by https://github.com/SherLock707
+
+source = $HOME/.cache/wal/colors-hyprland
+
+general {
+    grace = 1
+}
+
+background {
+    monitor =
+	path = screenshot   # screenshot of your desktop
+	# path = $HOME/.config/rofi/.current_wallpaper   # NOTE only png supported for now
+    color = $color7
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_size = 4
+    blur_passes = 2 # 0 disables blurring
+    noise = 0.0117
+    contrast = 1.3000 # Vibrant!!!
+    brightness = 0.8000
+    vibrancy = 0.2100
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 250, 50
+    outline_thickness = 3
+    dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = $color1
+    inner_color = $color0
+    font_color = $color7
+    fade_on_empty = true
+    placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    
+    position = 0, 100
+    halign = center
+    valign = bottom
+}
+
+# Date
+label {
+    monitor =
+    text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B %Y')" </b>"
+    color = $color5
+    font_size = 34
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -150
+    halign = center
+    valign = top
+}
+
+# Week
+label {
+    monitor =
+    text = cmd[update:18000000] echo "<b> "$(date +'Week %U')" </b>"
+    color = $color7
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -200
+    halign = center
+    valign = top
+}
+
+# Time
+label {
+    monitor =
+# text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM
+text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
+    color = $color7
+    font_size = 94
+    font_family = JetBrains Mono Nerd Font 10
+
+    position = 0, -150
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text =    $USER
+    color = $color7
+    font_size = 18
+    font_family = Inter Display Medium
+
+    position = 0, 200
+    halign = center
+    valign = bottom
+}
+
+label {
+    monitor =
+    text = cmd[update:60000] echo "<b> "$(uptime -p)" </b>"
+    color = $color12
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 0, 0
+    halign = right
+    valign = bottom
+}
+
+label {
+    monitor =
+    text = cmd[update:3600000] ping -c 1 wttr.in > /dev/null && curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2
+    color = $color10
+    font_size = 24
+    font_family = JetBrains Mono Nerd Font 10
+    position = 50, 0
+    halign = left
+    valign = bottom
+}
+
+image {
+    monitor =
+    path = $HOME/.config/rofi/.current_wallpaper
+    size = 230
+    rounding = -1
+    border_size = 4
+    border_color = $color12
+    rotate = 0
+    reload_time = -1
+    position = 0, 200
+    halign = center
+    valign = center
+}
\ No newline at end of file
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index fffdcd98..b6c57f3e 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -7,9 +7,9 @@
 
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
-wallpaper=$HOME/Pictures/wallpapers/Fantasy-Landscape.png
+wallpaper=$HOME/Pictures/wallpapers/Dark_Nature.png
 waybar_style="$HOME/.config/waybar/style/[Pywal] Chroma Tally.css"
-kvantum_theme="Tokyo-Night"
+kvantum_theme="Catppuccin-Mocha"
 
 swww="swww img"
 effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
@@ -20,7 +20,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # Initialize pywal and wallpaper
 	if [ -f "$wallpaper" ]; then
 		wal -i $wallpaper -s -t > /dev/null 
-		swww init && $swww $wallpaper $effect
+		swww query || swww-daemon && $swww $wallpaper $effect
 	    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 & 
 	fi
      
diff --git a/config/hypr/scripts/AirplaneMode.sh b/config/hypr/scripts/AirplaneMode.sh
index 1176c80f..1587a2bc 100755
--- a/config/hypr/scripts/AirplaneMode.sh
+++ b/config/hypr/scripts/AirplaneMode.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Airplane Mode. Turning on or off all wifi using rfkill. 
 
 notif="$HOME/.config/swaync/images/bell.png"
diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh
index 04987ab1..7d43f570 100755
--- a/config/hypr/scripts/Brightness.sh
+++ b/config/hypr/scripts/Brightness.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for Monitor backlights (if supported) using brightnessctl
 
 iDIR="$HOME/.config/swaync/icons"
diff --git a/config/hypr/scripts/BrightnessKbd.sh b/config/hypr/scripts/BrightnessKbd.sh
index f96c6e08..92083e78 100755
--- a/config/hypr/scripts/BrightnessKbd.sh
+++ b/config/hypr/scripts/BrightnessKbd.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for keyboard backlights (if supported) using brightnessctl
 
 iDIR="$HOME/.config/swaync/icons"
diff --git a/config/hypr/scripts/ChangeBlur.sh b/config/hypr/scripts/ChangeBlur.sh
index 8ad0dd40..321b8ec6 100755
--- a/config/hypr/scripts/ChangeBlur.sh
+++ b/config/hypr/scripts/ChangeBlur.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-## Script for changing blurs on the fly
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for changing blurs on the fly
 
 notif="$HOME/.config/swaync/images/bell.png"
 
diff --git a/config/hypr/scripts/ChangeLayout.sh b/config/hypr/scripts/ChangeLayout.sh
index 5981024a..75823bab 100755
--- a/config/hypr/scripts/ChangeLayout.sh
+++ b/config/hypr/scripts/ChangeLayout.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # for changing Hyprland Layouts (Master or Dwindle) on the fly
 
 notif="$HOME/.config/swaync/images/bell.png"
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index 682174fc..f93005bc 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Clipboard Manager. This script uses cliphist, rofi, and wl-copy.
 
 # Actions:
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 885c7c6a..50b01644 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -87,13 +87,13 @@ $swww "${next_wallpaper}" $effect
 
 # Set Kvantum Manager theme & QT5/QT6 settings
 if [ "$next_mode" = "Dark" ]; then
-    kvantum_theme="Tokyo-Night"
-    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Night.conf"
-    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Night.conf"
+    kvantum_theme="Catppuccin-Mocha"
+    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Mocha.conf"
+    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Mocha.conf"
 else
-    kvantum_theme="Tokyo-Day"
-    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Day.conf"
-    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Day.conf"
+    kvantum_theme="Catppuccin-Latte"
+    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Latte.conf"
+    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Latte.conf"
 fi
 
 kvantummanager --set "$kvantum_theme"
diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh
index f05676eb..74051403 100755
--- a/config/hypr/scripts/GameMode.sh
+++ b/config/hypr/scripts/GameMode.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Game Mode. Turning off all animations
 
 notif="$HOME/.config/swaync/images/bell.png"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
 
 
-HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==2{print $2}')
+HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==1{print $2}')
 if [ "$HYPRGAMEMODE" = 1 ] ; then
     hyprctl --batch "\
         keyword animations:enabled 0;\
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 5b79cf06..796084b8 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Keyhints. Idea got from Garuda Hyprland
 
 # Detect monitor resolution and scale
@@ -41,6 +41,7 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " enter" "Terminal" "(kitty)" \
 " or  D" "App Launcher" "(rofi)" \
 " T" "Open File Manager" "(Thunar)" \
+" S" "Google Search" "(rofi)" \
 " Q" "close active window" "(not kill)" \
 " Shift Q " "closes a specified window" "(window)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
@@ -68,6 +69,3 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " E" "View or EDIT Keybinds, Settings, Monitor" "" \
 "" "" "" \
 "More tips:" "https://github.com/JaKooLit/Hyprland-Dots/wiki" ""\
-
-
-
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index 1e676780..56d496a5 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# For Swaylock
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
-CONFIG="$HOME/.config/swaylock/config"
-
-sleep 0.5s; swaylock --config ${CONFIG} & disown
+# For Hyprlock
+hyprlock -q
\ No newline at end of file
diff --git a/config/hypr/scripts/MediaCtrl.sh b/config/hypr/scripts/MediaCtrl.sh
index d9855e4f..b3f94295 100755
--- a/config/hypr/scripts/MediaCtrl.sh
+++ b/config/hypr/scripts/MediaCtrl.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Playerctl
 
 music_icon="$HOME/.config/swaync/icons/music.png"
diff --git a/config/hypr/scripts/Polkit-NixOS.sh b/config/hypr/scripts/Polkit-NixOS.sh
index 048c1b02..51675eff 100755
--- a/config/hypr/scripts/Polkit-NixOS.sh
+++ b/config/hypr/scripts/Polkit-NixOS.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For NixOS starting of polkit-gnome. Dec 2023, the settings stated in NixOS wiki does not work so have to manual start it
 
 # Find all polkit-gnome executables in the Nix store
diff --git a/config/hypr/scripts/Polkit.sh b/config/hypr/scripts/Polkit.sh
index 07b1211d..80310ba0 100755
--- a/config/hypr/scripts/Polkit.sh
+++ b/config/hypr/scripts/Polkit.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This is for polkits, it will start from top and will stop if the top is executed
 
 # Polkit possible paths files to check
diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh
index 389ec738..59f2e1df 100755
--- a/config/hypr/scripts/PortalHyprland.sh
+++ b/config/hypr/scripts/PortalHyprland.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For manually starting xdg-desktop-portal
 
 sleep 1
diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/PywalSwww.sh
index 4ed7448f..fe067611 100755
--- a/config/hypr/scripts/PywalSwww.sh
+++ b/config/hypr/scripts/PywalSwww.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Pywal Colors for current wallpaper
 
 # Define the path to the swww cache directory
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index a585eb84..15516dff 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Scripts for refreshing waybar, rofi, swaync, pywal colors
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh
index f0c3d569..689bccf0 100755
--- a/config/hypr/scripts/RefreshNoWaybar.sh
+++ b/config/hypr/scripts/RefreshNoWaybar.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # Modified version of Refresh but no waybar refresh
 # Used by automatic wallpaper change
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index 4182a5a9..4c51ee8a 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi Emoticons. Not my own. Cant remember the source
 
-sed '1,/^### DATA ###$/d' $0 | 
+sed '1,/^# # DATA # #$/d' $0 | 
 rofi -dmenu -config ~/.config/rofi/config-long.rasi| 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
-### DATA ###
+# # DATA # #
 😀 grinning face face smile happy joy :D grin
 😃 grinning face with big eyes face happy joy haha :D :) smile funny
 😄 grinning face with smiling eyes face happy joy funny haha laugh like :D :) smile
diff --git a/config/hypr/scripts/RofiSearch.sh b/config/hypr/scripts/RofiSearch.sh
new file mode 100755
index 00000000..13148455
--- /dev/null
+++ b/config/hypr/scripts/RofiSearch.sh
@@ -0,0 +1,10 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Modified Script for Google Search
+# Original Submitted by https://github.com/LeventKaanOguz
+
+# Opens rofi in dmenu mod and waits for input. Then pushes the input to the query of the URL.
+#
+
+rofi_config="$HOME/.config/rofi/config-search.rasi"
+
+echo "" | rofi -dmenu -config "$rofi_config" -p "Search:" | xargs -I{} xdg-open https://www.google.com/search?q={}
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index f35f9292..309114dc 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Screenshots scripts
 
 iDIR="$HOME/.config/swaync/icons"
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 90451c67..0145e262 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This is for changing kb_layouts. Set kb_layouts in $settings_file
 
 layout_f="$HOME/.cache/kb_layout"
@@ -38,8 +38,8 @@ next_index=$(( (current_index + 1) % layout_count ))
 new_layout="${layout_mapping[next_index]}"
 
 # Update the keyboard layout
-hyprctl keyword input:kb_layout "$new_layout"
+hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
 echo "$new_layout" > "$layout_f"
 
 # Notification for the new keyboard layout
-notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
\ No newline at end of file
+notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh
index 47ad48f6..e94ee068 100755
--- a/config/hypr/scripts/TouchPad.sh
+++ b/config/hypr/scripts/TouchPad.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For disabling touchpad.
+# Edit the Touchpad_Device according to your system
+# use hyprctl devices to get your system touchpad device name
+
 
 Touchpad_Device="asue1209:00-04f3:319f-touchpad"
 notif="$HOME/.config/swaync/images/bell.png"
@@ -18,7 +21,7 @@ toggle_touchpad() {
   fi
 
   notify-send -u low -i "$notif" "Touchpad $action"
-  hyprctl keyword "device:$Touchpad_Device:enabled" "$(cat "$STATUS_FILE")"
+  hyprctl keyword "device[$Touchpad_Device]:enabled" "$(cat "$STATUS_FILE")"
 }
 
 toggle_touchpad
diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh
index 8c5af5de..d2fef87e 100755
--- a/config/hypr/scripts/Volume.sh
+++ b/config/hypr/scripts/Volume.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Scripts for volume controls for audio and mic 
 
 iDIR="$HOME/.config/swaync/icons"
@@ -42,17 +42,19 @@ notify_user() {
 # Increase Volume
 inc_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
-        pamixer -u && notify_user
+        toggle_mute
+    else
+        pamixer -i 5 --allow-boost --set-limit 150 && notify_user
     fi
-    pamixer -i 5 && notify_user
 }
 
 # Decrease Volume
 dec_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
-        pamixer -u && notify_user
+        toggle_mute
+    else
+        pamixer -d 5 && notify_user
     fi
-    pamixer -d 5 && notify_user
 }
 
 # Toggle Mute
@@ -102,17 +104,19 @@ notify_mic_user() {
 # Increase MIC Volume
 inc_mic_volume() {
     if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        pamixer --default-source -u && notify_mic_user
+        toggle_mic
+    else
+        pamixer --default-source -i 5 && notify_mic_user
     fi
-    pamixer --default-source -i 5 && notify_mic_user
 }
 
 # Decrease MIC Volume
 dec_mic_volume() {
     if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        pamixer --default-source -u && notify_mic_user
+        toggle-mic
+    else
+        pamixer --default-source -d 5 && notify_mic_user
     fi
-    pamixer --default-source -d 5 && notify_mic_user
 }
 
 # Execute accordingly
diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh
index bf9e7435..3c4b0f53 100755
--- a/config/hypr/scripts/WaybarCava.sh
+++ b/config/hypr/scripts/WaybarCava.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # Not my own work. This was added through Github PR. Credit to original author
 
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index 31146b59..a70953bb 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for waybar layout or configs
 
 set -euo pipefail
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index bbcb6ea3..4cd484b0 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for waybar styles
 
 set -euo pipefail
diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
index 4c53c381..1987e285 100755
--- a/config/hypr/scripts/Wlogout.sh
+++ b/config/hypr/scripts/Wlogout.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # wlogout (Power, Screen Lock, Suspend, etc)
 
diff --git a/config/hypr/v2.2.4 b/config/hypr/v2.2.8
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.4
+++ b/config/hypr/v2.2.8