diff --git a/export-image/04-set-partuuid/00-run.sh b/export-image/04-set-partuuid/00-run.sh
index c4d0304..15eb3fd 100755
--- a/export-image/04-set-partuuid/00-run.sh
+++ b/export-image/04-set-partuuid/00-run.sh
@@ -5,11 +5,11 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
 
 BOOT_PARTUUID="${IMGID}-01"
-ROOT_PARTUUID="${IMGID}-02"
-#HOME_PARTUUID="${IMGID}-03"
+RECOVERY_PARTUUID="${IMGID}-02"
+ROOT_PARTUUID="${IMGID}-03"
 
 sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
 sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
-#sed -i "s/HOMEDEV/PARTUUID=${HOME_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
+#sed -i "s/RECOVERY/PARTUUID=${RECOVERY_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
 
 sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/firmware/cmdline.txt"
diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index 30af2a3..4945264 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -31,8 +31,8 @@ truncate -s "${IMG_SIZE}" "${IMG_FILE}"
 
 parted --script "${IMG_FILE}" mklabel msdos
 parted --script "${IMG_FILE}" unit B mkpart primary fat32 "${BOOT_PART_START}" "$((BOOT_PART_START + BOOT_PART_SIZE - 1))"
+parted --script "${IMG_FILE}" unit B mkpart primary fat32 "${RECOVERY_PART_START}" "$((RECOVERY_PART_START + RECOVERY_PART_SIZE - 1))"
 parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${ROOT_PART_START}" "$((ROOT_PART_START + ROOT_PART_SIZE - 1))"
-parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${RECOVERY_PART_START}" "$((RECOVERY_PART_START + RECOVERY_PART_SIZE - 1))"
 
 echo "Creating loop device..."
 cnt=0
@@ -49,8 +49,8 @@ done
 
 ensure_loopdev_partitions "$LOOP_DEV"
 BOOT_DEV="${LOOP_DEV}p1"
-ROOT_DEV="${LOOP_DEV}p2"
-RECOVERY_DEV="${LOOP_DEV}p3"
+RECOVERY_DEV="${LOOP_DEV}p2"
+ROOT_DEV="${LOOP_DEV}p3"
 
 ROOT_FEATURES="^huge_file"
 for FEATURE in 64bit; do
@@ -66,8 +66,8 @@ else
 fi
 
 mkdosfs -n bootfs -F "$FAT_SIZE" -s 4 -v "$BOOT_DEV" > /dev/null
+mkdosfs -n recovery -F "16" -s 4 -v "$RECOVERY_DEV" > /dev/null
 mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
-mkfs.ext4 -L recovery -O "$ROOT_FEATURES" "$RECOVERY_DEV" > /dev/null
 
 mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
 mkdir -p "${ROOTFS_DIR}/boot/firmware"
diff --git a/stage0/01-locale/00-run.sh b/stage0/01-locale/00-run.sh
new file mode 100644
index 0000000..7fb28e5
--- /dev/null
+++ b/stage0/01-locale/00-run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+#on_chroot <<- EOF
+#    sed -i "/^${LOCALE_DEFAULT//./\\.} UTF-8/s/^#//" /etc/locale.gen || echo "${LOCALE_DEFAULT} UTF-8" >> /etc/locale.gen
+#    locale-gen
+#    update-locale LANG=${LOCALE_DEFAULT}
+#    echo "LANG=${LOCALE_DEFAULT}" > /etc/default/locale
+#EOF
\ No newline at end of file
diff --git a/stage1/01-sys-tweaks/files/fstab b/stage1/01-sys-tweaks/files/fstab
index c46cb56..96b926d 100644
--- a/stage1/01-sys-tweaks/files/fstab
+++ b/stage1/01-sys-tweaks/files/fstab
@@ -1,5 +1,3 @@
 proc     /proc           proc    defaults          0       0
 BOOTDEV  /boot/firmware  vfat    defaults          0       2
-ROOTDEV  /               ext4    defaults,noatime  0       1
-# For /home (always writable):
-#LABEL=home /home ext4 defaults 0 2
\ No newline at end of file
+ROOTDEV  /               ext4    defaults,noatime  0       1
\ No newline at end of file
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index 1cd6bf0..5d2648c 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -4,7 +4,6 @@ desktop-base
 git
 gvfs
 rfkill
-firefox-esr
 fonts-droid-fallback
 fonts-liberation2
 obconf
diff --git a/stage3/00-install-packages/01-packages-amd64 b/stage3/00-install-packages/01-packages-amd64
new file mode 100644
index 0000000..e7b065e
--- /dev/null
+++ b/stage3/00-install-packages/01-packages-amd64
@@ -0,0 +1 @@
+firefox-esr
\ No newline at end of file
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/01-packages-nr
similarity index 100%
rename from stage3/00-install-packages/00-packages-nr
rename to stage3/00-install-packages/01-packages-nr
diff --git a/stage3/01-install-desktop/00-packages-nr b/stage3/01-install-desktop/00-packages-nr
index 6fe5e82..52e2edf 100644
--- a/stage3/01-install-desktop/00-packages-nr
+++ b/stage3/01-install-desktop/00-packages-nr
@@ -1 +1 @@
-gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-initial-setup gnome-tweaks gnome-shell-extension-no-annoyance gnome-shell-extension-manager gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-bluetooth-quick-connect gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng gnome-shell-extensions-extra
+gnome-session gnome-shell libpam-gnome-keyring gnome-control-center gnome-software network-manager-gnome pulseaudio gnome-terminal gnome-online-accounts gnome-initial-setup gnome-tweaks gnome-shell-extension-no-annoyance gnome-shell-extension-manager gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-bluetooth-quick-connect gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons-ng gnome-shell-extensions-extra
diff --git a/stage3/02-extras-fixes/00-packages b/stage3/02-setup-system/00-packages
similarity index 100%
rename from stage3/02-extras-fixes/00-packages
rename to stage3/02-setup-system/00-packages
diff --git a/stage3/02-extras-fixes/00-run.sh b/stage3/02-setup-system/00-run.sh
similarity index 87%
rename from stage3/02-extras-fixes/00-run.sh
rename to stage3/02-setup-system/00-run.sh
index 67a9437..f119dca 100755
--- a/stage3/02-extras-fixes/00-run.sh
+++ b/stage3/02-setup-system/00-run.sh
@@ -16,11 +16,7 @@ EOF
 
 mkdir -p "${ROOTFS_DIR}/etc/dconf/db/local.d"
 mkdir -p "${ROOTFS_DIR}/etc/dconf/profile"
-on_chroot << EOF
-# Create the user profile to link user-db:user and system-db:local
-echo "user-db:user" > /etc/dconf/profile/user
-echo "system-db:local" >> /etc/dconf/profile/user
-EOF
+install -m 644 files/dconf-profile "${ROOTFS_DIR}/etc/dconf/profile/user"
 
 # Set default gnome-extensions
 install -m 644 files/gnome-extensions "${ROOTFS_DIR}/etc/dconf/db/local.d/00-extensions"
diff --git a/stage3/02-extras-fixes/01-run.sh b/stage3/02-setup-system/01-run-arm-only.sh
similarity index 100%
rename from stage3/02-extras-fixes/01-run.sh
rename to stage3/02-setup-system/01-run-arm-only.sh
diff --git a/stage3/02-setup-system/files/dconf-profile b/stage3/02-setup-system/files/dconf-profile
new file mode 100644
index 0000000..ca120ee
--- /dev/null
+++ b/stage3/02-setup-system/files/dconf-profile
@@ -0,0 +1,2 @@
+user-db:user
+system-db:local
\ No newline at end of file
diff --git a/stage3/02-extras-fixes/files/gnome-default-settings b/stage3/02-setup-system/files/gnome-default-settings
similarity index 70%
rename from stage3/02-extras-fixes/files/gnome-default-settings
rename to stage3/02-setup-system/files/gnome-default-settings
index b60a1a6..e612b38 100644
--- a/stage3/02-extras-fixes/files/gnome-default-settings
+++ b/stage3/02-setup-system/files/gnome-default-settings
@@ -4,6 +4,7 @@ color-scheme='prefer-dark'
 
 [org/gnome/desktop/background]
 picture-uri='file:///usr/local/share/backgrounds/loveimage.png'
+picture-uri-dark='file:///usr/local/share/backgrounds/loveimage.png'
 picture-options='spanned'
 primary-color='000000'
 secondary-color='FFFFFF'
\ No newline at end of file
diff --git a/stage3/02-extras-fixes/files/gnome-extensions b/stage3/02-setup-system/files/gnome-extensions
similarity index 100%
rename from stage3/02-extras-fixes/files/gnome-extensions
rename to stage3/02-setup-system/files/gnome-extensions
diff --git a/stage3/02-extras-fixes/files/loveimage.png b/stage3/02-setup-system/files/loveimage.png
similarity index 100%
rename from stage3/02-extras-fixes/files/loveimage.png
rename to stage3/02-setup-system/files/loveimage.png
diff --git a/stage3/02-extras-fixes/files/pi-apps b/stage3/02-setup-system/files/pi-apps
similarity index 100%
rename from stage3/02-extras-fixes/files/pi-apps
rename to stage3/02-setup-system/files/pi-apps
diff --git a/stage3/02-extras-fixes/files/pi-apps-logo.png b/stage3/02-setup-system/files/pi-apps-logo.png
similarity index 100%
rename from stage3/02-extras-fixes/files/pi-apps-logo.png
rename to stage3/02-setup-system/files/pi-apps-logo.png
diff --git a/stage3/02-extras-fixes/files/pi-apps.desktop b/stage3/02-setup-system/files/pi-apps.desktop
similarity index 100%
rename from stage3/02-extras-fixes/files/pi-apps.desktop
rename to stage3/02-setup-system/files/pi-apps.desktop
diff --git a/stage3/02-extras-fixes/files/polkit-admin.conf b/stage3/02-setup-system/files/polkit-admin.conf
similarity index 100%
rename from stage3/02-extras-fixes/files/polkit-admin.conf
rename to stage3/02-setup-system/files/polkit-admin.conf
diff --git a/stage3/02-extras-fixes/files/vendor.conf b/stage3/02-setup-system/files/vendor.conf
similarity index 100%
rename from stage3/02-extras-fixes/files/vendor.conf
rename to stage3/02-setup-system/files/vendor.conf