diff --git a/distros/void.d/setup-x86.sh b/distros/void.d/setup-x86.sh
index d597907..6fcdf02 100755
--- a/distros/void.d/setup-x86.sh
+++ b/distros/void.d/setup-x86.sh
@@ -8,6 +8,3 @@ do
 	ln -s /etc/sv/${service} "${MOUNTDIR}/etc/runit/runsvdir/default/"
 	echo "Installed service ${service}"
 done
-
-echo "Copying /etc"
-cp -av etc-x86/* "${MOUNTDIR}/etc"
diff --git a/distros/void.sh b/distros/void.sh
index d71de02..fca8cf8 100755
--- a/distros/void.sh
+++ b/distros/void.sh
@@ -9,23 +9,35 @@
 
 # install script for Void based systems
 
-function base () { xbps-install \
-		binutils \
-		cryptsetup \
+function base () {
+	xbps-install \
 		chrony \
 		elogind \
 		fscrypt \
-		gummiboot \
 		iwd \
-		sbsigntool \
 		udisks2 \
-		vsv \
-		PopCorn
+		vsv
 }
 function base_desc () {
 	echo "Install base system utilities, with encryption and UEFI support."
 }
 
+function luks () {
+	xbps_install cryptsetup
+}
+function luks_desc () {
+	echo "Install support for LUKS."
+}
+
+function uefi_bundle () {
+	xbps-install \
+		binutils \
+		gummiboot \
+		sbsigntool
+}
+function uefi_bundle_desc () {
+	echo "Install tools for creating UEFI bundles."
+
 function refind () {
 	xbps-install refind
 }
@@ -33,6 +45,27 @@ function refind_desc () {
 	echo "Install rEFInd boot manager. Necessary when it's the only system on a device."
 }
 
+function zfs () {
+	xbps-install zfs zfsbootmenu
+}
+function zfs_desc () {
+	echo "Install support for ZFS."
+}
+
+function security () {
+	xbps-install apparmor
+}
+function security_desc () {
+	echo "Install security related packages."
+}
+
+function popcorn () {
+	xbps-install PopCorn
+}
+function popcorn_desc () {
+	echo "Install PopCorn usage statistics."
+}
+
 function term () {
 	xbps-install \
 		bat \
@@ -137,6 +170,7 @@ function media () {
 	audio
 
 	xbps-install \
+		bluez \
 		elisa \
 		mpv \
 		mpv-mpris \
@@ -251,6 +285,14 @@ function kicad_desc () {
 	echo "Install KiCad EDA and its resource packages."
 }
 
+function nonfree () {
+	xbps-install void-repo-nonfree
+	xbps-install -S intel-ucode
+}
+function nonfree_desc () {
+	echo "Install nonfree repo and Intel microcode."
+}
+
 function ate () {
 	xbps-install \
 		tcc \
@@ -261,8 +303,10 @@ function ate_desc () {
 	echo "Install the packages necessary to use ate compiled by TCC."
 }
 
-MOST_PACKAGES="base term intel fonts themes wm audio media dev qt5 mozzila pdf"
-COMPLEMENT_PACKAGES="refind emacs office flatpak embedded kicad ate"
+MOST_PACKAGES="base term intel fonts themes wm audio media
+ dev qt5 mozzila pdf popcorn"
+COMPLEMENT_PACKAGES="uefi_bundle luks zfs security refind
+ emacs office flatpak embedded kicad ate nonfree"
 
 function install_most () {
 	for target in $MOST_PACKAGES