diff --git a/.gitignore b/.gitignore
index ea1472e..95563ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-output/
+chroots/
diff --git a/make-os b/make-os
index 2128277..a6953f5 100755
--- a/make-os
+++ b/make-os
@@ -1,54 +1,71 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
-if
-	if [ "$1" = "" ]; then
-		echo "Define i386/amd64 as the first argument."
-		exit 1
-	fi
-	cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
-	source shell
-	source "env-$1"
-	#export OPUS_IMAGEDIR="/media/zram/$1"
-	export OPUS_IMAGEDIR="$OPUS_OUTPUT/$1"
-	make-base "$OPUS_IMAGEDIR" # Base image
+cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
+source shell
+source "env-$1"
+
+(
+	set -e
+	# export OPUS_OUTPUT="/media/zram"
+	export OPUS_IMAGEDIR_BASE="$OPUS_OUTPUT/$1/base"
+	export OPUS_IMAGEDIR_FINAL="$OPUS_OUTPUT/$1/final"
 	export OPUS_PACKAGES=""
+	export OPUS_PACKAGES_INTERACTIVE=""
 	export OPUS_PACKAGES_DL=""
 	export OPUS_PACKAGES_REMOVE=""
 	
 	# Base
-	source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/oobe" "$OPUS_IMAGEDIR"
+	if [ -d "$OPUS_IMAGEDIR_BASE-tmp" ]; then
+		rm -f -r "$OPUS_IMAGEDIR_BASE-tmp"
+	fi
 	
-	# Base - Hardware
-	source apply-mod "$OPUS_HOME/input/kernel" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/firmware-free" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/grub" "$OPUS_IMAGEDIR"
+	if ! [ -d "$OPUS_IMAGEDIR_BASE" ]; then
+		mkdir -p "$OPUS_IMAGEDIR_BASE-tmp"
+		make-base "$OPUS_IMAGEDIR_BASE-tmp" # Base image
+		source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR_BASE-tmp"
+		mv "$OPUS_IMAGEDIR_BASE-tmp" "$OPUS_IMAGEDIR_BASE"
+	fi
 	
-	# Graphical
-	source apply-mod "$OPUS_HOME/input/packages-graphical" "$OPUS_IMAGEDIR"
+	if [ -d "$OPUS_IMAGEDIR_FINAL-tmp" ]; then
+		rm -f -r "$OPUS_IMAGEDIR_FINAL-tmp"
+	fi
 	
-	# Overrides
-	source apply-mod "$OPUS_HOME/input/hostname" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/user-config" "$OPUS_IMAGEDIR"
+	if ! [ -d "$OPUS_IMAGEDIR_FINAL" ]; then
+		echo "Copying base image ..."
+		cp -a "$OPUS_IMAGEDIR_BASE" "$OPUS_IMAGEDIR_FINAL-tmp"
+		# Hardware
+		source apply-mod "$OPUS_HOME/mods/kernel" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/firmware-free" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/grub" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Graphical
+		source apply-mod "$OPUS_HOME/mods/packages-graphical" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Overrides
+		source apply-mod "$OPUS_HOME/mods/hostname" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Raw image
+		# source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
+		
+		# Packages
+		source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/packages-apply" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Extra
+		source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp"
+		mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL"
+	fi
 	
-	# Raw image
-	source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
-	
-	# Packages
-	source apply-mod "$OPUS_HOME/input/fast-dpkg" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/packages-apply" "$OPUS_IMAGEDIR"
-	
-	# Extra
-	source apply-mod "$OPUS_HOME/input/clean-logs" "$OPUS_IMAGEDIR"
-	
-	make-image "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image
-then
+	echo ""
+	echo "Done."
+	#make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
+)
+if [ $? != 0 ]; then
 	set +e
-else
-	set +e
-	echo 
-	echo Script execution ended due to error. Cleaning up...
+	echo "Script execution ended due to error. Cleaning up..."
 	fchroot-end "$OPUS_IMAGEDIR"
-	rm -r "$OPUS_IMAGEDIR"
-	echo Script execution ended due to error.
+	echo "Script execution ended due to error."
+	exit 1
 fi
\ No newline at end of file
diff --git a/make-os-proprietary b/make-os-proprietary
index 21e7725..c6b8a6d 100755
--- a/make-os-proprietary
+++ b/make-os-proprietary
@@ -1,56 +1,72 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
-if
-	if [ "$1" = "" ]; then
-		echo "Define i386/amd64 as the first argument."
-		exit 1
-	fi
-	cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
-	source shell
-	source "env-$1"
-	source "env-proprietary"
-	#export OPUS_IMAGEDIR="/media/zram/$1"
-	export OPUS_IMAGEDIR="$OPUS_OUTPUT/$1"
-	make-base "$OPUS_IMAGEDIR" # Base image
+cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
+source shell
+source "env-$1"
+
+(
+	set -e
+	# export OPUS_OUTPUT="/media/zram"
+	export OPUS_IMAGEDIR_BASE="$OPUS_OUTPUT/$1/base"
+	export OPUS_IMAGEDIR_FINAL="$OPUS_OUTPUT/$1/final"
 	export OPUS_PACKAGES=""
+	export OPUS_PACKAGES_INTERACTIVE=""
 	export OPUS_PACKAGES_DL=""
 	export OPUS_PACKAGES_REMOVE=""
 	
 	# Base
-	source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/oobe" "$OPUS_IMAGEDIR"
+	if [ -d "$OPUS_IMAGEDIR_BASE-tmp" ]; then
+		rm -f -r "$OPUS_IMAGEDIR_BASE-tmp"
+	fi
 	
-	# Base - Hardware
-	source apply-mod "$OPUS_HOME/input/kernel" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/firmware-free" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/firmware-proprietary" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/grub" "$OPUS_IMAGEDIR"
+	if ! [ -d "$OPUS_IMAGEDIR_BASE" ]; then
+		mkdir -p "$OPUS_IMAGEDIR_BASE-tmp"
+		make-base "$OPUS_IMAGEDIR_BASE-tmp" # Base image
+		source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR_BASE-tmp"
+		mv "$OPUS_IMAGEDIR_BASE-tmp" "$OPUS_IMAGEDIR_BASE"
+	fi
 	
-	# Graphical
-	source apply-mod "$OPUS_HOME/input/packages-graphical" "$OPUS_IMAGEDIR"
+	if [ -d "$OPUS_IMAGEDIR_FINAL-tmp" ]; then
+		rm -f -r "$OPUS_IMAGEDIR_FINAL-tmp"
+	fi
 	
-	# Overrides
-	source apply-mod "$OPUS_HOME/input/hostname" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/user-config" "$OPUS_IMAGEDIR"
+	if ! [ -d "$OPUS_IMAGEDIR_FINAL" ]; then
+		echo "Copying base image ..."
+		cp -a "$OPUS_IMAGEDIR_BASE" "$OPUS_IMAGEDIR_FINAL-tmp"
+		# Hardware
+		source apply-mod "$OPUS_HOME/mods/kernel" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/firmware-free" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/firmware-proprietary" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/grub" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Graphical
+		source apply-mod "$OPUS_HOME/mods/packages-graphical" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Overrides
+		source apply-mod "$OPUS_HOME/mods/hostname" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Raw image
+		# source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
+		
+		# Packages
+		source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/packages-apply" "$OPUS_IMAGEDIR_FINAL-tmp"
+		
+		# Extra
+		source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp"
+		source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp"
+		mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL"
+	fi
 	
-	# Raw image
-	source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
-	
-	# Packages
-	source apply-mod "$OPUS_HOME/input/fast-dpkg" "$OPUS_IMAGEDIR"
-	source apply-mod "$OPUS_HOME/input/packages-apply" "$OPUS_IMAGEDIR"
-	
-	# Extra
-	source apply-mod "$OPUS_HOME/input/clean-logs" "$OPUS_IMAGEDIR"
-	
-	make-image "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image
-then
+	echo ""
+	echo "Done."
+	#make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
+)
+if [ $? != 0 ]; then
 	set +e
-else
-	set +e
-	echo 
-	echo Script execution ended due to error. Cleaning up...
+	echo "Script execution ended due to error. Cleaning up..."
 	fchroot-end "$OPUS_IMAGEDIR"
-	rm -r "$OPUS_IMAGEDIR"
-	echo Script execution ended due to error.
+	echo "Script execution ended due to error."
+	exit 1
 fi
\ No newline at end of file
diff --git a/input/clean-logs/modscript b/mods/clean-logs/modscript
similarity index 62%
rename from input/clean-logs/modscript
rename to mods/clean-logs/modscript
index 900bd3e..c6207bb 100755
--- a/input/clean-logs/modscript
+++ b/mods/clean-logs/modscript
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 find "$1/var/log" -type f -delete
\ No newline at end of file
diff --git a/input/fast-dpkg/data/etc/dpkg/dpkg.cfg.d/force-unsafe-io b/mods/fast-dpkg/data/etc/dpkg/dpkg.cfg.d/force-unsafe-io
similarity index 100%
rename from input/fast-dpkg/data/etc/dpkg/dpkg.cfg.d/force-unsafe-io
rename to mods/fast-dpkg/data/etc/dpkg/dpkg.cfg.d/force-unsafe-io
diff --git a/input/firmware-free/modscript b/mods/firmware-free/modscript
similarity index 79%
rename from input/firmware-free/modscript
rename to mods/firmware-free/modscript
index f85ba59..f8ee996 100755
--- a/input/firmware-free/modscript
+++ b/mods/firmware-free/modscript
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 export OPUS_PACKAGES="$OPUS_PACKAGES firmware-linux-free firmware-ath9k-htc"
\ No newline at end of file
diff --git a/input/firmware-proprietary/modscript b/mods/firmware-proprietary/modscript
similarity index 60%
rename from input/firmware-proprietary/modscript
rename to mods/firmware-proprietary/modscript
index 357451f..e04aac2 100755
--- a/input/firmware-proprietary/modscript
+++ b/mods/firmware-proprietary/modscript
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 function sfp {
 	packages=""
 	while read p; do
@@ -7,6 +7,7 @@ function sfp {
 			packages="$packages ${packageinfo[0]}"
 		fi
 	done <<<$(apt-cache search "$1")
-	echo $packages
+	echo "${packages//"firmware-ipw2x00"/""}"
 }
-export OPUS_PACKAGES="$OPUS_PACKAGES firmware-linux firmware-misc-nonfree $(sfp wireless) $(sfp wifi) $(sfp net)"
\ No newline at end of file
+export OPUS_PACKAGES="$OPUS_PACKAGES firmware-linux firmware-misc-nonfree $(sfp wireless) $(sfp wifi) $(sfp net)"
+export OPUS_PACKAGES_INTERACTIVE="$OPUS_PACKAGES_INTERACTIVE firmware-ipw2x00"
\ No newline at end of file
diff --git a/input/grub/modscript b/mods/grub/modscript
similarity index 68%
rename from input/grub/modscript
rename to mods/grub/modscript
index 3b274a9..9eb0f19 100755
--- a/input/grub/modscript
+++ b/mods/grub/modscript
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 export OPUS_PACKAGES="$OPUS_PACKAGES grub2"
\ No newline at end of file
diff --git a/input/hostname/modscript b/mods/hostname/modscript
similarity index 74%
rename from input/hostname/modscript
rename to mods/hostname/modscript
index 78e6420..58cb955 100755
--- a/input/hostname/modscript
+++ b/mods/hostname/modscript
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 echo $(head -c4 </dev/urandom|xxd -p -u) >"$1/etc/hostname"
\ No newline at end of file
diff --git a/input/image-raw/data/isRawImage b/mods/image-raw/data/isRawImage
similarity index 100%
rename from input/image-raw/data/isRawImage
rename to mods/image-raw/data/isRawImage
diff --git a/input/image-raw/data/setupdisk b/mods/image-raw/data/setupdisk
similarity index 100%
rename from input/image-raw/data/setupdisk
rename to mods/image-raw/data/setupdisk
diff --git a/input/image-raw/setup b/mods/image-raw/modscript
similarity index 64%
rename from input/image-raw/setup
rename to mods/image-raw/modscript
index 7985bac..c9d96d7 100755
--- a/input/image-raw/setup
+++ b/mods/image-raw/modscript
@@ -1,3 +1,2 @@
-#!/usr/bin/env bash
-set -e
+#!/bin/bash
 export OPUS_PACKAGES="$OPUS_PACKAGES cloud-utils"
\ No newline at end of file
diff --git a/input/kernel/modscript b/mods/kernel/modscript
similarity index 100%
rename from input/kernel/modscript
rename to mods/kernel/modscript
diff --git a/input/oobe/data/bin/login b/mods/oobe/data/bin/login
similarity index 100%
rename from input/oobe/data/bin/login
rename to mods/oobe/data/bin/login
diff --git a/input/oobe/modscript b/mods/oobe/modscript
similarity index 90%
rename from input/oobe/modscript
rename to mods/oobe/modscript
index 6f08123..43af6cd 100755
--- a/input/oobe/modscript
+++ b/mods/oobe/modscript
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 export OPUS_PACKAGES="$OPUS_PACKAGES sudo keyboard-configuration network-manager python3 cloud-utils ecryptfs-utils rsync lsof"
 export OPUS_PACKAGES_DL="$OPUS_PACKAGES console-setup locales tzdata"
\ No newline at end of file
diff --git a/input/packages-apply/data/chroot b/mods/packages-apply/data/chroot
similarity index 59%
rename from input/packages-apply/data/chroot
rename to mods/packages-apply/data/chroot
index f51b928..1b541f8 100755
--- a/input/packages-apply/data/chroot
+++ b/mods/packages-apply/data/chroot
@@ -1,7 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
 apt -y update
 apt -y upgrade
+DEBIAN_FRONTEND="noninteractive"
 apt -y install $OPUS_PACKAGES
 apt -y install --download-only $OPUS_PACKAGES_DL
+unset DEBIAN_FRONTEND
+apt -y install $OPUS_PACKAGES_INTERACTIVE
 apt -y remove $OPUS_PACKAGES_REMOVE
 apt -y autoclean
\ No newline at end of file
diff --git a/input/packages-graphical/data/etc/skel/.bash_profile b/mods/packages-graphical/data/etc/skel/.bash_profile
similarity index 100%
rename from input/packages-graphical/data/etc/skel/.bash_profile
rename to mods/packages-graphical/data/etc/skel/.bash_profile
diff --git a/input/packages-graphical/data/usr/bin/opus-dvn_lock b/mods/packages-graphical/data/usr/bin/opus-dvn_lock
similarity index 100%
rename from input/packages-graphical/data/usr/bin/opus-dvn_lock
rename to mods/packages-graphical/data/usr/bin/opus-dvn_lock
diff --git a/input/packages-graphical/modscript b/mods/packages-graphical/modscript
similarity index 94%
rename from input/packages-graphical/modscript
rename to mods/packages-graphical/modscript
index 15b4fb5..91a1dec 100755
--- a/input/packages-graphical/modscript
+++ b/mods/packages-graphical/modscript
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 export OPUS_PACKAGES="$OPUS_PACKAGES xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse network-manager-gnome xfce4-terminal xfce4-screenshooter mousepad netsurf-gtk xautolock xsecurelock qt5-style-plugins alsa-utils synaptic epiphany-browser"
 export OPUS_PACKAGES_REMOVE="$OPUS_PACKAGES_REMOVE xscreensaver"
\ No newline at end of file
diff --git a/input/sources/modscript b/mods/sources/modscript
similarity index 70%
rename from input/sources/modscript
rename to mods/sources/modscript
index 5277047..d5ac719 100755
--- a/input/sources/modscript
+++ b/mods/sources/modscript
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 echo "$OPUS_SOURCES" >"$1/etc/apt/sources.list"
\ No newline at end of file
diff --git a/input/user-config/data/etc/skel/.config/Mousepad/accels.scm b/mods/user-config/data/etc/skel/.config/Mousepad/accels.scm
similarity index 100%
rename from input/user-config/data/etc/skel/.config/Mousepad/accels.scm
rename to mods/user-config/data/etc/skel/.config/Mousepad/accels.scm
diff --git a/input/user-config/data/etc/skel/.config/Thunar/accels.scm b/mods/user-config/data/etc/skel/.config/Thunar/accels.scm
similarity index 100%
rename from input/user-config/data/etc/skel/.config/Thunar/accels.scm
rename to mods/user-config/data/etc/skel/.config/Thunar/accels.scm
diff --git a/input/user-config/data/etc/skel/.config/Thunar/uca.xml b/mods/user-config/data/etc/skel/.config/Thunar/uca.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/Thunar/uca.xml
rename to mods/user-config/data/etc/skel/.config/Thunar/uca.xml
diff --git a/input/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop b/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop
rename to mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop
diff --git a/input/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop b/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop
rename to mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop
diff --git a/input/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop b/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop
rename to mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop
diff --git a/input/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop b/mods/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop
rename to mods/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop
diff --git a/input/user-config/data/etc/skel/.config/autostart/lockscreen.desktop b/mods/user-config/data/etc/skel/.config/autostart/lockscreen.desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/lockscreen.desktop
rename to mods/user-config/data/etc/skel/.config/autostart/lockscreen.desktop
diff --git a/input/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop b/mods/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop
similarity index 100%
rename from input/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop
rename to mods/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop
diff --git a/input/user-config/data/etc/skel/.config/dconf/user b/mods/user-config/data/etc/skel/.config/dconf/user
similarity index 100%
rename from input/user-config/data/etc/skel/.config/dconf/user
rename to mods/user-config/data/etc/skel/.config/dconf/user
diff --git a/input/user-config/data/etc/skel/.config/user-dirs.dirs b/mods/user-config/data/etc/skel/.config/user-dirs.dirs
similarity index 100%
rename from input/user-config/data/etc/skel/.config/user-dirs.dirs
rename to mods/user-config/data/etc/skel/.config/user-dirs.dirs
diff --git a/input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc b/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc
rename to mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc
diff --git a/input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc b/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc
rename to mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc
diff --git a/input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc b/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc
rename to mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc
diff --git a/input/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc b/mods/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
rename to mods/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
diff --git a/input/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm b/mods/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm
rename to mods/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm
diff --git a/input/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc b/mods/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc
rename to mods/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from input/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/input/user-config/data/etc/skel/.xsessionrc b/mods/user-config/data/etc/skel/.xsessionrc
similarity index 100%
rename from input/user-config/data/etc/skel/.xsessionrc
rename to mods/user-config/data/etc/skel/.xsessionrc
diff --git a/input/user-config/data/etc/skel/Desktop/.opus-placeholder b/mods/user-config/data/etc/skel/Desktop/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Desktop/.opus-placeholder
rename to mods/user-config/data/etc/skel/Desktop/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Documents/.opus-placeholder b/mods/user-config/data/etc/skel/Documents/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Documents/.opus-placeholder
rename to mods/user-config/data/etc/skel/Documents/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Downloads/.opus-placeholder b/mods/user-config/data/etc/skel/Downloads/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Downloads/.opus-placeholder
rename to mods/user-config/data/etc/skel/Downloads/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Music/.opus-placeholder b/mods/user-config/data/etc/skel/Music/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Music/.opus-placeholder
rename to mods/user-config/data/etc/skel/Music/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Pictures/.opus-placeholder b/mods/user-config/data/etc/skel/Pictures/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Pictures/.opus-placeholder
rename to mods/user-config/data/etc/skel/Pictures/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Public/.opus-placeholder b/mods/user-config/data/etc/skel/Public/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Public/.opus-placeholder
rename to mods/user-config/data/etc/skel/Public/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Templates/.opus-placeholder b/mods/user-config/data/etc/skel/Templates/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Templates/.opus-placeholder
rename to mods/user-config/data/etc/skel/Templates/.opus-placeholder
diff --git a/input/user-config/data/etc/skel/Videos/.opus-placeholder b/mods/user-config/data/etc/skel/Videos/.opus-placeholder
similarity index 100%
rename from input/user-config/data/etc/skel/Videos/.opus-placeholder
rename to mods/user-config/data/etc/skel/Videos/.opus-placeholder
diff --git a/output/placeholder b/output/placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/path/make-image-gz b/path/make-image-gz
new file mode 100755
index 0000000..11fdd3b
--- /dev/null
+++ b/path/make-image-gz
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -e
+cd "$OPUS_IMAGEDIR"
+tar -czvf "$2"
\ No newline at end of file
diff --git a/path/make-image b/path/make-image-raw
similarity index 100%
rename from path/make-image
rename to path/make-image-raw
diff --git a/shell b/shell
index 9a9de8a..39c1bb9 100644
--- a/shell
+++ b/shell
@@ -1,9 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
+set -e
+alias cp="cp --reflink=auto"
 export OPUS_NAME="opus-dvn"
 export OPUS_HOME="$(dirname "$(realpath -s "$BASH_SOURCE")")"
 export PATH="$OPUS_HOME/path:$PATH"
 export OPUS_PID="$BASHPID"
-export OPUS_OUTPUT="$OPUS_HOME/output"
+export OPUS_OUTPUT="$OPUS_HOME/chroots"
 export OPUS_URL="http://deb.devuan.org/merged"
 export OPUS_DIST="chimaera"
 export OPUS_SOURCES="deb http://deb.devuan.org/merged $OPUS_DIST main
@@ -17,7 +19,6 @@ deb http://pkgmaster.devuan.org/merged $OPUS_DIST-security main
 # deb http://deb.devuan.org/merged $OPUS_DIST-updates main
 # deb-src http://deb.devuan.org/merged $OPUS_DIST-updates main
 "
-#export DEBIAN_FRONTEND="noninteractive"
 export PS1="\[\033[0;35m\]\$OPUS_NAME \$OPUS_ARCH \[\033[0m\]- \[\033[0;37m\]\$PWD\[\033[0m\]: "
 env
 echo ""