diff --git a/config/hypr/hypridle.conf/hypridle.conf b/config/hypr/hypridle.conf
similarity index 100%
rename from config/hypr/hypridle.conf/hypridle.conf
rename to config/hypr/hypridle.conf
diff --git a/config/hypr/hyprland.conf/hyprland.conf b/config/hypr/hyprland.conf
similarity index 100%
rename from config/hypr/hyprland.conf/hyprland.conf
rename to config/hypr/hyprland.conf
diff --git a/config/hypr/hyprlock.conf/hyprlock.conf b/config/hypr/hyprlock.conf
similarity index 100%
rename from config/hypr/hyprlock.conf/hyprlock.conf
rename to config/hypr/hyprlock.conf
diff --git a/config/hypr/scripts/scripts/change-wallpaper.sh b/config/hypr/scripts/change-wallpaper.sh
similarity index 100%
rename from config/hypr/scripts/scripts/change-wallpaper.sh
rename to config/hypr/scripts/change-wallpaper.sh
diff --git a/config/hypr/scripts/scripts/clipboard-menu.sh b/config/hypr/scripts/clipboard-menu.sh
similarity index 100%
rename from config/hypr/scripts/scripts/clipboard-menu.sh
rename to config/hypr/scripts/clipboard-menu.sh
diff --git a/config/hypr/scripts/scripts/color-picker.sh b/config/hypr/scripts/color-picker.sh
similarity index 100%
rename from config/hypr/scripts/scripts/color-picker.sh
rename to config/hypr/scripts/color-picker.sh
diff --git a/config/hypr/scripts/scripts/exec.sh b/config/hypr/scripts/exec.sh
similarity index 100%
rename from config/hypr/scripts/scripts/exec.sh
rename to config/hypr/scripts/exec.sh
diff --git a/config/hypr/scripts/scripts/gen-pywal.sh b/config/hypr/scripts/gen-pywal.sh
similarity index 100%
rename from config/hypr/scripts/scripts/gen-pywal.sh
rename to config/hypr/scripts/gen-pywal.sh
diff --git a/config/hypr/scripts/scripts/get-dmenu.sh b/config/hypr/scripts/get-dmenu.sh
similarity index 100%
rename from config/hypr/scripts/scripts/get-dmenu.sh
rename to config/hypr/scripts/get-dmenu.sh
diff --git a/config/hypr/scripts/scripts/load-hyprsunset.sh b/config/hypr/scripts/load-hyprsunset.sh
similarity index 100%
rename from config/hypr/scripts/scripts/load-hyprsunset.sh
rename to config/hypr/scripts/load-hyprsunset.sh
diff --git a/config/hypr/scripts/scripts/save-hyprsunset.sh b/config/hypr/scripts/save-hyprsunset.sh
similarity index 100%
rename from config/hypr/scripts/scripts/save-hyprsunset.sh
rename to config/hypr/scripts/save-hyprsunset.sh
diff --git a/config/hypr/scripts/scripts/screenshot.sh b/config/hypr/scripts/screenshot.sh
similarity index 100%
rename from config/hypr/scripts/scripts/screenshot.sh
rename to config/hypr/scripts/screenshot.sh
diff --git a/config/hypr/shell/shell/autostart.conf b/config/hypr/shell/autostart.conf
similarity index 100%
rename from config/hypr/shell/shell/autostart.conf
rename to config/hypr/shell/autostart.conf
diff --git a/config/hypr/shell/shell/bindings.conf b/config/hypr/shell/bindings.conf
similarity index 100%
rename from config/hypr/shell/shell/bindings.conf
rename to config/hypr/shell/bindings.conf
diff --git a/config/hypr/shell/shell/decorations.conf b/config/hypr/shell/decorations.conf
similarity index 100%
rename from config/hypr/shell/shell/decorations.conf
rename to config/hypr/shell/decorations.conf
diff --git a/config/hypr/shell/shell/environment.conf b/config/hypr/shell/environment.conf
similarity index 100%
rename from config/hypr/shell/shell/environment.conf
rename to config/hypr/shell/environment.conf
diff --git a/config/hypr/shell/shell/hyprland.conf b/config/hypr/shell/hyprland.conf
similarity index 100%
rename from config/hypr/shell/shell/hyprland.conf
rename to config/hypr/shell/hyprland.conf
diff --git a/config/hypr/shell/shell/layout.conf b/config/hypr/shell/layout.conf
similarity index 100%
rename from config/hypr/shell/shell/layout.conf
rename to config/hypr/shell/layout.conf
diff --git a/config/hypr/shell/shell/rules.conf b/config/hypr/shell/rules.conf
similarity index 100%
rename from config/hypr/shell/shell/rules.conf
rename to config/hypr/shell/rules.conf
diff --git a/config/hypr/shell/shell/variables.conf b/config/hypr/shell/variables.conf
similarity index 100%
rename from config/hypr/shell/shell/variables.conf
rename to config/hypr/shell/variables.conf
diff --git a/config/hypr/user/autostart.conf b/config/hypr/user/autostart.conf
new file mode 100644
index 0000000..c50f3c7
--- /dev/null
+++ b/config/hypr/user/autostart.conf
@@ -0,0 +1,6 @@
+
+###############
+## AUTOSTART ##
+###############
+# Wiki: https://wiki.hyprland.org/Configuring/Keywords/#executing
+
diff --git a/config/hypr/user/bindings.conf b/config/hypr/user/bindings.conf
new file mode 100644
index 0000000..61daad4
--- /dev/null
+++ b/config/hypr/user/bindings.conf
@@ -0,0 +1,8 @@
+##############
+## BINDINGS ##
+##############
+# Wiki: https://wiki.hyprland.org/Configuring/Binds
+
+
+# Uncomment if you want to press SUPER to launch application search
+# bind = $mainMod, $mainMod_L, exec, astal toggle apps-window
diff --git a/config/hypr/user/decorations.conf b/config/hypr/user/decorations.conf
new file mode 100644
index 0000000..5600fee
--- /dev/null
+++ b/config/hypr/user/decorations.conf
@@ -0,0 +1,6 @@
+################
+## DECORATION ##
+################
+# Wiki: https://wiki.hyprland.org/Configuring/Variables
+
+
diff --git a/config/hypr/user/environment.conf b/config/hypr/user/environment.conf
new file mode 100644
index 0000000..e7e2aa0
--- /dev/null
+++ b/config/hypr/user/environment.conf
@@ -0,0 +1,6 @@
+#################
+## ENVIRONMENT ##
+#################
+# Wiki: https://wiki.hyprland.org/Configuring/Keywords/#setting-the-environment
+
+
diff --git a/config/hypr/user/hyprland.conf b/config/hypr/user/hyprland.conf
new file mode 100644
index 0000000..13dee9d
--- /dev/null
+++ b/config/hypr/user/hyprland.conf
@@ -0,0 +1,15 @@
+
+########################
+## USER CONFIGURATION ##
+########################
+
+# This sources all user configuration files
+
+source = ./monitors.conf
+source = ./environment.conf
+source = ./input.conf
+source = ./bindings.conf
+source = ./layout.conf
+source = ./decorations.conf
+source = ./autostart.conf
+source = ./rules.conf
diff --git a/config/hypr/user/input.conf b/config/hypr/user/input.conf
new file mode 100644
index 0000000..9f43fa2
--- /dev/null
+++ b/config/hypr/user/input.conf
@@ -0,0 +1,13 @@
+###########
+## INPUT ##
+###########
+
+# Wiki: https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs
+
+
+##############
+## GESTURES ##
+##############
+
+# Wiki: https://wiki.hyprland.org/Configuring/Variables/#gestures
+
diff --git a/config/hypr/user/layout.conf b/config/hypr/user/layout.conf
new file mode 100644
index 0000000..8d1b881
--- /dev/null
+++ b/config/hypr/user/layout.conf
@@ -0,0 +1,4 @@
+############
+## LAYOUT ##
+############
+# Wiki: https://wiki.hyprland.org/Configuring/Dwindle-Layout/#config
diff --git a/config/hypr/user/monitors.conf b/config/hypr/user/monitors.conf
new file mode 100644
index 0000000..d355322
--- /dev/null
+++ b/config/hypr/user/monitors.conf
@@ -0,0 +1,17 @@
+##############
+## MONITORS ##
+##############
+
+# Wiki: https://wiki.hyprland.org/Configuring/Monitors
+
+
+# Monitor
+# arg0 -> monitor name(you can get monitor names with `hyprctl monitors`);
+# arg1 -> resolution@hertz;
+# arg2 -> positioning from the top-left corner;
+# arg3 -> scaling;
+# arg4 -> variable refresh rate(optional);
+# - arg40 -> 1: vrr, 0: no vrr.
+
+# Example configuration:
+# monitor = HDMI-A-1, 1920x1080@60, 0x0, 1, vrr, 0
diff --git a/config/hypr/user/rules.conf b/config/hypr/user/rules.conf
new file mode 100644
index 0000000..2dd99a6
--- /dev/null
+++ b/config/hypr/user/rules.conf
@@ -0,0 +1,8 @@
+
+############################
+##  WINDOW & LAYER RULES  ##
+############################
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules for
+# more information on how to do this
+
diff --git a/config/kitty/kitty.conf/kitty.conf b/config/kitty/kitty.conf
similarity index 100%
rename from config/kitty/kitty.conf/kitty.conf
rename to config/kitty/kitty.conf
diff --git a/config/kitty/user.conf b/config/kitty/user.conf
new file mode 100644
index 0000000..060ca57
--- /dev/null
+++ b/config/kitty/user.conf
@@ -0,0 +1,2 @@
+# User configuration
+# Add your settings for kitty here
diff --git a/update-repo.sh b/update-repo.sh
index 9fbb589..30177cc 100644
--- a/update-repo.sh
+++ b/update-repo.sh
@@ -19,10 +19,11 @@ Clean_local() {
 }
 
 Update_local() {
+    mkdir -p $outdir
     for dir in ${config_dirs[@]}; do
         if [[ -d "$XDG_CONFIG_HOME/$dir" ]] || [[ -f "$XDG_CONFIG_HOME/$dir" ]]; then 
             Send_log "Copying ${dir^}"
-            mkdir -p $outdir/$dir
+            mkdir -p `dirname "$outdir/$dir"`
             cp -r $XDG_CONFIG_HOME/$dir $outdir/$dir
         else
             Send_log "warn" "Looks like the ${dir^} dir is in fault! Skipping..."