diff --git a/.github/workflows/cronjob.yml b/.github/workflows/cronjob.yml
index a5cdfd9..d9cc767 100644
--- a/.github/workflows/cronjob.yml
+++ b/.github/workflows/cronjob.yml
@@ -1,7 +1,7 @@
 name: Github Action with a cronjob trigger
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 0 1/10 * *"
 
   workflow_dispatch:
 
@@ -18,12 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout source repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - name: "List releases"
+      - name: "Release date"
         run: |
-          curl -Ls https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/latest | sed 's/[()",{} ]/\n/g' | grep -oi "https.*mage$" > latest-release.txt
-          date >> latest-release.txt
+          date > latest-release.txt
 
       - name: "Push to Source"
         run: |
diff --git a/.github/workflows/junest-CI.yml b/.github/workflows/junest-CI.yml
index 0ffb6b2..daaf79b 100644
--- a/.github/workflows/junest-CI.yml
+++ b/.github/workflows/junest-CI.yml
@@ -5,14 +5,14 @@ concurrency:
 
 on:
   schedule:
-    - cron: "0 14 * * 4"
+    - cron: "0 14 1/20 * *"
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: build
       if: always()
diff --git a/README.md b/README.md
index 7e8416c..fa5bb35 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Exec=virtualbox VirtualBoxVM --comment ...
 ### *"*AM*" Application Manager* 
 #### *Package manager, database & solutions for all AppImages and portable apps for GNU/Linux!*
 
-[![Istantanea_2024-06-26_17-00-46 png](https://github.com/ivan-hc/AM/assets/88724353/671f5eb0-6fb6-4392-b45e-af0ea9271d9b)](https://github.com/ivan-hc/AM)
+[![sample.png](https://raw.githubusercontent.com/ivan-hc/AM/main/sample/sample.png)](https://github.com/ivan-hc/AM)
 
 [![Readme](https://img.shields.io/github/stars/ivan-hc/AM?label=%E2%AD%90&style=for-the-badge)](https://github.com/ivan-hc/AM/stargazers) [![Readme](https://img.shields.io/github/license/ivan-hc/AM?label=&style=for-the-badge)](https://github.com/ivan-hc/AM/blob/main/LICENSE)
 
diff --git a/latest-release.txt b/latest-release.txt
index 54ac2e5..bd9234d 100644
--- a/latest-release.txt
+++ b/latest-release.txt
@@ -1 +1 @@
-https://github.com/ivan-hc/VirtualBox-appimage/releases/download/7.1.6/VirtualBox-KVM_7.1.6-archimage4.3-x86_64.AppImage
+Thu Jun 11 03:35:04 UTC 2026
diff --git a/virtualbox-kvm-junest.sh b/virtualbox-kvm-junest.sh
index e3a0a6f..1a50ea8 100644
--- a/virtualbox-kvm-junest.sh
+++ b/virtualbox-kvm-junest.sh
@@ -2,704 +2,265 @@
 
 APP=virtualbox-kvm
 BIN="virtualbox" #CHANGE THIS IF THE NAME OF THE BINARY IS DIFFERENT FROM "$APP" (for example, the binary of "obs-studio" is "obs")
-DEPENDENCES="alsa-lib alsa-oss alsa-plugins alsa-tools alsa-utils jack2 \
-pulseaudio pulseaudio-alsa libpulse libsndfile libasyncns libogg libvorbis flac opus mpg123 lame \
-libpipewire pipewire pipewire-alsa pipewire-audio pipewire-pulse" #SYNTAX: "APP1 APP2 APP3 APP4...", LEAVE BLANK IF NO OTHER DEPENDENCIES ARE NEEDED
+audio_pkgs="alsa-lib alsa-oss alsa-plugins alsa-tools alsa-utils flac jack2 lame libogg libpipewire libpulse libvorbis mpg123 opus pipewire pipewire-alsa pipewire-audio pulseaudio pulseaudio-alsa"
+vulkan_pkgs="libdisplay-info libdrm libxcb libxshmfence llvm-libs spirv-tools vulkan-asahi vulkan-gfxstream vulkan-icd-loader vulkan-intel vulkan-mesa-implicit-layers vulkan-nouveau vulkan-radeon vulkan-swrast vulkan-tools vulkan-virtio"
+DEPENDENCES=$(echo "$audio_pkgs $vulkan_pkgs dbus libasyncns libsndfile procps-ng qt6-base" | tr ' ' '\n' | sort -u | xargs) #SYNTAX: "APP1 APP2 APP3 APP4...", LEAVE BLANK IF NO OTHER DEPENDENCIES ARE NEEDED
 BASICSTUFF="binutils debugedit gzip"
 COMPILERS="base-devel"
 
-vboxver=$(curl -Ls https://gitlab.com/chaotic-aur/pkgbuilds/-/raw/main/virtualbox-kvm/PKGBUILD | grep vboxver | head -1 | tr "'" '\n' | grep "^[0-9]")
+# Set keywords to searchan include in names of directories and files in /usr/bin (BINSAVED), /usr/share (SHARESAVED) and /usr/lib (LIBSAVED)
+BINSAVED="kmod lsmod ldconfig"
+SHARESAVED="alsa"
+LIBSAVED="ibicui libxcb-cursor libxcb-util.so libxml pulse DBus"
+
+# Set the items you want to manually REMOVE. Complete the path in /etc/, /usr/bin/, /usr/lib/, /usr/lib/python*/ and /usr/share/ respectively.
+# The "rm" command will take into account the listed object/path and add an asterisk at the end, completing the path to be removed.
+# Some keywords and paths are already set. Remove them if you consider them necessary for the AppImage to function properly.
+ETC_REMOVED="makepkg.conf pacman"
+BIN_REMOVED="gcc"
+LIB_REMOVED="cmake gcc gconv libgphobos"
+PYTHON_REMOVED="__pycache__/"
+SHARE_REMOVED="gcc icons/AdwaitaLegacy icons/Adwaita/cursors/ terminfo i18n"
+
+# Set mountpoints, they are ment to be set into the AppRun.
+# Default mounted files are /etc/resolv.conf, /etc/hosts, /etc/nsswitch.conf, /etc/passwd, /etc/group, /etc/machine-id, /etc/asound.conf and /etc/localtime
+# Default mounted directories are /media, /mnt, /opt, /run/media, /usr/lib/locale, /usr/share/fonts, /usr/share/themes, /var, and Nvidia-related directories
+# Do not touch this if you are not sure.
+mountpoint_files=""
+mountpoint_dirs=""
+
+# Post-installation processes (add whatever you want)
+_post_installation_processes() {
+	printf "\n◆ User's processes: \n\n"
+
+	#############################################################################
+	#	PATCH FOR VIRTUALBOX
+	#############################################################################
+
+	sed -i "s/VERSION/$vboxver/g" AppDir/AppRun
+
+	# Workaround locale troubles (in some releases the language is not correctly detected)
+	mkdir -p AppDir/.junest/usr/lib/virtualbox/nls
+	cp -r AppDir/.junest/usr/share/virtualbox/nls/* AppDir/.junest/usr/lib/virtualbox/nls/
+
+	# Add guest additions
+	if ! test -f ./VBoxGuestAdditions.iso; then
+		wget https://download.virtualbox.org/virtualbox/"${vboxver}"/VBoxGuestAdditions_"${vboxver}".iso -O ./VBoxGuestAdditions.iso || exit 1
+	fi
+	mkdir -p AppDir/.junest/usr/lib/virtualbox/additions
+	cp -r VBoxGuestAdditions.iso AppDir/.junest/usr/lib/virtualbox/additions/ || exit 1
 
-#############################################################################
-#	KEYWORDS TO FIND AND SAVE WHEN COMPILING THE APPIMAGE
-#############################################################################
+	# Add extension pack
+	if ! test -f ./Extension_Pack.tar; then
+		wget https://download.virtualbox.org/virtualbox/"${vboxver}"/Oracle_VirtualBox_Extension_Pack-"${vboxver}".vbox-extpack -O ./Extension_Pack.tar
+	fi
+	mkdir -p shrunk
+	tar xfC ./Extension_Pack.tar shrunk
+	rm -r shrunk/{darwin*,solaris*,win*}
+	tar -c --gzip --file shrunk.vbox-extpack -C shrunk .
+	mkdir -p AppDir/.junest/usr/share/virtualbox/extensions
+	cp -r shrunk.vbox-extpack AppDir/.junest/usr/share/virtualbox/extensions/Oracle_VirtualBox_Extension_Pack-"${vboxver}".vbox-extpack
+	mkdir -p AppDir/.junest/usr/share/licenses/virtualbox-ext-oracle/
+	cp -r shrunk/ExtPack-license.txt AppDir/.junest/usr/share/licenses/virtualbox-ext-oracle/PUEL
+	mkdir -p AppDir/.junest/usr/lib/virtualbox/ExtensionPacks/Oracle_VirtualBox_Extension_Pack
+	cp -r shrunk/* AppDir/.junest/usr/lib/virtualbox/ExtensionPacks/Oracle_VirtualBox_Extension_Pack/
+
+	# Install the "VBoxCreateUSBNode.sh" script in /usr/lib/virtualbox
+	mkdir -p AppDir/.junest/usr/lib/virtualbox
+	cp -r AppDir/.junest/usr/share/virtualbox/VBoxCreateUSBNode.sh AppDir/.junest/usr/lib/virtualbox/
+	chown -R root:vboxusers AppDir/.junest/usr/lib/virtualbox
+
+	# Create and install the 60-vboxusb.rules file in /etc/udev/rules.d
+	mkdir -p AppDir/.junest/etc/udev/rules.d
+	cat <<-'HEREDOC' >> AppDir/.junest/etc/udev/rules.d/60-vboxusb.rules
+	SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+	SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+	SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+	SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+	HEREDOC
 
-BINSAVED="kmod lsmod ldconfig"
-SHARESAVED="SAVESHAREPLEASE"
-lib_audio_keywords="alsa jack pipewire pulse"
-lib_browser_launcher="gio-launch-desktop libasound.so libatk-bridge libatspi libcloudproviders libdb- libdl.so libedit libepoxy libgtk-3.so.0 libjson-glib libnssutil libpthread.so librt.so libtinysparql libwayland-cursor libX11-xcb.so libxapp-gtk3-module.so libXcursor libXdamage libXi.so libxkbfile.so libXrandr p11 pk"
-LIBSAVED="libicui libxcb-cursor libxcb-util.so libxml2 $lib_audio_keywords $lib_browser_launcher"
+	# Allow VirtualBox to be used in PROOT mode
+	sed -i 's#^MY_DIR=.*#MY_DIR="${JUNEST_HOME}/usr/lib/virtualbox"#g' AppDir/.junest/usr/bin/VBox || exit 1
 
-[ -n "$lib_browser_launcher" ] && DEPENDENCES="$DEPENDENCES xapp hicolor-icon-theme"
+	# Remove annoying vboxdrv messages
+	sed -i 's/elif ! lsmod/elif ! echo vboxdrv/g' AppDir/.junest/usr/bin/VBox || exit 1
+	sed -i 's# ! -c /dev/vboxdrv# -d /dev/vboxdrv#g' AppDir/.junest/usr/bin/VBox || exit 1
+}
+
+vboxver=$(curl -Ls https://gitlab.com/chaotic-aur/pkgbuilds/-/raw/main/virtualbox-kvm/PKGBUILD | grep vboxver | head -1 | tr "'" '\n' | grep "^[0-9]")
+export ICON="virtualbox.png"
 
-#############################################################################
+##########################################################################################################################################################
 #	SETUP THE ENVIRONMENT
-#############################################################################
-
-# Download appimagetool
-if [ ! -f ./appimagetool ]; then
-	echo "-----------------------------------------------------------------------------"
-	echo "◆ Downloading \"appimagetool\" from https://github.com/AppImage/appimagetool"
-	echo "-----------------------------------------------------------------------------"
-	curl -#Lo appimagetool https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage && chmod a+x appimagetool
+##########################################################################################################################################################
+
+# Download archimage-builder.sh
+if [ ! -f ./archimage-builder.sh ]; then
+	ARCHIMAGE_BUILDER="https://raw.githubusercontent.com/ivan-hc/ArchImage/refs/heads/main/core/archimage-builder.sh"
+	wget --retry-connrefused --tries=30 "$ARCHIMAGE_BUILDER" -O ./archimage-builder.sh || exit 0
 fi
 
 # Create and enter the AppDir
-mkdir -p "$APP".AppDir archlinux && cd archlinux || exit 1
+mkdir -p AppDir archlinux && cd archlinux || exit 1
+
+_JUNEST_CMD() {
+	./.local/share/junest/bin/junest "$@"
+}
 
 # Set archlinux as a temporary $HOME directory
 HOME="$(dirname "$(readlink -f "$0")")"
 
-#############################################################################
+##########################################################################################################################################################
 #	DOWNLOAD, INSTALL AND CONFIGURE JUNEST
-#############################################################################
-
-_enable_multilib() {
-	printf "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> ./.junest/etc/pacman.conf
-}
+##########################################################################################################################################################
 
-_enable_chaoticaur() {
-	# This function is ment to be used during the installation of JuNest, see "_pacman_patches"
-	./.local/share/junest/bin/junest -- sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
-	./.local/share/junest/bin/junest -- sudo pacman-key --lsign-key 3056513887B78AEB
-	./.local/share/junest/bin/junest -- sudo pacman-key --populate chaotic
-	./.local/share/junest/bin/junest -- sudo pacman --noconfirm -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
-	printf "\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist" >> ./.junest/etc/pacman.conf
-}
-
-_custom_mirrorlist() {
-	COUNTRY=$(curl -i ipinfo.io 2>/dev/null | grep country | cut -c 15- | cut -c -2)
-	if [ -n "$GITHUB_REPOSITORY_OWNER" ] || ! curl --output /dev/null --silent --head --fail "https://archlinux.org/mirrorlist/?country=$COUNTRY" 1>/dev/null; then
-		curl -Ls https://archlinux.org/mirrorlist/all | awk NR==2 RS= | sed 's/#Server/Server/g' > ./.junest/etc/pacman.d/mirrorlist
-	else
-		curl -Ls "https://archlinux.org/mirrorlist/?country=$COUNTRY" | sed 's/#Server/Server/g' > ./.junest/etc/pacman.d/mirrorlist
-	fi
-}
+_enable_archlinuxcn() {	ARCHLINUXCN_ON="1"; }
+_enable_chaoticaur() { CHAOTICAUR_ON="1"; }
+_enable_multilib() { MULTILIB_ON="1"; }
 
-_bypass_signature_check_level() {
-	sed -i 's/#SigLevel/SigLevel/g; s/Required DatabaseOptional/Never/g' ./.junest/etc/pacman.conf
-}
+#_enable_archlinuxcn
+_enable_chaoticaur
+#_enable_multilib
 
-_install_junest() {
-	echo "-----------------------------------------------------------------------------"
-	echo "◆ Clone JuNest from https://github.com/fsquillace/junest"
-	echo "-----------------------------------------------------------------------------"
-	git clone https://github.com/fsquillace/junest.git ./.local/share/junest
-	echo "-----------------------------------------------------------------------------"
-	echo "◆ Downloading JuNest archive from https://github.com/ivan-hc/junest"
-	echo "-----------------------------------------------------------------------------"
-	curl -#Lo junest-x86_64.tar.gz https://github.com/ivan-hc/junest/releases/download/continuous/junest-x86_64.tar.gz
-	./.local/share/junest/bin/junest setup -i junest-x86_64.tar.gz
-	rm -f junest-x86_64.tar.gz
-	echo " Apply patches to PacMan..."
-	#_enable_multilib
-	_enable_chaoticaur
-	_custom_mirrorlist
-	_bypass_signature_check_level
-
-	# Update arch linux in junest
-	./.local/share/junest/bin/junest -- sudo pacman -Syy
-	./.local/share/junest/bin/junest -- sudo pacman --noconfirm -Syu
-}
+[ -f ../archimage-builder.sh ] && source ../archimage-builder.sh junest-setup "$@"
 
-if ! test -d "$HOME/.local/share/junest"; then
-	echo "-----------------------------------------------------------------------------"
-	echo " DOWNLOAD, INSTALL AND CONFIGURE JUNEST"
-	echo "-----------------------------------------------------------------------------"
-	_install_junest
-else
-	echo "-----------------------------------------------------------------------------"
-	echo " RESTART JUNEST"
-	echo "-----------------------------------------------------------------------------"
-fi
-
-#############################################################################
+##########################################################################################################################################################
 #	INSTALL PROGRAMS USING YAY
-#############################################################################
+##########################################################################################################################################################
 
-./.local/share/junest/bin/junest -- yay -Syy
-./.local/share/junest/bin/junest -- gpg --keyserver keyserver.ubuntu.com --recv-key C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF # UNCOMMENT IF YOU USE THE AUR
-if [ -n "$BASICSTUFF" ]; then
-	./.local/share/junest/bin/junest -- yay --noconfirm -S "$BASICSTUFF"
-fi
-if [ -n "$COMPILERS" ]; then
-	./.local/share/junest/bin/junest -- yay --noconfirm -S "$COMPILERS"
-fi
-if [ -n "$DEPENDENCES" ]; then
-	./.local/share/junest/bin/junest -- yay --noconfirm -S "$DEPENDENCES"
-fi
-if [ -n "$APP" ]; then
-	./.local/share/junest/bin/junest -- yay --noconfirm -S alsa-lib gtk3 xapp
-	./.local/share/junest/bin/junest -- yay --noconfirm -S libxml2-legacy
-	./.local/share/junest/bin/junest -- yay --noconfirm -S "$APP"
-	./.local/share/junest/bin/junest -- glib-compile-schemas /usr/share/glib-2.0/schemas/
-else
-	echo "No app found, exiting"; exit 1
-fi
+[ -f ../archimage-builder.sh ] && source ../archimage-builder.sh install "$@"
 
 cd ..
 
-echo ""
-echo "-----------------------------------------------------------------------------"
-echo " CREATING THE APPDIR"
-echo "-----------------------------------------------------------------------------"
-echo ""
-
-# Set locale
-rm -f archlinux/.junest/etc/locale.conf
-sed -i 's/LANG=${LANG:-C}/LANG=$LANG/g' archlinux/.junest/etc/profile.d/locale.sh
-
-# Add launcher and icon
-rm -f ./*.desktop
-LAUNCHER=$(grep -iRl "$BIN" archlinux/.junest/usr/share/applications/* | grep ".desktop" | head -1)
-cp -r "$LAUNCHER" "$APP".AppDir/
-ICON="virtualbox.png"
-[ -z "$ICON" ] && ICON="$BIN"
-cp -r archlinux/.junest/usr/share/icons/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/22x22/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/24x24/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/32x32/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/48x48/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/64x64/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/128x128/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/192x192/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/256x256/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/512x512/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/icons/hicolor/scalable/mimetypes/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-cp -r archlinux/.junest/usr/share/pixmaps/*"$ICON"* "$APP".AppDir/ 2>/dev/null
-
-# Test if the desktop file and the icon are in the root of the future appimage (./*appdir/*)
-if test -f "$APP".AppDir/*.desktop; then
-	echo "◆ The .desktop file is available in $APP.AppDir/"
-elif test -f archlinux/.junest/usr/bin/"$BIN"; then
- 	echo "◆ No .desktop file available for $APP, creating a new one"
- 	cat <<-HEREDOC >> "$APP".AppDir/"$APP".desktop
-	[Desktop Entry]
-	Version=1.0
-	Type=Application
-	Name=$(echo "$APP" | tr '[:lower:]' '[:upper:]')
-	Comment=
-	Exec=$BIN
-	Icon=tux
-	Categories=Utility;
-	Terminal=true
-	StartupNotify=true
-	HEREDOC
-	curl -Lo "$APP".AppDir/tux.png https://raw.githubusercontent.com/Portable-Linux-Apps/Portable-Linux-Apps.github.io/main/favicon.ico 2>/dev/null
-else
-	echo "No binary in path... aborting all the processes."
-	exit 0
-fi
+##########################################################################################################################################################
+#	APPDIR
+##########################################################################################################################################################
 
-if [ ! -d "$APP".AppDir/.local ]; then
-	mkdir -p "$APP".AppDir/.local
-	rsync -av archlinux/.local/ "$APP".AppDir/.local/ | echo "◆ Rsync .local directory to the AppDir"
-	# Made JuNest a portable app and remove "read-only file system" errors
-	sed -i 's#${JUNEST_HOME}/usr/bin/junest_wrapper#${HOME}/.cache/junest_wrapper.old#g' "$APP".AppDir/.local/share/junest/lib/core/wrappers.sh
-	sed -i 's/rm -f "${JUNEST_HOME}${bin_path}_wrappers/#rm -f "${JUNEST_HOME}${bin_path}_wrappers/g' "$APP".AppDir/.local/share/junest/lib/core/wrappers.sh
-	sed -i 's/ln/#ln/g' "$APP".AppDir/.local/share/junest/lib/core/wrappers.sh
-	sed -i 's/rm -f "$file"/test -f "$file"/g' "$APP".AppDir/.local/share/junest/lib/core/wrappers.sh
-	sed -i 's#--bind "$HOME" "$HOME"#--bind-try /home /home --bind-try /run/user /run/user#g' "$APP".AppDir/.local/share/junest/lib/core/namespace.sh
-fi
+[ -f ./archimage-builder.sh ] && source ./archimage-builder.sh appdir "$@"
 
-echo "◆ Rsync .junest directories structure to the AppDir"
-rm -Rf "$APP".AppDir/.junest/*
-archdirs=$(find archlinux/.junest -type d | sed 's/^archlinux\///g')
-for d in $archdirs; do
-	mkdir -p "$APP".AppDir/"$d"
-done
-symlink_dirs=" bin sbin lib lib64 usr/sbin usr/lib64"
-for l in $symlink_dirs; do
-	cp -r archlinux/.junest/"$l" "$APP".AppDir/.junest/"$l"
-done
-
-rsync -av archlinux/.junest/usr/bin_wrappers/ "$APP".AppDir/.junest/usr/bin_wrappers/ | echo "◆ Rsync bin_wrappers to the AppDir"
-rsync -av archlinux/.junest/etc/* "$APP".AppDir/.junest/etc/ | echo "◆ Rsync /etc"
-
-#############################################################################
+##########################################################################################################################################################
 #	APPRUN
-#############################################################################
-
-rm -f "$APP".AppDir/AppRun
-cat <<-'HEREDOC' >> "$APP".AppDir/AppRun
-#!/bin/sh
-HERE="$(dirname "$(readlink -f "$0")")"
-export UNION_PRELOAD="$HERE"
-export JUNEST_HOME="$HERE"/.junest
-export MY_DIR="$JUNEST_HOME"/usr/lib/virtualbox
-
-if command -v unshare >/dev/null 2>&1 && ! unshare --user -p /bin/true >/dev/null 2>&1; then
-   PROOT_ON=1
-   export PATH="$HERE"/.local/share/junest/bin/:"$PATH"
-   mkdir -p "$HOME"/.cache
-else
-   export PATH="$PATH":"$HERE"/.local/share/junest/bin
-fi
+##########################################################################################################################################################
 
-[ -z "$NVIDIA_ON" ] && NVIDIA_ON=1
-if [ "$NVIDIA_ON" = 1 ]; then
-   DATADIR="${XDG_DATA_HOME:-$HOME/.local/share}"
-   CONTY_DIR="${DATADIR}/Conty/overlayfs_shared"
-   [ -f /sys/module/nvidia/version ] && nvidia_driver_version="$(cat /sys/module/nvidia/version)"
-   if [ -n "$nvidia_driver_version" ]; then
-      mkdir -p "${CONTY_DIR}"/nvidia "${CONTY_DIR}"/up/usr/lib "${CONTY_DIR}"/up/usr/share
-      nvidia_data_dirs="egl glvnd nvidia vulkan"
-      for d in $nvidia_data_dirs; do [ ! -d "${CONTY_DIR}"/up/usr/share/"$d" ] && ln -s /usr/share/"$d" "${CONTY_DIR}"/up/usr/share/ 2>/dev/null; done
-      [ ! -f "${CONTY_DIR}"/nvidia/current-nvidia-version ] && echo "${nvidia_driver_version}" > "${CONTY_DIR}"/nvidia/current-nvidia-version
-      [ -f "${CONTY_DIR}"/nvidia/current-nvidia-version ] && nvidia_driver_conty=$(cat "${CONTY_DIR}"/nvidia/current-nvidia-version)
-      if [ "${nvidia_driver_version}" != "${nvidia_driver_conty}" ]; then
-         rm -f "${CONTY_DIR}"/up/usr/lib/*; echo "${nvidia_driver_version}" > "${CONTY_DIR}"/nvidia/current-nvidia-version
-      fi
-      /sbin/ldconfig -p > "${CONTY_DIR}"/nvidia/host_libs
-      grep -i "nvidia\|libcuda" "${CONTY_DIR}"/nvidia/host_libs | cut -d ">" -f 2 > "${CONTY_DIR}"/nvidia/host_nvidia_libs
-      libnv_paths=$(grep "libnv" "${CONTY_DIR}"/nvidia/host_libs | cut -d ">" -f 2)
-      for f in $libnv_paths; do strings "${f}" | grep -qi -m 1 "nvidia" && echo "${f}" >> "${CONTY_DIR}"/nvidia/host_nvidia_libs; done
-      nvidia_libs=$(cat "${CONTY_DIR}"/nvidia/host_nvidia_libs)
-      for n in $nvidia_libs; do libname=$(echo "$n" | sed 's:.*/::') && [ ! -f "${CONTY_DIR}"/up/usr/lib/"$libname" ] && cp "$n" "${CONTY_DIR}"/up/usr/lib/; done
-      libvdpau_nvidia="${CONTY_DIR}/up/usr/lib/libvdpau_nvidia.so"
-      if ! test -f "${libvdpau_nvidia}*"; then cp "$(find /usr/lib -type f -name 'libvdpau_nvidia.so*' -print -quit 2>/dev/null | head -1)" "${CONTY_DIR}"/up/usr/lib/; fi
-      [ -f "${libvdpau_nvidia}"."${nvidia_driver_version}" ] && [ ! -f "${libvdpau_nvidia}" ] && ln -s "${libvdpau_nvidia}"."${nvidia_driver_version}" "${libvdpau_nvidia}"
-      [ -d "${CONTY_DIR}"/up/usr/lib ] && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}":"${CONTY_DIR}"/up/usr/lib:"${LD_LIBRARY_PATH}"
-      [ -d "${CONTY_DIR}"/up/usr/share ] && export XDG_DATA_DIRS="${XDG_DATA_DIRS}":"${CONTY_DIR}"/up/usr/share:"${XDG_DATA_DIRS}"
-   fi
-fi
-
-PROOT_BINDINGS=""
-BWRAP_BINDINGS=""
-
-bind_files="/etc/resolv.conf /etc/hosts /etc/nsswitch.conf /etc/passwd /etc/group /etc/machine-id /etc/asound.conf /etc/localtime "
-for f in $bind_files; do [ -f "$f" ] && PROOT_BINDINGS=" $PROOT_BINDINGS --bind=$f" && BWRAP_BINDINGS=" $BWRAP_BINDINGS --ro-bind-try $f $f"; done
+rm -f AppDir/AppRun
 
-bind_dirs=" /media /mnt /opt /run/media /usr/lib/locale /usr/share/fonts /usr/share/themes /var"
-for d in $bind_dirs; do [ -d "$d" ] && PROOT_BINDINGS=" $PROOT_BINDINGS --bind=$d" && BWRAP_BINDINGS=" $BWRAP_BINDINGS --bind-try $d $d"; done
+# Set to "1" if you want to add Nvidia drivers manager in the AppRun
+export NVIDIA_ON=1
 
-PROOT_BINDS=" --bind=/dev --bind=/sys --bind=/tmp --bind=/proc $PROOT_BINDINGS --bind=/home --bind=/home/$USER "
-BWRAP_BINDS=" --dev-bind /dev /dev --ro-bind /sys /sys --bind-try /tmp /tmp --proc /proc $BWRAP_BINDINGS --cap-add CAP_SYS_ADMIN "
+[ -f ./archimage-builder.sh ] && source ./archimage-builder.sh apprun "$@"
 
-_JUNEST_CMD() {
-   if [ "$PROOT_ON" = 1 ]; then
-      "$HERE"/.local/share/junest/bin/junest proot -n -b "$PROOT_BINDS" "$@"
-   else
-      "$HERE"/.local/share/junest/bin/junest -n -b "$BWRAP_BINDS" "$@"
-   fi
-}
+# AppRun footer, here you can add options and change the way the AppImage interacts with its internal structure
+cat <<-'HEREDOC' >> AppDir/AppRun
 
 if command -v sudo >/dev/null 2>&1; then
-	export SUDOCMD="sudo"
+    export SUDOCMD="sudo"
 elif command -v doas >/dev/null 2>&1; then
-	export SUDOCMD="doas"
+    export SUDOCMD="doas"
 else
-	echo 'ERROR: No sudo or doas found'
-	exit 1
+    echo 'ERROR: No sudo or doas found'
+    exit 1
 fi
 
 Show_help_message() {
-	printf " Available options:\n"
-	printf "\n  --vbox-usb-enable\n"
-	printf "\n	Enable USB support in Virtual Machines. Requires \"sudo\" password.\n"
-	printf "\n	The above option does the following:\n"
-	printf "\n	- Creates the \"vboxusers\" group"
-	printf "\n	- Adds your \$USER to the \"vboxusers\" group"
-	printf "\n	- Creates the /usr/lib/virtualbox directory on the host system"
-	printf "\n	- Installs the \"VBoxCreateUSBNode.sh\" script in /usr/lib/virtualbox"
-	printf "\n	- Creates the /etc/udev/rules.d directory"
-	printf "\n	- Creates and installs the \"60-vboxusb.rules\" file in /etc/udev/rules.d\n"
-	printf "\n  VirtualBoxVM\n"
-	printf "\n	A VirtualBox command to handle Virtual Machines via command line\n\n"
+    printf " Available options:\n"
+    printf "\n  --vbox-usb-enable\n"
+    printf "\n	Enable USB support in Virtual Machines. Requires \"sudo\" password.\n"
+    printf "\n	The above option does the following:\n"
+    printf "\n	- Creates the \"vboxusers\" group"
+    printf "\n	- Adds your \$USER to the \"vboxusers\" group"
+    printf "\n	- Creates the /usr/lib/virtualbox directory on the host system"
+    printf "\n	- Installs the \"VBoxCreateUSBNode.sh\" script in /usr/lib/virtualbox"
+    printf "\n	- Creates the /etc/udev/rules.d directory"
+    printf "\n	- Creates and installs the \"60-vboxusb.rules\" file in /etc/udev/rules.d\n"
+    printf "\n  VirtualBoxVM\n"
+    printf "\n	A VirtualBox command to handle Virtual Machines via command line\n\n"
 }
 
 VBoxUSB_enable() {
-	printf "\n The above option does the following:\n"
-	printf "\n - Creates the \"vboxusers\" group"
-	printf "\n - Adds your \$USER to the \"vboxusers\" group"
-	printf "\n - Creates the /usr/lib/virtualbox directory on the host system"
-	printf "\n - Installs the \"VBoxCreateUSBNode.sh\" script in /usr/lib/virtualbox"
-	printf "\n - Creates the /etc/udev/rules.d directory"
-	printf "\n - Creates and installs the \"60-vboxusb.rules\" file in /etc/udev/rules.d\n"
-	printf "\n See also https://github.com/cyberus-technology/virtualbox-kvm#usb-pass-through\n"
-	printf "\nAuthentication is required\n"
-	if ! test -f /usr/lib/virtualbox/VBoxCreateUSBNode.sh; then
-		# Create the "vboxusers" group and add $USER
-		$SUDOCMD groupadd -r vboxusers -U "$USER" 
-		# Create the directory /usr/lib/virtualbox on the host system
-		$SUDOCMD mkdir -p /usr/lib/virtualbox
-		# Install the "VBoxCreateUSBNode.sh" script in /usr/lib/virtualbox
-		_JUNEST_CMD -- cp /usr/share/virtualbox/VBoxCreateUSBNode.sh ./
-		chmod a+x VBoxCreateUSBNode.sh
-		$SUDOCMD mv VBoxCreateUSBNode.sh /usr/lib/virtualbox/
-		$SUDOCMD chown -R root:vboxusers /usr/lib/virtualbox
-	fi
-	if ! test -f /etc/udev/rules.d/60-vboxusb.rules; then
-		# Create the directory /etc/udev/rules.d
-		$SUDOCMD mkdir -p /etc/udev/rules.d
-		# Create and install the 60-vboxusb.rules file in /etc/udev/rules.d
-		_JUNEST_CMD -- cp /etc/udev/rules.d/60-vboxusb.rules ./
-		$SUDOCMD mv 60-vboxusb.rules /etc/udev/rules.d/
-		# Reload the udev rules
-		$SUDOCMD systemctl reload systemd-udevd
-	fi
-	printf "\nIt is recommended that you reboot for the changes to take effect.\n"
+    printf "\n The above option does the following:\n"
+    printf "\n - Creates the \"vboxusers\" group"
+    printf "\n - Adds your \$USER to the \"vboxusers\" group"
+    printf "\n - Creates the /usr/lib/virtualbox directory on the host system"
+    printf "\n - Installs the \"VBoxCreateUSBNode.sh\" script in /usr/lib/virtualbox"
+    printf "\n - Creates the /etc/udev/rules.d directory"
+    printf "\n - Creates and installs the \"60-vboxusb.rules\" file in /etc/udev/rules.d\n"
+    printf "\n See also https://github.com/cyberus-technology/virtualbox-kvm#usb-pass-through\n"
+    printf "\nAuthentication is required\n"
+    if ! test -f /usr/lib/virtualbox/VBoxCreateUSBNode.sh; then
+        # Create the "vboxusers" group and add $USER
+        $SUDOCMD groupadd -r vboxusers -U "$USER" 
+        # Create the directory /usr/lib/virtualbox on the host system
+        $SUDOCMD mkdir -p /usr/lib/virtualbox
+        # Install the "VBoxCreateUSBNode.sh" script in /usr/lib/virtualbox
+        _JUNEST_CMD -- cp /usr/share/virtualbox/VBoxCreateUSBNode.sh ./
+        chmod a+x VBoxCreateUSBNode.sh
+        $SUDOCMD mv VBoxCreateUSBNode.sh /usr/lib/virtualbox/
+        $SUDOCMD chown -R root:vboxusers /usr/lib/virtualbox
+    fi
+    if ! test -f /etc/udev/rules.d/60-vboxusb.rules; then
+        # Create the directory /etc/udev/rules.d
+        $SUDOCMD mkdir -p /etc/udev/rules.d
+        # Create and install the 60-vboxusb.rules file in /etc/udev/rules.d
+        _JUNEST_CMD -- cp /etc/udev/rules.d/60-vboxusb.rules ./
+        $SUDOCMD mv 60-vboxusb.rules /etc/udev/rules.d/
+        # Reload the udev rules
+        $SUDOCMD systemctl reload systemd-udevd
+    fi
+    printf "\nIt is recommended that you reboot for the changes to take effect.\n"
 }
 
-EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
-
 case "$1" in
 '')
-	_JUNEST_CMD -- /usr/bin/virtualbox
-	;;
+      _JUNEST_CMD -- /usr/bin/virtualbox
+      ;;
 'VirtualBoxVM')
-	_JUNEST_CMD -- /usr/bin/VirtualBoxVM "$@"
-	;;
+      _JUNEST_CMD -- /usr/bin/VirtualBoxVM "$@"
+      ;;
 '-h'|'--help')
-	Show_help_message
-	;;
+      Show_help_message
+      ;;
 '--vbox-usb-enable')
-	VBoxUSB_enable
-	;;
+      VBoxUSB_enable
+      ;;
 '-v'|'--version')
-	echo "VirtualBox VERSION KVM"
-	;;
+      echo "VirtualBox VERSION KVM"
+      ;;
 'virtualbox'|*)
-	_JUNEST_CMD -- /usr/bin/VirtualBox "$@"
-;;
+      _JUNEST_CMD -- /usr/bin/VirtualBox "$@"
+      ;;
 esac
-HEREDOC
-chmod a+x "$APP".AppDir/AppRun
-sed -i "s/VERSION/$vboxver/g" "$APP".AppDir/AppRun
-
-#############################################################################
-#	EXTRACT PACKAGES
-#############################################################################
-
-[ -z "$extraction_count" ] && extraction_count=0
-[ ! -f ./autodeps ] && echo "$extraction_count" > ./autodeps
-[ -f ./autodeps ] && autodeps=$(cat ./autodeps)
-[ "$autodeps" != "$extraction_count" ] && rm -Rf ./deps ./packages && echo "$extraction_count" > ./autodeps
-
-[ ! -f ./userdeps ] && echo "$DEPENDENCES" > ./userdeps
-[ -f ./userdeps ] && userdeps=$(cat ./userdeps)
-[ "$userdeps" != "$DEPENDENCES" ] && rm -Rf ./deps ./packages && echo "$DEPENDENCES" > ./userdeps
-
-_extract_main_package() {
-	mkdir -p base
-	rm -Rf ./base/*
-	pkg_full_path=$(find ./archlinux -type f -name "$APP-*zst")
-	if [ "$(echo "$pkg_full_path" | wc -l)" = 1 ]; then
-		pkg_full_path=$(find ./archlinux -type f -name "$APP-*zst")
-	else
-		for p in $pkg_full_path; do
-			if tar fx "$p" .PKGINFO -O | grep -q "pkgname = $APP$"; then
-				pkg_full_path="$p"
-			fi
-		done
-	fi
-	[ -z "$pkg_full_path" ] && echo "💀 ERROR: no package found for \"$APP\", operation aborted!" && exit 0
-	tar fx "$pkg_full_path" -C ./base/
-	VERSION=$(cat ./base/.PKGINFO | grep pkgver | cut -c 10- | sed 's@.*:@@')
-	mkdir -p deps
-}
-
-_download_missing_packages() {
-	localpackage=$(find ./archlinux -name "$arg-[0-9]*zst")
-	if ! test -f "$localpackage"; then
-		./archlinux/.local/share/junest/bin/junest -- yay --noconfirm -Sw "$arg"
-	fi
-}
-
-_extract_package() {
-	_download_missing_packages &> /dev/null
-	pkg_full_path=$(find ./archlinux -name "$arg-[0-9]*zst")
-	pkgname=$(echo "$pkg_full_path" | sed 's:.*/::')
-	[ ! -f ./packages ] && rm -Rf ./deps/* && touch ./packages
-	if [ -z "$( ls -A './deps' )" ]; then
-		rm -f ./packages
-		echo ""
-		echo "-----------------------------------------------------------------------------"
-		echo " EXTRACTING PACKAGES"
-		echo "-----------------------------------------------------------------------------"
-		echo ""
-	fi
-	if test -f "$pkg_full_path"; then
-		if ! grep -q "$pkgname" ./packages 2>/dev/null;then
-			echo "◆ Extracting $pkgname"
-			tar fx "$pkg_full_path" -C ./deps/ --warning=no-unknown-keyword
-			echo "$pkgname" >> ./packages
-		fi
-		[ -n "$lib_browser_launcher" ] && [[ "$arg" =~ (hicolor-icon-theme|xapp) ]] && tar fx "$pkg_full_path" -C ./base/ --warning=no-unknown-keyword --exclude='.PKGINFO'
-	fi
-}
-
-_determine_packages_and_libraries() {
-	if echo "$arg" | grep -q "\.so"; then
-		LIBSAVED="$LIBSAVED $arg"
-	elif [ "$arg" != autoconf ] && [ "$arg" != autoconf ] && [ "$arg" != automake ] && [ "$arg" != bison ] && [ "$arg" != debugedit ] && [ "$arg" != dkms ] && [ "$arg" != fakeroot ] && [ "$arg" != flatpak ] && [ "$arg" != linux ] && [ "$arg" != gcc ] && [ "$arg" != make ] && [ "$arg" != pacman ] && [ "$arg" != patch ] && [ "$arg" != systemd ] \
-	&& ! echo "$arg" | grep -q "$BIN"; then
-		_extract_package
-		cat ./deps/.PKGINFO 2>/dev/null | grep "^depend = " | cut -c 10- | sed 's/=.*//' >> depdeps
-		rm -f ./deps/.*
-	fi
-}
-
-_extract_deps() {
-	DEPS=$(sort -u ./depdeps)
-	for arg in $DEPS; do
-		_determine_packages_and_libraries
-	done
-}
-
-_extract_all_dependences() {
-	rm -f ./depdeps
-
-	OPTDEPS=$(cat ./base/.PKGINFO 2>/dev/null | grep "^optdepend = " | sed 's/optdepend = //g' | sed 's/=.*//' | sed 's/:.*//')
-	for arg in $OPTDEPS; do
-		_determine_packages_and_libraries
-	done
-	[ -f ./depdeps ] && _extract_deps
-	rm -f ./depdeps
-
-	ARGS=$(echo "$DEPENDENCES" | tr " " "\n")
-	for arg in $ARGS; do
-		_determine_packages_and_libraries
-	done
-
-	DEPS=$(cat ./base/.PKGINFO 2>/dev/null | grep "^depend = " | sed 's/depend = //g' | sed 's/=.*//')
-	for arg in $DEPS; do
-		_determine_packages_and_libraries
-	done
-
-	# Set the level of sub-dependencies extraction, the higher the number, the bigger the AppImage will be
-	if [ "$extraction_count" != 0 ]; then
-		for e in $(seq "$extraction_count"); do _extract_deps; done
-	fi
-}
-
-_extract_main_package
-_extract_all_dependences
-
-echo ""
-echo "-----------------------------------------------------------------------------"
-echo " IMPLEMENTING NECESSARY LIBRARIES (MAY TAKE SEVERAL MINUTES)"
-echo "-----------------------------------------------------------------------------"
-echo ""
-
-# Save files in /usr/bin
-_savebins() {
-	echo "◆ Saving files in /usr/bin"
-	cp -r ./archlinux/.junest/usr/bin/bwrap ./"$APP".AppDir/.junest/usr/bin/
-	cp -r ./archlinux/.junest/usr/bin/proot* ./"$APP".AppDir/.junest/usr/bin/
-	cp -r ./archlinux/.junest/usr/bin/*$BIN* ./"$APP".AppDir/.junest/usr/bin/
-	coreutils="[ basename cat chmod chown cp cut dir dirname du echo env expand expr fold head id ln ls mkdir mv readlink realpath rm rmdir seq sleep sort stty sum sync tac tail tee test timeout touch tr true tty uname uniq wc who whoami yes"
-	utils_bin="awk bash $coreutils gawk gio grep ld ldd sed sh strings xdg-open"
-	for b in $utils_bin; do
- 		cp -r ./archlinux/.junest/usr/bin/"$b" ./"$APP".AppDir/.junest/usr/bin/
-   	done
-	for arg in $BINSAVED; do
-		cp -r ./archlinux/.junest/usr/bin/*"$arg"* ./"$APP".AppDir/.junest/usr/bin/
-	done
-}
-
-# Save files in /usr/lib
-_savelibs() {
-	echo "◆ Detect libraries related to /usr/bin files"
-	libs4bin=$(readelf -d ./"$APP".AppDir/.junest/usr/bin/* 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so")
-
-	echo "◆ Saving JuNest core libraries"
-	cp -r ./archlinux/.junest/usr/lib/ld-linux-x86-64.so* ./"$APP".AppDir/.junest/usr/lib/
-	lib_preset="$APP $BIN gconv libdw libelf libresolv.so libtinfo.so $libs4bin"
-	LIBSAVED="$lib_preset $LIBSAVED $SHARESAVED"
-	for arg in $LIBSAVED; do
-		LIBPATHS="$LIBPATHS $(find ./archlinux/.junest/usr/lib -maxdepth 20 -wholename "*$arg*" | sed 's/\.\/archlinux\///g')"
-	done
-	for arg in $LIBPATHS; do
-		[ ! -d "$APP".AppDir/"$arg" ] && cp -r ./archlinux/"$arg" "$APP".AppDir/"$arg" &
-	done
-	wait
-	core_libs=$(find ./"$APP".AppDir -type f)
-	lib_core=$(for c in $core_libs; do readelf -d "$c" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-
-	echo "◆ Detect libraries of the main package"
-	base_libs=$(find ./base -type f | uniq)
-	lib_base_0=$(for b in $base_libs; do readelf -d "$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-
-	echo "◆ Detect libraries of the dependencies"
-	dep_libs=$(find ./deps -executable -name "*.so*")
-	lib_deps=$(for d in $dep_libs; do readelf -d "$d" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-
-	echo "◆ Detect and copy base libs"
-	basebin_libs=$(find ./base -executable -name "*.so*")
-	lib_base_1=$(for b in $basebin_libs; do readelf -d "$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_1=$(echo "$lib_base_1" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_2=$(for b in $lib_base_1; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_2=$(echo "$lib_base_2" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_3=$(for b in $lib_base_2; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_3=$(echo "$lib_base_3" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_4=$(for b in $lib_base_3; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_4=$(echo "$lib_base_4" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_5=$(for b in $lib_base_4; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_5=$(echo "$lib_base_5" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_6=$(for b in $lib_base_5; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_6=$(echo "$lib_base_6" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_7=$(for b in $lib_base_6; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_7=$(echo "$lib_base_7" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_8=$(for b in $lib_base_7; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_8=$(echo "$lib_base_8" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_9=$(for b in $lib_base_8; do readelf -d ./archlinux/.junest/usr/lib/"$b" 2>/dev/null | grep NEEDED | tr '[] ' '\n' | grep ".so"; done)
-	lib_base_9=$(echo "$lib_base_9" | tr ' ' '\n' | sort -u | xargs)
-	lib_base_libs="$lib_core $lib_base_0 $lib_base_1 $lib_base_2 $lib_base_3 $lib_base_4 $lib_base_5 $lib_base_6 $lib_base_7 $lib_base_8 $lib_base_9 $lib_deps"
-	lib_base_libs=$(echo "$lib_base_libs" | tr ' ' '\n' | sort -u | sed 's/.so.*/.so/' | xargs)
-	for l in $lib_base_libs; do
-		rsync -av ./archlinux/.junest/usr/lib/"$l"* ./"$APP".AppDir/.junest/usr/lib/ &
-	done
-	wait
-	for l in $lib_base_libs; do
-		rsync -av ./deps/usr/lib/"$l"* ./"$APP".AppDir/.junest/usr/lib/ &
-	done
-	wait
-}
-
-# Save files in /usr/share
-_saveshare() {
-	echo "◆ Saving directories in /usr/share"
-	SHARESAVED="$SHARESAVED $APP $BIN fontconfig glib- locale mime wayland X11"
-	for arg in $SHARESAVED; do
-		cp -r ./archlinux/.junest/usr/share/*"$arg"* ./"$APP".AppDir/.junest/usr/share/
- 	done
-}
-
-_savebins 2>/dev/null
-_savelibs 2>/dev/null
-_saveshare 2>/dev/null
 
-echo ""
-echo "-----------------------------------------------------------------------------"
-echo " ASSEMBLING THE APPIMAGE"
-echo "-----------------------------------------------------------------------------"
-echo ""
-
-_rsync_main_package() {
-	rm -Rf ./base/.*
-	rsync -av ./base/ ./"$APP".AppDir/.junest/ | echo "◆ Rsync the content of the \"$APP\" package"
-}
-
-_rsync_dependences() {
-	rm -Rf ./deps/.*
-	chmod -R 777 ./deps/*
-	rsync -av ./deps/ ./"$APP".AppDir/.junest/ | echo "◆ Rsync all dependencies, please wait"
-}
-
-_rsync_main_package
-_rsync_dependences
-
-#############################################################################
-#	REMOVE BLOATWARES, ENABLE MOUNTPOINTS
-#############################################################################
-
-_remove_more_bloatwares() {
-	etc_remove="makepkg.conf pacman"
-	for r in $etc_remove; do
-		rm -Rf ./"$APP".AppDir/.junest/etc/"$r"*
-	done
-	bin_remove="gcc"
-	for r in $bin_remove; do
-		rm -Rf ./"$APP".AppDir/.junest/usr/bin/"$r"*
-	done
-	lib_remove="cmake gcc gconv libgphobos"
-	for r in $lib_remove; do
-		rm -Rf ./"$APP".AppDir/.junest/usr/lib/"$r"*
-	done
-	share_remove="gcc i18n"
-	for r in $share_remove; do
-		rm -Rf ./"$APP".AppDir/.junest/usr/share/"$r"*
-	done
-	echo Y | rm -Rf ./"$APP".AppDir/.cache/yay/*
-	find ./"$APP".AppDir/.junest/usr/share/doc/* -not -iname "*$BIN*" -a -not -name "." -delete 2> /dev/null #REMOVE ALL DOCUMENTATION NOT RELATED TO THE APP
-	find ./"$APP".AppDir/.junest/usr/share/locale/*/*/* -not -iname "*$BIN*" -a -not -name "." -delete 2> /dev/null #REMOVE ALL ADDITIONAL LOCALE FILES
-	rm -Rf ./"$APP".AppDir/.junest/home # remove the inbuilt home
-	rm -Rf ./"$APP".AppDir/.junest/usr/include # files related to the compiler
-	rm -Rf ./"$APP".AppDir/.junest/usr/share/man # AppImages are not ment to have man command
-	rm -Rf ./"$APP".AppDir/.junest/usr/lib/python*/__pycache__/* # if python is installed, removing this directory can save several megabytes
-	rm -Rf ./"$APP".AppDir/.junest/usr/lib/libgallium*
-	rm -Rf ./"$APP".AppDir/.junest/usr/lib/libgo.so*
-	rm -Rf ./"$APP".AppDir/.junest/usr/lib/libLLVM* # included in the compilation phase, can sometimes be excluded for daily use
-	rm -Rf ./"$APP".AppDir/.junest/var/* # remove all packages downloaded with the package manager
-}
-
-_enable_mountpoints_for_the_inbuilt_bubblewrap() {
-	mkdir -p ./"$APP".AppDir/.junest/home
-	mkdir -p ./"$APP".AppDir/.junest/media
-	mkdir -p ./"$APP".AppDir/.junest/usr/lib/locale
-	mkdir -p ./"$APP".AppDir/.junest/usr/share/fonts
-	mkdir -p ./"$APP".AppDir/.junest/usr/share/themes
-	mkdir -p ./"$APP".AppDir/.junest/run/media
-	mkdir -p ./"$APP".AppDir/.junest/run/user
-	rm -f ./"$APP".AppDir/.junest/etc/localtime && touch ./"$APP".AppDir/.junest/etc/localtime
-	[ ! -f ./"$APP".AppDir/.junest/etc/asound.conf ] && touch ./"$APP".AppDir/.junest/etc/asound.conf
-	[ ! -e ./"$APP".AppDir/.junest/usr/share/X11/xkb ] && rm -f ./"$APP".AppDir/.junest/usr/share/X11/xkb && mkdir -p ./"$APP".AppDir/.junest/usr/share/X11/xkb && sed -i -- 's# /var"$# /usr/share/X11/xkb /var"#g' ./"$APP".AppDir/AppRun
-}
-
-#############################################################################
-#	PATCH FOR VIRTUALBOX
-#############################################################################
-
-# Fix locale
-mkdir -p ./"$APP".AppDir/.junest/usr/lib/virtualbox/nls
-mv ./"$APP".AppDir/.junest/usr/share/virtualbox/nls/* ./"$APP".AppDir/.junest/usr/lib/virtualbox/nls/
-rm -R -f ./"$APP".AppDir/.junest/usr/share/virtualbox/nls
-
-# Add guest additions
-if ! test -f ./VBoxGuestAdditions.iso; then
-	wget https://download.virtualbox.org/virtualbox/"${vboxver}"/VBoxGuestAdditions_"${vboxver}".iso -O ./VBoxGuestAdditions.iso || exit 1
-fi
-mkdir -p ./"$APP".AppDir/.junest/usr/lib/virtualbox/additions
-cp -r VBoxGuestAdditions.iso ./"$APP".AppDir/.junest/usr/lib/virtualbox/additions/ || exit 1
-
-# Add extension pack
-if ! test -f ./Extension_Pack.tar; then
-	wget https://download.virtualbox.org/virtualbox/"${vboxver}"/Oracle_VirtualBox_Extension_Pack-"${vboxver}".vbox-extpack -O ./Extension_Pack.tar
-fi
-mkdir -p shrunk
-tar xfC ./Extension_Pack.tar shrunk
-rm -r shrunk/{darwin*,solaris*,win*}
-tar -c --gzip --file shrunk.vbox-extpack -C shrunk .
-mkdir -p ./"$APP".AppDir/.junest/usr/share/virtualbox/extensions
-cp -r shrunk.vbox-extpack ./"$APP".AppDir/.junest/usr/share/virtualbox/extensions/Oracle_VirtualBox_Extension_Pack-"${vboxver}".vbox-extpack
-mkdir -p ./"$APP".AppDir/.junest/usr/share/licenses/virtualbox-ext-oracle/
-cp -r shrunk/ExtPack-license.txt ./"$APP".AppDir/.junest/usr/share/licenses/virtualbox-ext-oracle/PUEL
-mkdir -p ./"$APP".AppDir/.junest/usr/lib/virtualbox/ExtensionPacks/Oracle_VirtualBox_Extension_Pack
-cp -r shrunk/* ./"$APP".AppDir/.junest/usr/lib/virtualbox/ExtensionPacks/Oracle_VirtualBox_Extension_Pack/
-
-# Install the "VBoxCreateUSBNode.sh" script in /usr/lib/virtualbox
-mkdir -p ./"$APP".AppDir/.junest/usr/lib/virtualbox
-cp -r ./"$APP".AppDir/.junest/usr/share/virtualbox/VBoxCreateUSBNode.sh ./"$APP".AppDir/.junest/usr/lib/virtualbox/
-chown -R root:vboxusers ./"$APP".AppDir/.junest/usr/lib/virtualbox
-
-# Create and install the 60-vboxusb.rules file in /etc/udev/rules.d
-mkdir -p ./"$APP".AppDir/.junest/etc/udev/rules.d
-cat <<-'HEREDOC' >> ./"$APP".AppDir/.junest/etc/udev/rules.d/60-vboxusb.rules
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 HEREDOC
+chmod a+x AppDir/AppRun
 
-# Allow VirtualBox to be used in PROOT mode
-sed -i 's/^MY_DIR=/#MY_DIR=/g' ./"$APP".AppDir/.junest/usr/bin/VBox || exit 1
-
-# Remove annoying vboxdrv messages
-sed -i 's/elif ! lsmod/elif ! echo vboxdrv/g' ./"$APP".AppDir/.junest/usr/bin/VBox || exit 1
-sed -i 's# ! -c /dev/vboxdrv# -d /dev/vboxdrv#g' ./"$APP".AppDir/.junest/usr/bin/VBox || exit 1
+##########################################################################################################################################################
+#	COMPILE
+##########################################################################################################################################################
 
-# Fix libcurl
-rm -f ./"$APP".AppDir/.junest/usr/lib/libcurl* && cp -r ./archlinux/.junest/usr/lib/libcurl* ./"$APP".AppDir/.junest/usr/lib/
+[ -f ./archimage-builder.sh ] && source ./archimage-builder.sh compile "$@"
 
-_remove_more_bloatwares
-find ./"$APP".AppDir/.junest/usr/lib ./"$APP".AppDir/.junest/usr/lib32 -type f -regex '.*\.a' -exec rm -f {} \; 2>/dev/null
-find ./"$APP".AppDir/.junest/usr -type f -regex '.*\.so.*' -exec strip --strip-debug {} \;
-find ./"$APP".AppDir/.junest/usr/bin -type f ! -regex '.*\.so.*' -exec strip --strip-unneeded {} \;
-find ./"$APP".AppDir/.junest/usr -type d -empty -delete
-_enable_mountpoints_for_the_inbuilt_bubblewrap
-
-#############################################################################
+##########################################################################################################################################################
 #	CREATE THE APPIMAGE
-#############################################################################
+##########################################################################################################################################################
 
 if test -f ./*.AppImage; then rm -Rf ./*archimage*.AppImage; fi
 
-#APPNAME=$(cat ./"$APP".AppDir/*.desktop | grep 'Name=' | head -1 | cut -c 6- | sed 's/ /-/g')
 APPNAME="VirtualBox-KVM"
-VERSION="$vboxver"
-UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|VirtualBox-appimage|latest|*x86_64.AppImage.zsync"
-echo "$VERSION" > ./version
-ARCH=x86_64 ./appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
-	-u "$UPINFO" \
-	./"$APP".AppDir "$APPNAME"_"$VERSION"-archimage4.3-x86_64.AppImage
+REPO="VirtualBox-appimage"
+TAG="latest"
+UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|$REPO|$TAG|*x86_64.AppImage.zsync"
+
+echo "$vboxver" > ./version
+
+_appimagetool() {
+	if ! command -v appimagetool 1>/dev/null; then
+		if [ ! -f ./appimagetool ]; then
+			echo " Downloading appimagetool..." && curl -#Lo appimagetool https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-"$ARCH".AppImage && chmod a+x ./appimagetool || exit 1
+		fi
+		./appimagetool "$@"
+	else
+		appimagetool "$@"
+	fi
+}
+
+ARCH=x86_64 _appimagetool -u "$UPINFO" AppDir "$APPNAME"_"$vboxver"-"$ARCHIMAGE_VERSION"-x86_64.AppImage