diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
index 36781f995..f4b313d78 100644
--- a/config/hypr/UserConfigs/Monitors.conf
+++ b/config/hypr/UserConfigs/Monitors.conf
@@ -5,7 +5,6 @@
 # https://wiki.hyprland.org/Configuring/Monitors/
 # Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info.
 
-
 # Monitors
 monitor=,preferred,auto,1
 
@@ -13,16 +12,17 @@ monitor=,preferred,auto,1
 # Created this inorder for the monitor display to not wake up if not intended.
 # See here: https://github.com/hyprwm/Hyprland/issues/4090
 
+# Some examples
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
 #monitor = DP-3, 1920x1080@240, auto, 1 
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
 
-# QEMU-KVM or any virtual box
+# QEMU-KVM, virtual box or vmware
 #monitor = Virtual-1, 1920x1080@60,auto,1
 
-# Hi Refresh Rate
+# High Refresh Rate
 #monitor=,highrr,auto,1
 
 # High Resolution
@@ -31,18 +31,21 @@ monitor=,preferred,auto,1
 # to disable a monitor
 #monitor=name,disable
 
-# Mirror
+# Mirror samples
 #monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2
 #monitor=,preferred,auto,1,mirror,eDP-1
-
-
-# Example :
-#monitor=eDP-1,2560x1440@165,0x0,1
-#workspace=HDMI-A-1,1
 #monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1
-#workspace=HDMI-A-2,2
+
+# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below
+# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit.
+# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen)
+# monitor=,preferred,auto,1,bitdepth,10
 
 #monitor=eDP-1,transform,0
 #monitor=eDP-1,addreserved,10,10,10,49
-#workspace=eDP-1,1
+
+# workspaces - Monitor rules
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+# SUPER E - Workspace-Rules 
+# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 47f88ed57..c7b17fecf 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -8,9 +8,6 @@
 # Sourcing colors generated by wallust
 source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
 
-# blurls = waybar
-# blurls = rofi
-
 dwindle {
   pseudotile = yes
   preserve_split = yes
@@ -18,7 +15,7 @@ dwindle {
 }
 
 master {
-  new_status = master #from Hyprland >v0.41.2
+  new_status = master
   new_on_top = 1
   mfact = 0.5
 }
@@ -148,7 +145,7 @@ misc {
   enable_swallow = true
   swallow_regex = ^(kitty)$
   focus_on_activate = false
-  no_direct_scanout = true #for fullscreen games
+  #no_direct_scanout = true #for fullscreen games - deprecated
   initial_workspace_tracking = 0
   middle_click_paste = false
 }
@@ -164,9 +161,15 @@ xwayland {
   force_zero_scaling = true
 }
 
-# cursor section for Hyprland >= v0.41.0
+# render section for Hyprland >= v0.42.0
+render {
+  explicit_sync = 2
+  explicit_sync_kms = 2
+  direct_scanout = false
+}
+
 cursor {
   no_hardware_cursors = false
   enable_hyprcursor = true
-  warp_on_change_workspace = true # for -git or Hyprland >v0.41.1
+  warp_on_change_workspace = true 
 }
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 602531e1e..8aba98ba5 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -5,8 +5,8 @@
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
 
-# windowrule center
-windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol)
+# windowrule Position
+windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)
 windowrule = center,^([Ww]hatsapp-for-linux)$
 windowrule = center,^([Ff]erdium)$
 
@@ -15,6 +15,8 @@ windowrule = center,^([Ff]erdium)$
 # windowrulev2 = center,floating:1 # warning, it cause even the menu to float and center.
 windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
 windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
+windowrulev2 = move 72% 7%,title:^(Picture-in-Picture)$ 
+#windowrulev2 = move 72% 7%,title:^(Firefox)$ 
 
 # windowrule v2 to avoid idle for fullscreen apps
 windowrulev2 = idleinhibit fullscreen, class:^(*)$
@@ -25,13 +27,12 @@ windowrulev2 = idleinhibit fullscreen, fullscreen:1
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
 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 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5, class:^([Ss]team)$
 windowrulev2 = workspace 5, class:^([Ll]utris)$
-windowrulev2 = workspace 7, class:^([Dd]iscord)$
-windowrulev2 = workspace 7, class:^([Ww]ebCord)$
-windowrulev2 = workspace 7, class:^([Vv]esktop)$
+windowrulev2 = workspace 7, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
 windowrulev2 = workspace 7, class:^([Ff]erdium)$
 windowrulev2 = workspace 7, class:^([Ww]hatsapp-for-linux)$
 
@@ -48,13 +49,14 @@ windowrulev2 = float, class:(xdg-desktop-portal-gtk)
 windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
 windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
 windowrulev2 = float, class:^([Rr]ofi)$
-windowrulev2 = float, class:^(eog)$
-windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol)$
-windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct|mpv)$
+windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
+windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
+windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct)$
+windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$
 windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
 windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ # system monitor
 windowrulev2 = float, class:^(yad)$ # icon browser
-windowrulev2 = float, class:^(wihotspot-gui)$ # wifi hotspot
+windowrulev2 = float, class:^(wihotspot(-gui)?)$ # wifi hotspot
 windowrulev2 = float, class:^(evince)$ # document viewer
 windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
@@ -63,6 +65,8 @@ windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ett
 windowrulev2 = float, class:^([Qq]alculate-gtk)$
 windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = float, class:^([Ff]erdium)$
+windowrulev2 = float, title:^(Picture-in-Picture)$
+#windowrulev2 = float, title:^(Firefox)$
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
@@ -72,24 +76,22 @@ windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-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
-windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
+windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar|org.gnome.Nautilus)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
-windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor)$
+windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$
 windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
-windowrulev2 = opacity 0.9 0.8, class:^(Alacritty)$
-windowrulev2 = opacity 0.9 0.8, class:^(kitty)$
-windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
+windowrulev2 = opacity 0.9 0.8, class:^(Alacritty|kitty)$ # Terminals
 windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
 windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|yad)$
 windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
 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:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode|code-url-handler)$
 windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-.+)$ # JetBrains IDEs
 windowrulev2 = opacity 0.94 0.86, class:^([Dd]iscord|[Vv]esktop)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
-windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot-gui|org.gnome.baobab)$
+windowrulev2 = opacity 0.9 0.8, class:^(im.riot.Riot)$ # Element matrix client
+windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot(-gui)?|org.gnome.baobab)$
 windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
@@ -97,37 +99,33 @@ windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemM
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui
 windowrulev2 = opacity 0.9 0.7, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]erdium)$
+windowrulev2 = opacity 0.95 0.75, title:^(Picture-in-Picture)$
 
 # windowrule v2 - size
 windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = size 70% 70%, class:^(xdg-desktop-portal-gtk)$
 windowrulev2 = size 60% 70%, title:(Kvantum Manager)
 windowrulev2 = size 60% 70%, class:^(qt6ct)$
-windowrulev2 = size 70% 70%, class:^(evince|wihotspot-gui)$
+windowrulev2 = size 70% 70%, class:^(evince|wihotspot(-gui)?)$
 windowrulev2 = size 60% 70%, class:^(file-roller|org.gnome.FileRoller)$
 windowrulev2 = size 60% 70%, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = size 60% 70%, class:^([Ff]erdium)$
+windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$ 
+#windowrulev2 = size 25% 25%, title:^(Firefox)$ 
 
-#layerrule = unset,class:^([Rr]ofi)$
-#layerrule = blur,class:^([Rr]ofi)$
-#layerrule = ignorezero, <rofi>
-
-layerrule = ignorezero, overview
-layerrule = blur, overview
+# windowrule v2 - pinning
+windowrulev2 = pin,title:^(Picture-in-Picture)$
+#windowrulev2 = pin,title:^(Firefox)$ 
 
 #windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
 #windowrulev2 = opacity 0.8 0.8, pinned:1
 
-# Picture-in-a-Picture (PIP) rules: Oddly, some need re-duplication.  This is because the window for
-# PIP changes after on first launch, and will not inherant the rules...
-windowrulev2=opacity 0.95 0.75,title:^(Picture-in-Picture)$ # for opacity: [focus num] [bg num]
-# Interestingly, the opacity rule above doesn't need the reduplication?
-windowrulev2=pin,title:^(Picture-in-Picture)$ 
-#windowrulev2=pin,title:^(Firefox)$ 
-windowrulev2=float, title:^(Picture-in-Picture)$
-#windowrulev2=float, title:^(Firefox)$
-windowrulev2=size 25% 25%,title:^(Picture-in-Picture)$ 
-#windowrulev2=size 25% 25%,title:^(Firefox)$ 
-windowrulev2=move 72% 7%,title:^(Picture-in-Picture)$ 
-#windowrulev2=move 72% 7%,title:^(Firefox)$ 
+
+# LAYER RULES 
+#layerrule = unset,class:^([Rr]ofi)$
+#layerrule = blur,class:^([Rr]ofi)$
+#layerrule = ignorezero, <rofi>
+
+#layerrule = ignorezero, overview
+#layerrule = blur, overview
\ No newline at end of file
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index cd6046193..8864a30c5 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -2,7 +2,7 @@
 # Rofi menu for Quick Edit / View of Settings (SUPER E)
 
 # define your preferred text editor and terminal to use
-editor=nano
+editor=${EDITOR:-nano}
 tty=kitty
 
 configs="$HOME/.config/hypr/configs"
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 84f8fd7b6..cc6a57814 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Wallpaper Effects using imagemagick
+# Wallpaper Effects using ImageMagick
 # Inspiration from ML4W - Stephan Raabe https://gitlab.com/stephan-raabe/dotfiles
 
-# variables
+# Variables
 current_wallpaper="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current"
 wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
@@ -20,27 +20,26 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
 # Define ImageMagick effects
-# https://imagemagick.org/script/magick.php
-
 declare -A effects=(
-["Black & White"]="magick $current_wallpaper -colorspace gray -sigmoidal-contrast 10,40% $wallpaper_output"
-["Blurred"]="magick $current_wallpaper -blur 0x5 $wallpaper_output"
-["Solarize"]="magick $current_wallpaper -solarize 80% $wallpaper_output"
-["Sepia Tone"]="magick $current_wallpaper -sepia-tone 65% $wallpaper_output"
-["Negate"]="magick $current_wallpaper -negate $wallpaper_output"
-["Charcoal"]="magick $current_wallpaper -charcoal 0x5 $wallpaper_output"
-["Edge Detect"]="magick $current_wallpaper -edge 1 $wallpaper_output"
-["Emboss"]="magick $current_wallpaper -emboss 0x5 $wallpaper_output"
-["Sharpen"]="magick $current_wallpaper -sharpen 0x5 $wallpaper_output"
-["Oil Paint"]="magick $current_wallpaper -paint 4 $wallpaper_output"
-["Vignette"]="magick $current_wallpaper -vignette 0x5 $wallpaper_output"
-["Posterize"]="magick $current_wallpaper -posterize 4 $wallpaper_output"
-["Polaroid"]="magick $current_wallpaper -polaroid 0 $wallpaper_output"
-["No Effects"]="no-effects"
+    ["No Effects"]="no-effects"
+    ["Black & White"]="magick $current_wallpaper -colorspace gray -sigmoidal-contrast 10,40% $wallpaper_output"
+    ["Blurred"]="magick $current_wallpaper -blur 0x10 $wallpaper_output"
+    ["Charcoal"]="magick $current_wallpaper -charcoal 0x5 $wallpaper_output"
+    ["Edge Detect"]="magick $current_wallpaper -edge 1 $wallpaper_output"
+    ["Emboss"]="magick $current_wallpaper -emboss 0x5 $wallpaper_output"
+    ["Negate"]="magick $current_wallpaper -negate $wallpaper_output"
+    ["Oil Paint"]="magick $current_wallpaper -paint 4 $wallpaper_output"
+    ["Posterize"]="magick $current_wallpaper -posterize 4 $wallpaper_output"
+    ["Polaroid"]="magick $current_wallpaper -polaroid 0 $wallpaper_output"
+    ["Sepia Tone"]="magick $current_wallpaper -sepia-tone 65% $wallpaper_output"
+    ["Solarize"]="magick $current_wallpaper -solarize 80% $wallpaper_output"
+    ["Sharpen"]="magick $current_wallpaper -sharpen 0x5 $wallpaper_output"
+    ["Vignette"]="magick $current_wallpaper -vignette 0x5 $wallpaper_output"
+    ["Zoomed"]="magick $current_wallpaper -gravity Center -extent 1:1 $wallpaper_output"
 )
 
 # Function to apply no effects
-no_effects() {
+no-effects() {
     swww img -o "$focused_monitor" "$current_wallpaper" $SWWW_PARAMS &
     # Wait for swww command to complete
     wait $!
@@ -51,56 +50,52 @@ no_effects() {
     # Refresh rofi, waybar, wallust palettes
     "${SCRIPTSDIR}/Refresh.sh"
     notify-send -u low -i "$iDIR/bell.png" "No wallpaper effects"
-	
-	# copying wallpaper for rofi menu
-	cp $current_wallpaper $wallpaper_output
+    # copying wallpaper for rofi menu
+    cp "$current_wallpaper" "$wallpaper_output"
 }
 
 # Function to run rofi menu
 main() {
     # Populate rofi menu options
-    options="No Effects"
+    options=("No Effects")
     for effect in "${!effects[@]}"; do
-        if [ "$effect" != "No Effects" ]; then
-            options+="\n$effect"
-        fi
+        [[ "$effect" != "No Effects" ]] && options+=("$effect")
     done
 
-    # rofi
-    choice=$(echo -e "$options" | rofi -i -dmenu -config ~/.config/rofi/config-wallpaper-effect.rasi) 
-    if [ ! -z "$choice" ]; then
-        # Check if the choice exists in the array
-        if [[ "${effects[$choice]+exists}" ]]; then
-            if [ "$choice" == "No Effects" ]; then
-                no_effects
-            else
-                # Apply selected effect
-                notify-send -u normal -i "$iDIR/bell.png" "Applying $choice effects"
-                eval "${effects[$choice]}"
-                # Wait for effects to be applied
-                sleep 1
-                # Execute swww command after image conversion
-                swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
-                # Wait for swww command to complete
-                wait $!
-                # Run other commands after swww
-                wallust run "$wallpaper_output" -s &
-                # Wait for other commands to finish
-                wait $!
-                # Refresh rofi, waybar, wallust palettes
-                "${SCRIPTSDIR}/Refresh.sh"
-                notify-send -u low -i "$iDIR/bell.png" "$choice effects applied"
-            fi
+    # Show rofi menu and handle user choice
+    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -p "Choose effect" -i -config ~/.config/rofi/config-wallpaper-effect.rasi)
+
+    # Process user choice
+    if [[ -n "$choice" ]]; then
+        if [[ "$choice" == "No Effects" ]]; then
+            no-effects
+        elif [[ "${effects[$choice]+exists}" ]]; then
+            # Apply selected effect
+            notify-send -u normal -i "$iDIR/bell.png" "Applying $choice effects"
+            eval "${effects[$choice]}"
+            # Wait for effects to be applied
+            sleep 1
+            # Execute swww command after image conversion
+            swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
+            # Wait for swww command to complete
+            wait $!
+            # Wait for other commands to finish
+            wallust run "$wallpaper_output" -s &
+            # Wait for other commands to finish
+            wait $!
+            # Refresh rofi, waybar, wallust palettes
+            "${SCRIPTSDIR}/Refresh.sh"
+            notify-send -u low -i "$iDIR/bell.png" "$choice effects applied"
         else
-            echo "Effects not recognized."
+            echo "Effect '$choice' not recognized."
         fi
     fi
 }
 
-# Check if rofi is already running
+# Check if rofi is already running and kill it
 if pidof rofi > /dev/null; then
-  pkill rofi
-  exit 0
+    pkill rofi
+    exit 0
 fi
 
 main
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index d2ca7c28e..23c02805f 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -21,20 +21,23 @@ if pidof swaybg > /dev/null; then
   pkill swaybg
 fi
 
-# Retrieve image files
-PICS=($(find "${wallDIR}" -type f \( -iname \*.jpg -o -iname \*.jpeg -o -iname \*.png -o -iname \*.gif \)))
+# Retrieve image files using null delimiter to handle spaces in filenames
+mapfile -d '' PICS < <(find "${wallDIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" \) -print0)
+
 RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME=". random"
 
 # Rofi command
 rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
-
 # Sorting Wallpapers
 menu() {
-  sorted_options=($(printf '%s\n' "${PICS[@]}" | sort))
+  # Sort the PICS array
+  IFS=$'\n' sorted_options=($(sort <<<"${PICS[*]}"))
+  
   # Place ". random" at the beginning with the random picture as an icon
   printf "%s\x00icon\x1f%s\n" "$RANDOM_PIC_NAME" "$RANDOM_PIC"
+  
   for pic_path in "${sorted_options[@]}"; do
     pic_name=$(basename "$pic_path")
     # Displaying .gif to indicate animated images
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index 1d2ea30b3..c0a40fd71 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -63,12 +63,12 @@
 # min-max temperature
 temp_min = (
     html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
-    .eq(0)
+    .eq(1)
     .text()
 )
 temp_max = (
     html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
-    .eq(1)
+    .eq(0)
     .text()
 )
 temp_min_max = f"  {temp_min}\t\t  {temp_max}"
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 30486de28..b53c6e8cd 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -38,7 +38,7 @@ bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Eff
 bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
 
 # Waybar / Bar related
-bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar 
+bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
 bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
 bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
 
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 440ccb2f7..af56bc18b 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -60,8 +60,8 @@ label {
 # Hour-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%H")"
-#    text = cmd[update:1000] echo -e "$(date +"%I")" #AM/PM
+    text = cmd[update:1000] echo "$(date +"%H")"
+#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
     color = rgba(255, 185, 0, .6)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold 
@@ -73,7 +73,7 @@ label {
 # Minute-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%M")"
+    text = cmd[update:1000] echo "$(date +"%M")"
     color = rgba(255, 255, 255, .6)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
@@ -85,8 +85,8 @@ label {
 # Seconds-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%S")"
-#    text = cmd[update:1000] echo -e "$(date +"%S %p")" #AM/PM
+    text = cmd[update:1000] echo "$(date +"%S")"
+#    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
     color = $color12
     font_size = 40
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 28bf33abc..85e653220 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -8,7 +8,7 @@
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
-waybar_style="$HOME/.config/waybar/style/[Wallust] Box type.css"
+waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css"
 kvantum_theme="Catppuccin-Mocha"
 color_scheme="prefer-dark"
 gtk_theme="Andromeda-dark"
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 42e708964..f7a3ec082 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -26,7 +26,7 @@ done
 ags -q
 
 sleep 0.3
-# Relaunch waybar
+#Restart waybar
 waybar &
 
 # relaunch swaync
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 55bdf997f..9ef71f646 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -6,29 +6,41 @@ layout_f="$HOME/.cache/kb_layout"
 settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf"
 notif="$HOME/.config/swaync/images/bell.png"
 
+echo "Starting script..."
+
 # Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found
 if [ ! -f "$layout_f" ]; then
+  echo "Creating layout file as it does not exist..."
   default_layout=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null)
   if [ -z "$default_layout" ]; then
     default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found
   fi
   echo "$default_layout" > "$layout_f"
+  echo "Default layout set to $default_layout"
 fi
 
 current_layout=$(cat "$layout_f")
+echo "Current layout: $current_layout"
 
 # Read keyboard layout settings from Settings.conf
 if [ -f "$settings_file" ]; then
+  echo "Reading keyboard layout settings from $settings_file..."
   kb_layout_line=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2)
   IFS=',' read -ra layout_mapping <<< "$kb_layout_line"
+  echo "Available layouts: ${layout_mapping[@]}"
+else
+  echo "Settings file not found!"
+  exit 1
 fi
 
 layout_count=${#layout_mapping[@]}
+echo "Number of layouts: $layout_count"
 
 # Find the index of the current layout in the mapping
 for ((i = 0; i < layout_count; i++)); do
   if [ "$current_layout" == "${layout_mapping[i]}" ]; then
     current_index=$i
+    echo "Current layout index: $current_index"
     break
   fi
 done
@@ -36,10 +48,7 @@ done
 # Calculate the index of the next layout
 next_index=$(( (current_index + 1) % layout_count ))
 new_layout="${layout_mapping[next_index]}"
-
-# Update the keyboard layout
-hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
-echo "$new_layout" > "$layout_f"
+echo "Next layout: $new_layout"
 
 # Created by T-Crypt
 
@@ -51,7 +60,8 @@ change_layout() {
     local got_error=false
 
     while read -r name; do
-        hyprctl switchxkblayout "$name" next
+        echo "Switching layout for $name to $new_layout..."
+        hyprctl switchxkblayout "$name" "$new_layout"
         if [[ $? -eq 0 ]]; then
             echo "Switched the layout for $name."
         else
@@ -74,5 +84,8 @@ if ! change_layout; then
     exit 1
 else
     # Notification for the new keyboard layout
-	  notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+    notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+    echo "Layout change notification sent."
 fi
+
+echo "$new_layout" > "$layout_f"
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index 030298893..36cbeb101 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -24,15 +24,7 @@ menu() {
 # Apply selected configuration
 apply_config() {
     ln -sf "$waybar_layouts/$1" "$waybar_config"
-    restart_waybar_if_needed
-}
-
-# Restart Waybar
-restart_waybar_if_needed() {
-    if pgrep -x "waybar" >/dev/null; then
-        pkill waybar
-        sleep 0.1  # Delay for Waybar to completely terminate
-    fi
+    #restart_waybar_if_needed
     "${SCRIPTSDIR}/Refresh.sh" &
 }
 
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 2e994780d..95a348ba5 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -26,15 +26,6 @@ menu() {
 # Apply selected style
 apply_style() {
     ln -sf "$waybar_styles/$1.css" "$waybar_style"
-    restart_waybar_if_needed
-}
-
-# Restart Waybar if it's running
-restart_waybar_if_needed() {
-    if pgrep -x "waybar" >/dev/null; then
-        pkill waybar
-        sleep 0.1  # Delay for Waybar to completely terminate
-    fi
     "${SCRIPTSDIR}/Refresh.sh" &
 }
 
diff --git a/config/hypr/v2.3.1 b/config/hypr/v2.3.2
similarity index 100%
rename from config/hypr/v2.3.1
rename to config/hypr/v2.3.2
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 60a20bdf9..ccf60a481 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,7 +1,7 @@
-font_family     Fira Code SemiBold
-font_size 		16.0
-bold_font       auto
-italic_font      auto
+font_family Fira Code SemiBold
+font_size 16.0
+bold_font auto
+italic_font auto
 bold_italic_font auto
 
 background_opacity 0.5
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
new file mode 100644
index 000000000..861f3aee4
--- /dev/null
+++ b/config/nvim/init.lua
@@ -0,0 +1,16 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup("plugins")
+require("vim-options")
+
diff --git a/config/nvim/init.vim.txt b/config/nvim/init.vim.txt
new file mode 100644
index 000000000..2388fe287
--- /dev/null
+++ b/config/nvim/init.vim.txt
@@ -0,0 +1,45 @@
+" Basic Configurations
+" FernuDev Github - https://github.com/Fernu292
+
+set number
+set mouse=a
+syntax enable
+set showcmd
+set encoding=utf-8
+set showmatch
+set relativenumber
+
+set expandtab
+set tabstop=4
+set shiftwidth=0
+set softtabstop=0
+set autoindent
+set smarttab
+
+call plug#begin()
+	Plug 'nvim-lualine/lualine.nvim'
+	Plug 'nvim-tree/nvim-web-devicons'
+	Plug 'navarasu/onedark.nvim'
+	Plug 'catppuccin/nvim', { 'as': 'catppuccin' }
+call plug#end()
+
+" Calling the Lualine pluggin
+
+colorscheme onedark 
+
+lua << END
+require('lualine').setup {
+	options = {
+		icons_enabled = true,
+		theme = 'material'
+	}
+}
+
+require('onedark').setup {
+	style = "dark",
+	transparent = true,
+}
+
+require('onedark').load()
+
+END
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
new file mode 100644
index 000000000..b26c6d27e
--- /dev/null
+++ b/config/nvim/lazy-lock.json
@@ -0,0 +1,16 @@
+{
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "catppuccin": { "branch": "main", "commit": "894efb557728e532aa98b98029d16907a214ec05" },
+  "lazy.nvim": { "branch": "main", "commit": "dea1f687fe6e15eb3098557a69d44231ebcb6cf5" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
+  "mason.nvim": { "branch": "main", "commit": "2af3b574b68dc0273c7fb60369f3a48d5a16a857" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
+  "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" },
+  "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
+  "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }
+}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
new file mode 100644
index 000000000..a2b4f84dd
--- /dev/null
+++ b/config/nvim/lua/plugins.lua
@@ -0,0 +1,2 @@
+return {}
+
diff --git a/config/nvim/lua/plugins/alpha.lua b/config/nvim/lua/plugins/alpha.lua
new file mode 100644
index 000000000..a3346f1bd
--- /dev/null
+++ b/config/nvim/lua/plugins/alpha.lua
@@ -0,0 +1,105 @@
+--- @type LazyPluginSpec
+return {
+    "goolord/alpha-nvim",
+    event = "VimEnter",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    opts = function()
+        local dashboard = require("alpha.themes.dashboard")
+        require("alpha.term")
+        local arttoggle = false
+
+        local logo = {
+            [[                                                    ]],
+            [[ ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗ ]],
+            [[ ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║ ]],
+            [[ ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║ ]],
+            [[ ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ]],
+            [[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ]],
+            [[ ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝ ]],
+            [[                                                    ]],
+        }
+
+        local art = {
+            -- { name, width, height }
+            { "tohru", 62, 17 },
+        }
+
+        if arttoggle == true then
+            dashboard.opts.opts.noautocmd = true
+            dashboard.section.terminal.opts.redraw = true
+            local path = vim.fn.stdpath("config") .. "/assets/"
+            -- local random = math.random(1, #art)
+            local currentart = art[1]
+            dashboard.section.terminal.command = "cat " .. path .. currentart[1]
+
+            dashboard.section.terminal.width = currentart[2]
+            dashboard.section.terminal.height = currentart[3]
+
+            dashboard.opts.layout = {
+                dashboard.section.terminal,
+                { type = "padding", val = 2 },
+                dashboard.section.buttons,
+                dashboard.section.footer,
+            }
+        else
+            dashboard.section.header.val = logo
+        end
+        dashboard.section.buttons.val = {
+            dashboard.button("f", " " .. "Find files", ":Telescope find_files <CR>"),
+        }
+        for _, button in ipairs(dashboard.section.buttons.val) do
+            button.opts.hl = "AlphaButtons"
+            button.opts.hl_shortcut = "AlphaShortcut"
+        end
+        dashboard.section.header.opts.hl = "Function"
+        dashboard.section.buttons.opts.hl = "Identifier"
+        dashboard.section.footer.opts.hl = "Function"
+        dashboard.opts.layout[1].val = 4
+        return dashboard
+    end,
+    config = function(_, dashboard)
+        if vim.o.filetype == "lazy" then
+            vim.cmd.close()
+            vim.api.nvim_create_autocmd("User", {
+                pattern = "AlphaReady",
+                callback = function()
+                    require("lazy").show()
+                end,
+            })
+        end
+        require("alpha").setup(dashboard.opts)
+        vim.api.nvim_create_autocmd("User", {
+            pattern = "LazyVimStarted",
+            callback = function()
+                local v = vim.version()
+                local dev = ""
+                if v.prerelease == "dev" then
+                    dev = "-dev+" .. v.build
+                else
+                    dev = ""
+                end
+                local version = v.major .. "." .. v.minor .. "." .. v.patch .. dev
+                local stats = require("lazy").stats()
+                local plugins_count = stats.loaded .. "/" .. stats.count
+                local ms = math.floor(stats.startuptime + 0.5)
+                local time = vim.fn.strftime("%H:%M:%S")
+                local date = vim.fn.strftime("%d.%m.%Y")
+                local line1 = " " .. plugins_count .. " plugins loaded in " .. ms .. "ms"
+                local line2 = "󰃭 " .. date .. "  " .. time
+                local line3 = " " .. version
+
+                local line1_width = vim.fn.strdisplaywidth(line1)
+                local line2Padded = string.rep(" ", (line1_width - vim.fn.strdisplaywidth(line2)) / 2) .. line2
+                local line3Padded = string.rep(" ", (line1_width - vim.fn.strdisplaywidth(line3)) / 2) .. line3
+
+                dashboard.section.footer.val = {
+                    line1,
+                    line2Padded,
+                    line3Padded,
+                }
+                pcall(vim.cmd.AlphaRedraw)
+            end,
+        })
+    end,
+}
+
diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 000000000..6d05f9842
--- /dev/null
+++ b/config/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,13 @@
+return {
+    "catppuccin/nvim",
+    lazy = false,
+    name = "catppuccin",
+    priority = 1000,
+    config = function()
+        require("catppuccin").setup({
+            transparent_background = true,
+        })
+        vim.cmd.colorscheme "catppuccin"
+    end
+}
+
diff --git a/config/nvim/lua/plugins/lsp-config.lua b/config/nvim/lua/plugins/lsp-config.lua
new file mode 100644
index 000000000..f41e79845
--- /dev/null
+++ b/config/nvim/lua/plugins/lsp-config.lua
@@ -0,0 +1,25 @@
+return {
+    {
+        "williamboman/mason.nvim",
+        config = function()
+            require("mason").setup()
+        end
+    },
+    {
+        "williamboman/mason-lspconfig.nvim",
+        config = function()
+            require("mason-lspconfig").setup({
+                ensure_installed = {"lua_ls", "clangd", "cmake", "cssls", "html"}
+            })
+        end
+    },
+    {
+        "neovim/nvim-lspconfig",
+        config = function()
+            local lspconfig = require("lspconfig")
+            lspconfig.lua_ls.setup({})
+            vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
+        end
+    }
+}
+
diff --git a/config/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
new file mode 100644
index 000000000..bf5923d64
--- /dev/null
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,10 @@
+return {
+    'nvim-lualine/lualine.nvim',
+    config = function()
+        require('lualine').setup({
+            options = {
+                theme = 'dracula'
+            }
+        })
+    end
+}
diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua
new file mode 100644
index 000000000..da29ce409
--- /dev/null
+++ b/config/nvim/lua/plugins/neo-tree.lua
@@ -0,0 +1,12 @@
+return {
+    "nvim-neo-tree/neo-tree.nvim",
+    branch = "v3.x",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        "nvim-tree/nvim-web-devicons",
+        "MunifTanjim/nui.nvim",
+    },
+    config = function()
+        vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal left<CR>', {})
+    end
+}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
new file mode 100644
index 000000000..7282f2cbb
--- /dev/null
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,13 @@
+return {
+    {
+        'nvim-telescope/telescope.nvim', tag = '0.1.8',
+        dependencies = { 'nvim-lua/plenary.nvim' },
+        config = function()
+            local builtin = require("telescope.builtin")
+            vim.keymap.set('n', '<C-p>', builtin.find_files, {})
+        end
+    },
+    {
+        "nvim-telescope/telescope-ui-select.nvim"
+    }
+}
diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 000000000..200634186
--- /dev/null
+++ b/config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,12 @@
+return {
+    "nvim-treesitter/nvim-treesitter", 
+    build = ":TSUpdate",
+    config = function()
+        local configs = require("nvim-treesitter.configs")
+        configs.setup({
+            ensure_installed = {"lua", "c", "javascript"},
+            highlight = { enable = true },
+            indent = { enable = true }
+        })
+    end
+}
diff --git a/config/nvim/lua/vim-options.lua b/config/nvim/lua/vim-options.lua
new file mode 100644
index 000000000..d28b7e8fe
--- /dev/null
+++ b/config/nvim/lua/vim-options.lua
@@ -0,0 +1,15 @@
+vim.cmd("set number")
+vim.cmd("set mouse=a")
+vim.cmd("syntax enable")
+vim.cmd("set showcmd")
+vim.cmd("set encoding=utf-8")
+vim.cmd("set showmatch")
+vim.cmd("set relativenumber")
+vim.cmd("set expandtab")
+vim.cmd("set tabstop=4")
+vim.cmd("set shiftwidth=0")
+vim.cmd("set softtabstop=0")
+vim.cmd("set autoindent")
+vim.cmd("set smarttab")
+vim.keymap.set('n', '<C-h>', '<C-w>h', {})
+vim.keymap.set('n', '<C-l>', '<C-w>l',{})
diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi
index bd5948c90..d9b27d6b1 100644
--- a/config/rofi/config-wallpaper-effect.rasi
+++ b/config/rofi/config-wallpaper-effect.rasi
@@ -18,7 +18,7 @@ window {
 listview {
   fixed-columns: false;
   colums: 2;
-  lines: 7;
+  lines: 8;
 }
 
 /* ---- Inputbar ---- */
diff --git a/config/wallust/templates/colors-kitty.conf b/config/wallust/templates/colors-kitty.conf
index ab207635b..17a0fdff9 100644
--- a/config/wallust/templates/colors-kitty.conf
+++ b/config/wallust/templates/colors-kitty.conf
@@ -1,7 +1,7 @@
-font_family     Fira Code SemiBold
-font_size 		16.0
-bold_font       auto
-italic_font      auto
+font_family Fira Code SemiBold
+font_size 16.0
+bold_font auto
+italic_font auto
 bold_italic_font auto
 
 background_opacity 0.5
diff --git a/config/waybar/modules b/config/waybar/modules
index 3132cc469..57393c082 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -707,7 +707,7 @@
 	"exec": "checkupdates | wc -l",
 	"exec-if": "[[ $(checkupdates | wc -l) ]]",
 	"interval": 15,
-	"on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
+	"on-click": "if command -v paru &> /dev/null; then kitty -T update paru -Syu; else kitty -T update yay -Syu; fi && notify-send 'The system has been updated'",
 	"tooltip": true,
 	"tooltip-format": "Left Click: Update System\nArch Linux Only",
 },
diff --git a/copy.sh b/copy.sh
index 506551d41..609d09d7e 100755
--- a/copy.sh
+++ b/copy.sh
@@ -4,7 +4,7 @@
 clear
 
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
-waybar_style="$HOME/.config/waybar/style/[Wallust] Box type.css"
+waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css"
 waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v3"
 waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" 
 
@@ -47,17 +47,22 @@ LOG="Copy-Logs/install-$(date +%d-%H%M%S)_dotfiles.log"
 # update home folders
 xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true
 
-# uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected
+# setting up for nvidia
 if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then
-  echo "Nvidia GPU detected. Setting up proper env's" 2>&1 | tee -a "$LOG" || true
+  echo "Nvidia GPU detected. Setting up proper env's and configs" 2>&1 | tee -a "$LOG" || true
   sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf
-  sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf  
+  sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf
+  # enabling no hardware cursors if nvidia detected
+  sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf  
+  # disabling explicit sync for nvidia for now (Hyprland 0.42.0)
+  sed -i 's/  explicit_sync = 2/  explicit_sync = 0/' config/hypr/UserConfigs/UserSettings.conf
 fi
 
 # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected
 if hostnamectl | grep -q 'Chassis: vm'; then
   echo "System is running in a virtual machine." 2>&1 | tee -a "$LOG" || true
+  # enabling no hardware cursors if VM detected
   sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf
   sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf
   sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf
@@ -218,11 +223,11 @@ while true; do
     sed -i 's#^    "format": "{:%a %d | %H:%M}", // 24H#    \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG"
             
     # for hyprlock
-    sed -i 's/^    text = cmd\[update:1000\] echo -e "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
-    sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/    text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+    sed -i 's/^    text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+    sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/    text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
 
-    sed -i 's/^    text = cmd\[update:1000\] echo -e "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
-    sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%S %p")" #AM\/PM/    text = cmd\[update:1000\] echo -e "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+    sed -i 's/^    text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+    sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/    text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
 
     # for SDDM (simple-sddm)
     sddm_folder="/usr/share/sddm/themes/simple-sddm"
@@ -257,9 +262,9 @@ done
 
 printf "\n"
 
-# Action to do for better rofi appearance
+# Action to do for better rofi and kitty appearance
 while true; do
-  echo "$ORANGE Select monitor resolution for better Rofi appearance:"
+  echo "$ORANGE Select monitor resolution for better Rofi and kitty appearance:"
   echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)"
   echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)"
   read -p "$CAT Enter the number of your choice: " choice
@@ -280,13 +285,16 @@ while true; do
 done
 
 # Use the selected resolution in your existing script
-echo "You chose $resolution resolution for better Rofi appearance." 2>&1 | tee -a "$LOG"
+echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG"
 
 # Add your commands based on the resolution choice
 if [ "$resolution" == "≤ 1080p" ]; then
-    cp -r config/rofi/resolution/1080p/* config/rofi/
+  cp -r config/rofi/resolution/1080p/* config/rofi/
+  sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf
+  sed -i 's/font_size 16.0/font_size 12.0/' config/wallust/templates/colors-kitty.conf
+
 elif [ "$resolution" == "≥ 1440p" ]; then
-    cp -r config/rofi/resolution/1440p/* config/rofi/
+  cp -r config/rofi/resolution/1440p/* config/rofi/
 fi
 
 printf "\n%.0s" {1..2}
@@ -326,7 +334,7 @@ get_backup_dirname() {
   echo "back-up_${timestamp}"
 }
 
-for DIR in ags btop cava fastfetch hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync wallust waybar wlogout; do 
+for DIR in ags btop cava fastfetch hypr kitty Kvantum nvim qt5ct qt6ct rofi swappy swaync wallust waybar wlogout; do 
   DIRPATH=~/.config/"$DIR"
   if [ -d "$DIRPATH" ]; then 
     echo -e "${NOTE} - Config for $DIR found, attempting to back up."
diff --git a/upgrade.sh b/upgrade.sh
index b287c0238..296978203 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -28,6 +28,7 @@ declare -A directories=(
     ["config/hypr/"]="$HOME/.config/hypr/"
     ["config/kitty/"]="$HOME/.config/kitty/"
     ["config/Kvantum/"]="$HOME/.config/Kvantum/"
+    ["config/nvim/"]="$HOME/.config/nvim/"
     ["config/qt5ct/"]="$HOME/.config/qt5ct"
     ["config/qt6ct/"]="$HOME/.config/qt6ct/"
     ["config/rofi/"]="$HOME/.config/rofi/"