diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index 55ee43c..32cae68 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -32,6 +32,7 @@ vinstall "${FILESDIR}/sudoers/10-common" 700 etc/sudoers.d
 
 vmkdir etc/bash/bashrc.d
 vinstall "${FILESDIR}/bash/xbps-aliase.sh" 755 etc/bash/bashrc.d
+vinstall "${FILESDIR}/bash/editor.sh" 755 etc/bash/bashrc.d
 
 vmkdir usr/lib/udev/rules.d
 vinstall "${FILESDIR}/udev/99-mount-media.rules" 744 usr/lib/udev/rules.d
@@ -48,10 +49,17 @@ vmkdir etc/default/grub-btrfs
 vinstall "${FILESDIR}/grub-btrfs/void.conf" 755 etc/default/grub-btrfs
 
 vmkdir etc/NetworkManager/conf.d
-vinstall "${FILESDIR}/nm/unmanaged-wg.conf" 744 etc/NetworkManager/conf.d
+vmkdir etc/NetworkManager/dispatcher.d
+vinstall "${FILESDIR}/nm/unmanaged-wg.conf" 644 etc/NetworkManager/conf.d
+vinstall "${FILESDIR}/nm/unmanaged-tun.conf" 644 etc/NetworkManager/conf.d
+vinstall "${FILESDIR}/nm/30-wg0" 744 etc/NetworkManager/dispatcher.d
 
-vinstall "${FILESDIR}/xorg/10-keyboard.conf" 744 usr/share/X11/xorg.conf.d
+vmkdir etc/profile.d
+vinstall "${FILESDIR}/profile/append-path.sh" 644 etc/profile.d
 
+vmkdir usr/share/X11/xorg.conf.d
+vinstall "${FILESDIR}/xorg/10-keyboard.conf" 644 usr/share/X11/xorg.conf.d
+	
 vmkdir etc/fonts/conf.d
 ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf "${DESTDIR}/etc/fonts/conf.d/70-no-bitmaps.conf"
 
diff --git a/modules/disk/bios/postconfig b/modules/disk/bios/postconfig
index 785e0ee..b544eab 100644
--- a/modules/disk/bios/postconfig
+++ b/modules/disk/bios/postconfig
@@ -78,7 +78,7 @@ mkswap "/dev/mapper/voidvg.${diskid}-swap"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
 btrfs subvol create "${dest}/rootfs"
 btrfs subvol create "${dest}/homefs"
-mkdir -p "${dest}/system/snapshots/{update,regular}" "${dest}/system/backup"
+mkdir -p "${dest}/system/snapshots/{update,regular,manual}" "${dest}/system/backup"
 
 umount "${dest}"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}" -o subvol=rootfs
@@ -89,7 +89,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	mkfs.btrfs -q -f "${target_boot}"
 	mount "${target_boot}" "${dest}/boot"
 	btrfs subvol create "${dest}/boot/bootfs"
-	mkdir -p "${dest}/boot/system/snapshots/{update,regular}" "${dest}/boot/system/backup"
+	mkdir -p "${dest}/boot/system/snapshots/{update,regular,manual}" "${dest}/boot/system/backup"
 	umount "${dest}/boot"
 	mount "${target_boot}" "${dest}/boot" -o subvol=bootfs
 fi
diff --git a/modules/disk/uefi/postconfig b/modules/disk/uefi/postconfig
index 3c7f113..9c21029 100644
--- a/modules/disk/uefi/postconfig
+++ b/modules/disk/uefi/postconfig
@@ -74,7 +74,7 @@ mkswap "/dev/mapper/voidvg.${diskid}-swap"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
 btrfs subvol create "${dest}/rootfs"
 btrfs subvol create "${dest}/homefs"
-mkdir -p "${dest}/system/snapshots/{update,regular}" "${dest}/system/backup"
+mkdir -p "${dest}/system/snapshots/{update,regular,manual}" "${dest}/system/backup"
 
 umount "${dest}"
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}" -o subvol=rootfs
@@ -85,7 +85,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	mkfs.btrfs -q -f "${target_boot}"
 	mount "${target_boot}" "${dest}/boot"
 	btrfs subvol create "${dest}/boot/bootfs"
-	mkdir -p "${dest}/boot/system/snapshots/{update,regular}" "${dest}/boot/system/backup"
+	mkdir -p "${dest}/boot/system/snapshots/{update,regular,manual}" "${dest}/boot/system/backup"
 	umount "${dest}/boot"
 	mount "${target_boot}" "${dest}/boot" -o subvol=bootfs
 fi