diff --git a/exports/squashfs/04-export/01-run.sh b/exports/squashfs/04-export/01-run.sh
index b969dcb..ec59294 100755
--- a/exports/squashfs/04-export/01-run.sh
+++ b/exports/squashfs/04-export/01-run.sh
@@ -67,3 +67,11 @@ esac
 cp "${SQUASHFS_FILE}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.squashfs"
 [ -n "${VMLINUZ}" ] && cp "${VMLINUZ}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.vmlinuz"
 [ -n "${INITRD}" ] && cp "${INITRD}" "${DEPLOY_DIR}/${ARCHIVE_FILENAME}${IMG_SUFFIX}.rootfs.initrd.img"
+
+# Cleanup
+#rm -f "${SQUASHFS_FILE}"
+#[ -n "${VMLINUZ_FILE}" ] && rm -f "${VMLINUZ_FILE}"
+#[ -n "${INITRD_FILE}" ] && rm -f "${INITRD_FILE}"
+
+# cleanup stage work dir
+#rm -rf "${STAGE_WORK_DIR}"
\ No newline at end of file
diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
index aac9525..b8165a9 100755
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@@ -17,10 +17,10 @@ fi
 install -m 644 files/debian.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
 sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/debian.sources"
 
-# Configure oxmc apt sources
-install -m 644 files/oxmc.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
-sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/oxmc.sources"
-install -m 644 files/oxmc.gpg "${ROOTFS_DIR}/usr/share/keyrings/"
+# Configure vesperos apt sources
+install -m 644 files/vesperos.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/vesperos.sources"
+install -m 644 files/vesperos.gpg "${ROOTFS_DIR}/usr/share/keyrings/"
 
 # Configure apt proxy
 if [ -n "$APT_PROXY" ]; then
diff --git a/stage0/00-configure-apt/files/oxmc.gpg b/stage0/00-configure-apt/files/vesperos.gpg
similarity index 100%
rename from stage0/00-configure-apt/files/oxmc.gpg
rename to stage0/00-configure-apt/files/vesperos.gpg
diff --git a/stage0/00-configure-apt/files/oxmc.sources b/stage0/00-configure-apt/files/vesperos.sources
similarity index 64%
rename from stage0/00-configure-apt/files/oxmc.sources
rename to stage0/00-configure-apt/files/vesperos.sources
index 3fbc32a..8dccfad 100644
--- a/stage0/00-configure-apt/files/oxmc.sources
+++ b/stage0/00-configure-apt/files/vesperos.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://apt.oxmc.me/vesperos
 Suites: RELEASE
 Components: main
-Signed-By: /usr/share/keyrings/oxmc.gpg
\ No newline at end of file
+Signed-By: /usr/share/keyrings/vesperos.gpg
\ No newline at end of file
diff --git a/stage3/01-install-desktop/00-packages-nr b/stage3/01-install-desktop/00-packages-nr
index 96ce4b3..354f1f0 100644
--- a/stage3/01-install-desktop/00-packages-nr
+++ b/stage3/01-install-desktop/00-packages-nr
@@ -1,2 +1,2 @@
-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-manager gnome-shell-extension-user-theme gnome-shell-extension-zorin-taskbar gnome-shell-extension-no-annoyance gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator
+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-manager gnome-shell-extension-user-theme vesperos-taskbar gnome-shell-extension-no-annoyance gnome-shell-extension-gsconnect gnome-shell-extension-dash-to-panel gnome-shell-extension-appindicator
 #gnome-shell-extension-desktop-icons-ng
diff --git a/stage3/01-install-desktop/01-packages-nr b/stage3/01-install-desktop/01-packages-nr
index 89589fd..8ed7861 100644
--- a/stage3/01-install-desktop/01-packages-nr
+++ b/stage3/01-install-desktop/01-packages-nr
@@ -1 +1 @@
-#vesperos-theme
\ No newline at end of file
+vesperos-theme
\ No newline at end of file
diff --git a/stage3/02-setup-system/00-run.sh b/stage3/02-setup-system/00-run.sh
index 0c461ea..ee2b8a8 100755
--- a/stage3/02-setup-system/00-run.sh
+++ b/stage3/02-setup-system/00-run.sh
@@ -32,7 +32,7 @@ install -m 644 files/gnome-default-extensions "${ROOTFS_DIR}/etc/dconf/db/local.
 
 # Install wallpapers
 #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/first-time-setup.png "${ROOTFS_DIR}/usr/local/share/backgrounds/first-time-setup.png"
 #install -m 644 files/neon-forest.png "${ROOTFS_DIR}/usr/local/share/backgrounds/neon-forest.png"
 
 # Set default settings (gnome-initial-setup)
diff --git a/stage3/02-setup-system/files/gnome-default-extensions b/stage3/02-setup-system/files/gnome-default-extensions
index e7ca2a6..e5ab843 100644
--- a/stage3/02-setup-system/files/gnome-default-extensions
+++ b/stage3/02-setup-system/files/gnome-default-extensions
@@ -1,8 +1,9 @@
 [org/gnome/shell]
-enabled-extensions=['zorin-taskbar@zorinos.com', 'ding@rastersoft.com', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx']
+# old ext" ding@rastersoft.com
+enabled-extensions=['vesperos-taskbar@oxmc.me', 'noannoyance@daase.net', 'ubuntu-appindicators@ubuntu.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'no-overview@fthx']
 favorite-apps=['org.gnome.Settings.desktop', 'firefox-esr.desktop', 'org.gnome.Nautilus.desktop']
 
-[org/gnome/shell/extensions/zorin-taskbar]
+[org/gnome/shell/extensions/vesperos-taskbar]
 panel-sizes='{"0":48}'
 panel-positions='{"0":"BOTTOM"}'
 panel-lengths='{"0":100}'
diff --git a/stage3/02-setup-system/files/gnome-initial-setup-default-settings b/stage3/02-setup-system/files/gnome-initial-setup-default-settings
index e9bb660..0c25dfa 100644
--- a/stage3/02-setup-system/files/gnome-initial-setup-default-settings
+++ b/stage3/02-setup-system/files/gnome-initial-setup-default-settings
@@ -1,8 +1,8 @@
 # This changes/sets the defaults for gnome-initial-setup's session
 
 #[org/gnome/desktop/background]
-#picture-uri='file:///usr/local/share/backgrounds/loveimage.png'
+#picture-uri='file:///usr/local/share/backgrounds/first-time-setup.png'
 #picture-options='zoom'
 
 #[org/gnome/desktop/screensaver]
-#picture-uri='file:///usr/local/share/backgrounds/loveimage.png'
+#picture-uri='file:///usr/local/share/backgrounds/first-time-setup.png'
diff --git a/stage3/02-setup-system/files/loveimage.png b/stage3/02-setup-system/files/loveimage.png
deleted file mode 100644
index 1c85ca6..0000000
Binary files a/stage3/02-setup-system/files/loveimage.png and /dev/null differ