diff --git a/README.md b/README.md
index d6a5606..a77a5e0 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,8 @@ cd archinstall
 $EDITOR config
 ./install.sh
 ```
+
+## Extend
+If you want to extend this script, simply place your own commands in a `.sh`
+file in `modules/{prechroot,chroot,chroot/user}` respectively depending on when
+you need it to be executed.
diff --git a/install.sh b/install.sh
index 8875772..f9172ee 100755
--- a/install.sh
+++ b/install.sh
@@ -4,5 +4,4 @@ set -a
 . ./config
 set +a
 
-# cp chroot?
 bash ./modules/"$install_type".sh
diff --git a/modules/base.sh b/modules/base.sh
index fff815b..cbd4866 100644
--- a/modules/base.sh
+++ b/modules/base.sh
@@ -1,14 +1,23 @@
 #!/bin/bash
 #shellcheck disable=SC2154
 
-for i in modules/00-prechroot/*.sh; do
+cp ./modules/chroot/ /mnt/
+for i in *.sh; do
     bash -x "$i"
 done
 
-for i in modules/10-chroot/*.sh; do
-    arch-chroot /mnt/ bash -x "$i"
+(cd ./modules/ || exit
+    for i in ./chroot/*.sh; do
+        arch-chroot /mnt/ bash -x "/$i"
+    done
+
+    for i in ./chroot/user/*.sh; do
+        arch-chroot /mnt/ sudo -u "$username" bash -x "/$i"
+    done
+)
+
+for i in ./modules/postchroot/*.sh; do
+    bash -x "$i"
 done
 
-for i in modules/20-user/*.sh; do
-    arch-chroot /mnt/ sudo -u "$username" bash -x "$i"
-done
+rm -rf /mnt/chroot/
diff --git a/modules/10-chroot/00-bootstrap.sh b/modules/chroot/00-bootstrap.sh
similarity index 100%
rename from modules/10-chroot/00-bootstrap.sh
rename to modules/chroot/00-bootstrap.sh
diff --git a/modules/10-chroot/10-bootloader.sh b/modules/chroot/10-bootloader.sh
similarity index 100%
rename from modules/10-chroot/10-bootloader.sh
rename to modules/chroot/10-bootloader.sh
diff --git a/modules/10-chroot/20-users.sh b/modules/chroot/20-users.sh
similarity index 100%
rename from modules/10-chroot/20-users.sh
rename to modules/chroot/20-users.sh
diff --git a/modules/10-chroot/30-services.sh b/modules/chroot/30-services.sh
similarity index 100%
rename from modules/10-chroot/30-services.sh
rename to modules/chroot/30-services.sh
diff --git a/modules/10-chroot/40-flatpak.sh b/modules/chroot/40-flatpak.sh
similarity index 100%
rename from modules/10-chroot/40-flatpak.sh
rename to modules/chroot/40-flatpak.sh
diff --git a/modules/chroot/50-dwm.sh.dwm b/modules/chroot/50-dwm.sh.dwm
new file mode 100644
index 0000000..f0cf5a3
--- /dev/null
+++ b/modules/chroot/50-dwm.sh.dwm
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git clone --depth 1 https://git.maby.dev/ange/.dotfiles.git /tmp/dotfiles
+/dotfiles/.config/suckless/update.sh
diff --git a/modules/20-user/10-services.sh b/modules/chroot/user/10-services.sh
similarity index 100%
rename from modules/20-user/10-services.sh
rename to modules/chroot/user/10-services.sh
diff --git a/modules/20-user/20-dotfiles.sh b/modules/chroot/user/20-dotfiles.sh
similarity index 100%
rename from modules/20-user/20-dotfiles.sh
rename to modules/chroot/user/20-dotfiles.sh
diff --git a/modules/desktop.sh b/modules/desktop.sh
index 2afffd0..89a6d53 100644
--- a/modules/desktop.sh
+++ b/modules/desktop.sh
@@ -40,6 +40,5 @@ case "$(lspci | grep 'VGA\|3D')" in
     *) ;;
 esac
 
+find ./modules/ -name '*.sh.desktop' -exec rename '.desktop' '' '{}' +
 bash ./modules/base.sh
-
-xdg-user-dirs-update
diff --git a/modules/dwm.sh b/modules/dwm.sh
index df4d6e4..6934320 100644
--- a/modules/dwm.sh
+++ b/modules/dwm.sh
@@ -22,7 +22,5 @@ case "$(lsmod)" in
         ;;
 esac
 
+find ./modules/ -name '*.sh.dwm' -exec rename '.dwm' '' '{}' +
 bash ./modules/desktop.sh
-
-git clone --depth 1 https://git.maby.dev/ange/.dotfiles.git dotfiles
-arch-chroot /mnt/ bash -x ./dotfiles/.config/suckless/update.sh
diff --git a/modules/00-prechroot/99-done.sh b/modules/postchroot/99-done.sh
similarity index 100%
rename from modules/00-prechroot/99-done.sh
rename to modules/postchroot/99-done.sh
diff --git a/modules/00-prechroot/10-disk.sh b/modules/prechroot/10-disk.sh
similarity index 92%
rename from modules/00-prechroot/10-disk.sh
rename to modules/prechroot/10-disk.sh
index e6dccac..d77e7d2 100644
--- a/modules/00-prechroot/10-disk.sh
+++ b/modules/prechroot/10-disk.sh
@@ -10,7 +10,7 @@ boot=/dev/disk/by-partlabel/boot
 root=/dev/disk/by-partlabel/root
 
 [ -n "$disk_passwd" ] && {
-    echo -n "$disk_passwd" | cryptsetup luksFormat "$root" -
+    echo -n - "$disk_passwd" | cryptsetup luksFormat "$root" -
     cryptsetup open "$root" cryptroot - <<< "$disk_passwd"
     root=/dev/mapper/cryptroot
 }
diff --git a/modules/00-prechroot/20-pkg.sh b/modules/prechroot/20-pkg.sh
similarity index 100%
rename from modules/00-prechroot/20-pkg.sh
rename to modules/prechroot/20-pkg.sh