diff --git a/pre-inst.sh b/pre-inst.sh
index 72de033..ad2db2a 100755
--- a/pre-inst.sh
+++ b/pre-inst.sh
@@ -122,9 +122,11 @@ mkdir \
 	/mnt/run/lock
 
 if [[ "${ID}" == 'elementary' ]]; then
-	"${BASEDIR}/base-elementary.sh" -1
+	"${baseDir}/elementary.sh" --mmdebstrap
 elif [[ "${ID}" == 'debian' ]]; then
-	"${BASEDIR}/base-debian.sh" -1
+	"${baseDir}/debian.sh" --mmdebstrap
+elif [[ "${ID}" == 'fedora' ]]; then
+	"${baseDir}/fedora.sh" --rsync
 fi
 
 printf \
@@ -134,13 +136,13 @@ printf \
 	"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null
 
 if [[ "${ID}" == 'debian' ]]; then
-	"${BASEDIR}/base-debian.sh" -2
+	"${baseDir}/debian.sh" --network-interfaces
 fi
 
 if [[ "${ID}" == 'elementary' ]]; then
-	"${BASEDIR}/base-elementary.sh" -2
+	"${baseDir}/elementary.sh" --sources
 elif [[ "${ID}" == 'debian' ]]; then
-	"${BASEDIR}/base-debian.sh" -3
+	"${baseDir}/debian.sh" --sources
 fi
 
 mount \
@@ -163,27 +165,27 @@ cp \
 	/mnt/etc/
 
 if [[ "${ID}" == 'fedora' ]]; then
-	"${BASEDIR}/base-fedora.sh" -2
+	"${baseDir}/fedora.sh" --resolv-conf
 fi
 
 rsync -pogAXtlHrDx \
-	"${BASEDIR}" \
+	"${baseDir}" \
 		/mnt
 
 if [[ "${ID}" == 'elementary' ]]; then
-	"${BASEDIR}/base-elementary.sh" -3
+	"${baseDir}/elementary.sh" --skel
 fi
 
 # if [[ ! "${*}" = *--no-part* ]]; then
-	if [[ -f "/etc/zfs/keys/${HOSTNAME,,}.key" ]]; then
+	if [[ -f "/etc/zfs/keys/${hostname,,}.key" ]]; then
 		cp \
-			/etc/zfs/keys/${HOSTNAME,,}.key \
+			/etc/zfs/keys/${hostname,,}.key \
 			/mnt/etc/zfs/keys/
 	fi
 # fi
 
 if [[ "${ID}" == 'elementary' ]]; then
-	"${BASEDIR}/base-elementary.sh" -4
+	"${baseDir}/elementary.sh" --elementary
 fi
 
 printf \