diff --git a/.gitignore b/.gitignore
index 362c7d6..c951b98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 archive.sh
 system.conf
+*kate-swp
diff --git a/install.sh b/install.sh
index 170286c..2a79fb8 100755
--- a/install.sh
+++ b/install.sh
@@ -90,27 +90,6 @@ if [[ "${ID}" == 'elementary' ]]; then
 		network-manager \
 		openssh-{client,server} \
 		popularity-contest
-elif [[ "${ID}" == 'debian' ]]; then
-	apt \
-		install \
-		--yes \
-		console-setup \
-		cryptsetup \
-		curl \
-		dpkg-dev \
-		efibootmgr \
-		ethtool \
-		firmware-{ast,atheros,bnx{2,2x},brcm80211,ipw2x00,iwlwifi,libertas,linux,realtek,zd1211} \
-		flatpak \
-		keyboard-configuration \
-		linux-{headers,image}-amd64 \
-		locales \
-		nano \
-		network-manager \
-		openssh-{client,server} \
-		popularity-contest \
-		printer-driver-all \
-		tasksel
 elif [[ "${ID}" == 'fedora' ]]; then
 	if [[ "${VERSION_ID}" -lt '41' ]]; then
 		dnf \
@@ -171,8 +150,6 @@ EOF
 
 	apt install \
 		--yes \
-		dosfstools \
-		systemd-timesyncd \
 		zfs-initramfs
 fi
 
diff --git a/partition.sh b/partition.sh
index 5a19545..58549dc 100755
--- a/partition.sh
+++ b/partition.sh
@@ -40,8 +40,8 @@ else
 fi
 
 if [[ "${ID}" == 'debian' ]]; then
-	if [[ ! "${HOST}" == "debian-live" ]]; then
-		cat << EOF | tee /mnt/etc/apt/sources.list.d/contrib.sources &> /dev/null
+	if [[ ! "$(hostname)" == "debian-live" ]]; then
+		cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
 Enabled:		yes
 Types:			deb
 URIs:			http://deb.debian.org/debian/
@@ -66,7 +66,7 @@ if [[ "${ID}" == 'debian' ]]; then
 	apt \
 		install \
 		--yes \
-		debootstrap \
+		mmdebstrap \
 		gdisk \
 		zfsutils-linux \
 		systemd-timesyncd
@@ -100,7 +100,7 @@ fi
 
 timedatectl
 
-if [[ ! "${HOST}" == "debian-live" ]]; then
+if [[ ! "$(hostname)" == "debian-live" ]]; then
 	zgenhostid \
 		-f \
 		0x00bab10c
@@ -428,11 +428,36 @@ mkdir \
 	/mnt/run/lock
 
 if [[ "${ID}" == 'elementary' ]]; then
-	debootstrap \
+	mmdebstrap \
+		--include='' \
 		"${UBUNTU_VERSION_CODENAME}" \
 		/mnt
 elif [[ "${ID}" == 'debian' ]]; then
-	debootstrap \
+	mmdebstrap \
+		--skip=check/empty \
+		--components=main,non-free-firmware,contrib \
+		--mode=root \
+		--format=directory \
+		--include=console-setup \
+		--include=cryptsetup \
+		--include=curl \
+		--include=dosfstools \
+		--include=dpkg-dev \
+		--include=efibootmgr \
+		--include=ethtool \
+		--include=firmware-{ast,atheros,bnx{2,2x},brcm80211,iwlwifi,libertas,linux,realtek,zd1211} \
+		--include=flatpak \
+		--include=keyboard-configuration \
+		--include=linux-{headers,image}-amd64 \
+		--include=locales \
+		--include=nano \
+		--include=network-manager \
+		--include=openssh-{client,server} \
+		--include=popularity-contest \
+		--include=printer-driver-all \
+		--include=systemd-timesyncd \
+		--include=tasksel \
+		--include=zstd \
 		"${VERSION_CODENAME}" \
 		/mnt
 fi
@@ -502,6 +527,8 @@ Suites:			${VERSION_CODENAME}-updates
 Components:		main non-free-firmware contrib
 Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
 EOF
+
+	rm /mnt/etc/apt/sources.list
 fi
 
 mount \
diff --git a/post-inst.sh b/post-inst.sh
index b84de51..856643f 100755
--- a/post-inst.sh
+++ b/post-inst.sh
@@ -88,6 +88,10 @@ EOF
 		audio,cdrom,dip,floppy,wheel,video,dialout \
 		${USERNAME}
 else
+	if [[ -z "$(cat /etc/group | grep 'lpadmin')" ]]; then
+		groupadd --gid 108 lpadmin
+	fi
+
 	usermod \
 		-a \
 		-G \