diff --git a/stage0/00-configure-apt/files/apt-chillcraftos-prefs b/stage0/00-configure-apt/files/apt-chillcraftos-prefs
index 405beff..c8fb40a 100644
--- a/stage0/00-configure-apt/files/apt-chillcraftos-prefs
+++ b/stage0/00-configure-apt/files/apt-chillcraftos-prefs
@@ -1,3 +1,3 @@
 Package: *
-Pin: release o=cdn.oxmc.me/apt, n=bookworm
+Pin: release o=apt.oxmc.me, n=bookworm
 Pin-Priority: 1001
diff --git a/stage3/04-extras-fixes/00-packages b/stage3/02-extras-fixes/00-packages
similarity index 100%
rename from stage3/04-extras-fixes/00-packages
rename to stage3/02-extras-fixes/00-packages
diff --git a/stage3/04-extras-fixes/00-run.sh b/stage3/02-extras-fixes/00-run.sh
similarity index 71%
rename from stage3/04-extras-fixes/00-run.sh
rename to stage3/02-extras-fixes/00-run.sh
index fdce4d0..c413f45 100755
--- a/stage3/04-extras-fixes/00-run.sh
+++ b/stage3/02-extras-fixes/00-run.sh
@@ -8,23 +8,29 @@ EOF
 # polkit fixes
 install -m 644 files/polkit-admin.conf "${ROOTFS_DIR}/etc/polkit-1/localauthority.conf.d/51-admin.conf"
 
-# Set default gnome-extensions
-on_chroot << EOF
-# Create the necessary directories for dconf settings and profiles
-mkdir -p /etc/dconf/db/local.d
-mkdir -p /etc/dconf/profile
+# Include custom vendor file for gnome-inital-setup
+mkdir -p "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
+install -m 644 files/vendor.conf "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
 
+# Configure default GDM3 Session to Xorg
+on_chroot << EOF
+sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/gdm3/daemon.conf
+mkdir -p /var/lib/gdm
+touch /var/lib/gdm/run-initial-setup
+EOF
+
+# Set default gnome-extensions
+mkdir -p "${ROOTFS_DIR}/etc/dconf/db/local.d"
+mkdir -p "${ROOTFS_DIR}/etc/dconf/profile"
+install -m 644 files/gnome-extensions "${ROOTFS_DIR}/etc/dconf/db/local.d/00-extensions"
+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 755 files/gnome-extensions "${ROOTFS_DIR}/etc/dconf/db/local.d/00-extensions"
 
 # Set default Wallpaper
-on_chroot << EOF
-# Create the necessary directories for the wallpaper
-mkdir -p /usr/local/share/backgrounds
-EOF
+mkdir -p "${ROOTFS_DIR}/usr/local/share/backgrounds"
 install -m 644 files/loveimage.png "${ROOTFS_DIR}/usr/local/share/backgrounds/loveimage.png"
 install -m 644 files/gnome-background "${ROOTFS_DIR}/etc/dconf/db/local.d/00-background"
 
diff --git a/stage3/04-extras-fixes/files/gnome-background b/stage3/02-extras-fixes/files/gnome-background
similarity index 100%
rename from stage3/04-extras-fixes/files/gnome-background
rename to stage3/02-extras-fixes/files/gnome-background
diff --git a/stage3/04-extras-fixes/files/gnome-extensions b/stage3/02-extras-fixes/files/gnome-extensions
similarity index 100%
rename from stage3/04-extras-fixes/files/gnome-extensions
rename to stage3/02-extras-fixes/files/gnome-extensions
diff --git a/stage3/04-extras-fixes/files/loveimage.png b/stage3/02-extras-fixes/files/loveimage.png
similarity index 100%
rename from stage3/04-extras-fixes/files/loveimage.png
rename to stage3/02-extras-fixes/files/loveimage.png
diff --git a/stage3/04-extras-fixes/files/pi-apps b/stage3/02-extras-fixes/files/pi-apps
similarity index 100%
rename from stage3/04-extras-fixes/files/pi-apps
rename to stage3/02-extras-fixes/files/pi-apps
diff --git a/stage3/04-extras-fixes/files/pi-apps-logo.png b/stage3/02-extras-fixes/files/pi-apps-logo.png
similarity index 100%
rename from stage3/04-extras-fixes/files/pi-apps-logo.png
rename to stage3/02-extras-fixes/files/pi-apps-logo.png
diff --git a/stage3/04-extras-fixes/files/pi-apps.desktop b/stage3/02-extras-fixes/files/pi-apps.desktop
similarity index 100%
rename from stage3/04-extras-fixes/files/pi-apps.desktop
rename to stage3/02-extras-fixes/files/pi-apps.desktop
diff --git a/stage3/04-extras-fixes/files/polkit-admin.conf b/stage3/02-extras-fixes/files/polkit-admin.conf
similarity index 100%
rename from stage3/04-extras-fixes/files/polkit-admin.conf
rename to stage3/02-extras-fixes/files/polkit-admin.conf
diff --git a/stage3/02-setup/files/vendor.conf b/stage3/02-extras-fixes/files/vendor.conf
similarity index 100%
rename from stage3/02-setup/files/vendor.conf
rename to stage3/02-extras-fixes/files/vendor.conf
diff --git a/stage3/02-setup/00-run.sh b/stage3/02-setup/00-run.sh
deleted file mode 100755
index 6593244..0000000
--- a/stage3/02-setup/00-run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-# Include custom vendor file for gnome-inital-setup
-mkdir -p "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
-install -m 644 files/vendor.conf "${ROOTFS_DIR}/usr/share/gnome-initial-setup/"
-
-# Configure default GDM3 Session to Xorg
-on_chroot << EOF
-sed -i 's/#WaylandEnable=false/WaylandEnable=false/' /etc/gdm3/daemon.conf
-mkdir -p /var/lib/gdm
-touch /var/lib/gdm/run-initial-setup
-EOF
\ No newline at end of file