diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
similarity index 88%
rename from config/hypr/configs/ENVariables.conf
rename to config/hypr/UserConfigs/ENVariables.conf
index 4437c64..031acae 100644
--- a/config/hypr/configs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -20,9 +20,9 @@ env = MOZ_ENABLE_WAYLAND,1
 
 # NVIDIA 
 # This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected
-#env = WLR_NO_HARDWARE_CURSORS,1
-#env = LIBVA_DRIVER_NAME,nvidia 
-#env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+env = WLR_NO_HARDWARE_CURSORS,1
+env = LIBVA_DRIVER_NAME,nvidia 
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = GBM_BACKEND,nvidia-drm 
 
 #env = __NV_PRIME_RENDER_OFFLOAD,1 
diff --git a/config/hypr/configs/LaptopDisplay.conf b/config/hypr/UserConfigs/LaptopDisplay.conf
similarity index 100%
rename from config/hypr/configs/LaptopDisplay.conf
rename to config/hypr/UserConfigs/LaptopDisplay.conf
diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
similarity index 94%
rename from config/hypr/configs/Laptops.conf
rename to config/hypr/UserConfigs/Laptops.conf
index 1704732..0a12d7f 100644
--- a/config/hypr/configs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -2,7 +2,9 @@
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
 # These configs are mostly for laptops. This is addemdum to Keybinds.conf
+
 $configs = $HOME/.config/hypr/configs
+$UserConfigs = $HOME/.config/hypr/UserConfigs
 $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
 
@@ -37,9 +39,9 @@ bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in
 # NOTE: Display for laptop are being generated into LaptopDisplay.conf
 # This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc
 
-#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $configs/LaptopDisplay.conf
-#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $configs/LaptopDisplay.conf
+#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $UserConfigs/LaptopDisplay.conf
+#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $UserConfigs/LaptopDisplay.conf
 
 # for laptop-lid action (to erase the last entry)
-#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/configs/LaptopDisplay.conf
+#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
 ##############################################################################
diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
similarity index 100%
rename from config/hypr/configs/Monitors.conf
rename to config/hypr/UserConfigs/Monitors.conf
diff --git a/config/hypr/configs/Execs.conf b/config/hypr/UserConfigs/Startup_Apps.conf
similarity index 94%
rename from config/hypr/configs/Execs.conf
rename to config/hypr/UserConfigs/Startup_Apps.conf
index ef5b8ad..6593268 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -2,6 +2,7 @@
 #Commands & Apps to be executed at launch
 
 $scriptsDir = $HOME/.config/hypr/scripts
+$UserscriptsDir = $HOME/.config/hypr/UserScripts
 $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $scriptsDir/WallpaperRandom.sh
 $WallpaperPath = $HOME/Pictures/wallpapers
@@ -33,7 +34,7 @@ exec-once = wl-paste --type text --watch cliphist store
 exec-once = wl-paste --type image --watch cliphist store
 
 # Rainbow borders
-exec-once = $scriptsDir/RainbowBorders.sh
+exec-once = $UserscriptsDir/RainbowBorders.sh
 
 # sway-idle with lock only
 exec-once = swayidle -w timeout 900 '$lock'
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
new file mode 100644
index 0000000..f55f0d5
--- /dev/null
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -0,0 +1,29 @@
+## /* ---- 💫 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
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables
+# See also Laptops.conf for laptops keybinds 
+
+$mainMod = SUPER
+$files = thunar
+$term = kitty
+$scriptsDir = $HOME/.config/hypr/scripts
+$UserScripts = $HOME/.config/hypr/UserScripts
+
+# rofi App launcher
+bindr = $mainMod, $mainMod_L, 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
+
+bind = $mainMod, Return, exec, $term  # Launch terminal
+bind = $mainMod, T, exec, $files
+
+# User Added Keybinds
+bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
+
+# For passthrough keyboard into a VM
+# bind = $mainMod ALT, P, submap, passthru
+#submap = passthru
+# to unbind
+#bind = $mainMod ALT, P, submap, reset
+#submap = reset
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
new file mode 100644
index 0000000..338658a
--- /dev/null
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -0,0 +1,145 @@
+## /* ---- 💫 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
+
+# Sourcing colors generated by pywal
+source = $HOME/.cache/wal/colors-hyprland
+# blurls = waybar
+# blurls = rofi
+
+dwindle {
+  pseudotile = yes
+  preserve_split = yes
+  special_scale_factor = 0.8
+}
+
+master {
+  new_is_master=1
+  new_on_top=1
+  mfact = 0.5
+}
+
+general {
+  sensitivity=1.00
+  apply_sens_to_raw=1
+  gaps_in = 4
+  gaps_out = 8
+  border_size = 2
+  resize_on_border = true
+   
+  col.active_border = $color0 $color2 $color4 $color6 $color8 90deg
+  col.inactive_border = $backgroundCol
+
+  layout = master
+}
+
+group {
+  col.border_active = $color15
+
+	groupbar {
+	col.active = $color0
+  }
+}
+
+decoration {
+  rounding = 8
+         
+  active_opacity = 1.0
+  inactive_opacity = 0.9
+  fullscreen_opacity = 1.0
+
+  dim_inactive = true
+  dim_strength = 0.1
+
+  drop_shadow=true
+  shadow_range=6
+  shadow_render_power = 1
+  col.shadow = $color2
+  col.shadow_inactive = 0x50000000
+
+  blur {
+  enabled = true	
+  size = 5
+  passes = 2
+  ignore_opacity = true
+  new_optimizations = true
+  }
+}
+    
+animations {
+  enabled = yes
+
+  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+  bezier = linear, 0.0, 0.0, 1.0, 1.0
+  bezier = wind, 0.05, 0.9, 0.1, 1.05
+  bezier = winIn, 0.1, 1.1, 0.1, 1.1
+  bezier = winOut, 0.3, -0.3, 0, 1
+  bezier = slow, 0, 0.85, 0.3, 1
+  bezier = overshot, 0.7, 0.6, 0.1, 1.1
+  bezier = bounce, 1.1, 1.6, 0.1, 0.85
+  bezier = sligshot, 1, -1, 0.15, 1.25
+  bezier = nice, 0, 6.9, 0.5, -4.20
+  
+  animation = windowsIn, 1, 5, slow, popin
+  animation = windowsOut, 1, 5, winOut, popin
+  animation = windowsMove, 1, 5, wind, slide
+  animation = border, 1, 10, linear
+  animation = borderangle, 1, 180, linear, loop 
+  animation = fade, 1, 5, overshot
+  animation = workspaces, 1, 5, wind
+  animation = windows, 1, 5, bounce, popin
+}
+
+input {
+  kb_layout=us
+  kb_variant=
+  kb_model=
+  kb_options=grp:alt_shift_toggle
+  kb_rules=
+  repeat_rate=50
+  repeat_delay=300
+  numlock_by_default=1
+  left_handed=0
+  follow_mouse=1
+  float_switch_override_focus=0
+
+  touchpad {
+    disable_while_typing=1
+    natural_scroll=0 
+    clickfinger_behavior=0
+    middle_button_emulation=1
+    tap-to-click=1
+    drag_lock=0
+          }
+}
+
+gestures {
+  workspace_swipe=1
+  workspace_swipe_fingers=3
+  workspace_swipe_distance=400
+  workspace_swipe_invert=1
+  workspace_swipe_min_speed_to_force=30
+  workspace_swipe_cancel_ratio=0.5
+  workspace_swipe_create_new=1 
+  workspace_swipe_forever=1
+}
+
+misc {
+  disable_hyprland_logo = true
+  disable_splash_rendering = true
+  mouse_move_enables_dpms = true
+  #vrr = 0
+  enable_swallow = true
+  no_direct_scanout = true #for fullscreen games
+  focus_on_activate = false
+  swallow_regex = ^(kitty)$
+  #disable_autoreload = true
+}
+
+binds {
+  workspace_back_and_forth=1
+  allow_workspace_cycles=1
+  pass_mouse_when_bound=0
+}
diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
similarity index 100%
rename from config/hypr/configs/WindowRules.conf
rename to config/hypr/UserConfigs/WindowRules.conf
diff --git a/config/hypr/scripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh
similarity index 100%
rename from config/hypr/scripts/RainbowBorders.sh
rename to config/hypr/UserScripts/RainbowBorders.sh
diff --git a/config/hypr/scripts/Weather.py b/config/hypr/UserScripts/Weather.py
similarity index 100%
rename from config/hypr/scripts/Weather.py
rename to config/hypr/UserScripts/Weather.py
diff --git a/config/hypr/scripts/Weather.sh b/config/hypr/UserScripts/Weather.sh
similarity index 100%
rename from config/hypr/scripts/Weather.sh
rename to config/hypr/UserScripts/Weather.sh
diff --git a/config/hypr/scripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
similarity index 100%
rename from config/hypr/scripts/ZshChangeTheme.sh
rename to config/hypr/UserScripts/ZshChangeTheme.sh
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index c36c080..84b78cf 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -1,25 +1,15 @@
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Default Keybinds
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables
-# See also Laptops.conf for laptops keybinds 
 $mainMod = SUPER
-$files = thunar
-$browser = firefox
-$term = kitty
 $scriptsDir = $HOME/.config/hypr/scripts
 
-# rofi App launcher
-bindr = $mainMod, $mainMod_L, 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
-
-bind = $mainMod, Return, exec, $term  # Launch terminal
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, Q, closewindow, 
 bind = $mainMod SHIFT, F, togglefloating,
 bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat
 bind = $mainMod, F, fullscreen
 bind = $mainMod, Q, killactive,
-bind = $mainMod, T, exec, $files
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
 bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
 
@@ -36,10 +26,6 @@ bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwi
 bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
 bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel
 
-
-# MISC (Miscellaneous Keybinds)
-bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
-
 # Wallpaper related keybinds
 bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply
 bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers
@@ -61,7 +47,7 @@ bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 
 # group
 bind = $mainMod, G, togglegroup
-bind = ALT, tab, changegroupactive  # change focus to another window  
+bind = ALT, tab, changegroupactive  #change focus to another window  
 
 # Special Keys / Hot Keys
 bind = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
@@ -164,11 +150,3 @@ bind = $mainMod, comma, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
-
-
-# For passthrough keyboard into a VM
-# bind = $mainMod ALT, P, submap, passthru
-#submap = passthru
-# to unbind
-#bind = $mainMod ALT, P, submap, reset
-#submap = reset
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 7db5911..e990101 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -1,143 +1,7 @@
 ## /* ---- 💫 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
 
-# Sourcing colors generated by pywal
-source = $HOME/.cache/wal/colors-hyprland
-# blurls = waybar
-# blurls = rofi
 
-dwindle {
-  pseudotile = yes
-  preserve_split = yes
-  special_scale_factor = 0.8
-}
 
-master {
-  new_is_master=1
-  new_on_top=1
-  mfact = 0.5
-}
-
-general {
-  sensitivity=1.00
-  apply_sens_to_raw=1
-  gaps_in = 4
-  gaps_out = 8
-  border_size = 2
-  resize_on_border = true
-   
-  col.active_border = $color0 $color2 $color4 $color6 $color8 90deg
-  col.inactive_border = $backgroundCol
-
-  layout = master
-}
-
-group {
-  col.border_active = $color15
-
-	groupbar {
-	col.active = $color0
-  }
-}
-
-decoration {
-  rounding = 8
-         
-  active_opacity = 1.0
-  inactive_opacity = 0.9
-  fullscreen_opacity = 1.0
-
-  dim_inactive = true
-  dim_strength = 0.1
-
-  drop_shadow=true
-  shadow_range=6
-  shadow_render_power = 1
-  col.shadow = $color2
-  col.shadow_inactive = 0x50000000
-
-  blur {
-  enabled = true	
-  size = 5
-  passes = 2
-  ignore_opacity = true
-  new_optimizations = true
-  }
-}
-    
-animations {
-  enabled = yes
-
-  bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-  bezier = linear, 0.0, 0.0, 1.0, 1.0
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = slow, 0, 0.85, 0.3, 1
-  bezier = overshot, 0.7, 0.6, 0.1, 1.1
-  bezier = bounce, 1.1, 1.6, 0.1, 0.85
-  bezier = sligshot, 1, -1, 0.15, 1.25
-  bezier = nice, 0, 6.9, 0.5, -4.20
-  
-  animation = windowsIn, 1, 5, slow, popin
-  animation = windowsOut, 1, 5, winOut, popin
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 10, linear
-  animation = borderangle, 1, 180, linear, loop 
-  animation = fade, 1, 5, overshot
-  animation = workspaces, 1, 5, wind
-  animation = windows, 1, 5, bounce, popin
-}
-
-input {
-  kb_layout=us
-  kb_variant=
-  kb_model=
-  kb_options=grp:alt_shift_toggle
-  kb_rules=
-  repeat_rate=50
-  repeat_delay=300
-  numlock_by_default=1
-  left_handed=0
-  follow_mouse=1
-  float_switch_override_focus=0
-
-  touchpad {
-    disable_while_typing=1
-    natural_scroll=0 
-    clickfinger_behavior=0
-    middle_button_emulation=1
-    tap-to-click=1
-    drag_lock=0
-          }
-}
-
-gestures {
-  workspace_swipe=1
-  workspace_swipe_fingers=3
-  workspace_swipe_distance=400
-  workspace_swipe_invert=1
-  workspace_swipe_min_speed_to_force=30
-  workspace_swipe_cancel_ratio=0.5
-  workspace_swipe_create_new=1 
-  workspace_swipe_forever=1
-}
-
-misc {
-  disable_hyprland_logo = true
-  disable_splash_rendering = true
-  mouse_move_enables_dpms = true
-  #vrr = 0
-  enable_swallow = true
-  no_direct_scanout = true #for fullscreen games
-  focus_on_activate = false
-  swallow_regex = ^(kitty)$
-  #disable_autoreload = true
-}
-
-binds {
-  workspace_back_and_forth=1
-  allow_workspace_cycles=1
-  pass_mouse_when_bound=0
-}
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index c09e6f7..4fd65aa 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,17 +1,23 @@
 # Sourcing external config files
+
+###### Default Configs
 $configs = $HOME/.config/hypr/configs
 
-source=$configs/ENVariables.conf
-source=$configs/Execs.conf
 source=$configs/Keybinds.conf
-source=$configs/Laptops.conf
-source=$configs/LaptopDisplay.conf
-source=$configs/Monitors.conf
-source=$configs/WindowRules.conf
 source=$configs/Settings.conf
 
 
+#### User Configs
+$UserConfigs = $HOME/.config/hypr/UserConfigs
 
+source= $UserConfigs/Startup_Apps.conf
+source= $UserConfigs/ENVariables.conf
+source= $UserConfigs/UserKeybinds.conf
+source= $UserConfigs/UserSettings.conf
+source= $UserConfigs/Monitors.conf
+source= $UserConfigs/Laptops.conf
+source= $UserConfigs/LaptopDisplay.conf
+source= $UserConfigs/WindowRules.conf
 
 
 
diff --git a/config/hypr/scripts/QuickEdit.sh b/config/hypr/scripts/QuickEdit.sh
index 7e9d67f..9c7cdff 100755
--- a/config/hypr/scripts/QuickEdit.sh
+++ b/config/hypr/scripts/QuickEdit.sh
@@ -1,40 +1,49 @@
 #!/bin/bash
 
-hyprDir="$HOME/.config/hypr/configs"
+defaultDir="$HOME/.config/hypr/configs"
+userDir="$HOME/.config/hypr/UserConfigs"
 
 menu(){
   printf "1. view Env-variables\n"
-  printf "2. view Rules\n"
-  printf "3. view Execs (startup)\n"
-  printf "4. view KeyBinds\n"
+  printf "2. view Window-Rules\n"
+  printf "3. view Startup_Apps\n"
+  printf "4. view User-Keybinds\n"
   printf "5. view Monitors\n"
   printf "6. view Laptop-Keybinds\n"
-  printf "7. view Hyprland-Settings\n"
+  printf "7. view User-Settings\n"
+  printf "8. view Default-Settings\n"
+  printf "9. view Default-Keybinds\n"
 }
 
 main() {
     choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
-            kitty -e nano "$hyprDir/ENVariables.conf"
+            kitty -e nano "$userDir/ENVariables.conf"
             ;;
         2)
-            kitty -e nano "$hyprDir/WindowRules.conf"
+            kitty -e nano "$userDir/WindowRules.conf"
             ;;
         3)
-            kitty -e nano "$hyprDir/Execs.conf"
+            kitty -e nano "$userDir/Startup_Apps.conf"
             ;;
         4)
-            kitty -e nano "$hyprDir/Keybinds.conf"
+            kitty -e nano "$userDir/UserKeybinds.conf"
             ;;
         5)
-            kitty -e nano "$hyprDir/Monitors.conf"
+            kitty -e nano "$userDir/Monitors.conf"
             ;;
         6)
-            kitty -e nano "$hyprDir/Laptops.conf"
+            kitty -e nano "$userDir/Laptops.conf"
             ;;
         7)
-            kitty -e nano "$hyprDir/Settings.conf"
+            kitty -e nano "$userDir/UserSettings.conf"
+            ;;
+        8)
+            kitty -e nano "$defaultDir/Settings.conf"
+            ;;
+        9)
+            kitty -e nano "$defaultDir/Keybinds.conf"
             ;;
         *)
             ;;
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 52f7e64..b5e0f55 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -1,6 +1,16 @@
 #!/usr/bin/env bash
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
+UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts
+
+# Define file_exists function
+file_exists() {
+    if [ -e "$1" ]; then
+        return 0  # File exists
+    else
+        return 1  # File does not exist
+    fi
+}
 
 # Kill already running processes
 _ps=(waybar rofi swaync)
@@ -18,9 +28,13 @@ waybar &
 sleep 0.5
 swaync > /dev/null 2>&1 &
 
-# Relaunching rainbow borders
+# Relaunching rainbow borders if the script exists
 sleep 1
-${SCRIPTSDIR}/RainbowBorders.sh &
+if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then
+    ${UserSCRIPTSDIR}/RainbowBorders.sh &
+fi
 
 # for cava-pywal (note, need to manually restart cava once wallpaper changes)
-ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true
\ No newline at end of file
+ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true
+
+exit 0
\ No newline at end of file
diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh
index dc99b62..be06167 100755
--- a/config/hypr/scripts/RefreshNoWaybar.sh
+++ b/config/hypr/scripts/RefreshNoWaybar.sh
@@ -5,6 +5,16 @@
 # Modified inorder to refresh rofi background, Pywal
 
 SCRIPTSDIR=$HOME/.config/hypr/scripts
+UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts
+
+# Define file_exists function
+file_exists() {
+    if [ -e "$1" ]; then
+        return 0  # File exists
+    else
+        return 1  # File does not exist
+    fi
+}
 
 # Kill already running processes
 _ps=(rofi)
@@ -17,10 +27,13 @@ done
 # Pywal refresh
 ${SCRIPTSDIR}/PywalSwww.sh &
 
-
-# Relaunching rainbow borders
+# Relaunching rainbow borders if the script exists
 sleep 1
-${SCRIPTSDIR}/RainbowBorders.sh &
+if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then
+    ${UserSCRIPTSDIR}/RainbowBorders.sh &
+fi
 
 # for cava-pywal (note, need to manually restart cava once wallpaper changes)
-ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true
\ No newline at end of file
+ln -sf "$HOME/.cache/wal/cava-colors" "$HOME/.config/cava/config" || true
+
+exit 0
\ No newline at end of file
diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi
index 308ff85..b5b4559 100644
--- a/config/rofi/config-compact.rasi
+++ b/config/rofi/config-compact.rasi
@@ -115,7 +115,7 @@ listview {
 	spacing:                     4px;
 	dynamic:                     true;
 	cycle:                       true;
-	scrollbar:                   false;
+	scrollbar:                   true;
 	layout:                      vertical;
 	reverse:                     false;
 	fixed-height:                true;
diff --git a/config/rofi/resolution/1080p/config-compact.rasi b/config/rofi/resolution/1080p/config-compact.rasi
index 308ff85..b5b4559 100644
--- a/config/rofi/resolution/1080p/config-compact.rasi
+++ b/config/rofi/resolution/1080p/config-compact.rasi
@@ -115,7 +115,7 @@ listview {
 	spacing:                     4px;
 	dynamic:                     true;
 	cycle:                       true;
-	scrollbar:                   false;
+	scrollbar:                   true;
 	layout:                      vertical;
 	reverse:                     false;
 	fixed-height:                true;
diff --git a/config/rofi/resolution/1440p/config-compact.rasi b/config/rofi/resolution/1440p/config-compact.rasi
index 0dd5fe5..029fdbd 100644
--- a/config/rofi/resolution/1440p/config-compact.rasi
+++ b/config/rofi/resolution/1440p/config-compact.rasi
@@ -115,7 +115,7 @@ listview {
 	spacing:                     4px;
 	dynamic:                     true;
 	cycle:                       true;
-	scrollbar:                   false;
+	scrollbar:                   true;
 	layout:                      vertical;
 	reverse:                     false;
 	fixed-height:                true;
diff --git a/copy.sh b/copy.sh
index 612b60e..8b5f454 100755
--- a/copy.sh
+++ b/copy.sh
@@ -4,6 +4,7 @@
 clear
 
 wallpaper=$HOME/Pictures/wallpapers/Cute-Cat_ja.jpg
+Waybar_Style="$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css"
 
 # Check if running as root. If root, script will exit
 if [[ $EUID -eq 0 ]]; then
@@ -36,17 +37,17 @@ xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true
 # uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected
 if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then
   # NVIDIA GPU detected, uncomment line 23 in ENVariables.conf
-  sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/configs/ENVariables.conf
-  sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/configs/ENVariables.conf
-  sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/configs/ENVariables.conf
+  sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf
+  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
 fi
 
 # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected
 if hostnamectl | grep -q 'Chassis: vm'; then
   echo "This script is running in a virtual machine."
-  sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/configs/ENVariables.conf
-  sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/configs/ENVariables.conf
-  sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/configs/Monitors.conf
+  sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.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
 fi
 
 # Preparing hyprland.conf to check for current keyboard layout
@@ -98,8 +99,8 @@ while true; do
     case $confirm in
         [yY])
             # If the detected layout is correct, update the 'kb_layout=' line in the file
-            awk -v layout="$layout" '/kb_layout/ {$0 = "  kb_layout=" layout} 1' config/hypr/configs/Settings.conf > temp.conf
-            mv temp.conf config/hypr/configs/Settings.conf
+            awk -v layout="$layout" '/kb_layout/ {$0 = "  kb_layout=" layout} 1' config/hypr/UserConfigs/Settings.conf > temp.conf
+            mv temp.conf config/hypr/UserConfigs/Settings.conf
             break ;;
         [nN])
             printf "\n%.0s" {1..2}
@@ -111,8 +112,8 @@ while true; do
             printf "\n%.0s" {1..2}
             read -p "${CAT} - Please enter the correct keyboard layout: " new_layout
             # Update the 'kb_layout=' line with the correct layout in the file
-            awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout=" new_layout} 1' config/hypr/configs/Settings.conf > temp.conf
-            mv temp.conf config/hypr/configs/Settings.conf
+            awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout=" new_layout} 1' config/hypr/UserConfigs/Settings.conf > temp.conf
+            mv temp.conf config/hypr/UserConfigs/Settings.conf
             break ;;
         *)
             echo "Please enter either 'y' or 'n'." ;;
@@ -166,7 +167,7 @@ get_backup_dirname() {
   echo "back-up_${timestamp}"
 }
 
-for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaylock wal waybar wlogout; do 
+for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync swaylock wal waybar wlogout; do 
   DIRPATH=~/.config/"$DIR"
   if [ -d "$DIRPATH" ]; then 
     echo -e "${NOTE} - Config for $DIR found, attempting to back up."
@@ -198,7 +199,7 @@ cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ER
  
 # Set some files as executable
 chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG"
-
+chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG"
 # Set executable for initial-boot.sh
 chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG"
 
@@ -252,7 +253,7 @@ else
 fi
 
 # symlinks for waybar style
-ln -sf "$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" "$HOME/.config/waybar/style.css" && \
+ln -sf $Waybar_Style "$HOME/.config/waybar/style.css" && \
 
 # initialize pywal to avoid config error on hyprland
 wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG"