diff --git a/install.sh b/install.sh
index 3c6493c..287bf8c 100755
--- a/install.sh
+++ b/install.sh
@@ -31,14 +31,11 @@ source \
 
 if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
 	if [[ "${disk}" == **/dev/nvme** ]]; then
-		part1='p1'
 		part2='p2'
 	else
-		part1='1'
 		part2='2'
 	fi
 else
-	part1='-part1'
 	part2='-part2'
 fi
 
diff --git a/partition.sh b/partition.sh
index 149e4f5..0291bee 100755
--- a/partition.sh
+++ b/partition.sh
@@ -8,60 +8,71 @@ source \
 source \
 	"${BASEDIR}/system.conf"
 
-if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${disk}" == **/dev/nvme** ]]; then
-		part3='p3'
+
+if [[ "${1}" == '--disk' ]]; then
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+		if [[ "${disk}" == **/dev/nvme** ]]; then
+			part3='p3'
+		else
+			part3='3'
+		fi
 	else
-		part3='3'
+		part3='-part3'
 	fi
-else
-	part3='-part3'
-fi
 
-swapoff \
-	--all
+	swapoff \
+		--all
 
-wipefs \
-	-a \
-	${disk}
-
-if [[ ! "${diskType}" == 'HDD' ]]; then
-	blkdiscard \
-		-f \
+	wipefs \
+		-a \
 		${disk}
-fi
 
-sgdisk \
-	--zap-all \
-	${disk}
-
-sgdisk \
-	-n1:0:+512M \
-	-t1:EF00 \
-	-c1:EFI \
-	${disk}
-
-if [[ "${enableSwap}" == "yes" ]]; then
-	swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
-
-	if [[ "${swapSize#}" -gt '32' ]]; then
-		swapSize='32'
+	if [[ ! "${diskType}" == 'HDD' ]]; then
+		blkdiscard \
+			-f \
+			${disk}
 	fi
 
 	sgdisk \
-		-n2:0:+${swapSize}G \
-		-t2:BF02 \
-		-c2:swap \
+		--zap-all \
 		${disk}
-fi
 
-sgdisk \
-	-n3:0:0 \
-	-t3:BF00 \
-	-c3:${ID} \
-	${disk}
+	sgdisk \
+		-n1:0:+512M \
+		-t1:EF00 \
+		-c1:EFI \
+		${disk}
+
+	if [[ "${enableSwap}" == "yes" ]]; then
+		swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
+
+		if [[ "${swapSize#}" -gt '32' ]]; then
+			swapSize='32'
+		fi
+
+		sgdisk \
+			-n2:0:+${swapSize}G \
+			-t2:BF02 \
+			-c2:swap \
+			${disk}
+	fi
+
+	sgdisk \
+		-n3:0:0 \
+		-t3:BF00 \
+		-c3:${ID} \
+		${disk}
+elif [[ "${1}" == '--efi' ]]; then
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+		if [[ "${disk}" == **/dev/nvme** ]]; then
+			part1='p1'
+		else
+			part1='1'
+		fi
+	else
+		part1='-part1'
+	fi
 
-if [[ "${*}" == *--efi* ]]; then
 	mkdosfs \
 		-F 32 \
 		-s 1 \
diff --git a/pre-inst.sh b/pre-inst.sh
index ed952fa..327f904 100755
--- a/pre-inst.sh
+++ b/pre-inst.sh
@@ -52,11 +52,13 @@ if [[ ! "$(hostname)" == "debian-live" ]]; then
 fi
 
 
-"${baseDir}/partition.sh"
+"${baseDir}/partition.sh" --disk
 
 sleep 5
 
-"${baseDir}/zfs.sh"
+"${baseDir}/zfs.sh" --format
+
+"${baseDir}/zfs.sh" --create
 
 "${baseDir}/mkdir-tmpfs.sh"
 
diff --git a/zfs.sh b/zfs.sh
index 0ce8f89..cc9f6b3 100755
--- a/zfs.sh
+++ b/zfs.sh
@@ -20,7 +20,7 @@ else
 fi
 
 
-# if [[ ! "${*}" = *--no-part* ]]; then
+if [[ "${1}" == '--format' ]]; then
 	if [[ "${encryption}" == 'yes' ]]; then
 		zpoolPassword='A'
 		zpoolPasswordVerify='B'
@@ -105,33 +105,22 @@ fi
 			${hostname,,} \
 			${disk}${part3}
 	fi
+fi
 
+if [[ "${1}" == '--create' ]]; then
 	zfs create \
 		-o canmount=off \
 		-o mountpoint=none \
 		${hostname,,}/ROOT
-# else
-# 	zpool import \
-# 		-N \
-# 		-R \
-# 		/mnt \
-# 		${hostname,,}
-#
-# 	zfs load-key \
-# 		-r \
-# 		-L prompt \
-# 		${hostname,,}
-# fi
 
-zfs create \
-	-o canmount=noauto \
-	-o mountpoint=/ \
-	${hostname,,}/ROOT/${ID}
+	zfs create \
+		-o canmount=noauto \
+		-o mountpoint=/ \
+		${hostname,,}/ROOT/${ID}
 
-zfs mount \
-	${hostname,,}/ROOT/${ID}
+	zfs mount \
+		${hostname,,}/ROOT/${ID}
 
-# if [[ ! "${*}" = *--no-part* ]]; then
 	zfs create \
 		${hostname,,}/home
 
@@ -213,65 +202,18 @@ zfs mount \
 	zpool set \
 		bootfs=${hostname,,}/ROOT/${ID} \
 		${hostname,,}
-# else
-# 	zfs mount \
-# 	${hostname,,}/home
-#
-# 	zfs mount \
-# 	${hostname,,}/home/root
-#
-# 	zfs mount \
-# 	${hostname,,}/var/log
-#
-# 	zfs mount \
-# 	${hostname,,}/var/spool
-#
-# 	zfs mount \
-# 	${hostname,,}/var/cache
-#
-# 	zfs mount \
-# 	${hostname,,}/var/lib/nfs
-#
-# 	zfs mount \
-# 	${hostname,,}/var/tmp
-#
-# 	zfs mount \
-# 	${hostname,,}/srv
-#
-# 	zfs mount \
-# 	${hostname,,}/usr/local
-#
-# 	zfs mount \
-# 	${hostname,,}/var/games
-#
-# 	zfs mount \
-# 	${hostname,,}/var/lib/AccountsService
-#
-# 	zfs mount \
-# 	${hostname,,}/var/lib/NetworkManager
-#
-# 	zfs mount \
-# 	${hostname,,}/var/www
-#
-# 	zfs mount \
-# 	${hostname,,}/keystore
-# fi
 
-if [[ "${ID}" == 'fedora' ]]; then
-	"${baseDir}/fedora.sh" -1
-fi
+	if [[ "${ID}" == 'fedora' ]]; then
+		"${baseDir}/fedora.sh" --rsync
+	fi
 
-# if [[ ! "${*}" = *--no-part* ]]; then
 	zfs create \
 		${hostname,,}/var/mail
 
 	chmod \
 		1777 \
 		/mnt/tmp
-# else
-# 	zfs mount \
-# 	${hostname,,}/var/mail
-# fi
+fi
 
 if [[ "${1}" == '--key' ]]; then
 	cp \