diff --git a/LICENSE b/LICENSE
index 6b156fe..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -664,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index f29d086..e81482d 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,6 @@ Clone:\
 `sudo ./fix_permissions.sh`
 
 ## Build
-`sudo ./build.sh -v`
+`sudo ./mkarchiso /path/to/profile`
 
 ## The iso appears at out folder
diff --git a/airootfs/etc/environment b/airootfs/etc/environment
index e26c32e..39b5a92 100755
--- a/airootfs/etc/environment
+++ b/airootfs/etc/environment
@@ -4,5 +4,7 @@
 #
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
-# QT_QPA_PLATFORMTHEME=qt5ct
+QT_QPA_PLATFORMTHEME=qt5ct
+#QT_STYLE_OVERRIDE=kvantum
 BROWSER=cachy-browser
+EDITOR=nano
diff --git a/airootfs/etc/group b/airootfs/etc/group
new file mode 100755
index 0000000..725b55e
--- /dev/null
+++ b/airootfs/etc/group
@@ -0,0 +1,8 @@
+root:x:0:root
+adm:x:4:liveuser
+wheel:x:10:liveuser
+uucp:x:14:liveuser
+nopasswdlogin:x:966:liveuser
+rfkill:x:983:liveuser
+sys:x:3:bin,liveuser
+liveuser:x:1000:
diff --git a/airootfs/etc/gshadow b/airootfs/etc/gshadow
new file mode 100755
index 0000000..29a1e7b
--- /dev/null
+++ b/airootfs/etc/gshadow
@@ -0,0 +1,2 @@
+root:!*::root
+liveuser:!*::
diff --git a/airootfs/etc/hostname b/airootfs/etc/hostname
index a5f866b..73c3973 100755
--- a/airootfs/etc/hostname
+++ b/airootfs/etc/hostname
@@ -1,3 +1,3 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-archiso
+CachyOS
diff --git a/airootfs/etc/mkinitcpio.conf b/airootfs/etc/mkinitcpio.conf
index 31d49f4..a376034 100755
--- a/airootfs/etc/mkinitcpio.conf
+++ b/airootfs/etc/mkinitcpio.conf
@@ -55,7 +55,7 @@ FILES=()
 HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
 
 # COMPRESSION
-# Use this to compress the initramfs image. By default, zstd compression
+# Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
 COMPRESSION="zstd"
 #COMPRESSION="gzip"
diff --git a/airootfs/etc/mkinitcpio.d/linux.preset b/airootfs/etc/mkinitcpio.d/linux.preset
index a1949cd..d35f137 100755
--- a/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/airootfs/etc/mkinitcpio.d/linux.preset
@@ -8,4 +8,4 @@ PRESETS=('archiso')
 ALL_kver='/boot/vmlinuz-linux'
 ALL_config='/etc/mkinitcpio.conf'
 
-archiso_image="/boot/archiso.img"
+archiso_image="/boot/initramfs-linux.img"
diff --git a/airootfs/etc/motd b/airootfs/etc/motd
index 2152ce0..344732f 100755
--- a/airootfs/etc/motd
+++ b/airootfs/etc/motd
@@ -1,18 +1,19 @@
 This ISO is based on Arch-ISO modified hugely to provide Installation Environment for CachyOS.
 https://cachyos.org
 
-Arch-ISO Source:
-https://gitlab.archlinux.org/archlinux/archiso
-
 CachyOS-archiso Sources:
 https://gitlab.com/cachyos/cachyos-archiso
 
-Live environment will start now and let you install CachyOS to disk, or tryout XFCE4-Desktop from Live-Session.
+Arch-ISO Source:
+https://gitlab.archlinux.org/archlinux/archiso
 
-Bugs can be reported here:
-https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports
+Calamares as our installer:
+https://github.com/calamares/calamares
+
+Live environment will start now and let you install CachyOS to disk, or tryout Plasma-Desktop from Live-Session.
 
 Getting help at the forum: https://forum.cachyos.org
 
-Welcome to your cachy!
+Welcome to your cachy
 
+---
diff --git a/airootfs/etc/pacman.conf b/airootfs/etc/pacman.conf
index 59f2eee..c323579 100755
--- a/airootfs/etc/pacman.conf
+++ b/airootfs/etc/pacman.conf
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
@@ -33,10 +33,11 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-#TotalDownload
-# We cannot check disk space from within a chroot environment
+#NoProgressBar
 #CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
diff --git a/airootfs/etc/passwd b/airootfs/etc/passwd
index 2807d5d..aebc492 100755
--- a/airootfs/etc/passwd
+++ b/airootfs/etc/passwd
@@ -1 +1 @@
-root:x:0:0:root:/root:/usr/bin/zsh
+root:x:0:0:root:/root:/bin/bash
diff --git a/airootfs/etc/skel/.bashrc b/airootfs/etc/skel/.bashrc
index 3256bd4..6ff8a1b 100755
--- a/airootfs/etc/skel/.bashrc
+++ b/airootfs/etc/skel/.bashrc
@@ -164,6 +164,19 @@ _open_files_for_editing() {
     done
 }
 
+_Pacdiff() {
+    local differ pacdiff=/usr/bin/pacdiff
+
+    if [ -n "$(echo q | DIFFPROG=diff $pacdiff)" ] ; then
+        for differ in kdiff3 meld diffuse ; do
+            if [ -x /usr/bin/$differ ] ; then
+                DIFFPROG=$differ su-c_wrapper $pacdiff
+                break
+            fi
+        done
+    fi
+}
+
 #------------------------------------------------------------
 
 ## Aliases for the functions above.
@@ -171,8 +184,5 @@ _open_files_for_editing() {
 ##
 
 # alias ef='_open_files_for_editing'     # 'ef' opens given file(s) for editing
-
-## Other potentially useful aliases.
-#
-# alias pacdiff=eos-pacdiff
+# alias pacdiff=_Pacdiff
 ################################################################################
diff --git a/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig b/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig
new file mode 100755
index 0000000..3159ec3
--- /dev/null
+++ b/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig
@@ -0,0 +1,2 @@
+[General]
+theme=KvArc
diff --git a/airootfs/etc/skel/.config/qt5ct/qt5ct.conf b/airootfs/etc/skel/.config/qt5ct/qt5ct.conf
new file mode 100755
index 0000000..dfda865
--- /dev/null
+++ b/airootfs/etc/skel/.config/qt5ct/qt5ct.conf
@@ -0,0 +1,28 @@
+[Appearance]
+color_scheme_path=/usr/share/qt5ct/colors/darker.conf
+custom_palette=false
+icon_theme=Arc-X-D
+standard_dialogs=default
+style=kvantum
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x1e\0S\0o\0u\0r\0\x63\0\x65\0 \0\x43\0o\0\x64\0\x65\0 \0P\0r\0o@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=/usr/share/qt5ct/qss/scrollbar-simple.qss, /usr/share/qt5ct/qss/sliders-simple.qss, /usr/share/qt5ct/qss/tooltip-simple.qss, /usr/share/qt5ct/qss/traynotification-simple.qss
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xc0\0\0\x3;\0\0\t\xa2\0\0\x6\xe\0\0\x6\xc2\0\0\x3W\0\0\t\xa0\0\0\x6\f\0\0\0\0\0\0\0\0\a\x80\0\0\x6\xc2\0\0\x3W\0\0\t\xa0\0\0\x6\f)"
diff --git a/airootfs/etc/skel/.gnupg/gpg.conf b/airootfs/etc/skel/.gnupg/gpg.conf
new file mode 100755
index 0000000..6c666d0
--- /dev/null
+++ b/airootfs/etc/skel/.gnupg/gpg.conf
@@ -0,0 +1,7 @@
+no-greeting
+no-permission-warning
+lock-never
+keyserver-options timeout=10
+keyserver-options import-clean
+keyserver-options no-self-sigs-only
+keyserver hkp://keys.openpgp.org
diff --git a/airootfs/etc/skel/.xprofile b/airootfs/etc/skel/.xprofile
index e04c0a5..346bc80 100755
--- a/airootfs/etc/skel/.xprofile
+++ b/airootfs/etc/skel/.xprofile
@@ -1,2 +1 @@
-xcompmgr &
 xset s off -dpms &
diff --git a/airootfs/etc/skel/xed.dconf b/airootfs/etc/skel/xed.dconf
new file mode 100755
index 0000000..50ee2c6
--- /dev/null
+++ b/airootfs/etc/skel/xed.dconf
@@ -0,0 +1,6 @@
+[org/x/editor/preferences/editor]
+bracket-matching=false
+display-line-numbers=true
+prefer-dark-theme=true
+scheme='cobalt'
+wrap-mode='none'
diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/airootfs/etc/systemd/network/20-ethernet.network
deleted file mode 100755
index efa309c..0000000
--- a/airootfs/etc/systemd/network/20-ethernet.network
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[Match]
-Name=en*
-Name=eth*
-
-[Network]
-DHCP=yes
-IPv6PrivacyExtensions=yes
-
-[DHCP]
-RouteMetric=512
diff --git a/airootfs/etc/systemd/network/20-wireless.network b/airootfs/etc/systemd/network/20-wireless.network
deleted file mode 100755
index bf9ab9d..0000000
--- a/airootfs/etc/systemd/network/20-wireless.network
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[Match]
-Name=wlp*
-Name=wlan*
-
-[Network]
-DHCP=yes
-IPv6PrivacyExtensions=yes
-
-[DHCP]
-RouteMetric=1024
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
deleted file mode 120000
index 4c158e6..0000000
--- a/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-networkd.service
\ No newline at end of file
diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
deleted file mode 120000
index 4f6ae34..0000000
--- a/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-resolved.service
\ No newline at end of file
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service
deleted file mode 120000
index 3625abd..0000000
--- a/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/iwd.service
\ No newline at end of file
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
deleted file mode 120000
index 4c158e6..0000000
--- a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-networkd.service
\ No newline at end of file
diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
deleted file mode 120000
index 4f6ae34..0000000
--- a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-resolved.service
\ No newline at end of file
diff --git a/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
deleted file mode 120000
index 51942c8..0000000
--- a/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-networkd.socket
\ No newline at end of file
diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
index f598e43..0fb119d 100755
--- a/airootfs/root/.zlogin
+++ b/airootfs/root/.zlogin
@@ -1 +1,6 @@
+# fix for screen readers
+if grep -Fq 'accessibility=' /proc/cmdline &> /dev/null; then
+    setopt SINGLE_LINE_ZLE
+fi
+
 ~/.automated_script.sh
diff --git a/build.sh b/build.sh
deleted file mode 100755
index c2a2b62..0000000
--- a/build.sh
+++ /dev/null
@@ -1,345 +0,0 @@
-#!/usr/bin/env bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-set -e -u
-
-iso_name=cachyos
-iso_label="CACHYOS"
-iso_publisher="CachyOS GNU/Linux <https://cachyos.org>"
-iso_application="CachyOS GNU/Linux Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=arch
-work_dir=work
-out_dir=out
-gpg_key=""
-
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-MKARCHISO=$script_path/mkarchiso
-
-umask 0022
-
-_usage ()
-{
-    echo "usage ${0} [options]"
-    echo
-    echo " General options:"
-    echo "    -N <iso_name>      Set an iso filename (prefix)"
-    echo "                        Default: ${iso_name}"
-    echo "    -V <iso_version>   Set an iso version (in filename)"
-    echo "                        Default: ${iso_version}"
-    echo "    -L <iso_label>     Set an iso label (disk label)"
-    echo "                        Default: ${iso_label}"
-    echo "    -P <publisher>     Set a publisher for the disk"
-    echo "                        Default: '${iso_publisher}'"
-    echo "    -A <application>   Set an application name for the disk"
-    echo "                        Default: '${iso_application}'"
-    echo "    -D <install_dir>   Set an install_dir (directory inside iso)"
-    echo "                        Default: ${install_dir}"
-    echo "    -w <work_dir>      Set the working directory"
-    echo "                        Default: ${work_dir}"
-    echo "    -o <out_dir>       Set the output directory"
-    echo "                        Default: ${out_dir}"
-    echo "    -v                 Enable verbose output"
-    echo "    -h                 This help message"
-    exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
-    if [[ ! -e "${work_dir}/build.${1}" ]]; then
-        "$1"
-        touch "${work_dir}/build.${1}"
-    fi
-}
-
-bypass_umount_error(){
-
-# Not used for now
-umount -l $script_path/work/x86_64/airootfs/proc $script_path/work/x86_64/airootfs/dev || true
-
-}
-
-# Setup custom pacman.conf with current cache directories.
-make_pacman_conf() {
-    local _cache_dirs
-    _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
-        "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
-    local _airootfs="${work_dir}/x86_64/airootfs"
-    mkdir -p -- "${_airootfs}"
-
-    if [[ -d "${script_path}/airootfs" ]]; then
-        cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
-        [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
-        [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
-    mkdir -p "${_airootfs}/usr/lib"
-    echo "VERSION=$iso_version" >> "${_airootfs}/usr/lib/cachtyos-release"
-
-        # Set up user home directories and permissions
-        if [[ -e "${_airootfs}/etc/passwd" ]]; then
-            while IFS=':' read -a passwd -r; do
-                [[ "${passwd[5]}" == '/' ]] && continue
-
-                if [[ -d "${_airootfs}${passwd[5]}" ]]; then
-                    chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
-                    chmod -f 0750 -- "${_airootfs}${passwd[5]}"
-                else
-                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
-                fi
-             done < "${_airootfs}/etc/passwd"
-        fi
-    fi
-}
-
-# Packages (airootfs)
-make_packages() {
-    if [[ "${gpg_key}" ]]; then
-      gpg --export "${gpg_key}" > "${work_dir}/gpgkey"
-      exec 17<>"${work_dir}/gpgkey"
-    fi
-    if [ -n "${verbose}" ]; then
-        ARCHISO_GNUPG_FD="${gpg_key:+17}" $MKARCHISO -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-            -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
-    else
-        ARCHISO_GNUPG_FD="${gpg_key:+17}" $MKARCHISO -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-            -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
-    fi
-    if [[ "${gpg_key}" ]]; then
-      exec 17<&-
-    fi
-}
-
-# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
-make_setup_mkinitcpio() {
-    local _hook
-    mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/hooks
-    mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/install
-    for _hook in archiso archiso_shutdown archiso_loop_mnt; do
-        cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/hooks
-        cp /usr/lib/initcpio/install/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/install
-    done
-    sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown
-    cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/x86_64/airootfs/etc/initcpio/install
-    cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/x86_64/airootfs/etc/initcpio
-    cp ${script_path}/mkinitcpio.conf ${work_dir}/x86_64/airootfs/etc/mkinitcpio-archiso.conf
-}
-
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
-    if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
-        while IFS=':' read -a passwd -r; do
-            [[ "${passwd[5]}" == '/' ]] && continue
-            cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/x86_64/airootfs/etc/skel" "${work_dir}/x86_64/airootfs${passwd[5]}"
-            chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/x86_64/airootfs${passwd[5]}"
-
-        done < "${script_path}/airootfs/etc/passwd"
-    fi
-
-    if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then
-        if [ -n "${verbose}" ]; then
-            $MKARCHISO -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-                -r '/root/customize_airootfs.sh' run
-        else
-            $MKARCHISO -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-                -r '/root/customize_airootfs.sh' run
-        fi
-        rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh"
-    fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/x86_64"
-    cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/"
-    cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then
-        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
-        cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \
-            "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
-    fi
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then
-        cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/"* \
-            "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
-    fi
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then
-        cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/"* \
-            "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
-    fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
-    _uname_r=$(file -b "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
-    for _cfg in "${script_path}/syslinux/"*.cfg; do
-        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
-    done
-    cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
-    gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \
-        "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz"
-    gzip -c -9 "${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
-        "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-make_isolinux() {
-    mkdir -p "${work_dir}/iso/isolinux"
-    sed "s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
-    mkdir -p "${work_dir}/iso/EFI/boot"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/iso/EFI/boot/bootx64.efi"
-
-    mkdir -p "${work_dir}/iso/loader/entries"
-    cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
-        "${work_dir}/iso/loader/entries/archiso-x86_64.conf"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf" > \
-        "${work_dir}/iso/loader/entries/archiso-x86_64-nonfree.conf"
-
-
-    # edk2-shell based UEFI shell
-    # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
-    mkdir -p "${work_dir}/iso/EFI/archiso"
-    truncate -s 100M "${work_dir}/iso/EFI/archiso/efiboot.img"
-    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
-
-    mkdir -p "${work_dir}/efiboot"
-    mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
-
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
-
-    cp "${work_dir}/iso/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-    cp "${work_dir}/iso/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-
-    mkdir -p "${work_dir}/efiboot/EFI/boot"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
-    mkdir -p "${work_dir}/efiboot/loader/entries"
-    cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
-        "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf" > \
-        "${work_dir}/efiboot/loader/entries/archiso-x86_64-nonfree.conf"
-
-    # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
-    umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
-    cp -a -l -f "${work_dir}/x86_64/airootfs" "${work_dir}"
-    if [ -n "${verbose}" ]; then
-        $MKARCHISO -v -w "${work_dir}" -D "${install_dir}" pkglist
-        $MKARCHISO -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
-    else
-        $MKARCHISO -w "${work_dir}" -D "${install_dir}" pkglist
-        $MKARCHISO -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
-    fi
-    rm -rf "${work_dir}/airootfs"
-    # rm -rf "${work_dir}/x86_64/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
-    if [ -n "${verbose}" ]; then
-        $MKARCHISO -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-            -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
-    else
-        $MKARCHISO -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-            -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
-    fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script must be run as root."
-    _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
-    case "${arg}" in
-        N) iso_name="${OPTARG}" ;;
-        V) iso_version="${OPTARG}" ;;
-        L) iso_label="${OPTARG}" ;;
-        P) iso_publisher="${OPTARG}" ;;
-        A) iso_application="${OPTARG}" ;;
-        D) install_dir="${OPTARG}" ;;
-        w) work_dir="${OPTARG}" ;;
-        o) out_dir="${OPTARG}" ;;
-        g) gpg_key="${OPTARG}" ;;
-        v) verbose="-v" ;;
-        h) _usage 0 ;;
-        *)
-           echo "Invalid argument '${arg}'"
-           _usage 1
-           ;;
-    esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-run_once make_custom_airootfs
-run_once make_packages
-run_once make_customize_airootfs
-run_once make_boot
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-run_once make_prepare
-run_once make_iso
diff --git a/ci.build.sh b/ci.build.sh
index b26d6e7..c83c76e 100755
--- a/ci.build.sh
+++ b/ci.build.sh
@@ -3,4 +3,4 @@
 pacman --noconfirm -Syu --needed base-devel archiso mkinitcpio-archiso git squashfs-tools
 
 sudo ./fix_permissions.sh
-sudo ./build.sh -v
+sudo ./mkarchiso .
diff --git a/efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf b/efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf
deleted file mode 100644
index 863c6d7..0000000
--- a/efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-title   CachyOS x86_64 UEFI NVIDIA (nonfree, latest cards only, no legacy) (CD)
-linux   /EFI/archiso/vmlinuz-linux
-initrd  /EFI/archiso/intel-ucode.img
-initrd  /EFI/archiso/amd-ucode.img
-initrd  /EFI/archiso/archiso.img
-options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
diff --git a/efiboot/loader/entries/archiso-x86_64-cd.conf b/efiboot/loader/entries/archiso-x86_64-cd.conf
deleted file mode 100644
index bc04baf..0000000
--- a/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-title   CachyOS x86_64 UEFI Default (CD)
-linux   /EFI/archiso/vmlinuz-linux
-initrd  /EFI/archiso/intel-ucode.img
-initrd  /EFI/archiso/amd-ucode.img
-initrd  /EFI/archiso/archiso.img
-options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
diff --git a/efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf b/efiboot/loader/entries/archiso-x86_64-linux-nonfree.conf
similarity index 73%
rename from efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf
rename to efiboot/loader/entries/archiso-x86_64-linux-nonfree.conf
index d8cbcb6..85c6099 100644
--- a/efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf
+++ b/efiboot/loader/entries/archiso-x86_64-linux-nonfree.conf
@@ -1,9 +1,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-title   CachyOS x86_64 UEFI Nvidia (nonfree, latest cards only, no legacy) (USB)
+title   CachyOS x86_64 UEFI NVIDIA (nonfree, latest cards only, no legacy) (CD)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/archiso.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
diff --git a/efiboot/loader/entries/archiso-x86_64-usb.conf b/efiboot/loader/entries/archiso-x86_64-linux.conf
similarity index 80%
rename from efiboot/loader/entries/archiso-x86_64-usb.conf
rename to efiboot/loader/entries/archiso-x86_64-linux.conf
index 3ce28fd..e54e437 100644
--- a/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/efiboot/loader/entries/archiso-x86_64-linux.conf
@@ -1,9 +1,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-title   CachyOS x86_64 UEFI Default (USB)
+title   CachyOS x86_64 UEFI Default
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/archiso.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
diff --git a/efiboot/loader/loader.conf b/efiboot/loader/loader.conf
index fd7db27..1ea5ce5 100644
--- a/efiboot/loader/loader.conf
+++ b/efiboot/loader/loader.conf
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 timeout 3
-default archiso-x86_64.conf
+default archiso-x86_64-linux.conf
diff --git a/fix_permissions.sh b/fix_permissions.sh
index efa3829..8684135 100755
--- a/fix_permissions.sh
+++ b/fix_permissions.sh
@@ -2,15 +2,10 @@
 
 # For all folders
 find ./airootfs -type d -exec chmod -R 755 {} \;
-#find ./airootfs -type d -exec chown root:root {} \;
 chown root:root -R ./airootfs
-#chown root:root $(find ./airootfs |grep -v "/etc/skel")
-
 chmod 700 ./airootfs/root
 chmod -R 700 airootfs/etc/sudoers.d
 chmod 444 ./airootfs/etc/sudoers.d/g_wheel
-#chown root:root ./airootfs/etc/sudoers.d
-#chown root:root ./airootfs/etc/sudoers.d/g_wheel
-chmod +x ./{build.sh,mkarchiso,run_before_squashfs.sh}
+chmod +x ./{mkarchiso,run_before_squashfs.sh}
 
 
diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg
deleted file mode 100644
index 7b14d59..0000000
--- a/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-PATH /%INSTALL_DIR%/boot/syslinux/
-DEFAULT loadconfig
-
-LABEL loadconfig
-  CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg
-  APPEND /%INSTALL_DIR%/
diff --git a/mirrorlist b/mirrorlist
new file mode 100755
index 0000000..93cd03d
--- /dev/null
+++ b/mirrorlist
@@ -0,0 +1,76 @@
+##########################################
+### This mirrorlist is only a fallback ###
+##########################################
+### Note that the mirrors were not ranked, so you may get better mirrorlist
+### by ranking with e.g. program 'reflector-simple'.
+
+## Germany & United States
+
+Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
+Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
+
+Server = http://arch.mirror.constant.com/$repo/os/$arch
+Server = https://arch.mirror.constant.com/$repo/os/$arch
+
+Server = https://mirror.pseudoform.org/$repo/os/$arch
+
+Server = http://mirror.lty.me/archlinux/$repo/os/$arch
+Server = https://mirror.lty.me/archlinux/$repo/os/$arch
+
+Server = https://mirror.pkgbuild.com/$repo/os/$arch
+
+Server = http://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
+Server = https://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
+
+Server = http://archlinux.thaller.ws/$repo/os/$arch
+Server = https://archlinux.thaller.ws/$repo/os/$arch
+
+Server = https://america.mirror.pkgbuild.com/$repo/os/$arch
+
+Server = http://mirror.wtnet.de/arch/$repo/os/$arch
+Server = https://mirror.wtnet.de/arch/$repo/os/$arch
+
+Server = http://arlm.tyzoid.com/$repo/os/$arch
+Server = https://arlm.tyzoid.com/$repo/os/$arch
+
+Server = http://phinau.de/arch/$repo/os/$arch
+Server = https://phinau.de/arch/$repo/os/$arch
+
+Server = http://arch.hu.fo/archlinux/$repo/os/$arch
+Server = https://arch.hu.fo/archlinux/$repo/os/$arch
+
+Server = http://mirror.chaoticum.net/arch/$repo/os/$arch
+Server = https://mirror.chaoticum.net/arch/$repo/os/$arch
+
+Server = http://archmirror1.octyl.net/$repo/os/$arch
+Server = https://archmirror1.octyl.net/$repo/os/$arch
+
+Server = http://arch.jensgutermuth.de/$repo/os/$arch
+Server = https://arch.jensgutermuth.de/$repo/os/$arch
+
+Server = http://mirror.hackingand.coffee/arch/$repo/os/$arch
+Server = https://mirror.hackingand.coffee/arch/$repo/os/$arch
+
+Server = http://arch.mirror.zachlge.org/$repo/os/$arch
+Server = https://arch.mirror.zachlge.org/$repo/os/$arch
+
+Server = http://mirror.arizona.edu/archlinux/$repo/os/$arch
+Server = https://mirror.arizona.edu/archlinux/$repo/os/$arch
+
+Server = http://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
+Server = https://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
+
+Server = http://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
+Server = https://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
+
+Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
+Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
+Server = https://mirror.bethselamin.de/$repo/os/$arch
+Server = http://mirror.23m.com/archlinux/$repo/os/$arch
+Server = https://mirror.23m.com/archlinux/$repo/os/$arch
+Server = http://mirror.moson.org/arch/$repo/os/$arch
+Server = https://mirror.moson.org/arch/$repo/os/$arch
+Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = http://mirrors.niyawe.de/archlinux/$repo/os/$arch
+Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
diff --git a/mkarchiso b/mkarchiso
index 13b9937..fce55cc 100755
--- a/mkarchiso
+++ b/mkarchiso
@@ -1,36 +1,55 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e -u
 
-export LANG=C
+# Control the environment
+umask 0022
+export LANG="C"
+export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 
-app_name=${0##*/}
-arch=$(uname -m)
+# Set application name from the script's file name
+app_name="${0##*/}"
+
+# Define global variables. All of them will be overwritten later
 pkg_list=()
-run_cmd=""
-quiet="y"
-pacman_conf="/etc/pacman.conf"
-iso_label="ARCH_$(date +%Y%m)"
-iso_publisher="Arch Linux <http://www.archlinux.org>"
-iso_application="Arch Linux Live/Rescue CD"
-install_dir="arch"
-work_dir="work"
-out_dir="out"
-sfs_mode="sfs"
-sfs_comp="xz"
-gpg_key=
+quiet=""
+work_dir=""
+out_dir=""
+img_name=""
+gpg_key=""
+iso_name=""
+iso_label=""
+iso_publisher=""
+iso_application=""
+iso_version=""
+install_dir=""
+arch=""
+pacman_conf=""
+packages=""
+bootmodes=()
+airootfs_image_type=""
+airootfs_image_tool_options=()
+declare -A file_permissions=()
 
 script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
 # executed inside _mkairootfs_sfs right before squashfs
-RUN_BEFORE_SQUASHFS=${script_path}/run_before_squashfs.sh
+RUN_BEFORE_SQUASHFS=$script_path/run_before_squashfs.sh
+
 
 # Show an INFO message
 # $1: message string
 _msg_info() {
     local _msg="${1}"
-    echo "[mkarchiso] INFO: ${_msg}"
+    [[ "${quiet}" == "y" ]] || printf '[%s] INFO: %s\n' "${app_name}" "${_msg}"
+}
+
+# Show a WARNING message
+# $1: message string
+_msg_warning() {
+    local _msg="${1}"
+    printf '[%s] WARNING: %s\n' "${app_name}" "${_msg}" >&2
 }
 
 # Show an ERROR message then exit with status
@@ -39,137 +58,84 @@ _msg_info() {
 _msg_error() {
     local _msg="${1}"
     local _error=${2}
-    echo
-    echo "[mkarchiso] ERROR: ${_msg}"
-    echo
-    if [[ ${_error} -gt 0 ]]; then
+    printf '[%s] ERROR: %s\n' "${app_name}" "${_msg}" >&2
+    if (( _error > 0 )); then
         exit "${_error}"
     fi
 }
 
-_chroot_init() {
-    mkdir -p ${work_dir}/airootfs
-    _pacman base syslinux
-}
-
-_chroot_run() {
-    eval arch-chroot ${work_dir}/airootfs "${run_cmd}"
-}
-
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
-    mkdir -p "${work_dir}/mnt/airootfs"
-    _msg_info "Mounting '${work_dir}/airootfs.img' on '${work_dir}/mnt/airootfs'"
-    mount "${work_dir}/airootfs.img" "${work_dir}/mnt/airootfs"
+    install -d -m 0755 -- "${work_dir}/mnt/airootfs"
+    _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'..."
+    mount -- "${airootfs_dir}.img" "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
 }
 
 _umount_airootfs() {
-    _msg_info "Unmounting '${work_dir}/mnt/airootfs'"
-    umount -d "${work_dir}/mnt/airootfs"
+    _msg_info "Unmounting '${work_dir}/mnt/airootfs'..."
+    umount -d -- "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
-    rmdir "${work_dir}/mnt/airootfs"
+    rmdir -- "${work_dir}/mnt/airootfs"
     trap - EXIT HUP INT TERM
 }
 
 # Show help usage, with an exit status.
 # $1: exit status number.
-_usage ()
-{
-    echo "usage ${app_name} [options] command <command options>"
-    echo " general options:"
-    echo "    -p PACKAGE(S)    Package(s) to install, can be used multiple times"
-    echo "    -r <command>     Run <command> inside airootfs"
-    echo "    -C <file>        Config file for pacman."
-    echo "                     Default: '${pacman_conf}'"
-    echo "    -L <label>       Set a label for the disk"
-    echo "                     Default: '${iso_label}'"
-    echo "    -P <publisher>   Set a publisher for the disk"
-    echo "                     Default: '${iso_publisher}'"
-    echo "    -A <application> Set an application name for the disk"
-    echo "                     Default: '${iso_application}'"
-    echo "    -D <install_dir> Set an install_dir. All files will by located here."
-    echo "                     Default: '${install_dir}'"
-    echo "                     NOTE: Max 8 characters, use only [a-z0-9]"
-    echo "    -w <work_dir>    Set the working directory"
-    echo "                     Default: '${work_dir}'"
-    echo "    -o <out_dir>     Set the output directory"
-    echo "                     Default: '${out_dir}'"
-    echo "    -s <sfs_mode>    Set SquashFS image mode (img or sfs)"
-    echo "                     img: prepare airootfs.sfs for dm-snapshot usage"
-    echo "                     sfs: prepare airootfs.sfs for overlayfs usage"
-    echo "                     Default: ${sfs_mode}"
-    echo "    -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
-    echo "                     Default: '${sfs_comp}'"
-    echo "    -v               Enable verbose output"
-    echo "    -h               This message"
-    echo " commands:"
-    echo "   init"
-    echo "      Make base layout and install base group"
-    echo "   install"
-    echo "      Install all specified packages (-p)"
-    echo "   run"
-    echo "      run command specified by -r"
-    echo "   prepare"
-    echo "      build all images"
-    echo "   pkglist"
-    echo "      make a pkglist.txt of packages installed on airootfs"
-    echo "   iso <image name>"
-    echo "      build an iso image from the working dir"
+_usage() {
+    IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
+usage: ${app_name} [options] <profile_dir>
+  options:
+     -A <application> Set an application name for the ISO
+                      Default: '${iso_application}'
+     -C <file>        pacman configuration file.
+                      Default: '${pacman_conf}'
+     -D <install_dir> Set an install_dir. All files will by located here.
+                      Default: '${install_dir}'
+                      NOTE: Max 8 characters, use only [a-z0-9]
+     -L <label>       Set the ISO volume label
+                      Default: '${iso_label}'
+     -P <publisher>   Set the ISO publisher
+                      Default: '${iso_publisher}'
+     -g <gpg_key>     Set the GPG key to be used for signing the sqashfs image
+     -h               This message
+     -o <out_dir>     Set the output directory
+                      Default: '${out_dir}'
+     -p PACKAGE(S)    Package(s) to install.
+                      Multiple packages are provided as quoted, space delimited list.
+     -v               Enable verbose output
+     -w <work_dir>    Set the working directory
+                      Default: '${work_dir}'
+
+  profile_dir:        Directory of the archiso profile to build
+ENDUSAGETEXT
+    printf '%s' "${usagetext}"
     exit "${1}"
 }
 
-# Shows configuration according to command mode.
-# $1: init | install | run | prepare | iso
-_show_config () {
-    local _mode="$1"
-    echo
-    _msg_info "Configuration settings"
-    _msg_info "                  Command:   ${command_name}"
+# Shows configuration options.
+_show_config() {
+    local build_date
+    build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
+    _msg_info "${app_name} configuration settings"
     _msg_info "             Architecture:   ${arch}"
     _msg_info "        Working directory:   ${work_dir}"
     _msg_info "   Installation directory:   ${install_dir}"
-    case "${_mode}" in
-        init)
-            _msg_info "       Pacman config file:   ${pacman_conf}"
-            ;;
-        install)
-            _msg_info "       Pacman config file:   ${pacman_conf}"
-            _msg_info "                 Packages:   ${pkg_list[*]}"
-            ;;
-        run)
-            _msg_info "              Run command:   ${run_cmd}"
-            ;;
-        prepare)
-            ;;
-        pkglist)
-            ;;
-        iso)
-            _msg_info "               Image name:   ${img_name}"
-            _msg_info "               Disk label:   ${iso_label}"
-            _msg_info "           Disk publisher:   ${iso_publisher}"
-            _msg_info "         Disk application:   ${iso_application}"
-            ;;
-    esac
-    echo
-}
-
-# Install desired packages to airootfs
-_pacman ()
-{
-    _msg_info "Installing packages to '${work_dir}/airootfs/'..."
-
-    if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@" &> /dev/null
-    else
-        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@"
-    fi
-
-    _msg_info "Packages installed successfully!"
+    _msg_info "               Build date:   ${build_date}"
+    _msg_info "         Output directory:   ${out_dir}"
+    _msg_info "                  GPG key:   ${gpg_key:-None}"
+    _msg_info "                  Profile:   ${profile}"
+    _msg_info "Pacman configuration file:   ${pacman_conf}"
+    _msg_info "          Image file name:   ${img_name}"
+    _msg_info "         ISO volume label:   ${iso_label}"
+    _msg_info "            ISO publisher:   ${iso_publisher}"
+    _msg_info "          ISO application:   ${iso_application}"
+    _msg_info "               Boot modes:   ${bootmodes[*]}"
+    _msg_info "                 Packages:   ${pkg_list[*]}"
 }
 
 # Cleanup airootfs
-_cleanup () {
+_cleanup_airootfs() {
     _msg_info "Cleaning up what we can on airootfs..."
 
     # Delete kernel(s)
@@ -189,236 +155,842 @@ _cleanup () {
         find "${work_dir}/airootfs/boot" -type f -name 'archiso.img' -delete
     fi
     # Delete pacman database sync cache files (*.tar.gz)
-    if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then
-        find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/lib/pacman" ]] && find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
     # Delete pacman database sync cache
-    if [[ -d "${work_dir}/airootfs/var/lib/pacman/sync" ]]; then
-        find "${work_dir}/airootfs/var/lib/pacman/sync" -delete
-    fi
+    # [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]] && find "${airootfs_dir}/var/lib/pacman/sync" -delete
     # Delete pacman package cache
-    if [[ -d "${work_dir}/airootfs/var/cache/pacman/pkg" ]]; then
-        find "${work_dir}/airootfs/var/cache/pacman/pkg" -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]] && find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete
     # Delete all log files, keeps empty dirs.
-    if [[ -d "${work_dir}/airootfs/var/log" ]]; then
-        find "${work_dir}/airootfs/var/log" -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/log" ]] && find "${airootfs_dir}/var/log" -type f -delete
     # Delete all temporary files and dirs
-    if [[ -d "${work_dir}/airootfs/var/tmp" ]]; then
-        find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete
-    fi
+    [[ -d "${airootfs_dir}/var/tmp" ]] && find "${airootfs_dir}/var/tmp" -mindepth 1 -delete
     # Delete package pacman related files.
-    find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete
+    find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
+    # Create an empty /etc/machine-id
+    printf '' > "${airootfs_dir}/etc/machine-id"
+
     _msg_info "Done!"
 }
 
+
+
+_run_mksquashfs() {
+    $RUN_BEFORE_SQUASHFS
+    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    if [[ "${quiet}" == "y" ]]; then
+        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
+    else
+        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
+    fi
+}
+
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
-_mkairootfs_img () {
-    if [[ ! -e "${work_dir}/airootfs" ]]; then
-        _msg_error "The path '${work_dir}/airootfs' does not exist" 1
-    fi
+_mkairootfs_ext4+squashfs() {
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
 
-    _msg_info "Creating ext4 image of 32GiB..."
-    truncate -s 32G "${work_dir}/airootfs.img"
-    local _qflag=""
+    _msg_info "Creating ext4 image of 32 GiB..."
     if [[ "${quiet}" == "y" ]]; then
-        _qflag="-q"
+        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
+    else
+        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
     fi
-    mkfs.ext4 ${_qflag} -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F "${work_dir}/airootfs.img"
-    tune2fs -c 0 -i 0 "${work_dir}/airootfs.img" &> /dev/null
+    tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" > /dev/null
     _msg_info "Done!"
     _mount_airootfs
-    _msg_info "Copying '${work_dir}/airootfs/' to '${work_dir}/mnt/airootfs/'..."
-    cp -aT "${work_dir}/airootfs/" "${work_dir}/mnt/airootfs/"
-    chown root:root "${work_dir}/mnt/airootfs/"
+    _msg_info "Copying '${airootfs_dir}/' to '${work_dir}/mnt/airootfs/'..."
+    cp -aT -- "${airootfs_dir}/" "${work_dir}/mnt/airootfs/"
+    chown -- 0:0 "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
-    mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress &> /dev/null
-    else
-        mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}"
-    fi
+    _run_mksquashfs "${airootfs_dir}.img"
     _msg_info "Done!"
-    rm "${work_dir}/airootfs.img"
+    rm -- "${airootfs_dir}.img"
 }
 
 # Makes a SquashFS filesystem from a source directory.
-_mkairootfs_sfs () {
-    if [[ ! -e "${work_dir}/airootfs" ]]; then
-        _msg_error "The path '${work_dir}/airootfs' does not exist" 1
-    fi
+_mkairootfs_squashfs() {
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
 
-    $RUN_BEFORE_SQUASHFS
-    mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress &> /dev/null
-    else
-        mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}"
-    fi
+    _run_mksquashfs "${airootfs_dir}"
+}
+
+# Makes an EROFS file system from a source directory.
+_mkairootfs_erofs() {
+    local fsuuid
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
+
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
+    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
+    fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
+    _msg_info "Creating EROFS image, this may take some time..."
+    mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${airootfs_dir}"
     _msg_info "Done!"
 }
 
-_mkchecksum () {
+_mkchecksum() {
     _msg_info "Creating checksum file for self-test..."
-    cd "${work_dir}/iso/${install_dir}/${arch}"
-    sha512sum airootfs.sfs > airootfs.sha512
-    cd "${OLDPWD}"
-    _msg_info "Done!"
-}
-
-_mksignature () {
-    _msg_info "Creating signature file..."
-    cd "${work_dir}/iso/${install_dir}/${arch}"
-    gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
-    cd "${OLDPWD}"
-    _msg_info "Done!"
-}
-
-command_pkglist () {
-    _show_config pkglist
-
-    _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Q --sysroot "${work_dir}/airootfs" > \
-        "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
-    _msg_info "Done!"
-
-}
-
-# Create an ISO9660 filesystem from "iso" directory.
-command_iso () {
-    local _iso_efi_boot_args=()
-
-    if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1
+    cd -- "${isofs_dir}/${install_dir}/${arch}"
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        sha512sum airootfs.sfs > airootfs.sha512
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        sha512sum airootfs.erofs > airootfs.sha512
     fi
-    if [[ ! -f "${work_dir}/iso/isolinux/isohdpfx.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isohdpfx.bin' does not exist." 1
+    cd -- "${OLDPWD}"
+    _msg_info "Done!"
+}
+
+_mksignature() {
+    _msg_info "Signing SquashFS image..."
+    cd -- "${isofs_dir}/${install_dir}/${arch}"
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        gpg --detach-sign --default-key "${gpg_key}" airootfs.erofs
+    fi
+    cd -- "${OLDPWD}"
+    _msg_info "Done!"
+}
+
+# Helper function to run functions only one time.
+_run_once() {
+    if [[ ! -e "${work_dir}/build.${1}" ]]; then
+        "$1"
+        touch "${work_dir}/build.${1}"
+    fi
+}
+
+# Set up custom pacman.conf with custom cache and pacman hook directories
+_make_pacman_conf() {
+    local _cache_dirs _system_cache_dirs _profile_cache_dirs
+    _system_cache_dirs="$(pacman-conf CacheDir| tr '\n' ' ')"
+    _profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir| tr '\n' ' ')"
+
+    # only use the profile's CacheDir, if it is not the default and not the same as the system cache dir
+    if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] && \
+        [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
+        _cache_dirs="${_profile_cache_dirs}"
+    else
+        _cache_dirs="${_system_cache_dirs}"
     fi
 
-    # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
-    if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then
-        _iso_efi_boot_args+=(
+    _msg_info "Copying custom pacman.conf to work directory..."
+    _msg_info "Using pacman CacheDir: ${_cache_dirs}"
+    # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r
+    # append CacheDir and HookDir to [options] section
+    # HookDir is *always* set to the airootfs' override directory
+    # see `man 8 pacman` for further info
+    pacman-conf --config "${pacman_conf}" | \
+        sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
+        /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" > "${work_dir}/pacman.conf"
+}
+
+# Prepare working directory and copy custom airootfs files (airootfs)
+_make_custom_airootfs() {
+    local passwd=()
+    local filename permissions
+
+    install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
+
+    if [[ -d "${profile}/airootfs" ]]; then
+        _msg_info "Copying custom airootfs files..."
+        cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${airootfs_dir}"
+        # Set ownership and mode for files and directories
+        for filename in "${!file_permissions[@]}"; do
+            IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
+            # Prevent file path traversal outside of $airootfs_dir
+            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "${airootfs_dir}"* ]]; then
+                _msg_error "Failed to set permissions on '${airootfs_dir}${filename}'. Outside of valid path." 1
+            # Warn if the file does not exist
+            elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
+                _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
+            else
+                if [[ "${filename: -1}" == "/" ]]; then
+                    chown -fhR -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                    chmod -fR -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                else
+                    chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                    chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                fi
+            fi
+        done
+        _msg_info "Done!"
+    fi
+}
+
+# Install desired packages to airootfs
+_make_packages() {
+    _msg_info "Installing packages to '${airootfs_dir}/'..."
+
+    if [[ -n "${gpg_key}" ]]; then
+        exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
+        export ARCHISO_GNUPG_FD
+    fi
+
+    if [[ "${quiet}" = "y" ]]; then
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}" &> /dev/null
+    else
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}"
+    fi
+
+    if [[ -n "${gpg_key}" ]]; then
+        exec {ARCHISO_GNUPG_FD}<&-
+        unset ARCHISO_GNUPG_FD
+    fi
+
+    _msg_info "Done! Packages installed successfully."
+}
+
+# Customize installation (airootfs)
+_make_customize_airootfs() {
+    local passwd=()
+
+    if [[ -e "${profile}/airootfs/etc/passwd" ]]; then
+        _msg_info "Copying /etc/skel/* to user homes..."
+        while IFS=':' read -a passwd -r; do
+            # Only operate on UIDs in range 1000–59999
+            (( passwd[2] >= 1000 && passwd[2] < 60000 )) || continue
+            # Skip invalid home directories
+            [[ "${passwd[5]}" == '/' ]] && continue
+            [[ -z "${passwd[5]}" ]] && continue
+            # Prevent path traversal outside of $airootfs_dir
+            if [[ "$(realpath -q -- "${airootfs_dir}${passwd[5]}")" == "${airootfs_dir}"* ]]; then
+                if [[ ! -d "${airootfs_dir}${passwd[5]}" ]]; then
+                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+                fi
+                cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel/." "${airootfs_dir}${passwd[5]}"
+                chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
+                chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
+            else
+                _msg_error "Failed to set permissions on '${airootfs_dir}${passwd[5]}'. Outside of valid path." 1
+            fi
+        done < "${profile}/airootfs/etc/passwd"
+        _msg_info "Done!"
+    fi
+
+    if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
+        _msg_info "Running customize_airootfs.sh in '${airootfs_dir}' chroot..."
+        _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
+        chmod -f -- +x "${airootfs_dir}/root/customize_airootfs.sh"
+        eval -- arch-chroot "${airootfs_dir}" "/root/customize_airootfs.sh"
+        rm -- "${airootfs_dir}/root/customize_airootfs.sh"
+        _msg_info "Done! customize_airootfs.sh run successfully."
+    fi
+}
+
+# Set up boot loaders
+_make_bootmodes() {
+    local bootmode
+    for bootmode in "${bootmodes[@]}"; do
+        _run_once "_make_bootmode_${bootmode}"
+    done
+}
+
+# Prepare kernel/initramfs ${install_dir}/boot/
+_make_boot_on_iso9660() {
+    local ucode_image
+    _msg_info "Preparing kernel and initramfs for the ISO 9660 file system..."
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
+    install -m 0644 -- "${airootfs_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
+
+    for ucode_image in {intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}; do
+        if [[ -e "${airootfs_dir}/boot/${ucode_image}" ]]; then
+            install -m 0644 -- "${airootfs_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
+            if [[ -e "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
+                install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+                install -m 0644 -- "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/"* \
+                    "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+            fi
+        fi
+    done
+    _msg_info "Done!"
+}
+
+# Prepare /syslinux for booting from MBR
+_make_bootmode_bios.syslinux.mbr() {
+    _msg_info "Setting up SYSLINUX for BIOS booting from a disk..."
+    install -d -m 0755 -- "${isofs_dir}/syslinux"
+    for _cfg in "${profile}/syslinux/"*.cfg; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+             "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
+    done
+    if [[ -e "${profile}/syslinux/splash.png" ]]; then
+        install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/syslinux/"
+    fi
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux/"
+
+    _run_once _make_boot_on_iso9660
+
+    if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/syslinux/hdt"
+        if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
+            gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
+                "${isofs_dir}/syslinux/hdt/pciids.gz"
+        fi
+        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -c -9 '{}' ';' -quit > \
+            "${isofs_dir}/syslinux/hdt/modalias.gz"
+    fi
+
+    # Add other aditional/extra files to ${install_dir}/boot/
+    if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
+        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
+        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
+            "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+    fi
+    _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully."
+}
+
+# Prepare /syslinux for El-Torito booting
+_make_bootmode_bios.syslinux.eltorito() {
+    _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
+    install -d -m 0755 -- "${isofs_dir}/syslinux"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/syslinux/"
+
+    # ISOLINUX and SYSLINUX installation is shared
+    _run_once _make_bootmode_bios.syslinux.mbr
+
+    _msg_info "Done! SYSLINUX set up for BIOS booting from an optical disc successfully."
+}
+
+# Prepare /EFI on ISO-9660
+_make_efi_dir_on_iso9660() {
+    _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
+    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
+
+    install -d -m 0755 -- "${isofs_dir}/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
+
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" > "${isofs_dir}/loader/entries/${_conf##*/}"
+    done
+
+    # edk2-shell based UEFI shell
+    # shellx64.efi is picked up automatically when on /
+    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+    fi
+    _msg_info "Done!"
+}
+
+# Prepare kernel/initramfs on efiboot.img
+_make_boot_on_fat() {
+    local ucode_image all_ucode_images=()
+    _msg_info "Preparing kernel and initramfs for the FAT file system..."
+    mmd -i "${work_dir}/efiboot.img" \
+        "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
+    mcopy -i "${work_dir}/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
+        "${airootfs_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
+    for ucode_image in \
+        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
+    do
+        if [[ -e "${ucode_image}" ]]; then
+            all_ucode_images+=("${ucode_image}")
+        fi
+    done
+    if (( ${#all_ucode_images[@]} )); then
+        mcopy -i "${work_dir}/efiboot.img" "${all_ucode_images[@]}" "::/${install_dir}/boot/"
+    fi
+    _msg_info "Done!"
+}
+
+# Prepare efiboot.img::/EFI for EFI boot mode
+_make_bootmode_uefi-x64.systemd-boot.esp() {
+    local efiboot_imgsize="0"
+    _msg_info "Setting up systemd-boot for UEFI booting..."
+
+    # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
+    efiboot_imgsize="$(du -bc \
+        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
+        "${profile}/efiboot/" \
+        "${airootfs_dir}/boot/vmlinuz-"* \
+        "${airootfs_dir}/boot/initramfs-"*".img" \
+        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
+        2>/dev/null | awk 'function ceil(x){return int(x)+(x>int(x))}
+            function byte_to_kib(x){return x/1024}
+            function mib_to_kib(x){return x*1024}
+            END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}'
+        )"
+    # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
+    # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
+    [[ -e "${work_dir}/efiboot.img" ]] && rm -f -- "${work_dir}/efiboot.img"
+    _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
+    mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "$efiboot_imgsize"
+
+    mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
+    mcopy -i "${work_dir}/efiboot.img" \
+        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
+
+    mmd -i "${work_dir}/efiboot.img" ::/loader ::/loader/entries
+    mcopy -i "${work_dir}/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" | mcopy -i "${work_dir}/efiboot.img" - "::/loader/entries/${_conf##*/}"
+    done
+
+    # shellx64.efi is picked up automatically when on /
+    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        mcopy -i "${work_dir}/efiboot.img" \
+            "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
+    fi
+
+    # Copy kernel and initramfs
+    _make_boot_on_fat
+
+    _msg_info "Done! systemd-boot set up for UEFI booting successfully."
+}
+
+# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
+_make_bootmode_uefi-x64.systemd-boot.eltorito() {
+    _run_once _make_bootmode_uefi-x64.systemd-boot.esp
+    # Set up /EFI on ISO-9660 to allow preparing an installation medium by manually copying files
+    _run_once _make_efi_dir_on_iso9660
+}
+
+_validate_requirements_bootmode_bios.syslinux.mbr() {
+    # bios.syslinux.mbr requires bios.syslinux.eltorito
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' bios.syslinux.eltorito ' ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Using 'bios.syslinux.mbr' boot mode without 'bios.syslinux.eltorito' is not supported." 0
+    fi
+
+    # Check if the syslinux package is in the package list
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' syslinux ' ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The 'syslinux' package is missing from the package list!" 0
+    fi
+
+    # Check if syslinux configuration files exist
+    if [[ ! -d "${profile}/syslinux" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/syslinux' directory is missing!" 0
+    else
+        local cfgfile
+        for cfgfile in "${profile}/syslinux/"*'.cfg'; do
+            if [[ -e "${cfgfile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/syslinux/'!" 0
+            fi
+        done
+    fi
+
+    # Check for optional packages
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' memtest86+ ' ]]; then
+        _msg_info "Validating '${bootmode}': 'memtest86+' is not in the package list. Memmory testing will not be available from syslinux."
+    fi
+}
+
+_validate_requirements_bootmode_bios.syslinux.eltorito() {
+    _validate_requirements_bootmode_bios.syslinux.mbr
+}
+
+_validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
+    # Check if mkfs.fat is available
+    if ! command -v mkfs.fat &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': mkfs.fat is not available on this host. Install 'dosfstools'!" 0
+    fi
+
+    # Check if mmd and mcopy are available
+    if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
+        _msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
+    fi
+
+    # Check if systemd-boot configuration files exist
+    if [[ ! -d "${profile}/efiboot/loader/entries" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/efiboot/loader/entries' directory is missing!" 0
+    else
+        if [[ ! -e "${profile}/efiboot/loader/loader.conf" ]]; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Validating '${bootmode}': File '${profile}/efiboot/loader/loader.conf' not found!" 0
+        fi
+        local conffile
+        for conffile in "${profile}/efiboot/loader/entries/"*'.conf'; do
+            if [[ -e "${conffile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/efiboot/loader/entries/'!" 0
+            fi
+        done
+    fi
+
+    # Check for optional packages
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' edk2-shell ' ]]; then
+        _msg_info "'edk2-shell' is not in the package list. The ISO will not contain a bootable UEFI shell."
+    fi
+}
+
+_validate_requirements_bootmode_uefi-x64.systemd-boot.eltorito() {
+    # uefi-x64.systemd-boot.eltorito has the exact same requirements as uefi-x64.systemd-boot.esp
+    _validate_requirements_bootmode_uefi-x64.systemd-boot.esp
+}
+
+# Build airootfs filesystem image
+_prepare_airootfs_image() {
+    _run_once "_mkairootfs_${airootfs_image_type}"
+    _mkchecksum
+    if [[ -n "${gpg_key}" ]]; then
+        _mksignature
+    fi
+}
+
+_validate_requirements_airootfs_image_type_squashfs() {
+    if ! command -v mksquashfs &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mksquashfs is not available on this host. Install 'squashfs-tools'!" 0
+    fi
+}
+
+_validate_requirements_airootfs_image_type_ext4+squashfs() {
+    if ! { command -v mkfs.ext4 &> /dev/null && command -v tune2fs &> /dev/null; }; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mkfs.ext4 and/or tune2fs is not available on this host. Install 'e2fsprogs'!" 0
+    fi
+    _validate_requirements_airootfs_image_type_squashfs
+}
+
+_validate_requirements_airootfs_image_type_erofs() {
+    if ! command -v mkfs.erofs; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mkfs.erofs is not available on this host. Install 'erofs-utils'!" 0
+    fi
+}
+
+# SYSLINUX El Torito
+_add_xorrisofs_options_bios.syslinux.eltorito() {
+    xorrisofs_options+=(
+        # El Torito boot image for x86 BIOS
+        '-eltorito-boot' 'syslinux/isolinux.bin'
+        # El Torito boot catalog file
+        '-eltorito-catalog' 'syslinux/boot.cat'
+        # Required options to boot with ISOLINUX
+        '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
+    )
+}
+
+# SYSLINUX MBR
+_add_xorrisofs_options_bios.syslinux.mbr() {
+    xorrisofs_options+=(
+        # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot syslinux/isolinux.bin"
+        '-isohybrid-mbr' "${isofs_dir}/syslinux/isohdpfx.bin"
+        # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
+        # bootstrap code area) and mark it as bootable
+        # This violates the UEFI specification, but may allow booting on some systems
+        # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+        '--mbr-force-bootable'
+        # Set the ISO 9660 partition's type to "Linux filesystem data"
+        # When only MBR is present, the partition type ID will be 0x83 "Linux" as xorriso translates all
+        # GPT partition type GUIDs except for the ESP GUID to MBR type ID 0x83
+        '-iso_mbr_part_type' '0FC63DAF-8483-4772-8E79-3D69D8477DE4'
+        # Move the first partition away from the start of the ISO to match the expectations of partition
+        # editors
+        # May allow booting on some systems
+        # https://dev.lovelyhq.com/libburnia/libisoburn/src/branch/master/doc/partition_offset.wiki
+        '-partition_offset' '16'
+    )
+}
+
+# systemd-boot in an attached EFI system partition
+_add_xorrisofs_options_uefi-x64.systemd-boot.esp() {
+    # Move the first partition away from the start of the ISO, otherwise the GPT will not be valid and ISO 9660
+    # partition will not be mountable
+    # shellcheck disable=SC2076
+    [[ " ${xorrisofs_options[*]} " =~ ' -partition_offset ' ]] || xorrisofs_options+=('-partition_offset' '16')
+    xorrisofs_options+=(
+        # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
+        '-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img"
+        # Ensure GPT is used as some systems do not support UEFI booting without it
+        '-appended_part_as_gpt'
+    )
+}
+
+# systemd-boot via El Torito
+_add_xorrisofs_options_uefi-x64.systemd-boot.eltorito() {
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.esp ' ]]; then
+        # systemd-boot in an attached EFI system partition via El Torito
+        xorrisofs_options+=(
+            # Start a new El Torito boot entry for UEFI
             '-eltorito-alt-boot'
+            # Set the second partition as the El Torito UEFI boot image
+            '-e' '--interval:appended_partition_2:all::'
+            # Boot image is not emulating floppy or hard disk; required for all known boot loaders
+            '-no-emul-boot'
+        )
+    else
+        # The ISO will not contain a GPT partition table, so to be able to reference efiboot.img, place it as a
+        # file inside the ISO 9660 file system
+        install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
+        cp -a -- "${work_dir}/efiboot.img" "${isofs_dir}/EFI/archiso/efiboot.img"
+        # systemd-boot in an embedded efiboot.img via El Torito
+        xorrisofs_options+=(
+            # Start a new El Torito boot entry for UEFI
+            '-eltorito-alt-boot'
+            # Set efiboot.img as the El Torito UEFI boot image
             '-e' 'EFI/archiso/efiboot.img'
+            # Boot image is not emulating floppy or hard disk; required for all known boot loaders
             '-no-emul-boot'
-            '-isohybrid-gpt-basdat'
         )
     fi
+    # Specify where to save the El Torito boot catalog file in case it is not already set by bios.syslinux.eltorito
+    # shellcheck disable=SC2076
+    [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
+}
 
-    _show_config iso
+# Build ISO
+_build_iso() {
+    local xorrisofs_options=()
+    local bootmode
+
+    [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
+
+    [[ "${quiet}" == "y" ]] && xorrisofs_options+=('-quiet')
+
+    # Add required xorrisofs options for each boot mode
+    for bootmode in "${bootmodes[@]}"; do
+        typeset -f "_add_xorrisofs_options_${bootmode}" &> /dev/null && "_add_xorrisofs_options_${bootmode}"
+    done
 
-    mkdir -p "${out_dir}"
     _msg_info "Creating ISO image..."
-    local _qflag=""
-    if [[ "${quiet}" == "y" ]]; then
-        xorriso -as mkisofs -quiet \
+    xorriso -as mkisofs \
             -iso-level 3 \
             -full-iso9660-filenames \
+            -joliet \
+            -joliet-long \
+            -rational-rock \
             -volid "${iso_label}" \
             -appid "${iso_application}" \
             -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
-            -eltorito-boot isolinux/isolinux.bin \
-            -eltorito-catalog isolinux/boot.cat \
-            -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
-            "${_iso_efi_boot_args[@]}" \
+            -preparer "prepared by ${app_name}" \
+            "${xorrisofs_options[@]}" \
             -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
+            "${isofs_dir}/"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${img_name}"
+}
+
+# Read profile's values from profiledef.sh
+_read_profile() {
+    if [[ -z "${profile}" ]]; then
+        _msg_error "No profile specified!" 1
+    fi
+    if [[ ! -d "${profile}" ]]; then
+        _msg_error "Profile '${profile}' does not exist!" 1
+    elif [[ ! -e "${profile}/profiledef.sh" ]]; then
+        _msg_error "Profile '${profile}' is missing 'profiledef.sh'!" 1
     else
-        xorriso -as mkisofs \
-            -iso-level 3 \
-            -full-iso9660-filenames \
-            -volid "${iso_label}" \
-            -appid "${iso_application}" \
-            -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
-            -eltorito-boot isolinux/isolinux.bin \
-            -eltorito-catalog isolinux/boot.cat \
-            -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
-            "${_iso_efi_boot_args[@]}" \
-            -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
+        cd -- "${profile}"
+
+        # Source profile's variables
+        # shellcheck source=configs/releng/profiledef.sh
+        . "${profile}/profiledef.sh"
+
+        # Resolve paths of files that are expected to reside in the profile's directory
+        [[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
+        packages="$(realpath -- "${packages}")"
+        pacman_conf="$(realpath -- "${pacman_conf}")"
+
+        cd -- "${OLDPWD}"
     fi
-    _msg_info "Done! | $(ls -sh "${out_dir}/${img_name}")"
 }
 
-# create airootfs.sfs filesystem, and push it in "iso" directory.
-command_prepare () {
-    _show_config prepare
-
-    _cleanup
-    if [[ "${sfs_mode}" == "sfs" ]]; then
-        _mkairootfs_sfs
+# Validate set options
+_validate_options() {
+    local validation_error=0 bootmode
+    local pkg_list_from_file=()
+    _msg_info "Validating options..."
+    # Check if the package list file exists and read packages from it
+    if [[ -e "${packages}" ]]; then
+        mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
+        pkg_list+=("${pkg_list_from_file[@]}")
+        if (( ${#pkg_list_from_file} < 1 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "No package specified in '${packages}'." 0
+        fi
     else
-        _mkairootfs_img
-    fi
-    _mkchecksum
-    if [[ "${gpg_key}" ]]; then
-      _mksignature
-    fi
-}
+        (( validation_error=validation_error+1 ))
+        _msg_error "File '${packages}' does not exist." 0
 
-# Install packages on airootfs.
-# A basic check to avoid double execution/reinstallation is done via hashing package names.
-command_install () {
-    if [[ ! -f "${pacman_conf}" ]]; then
-        _msg_error "Pacman config file '${pacman_conf}' does not exist" 1
     fi
 
-    if [[ "${#pkg_list[@]}" -eq 0 ]]; then
-        _msg_error "Packages must be specified" 0
-        _usage 1
+    # Check if pacman configuration file exists
+    if [[ ! -e "${pacman_conf}" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "File '${pacman_conf}' does not exist." 0
+    fi
+    # Check if the specified bootmodes are supported
+    for bootmode in "${bootmodes[@]}"; do
+        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
+            if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
+                "_validate_requirements_bootmode_${bootmode}"
+            else
+                _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "${bootmode} is not a valid boot mode!" 0
+        fi
+    done
+    # Check if the specified airootfs_image_type is supported
+    if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
+        if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
+            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+        else
+            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+    fi
+    if (( validation_error )); then
+        _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
+    fi
+    _msg_info "Done!"
+}
+
+# Set defaults and, if present, overrides from mkarchiso command line option parameters
+_set_overrides() {
+    # Set variables that have command line overrides
+    if [[ -v override_work_dir ]]; then
+        work_dir="$override_work_dir"
+    elif [[ -z "$work_dir" ]]; then
+        work_dir='./work'
+    fi
+    work_dir="$(realpath -- "$work_dir")"
+    if [[ -v override_out_dir ]]; then
+        out_dir="$override_out_dir"
+    elif [[ -z "$out_dir" ]]; then
+        out_dir='./out'
+    fi
+    out_dir="$(realpath -- "$out_dir")"
+    if [[ -v override_pacman_conf ]]; then
+        pacman_conf="$override_pacman_conf"
+    elif [[ -z "$pacman_conf" ]]; then
+        pacman_conf="/etc/pacman.conf"
+    fi
+    pacman_conf="$(realpath -- "$pacman_conf")"
+    [[ ! -v override_pkg_list ]] || pkg_list+=("${override_pkg_list[@]}")
+    if [[ -v override_iso_label ]]; then
+        iso_label="$override_iso_label"
+    elif [[ -z "$iso_label" ]]; then
+        iso_label="${app_name^^}"
+    fi
+    if [[ -v override_iso_publisher ]]; then
+        iso_publisher="$override_iso_publisher"
+    elif [[ -z "$iso_publisher" ]]; then
+        iso_publisher="${app_name}"
+    fi
+    if [[ -v override_iso_application ]]; then
+        iso_application="$override_iso_application"
+    elif [[ -z "$iso_application" ]]; then
+        iso_application="${app_name} iso"
+    fi
+    if [[ -v override_install_dir ]]; then
+        install_dir="$override_install_dir"
+    elif [[ -z "$install_dir" ]]; then
+        install_dir="${app_name}"
+    fi
+    [[ ! -v override_gpg_key ]] || gpg_key="$override_gpg_key"
+    if [[ -v override_quiet ]]; then
+        quiet="$override_quiet"
+    elif [[ -z "$quiet" ]]; then
+        quiet="n"
     fi
 
-    _show_config install
-
-    _pacman "${pkg_list[@]}"
+    # Set variables that do not have overrides
+    [[ -n "$arch" ]] || arch="$(uname -m)"
+    [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
+    [[ -n "$iso_name" ]] || iso_name="${app_name}"
+    [[ -n "$img_name" ]] || img_name="${iso_name}-${iso_version}-${arch}.iso"
 }
 
-command_init() {
-    _show_config init
-    _chroot_init
+_export_gpg_publickey() {
+    gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
 }
 
-command_run() {
-    _show_config run
-    _chroot_run
+_make_version() {
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+    _msg_info "Creating files with iso version..."
+    printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
+    printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
+    printf '%.1024s' "$(printf '# GRUB Environment Block\nVERSION=%s\n%s' "${iso_version}" \
+        "$(printf '%0.1s' "#"{1..1024})")" > "${isofs_dir}/${install_dir}/grubenv"
+    _msg_info "Done!"
 }
 
-if [[ "${EUID}" -ne 0 ]]; then
-    _msg_error "This script must be run as root." 1
-fi
+_make_pkglist() {
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+    _msg_info "Creating a list of installed packages on live-enviroment..."
+    pacman -Q --sysroot "${airootfs_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
+    _msg_info "Done!"
+}
 
-umask 0022
+_build_profile() {
+    # Set up essential directory paths
+    airootfs_dir="${work_dir}/${arch}/airootfs"
+    isofs_dir="${work_dir}/iso"
+    # Create working directory
+    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+    # Write build date to file or if the file exists, read it from there
+    if [[ -e "${work_dir}/build_date" ]]; then
+        SOURCE_DATE_EPOCH="$(<"${work_dir}/build_date")"
+    else
+        printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
+    fi
 
-while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
+    [[ "${quiet}" == "y" ]] || _show_config
+    _run_once _make_pacman_conf
+    [[ -z "${gpg_key}" ]] || _run_once _export_gpg_publickey
+    _run_once _make_custom_airootfs
+    _run_once _make_packages
+    _run_once _make_version
+    _run_once _make_customize_airootfs
+    _run_once _make_pkglist
+    _make_bootmodes
+    _run_once _cleanup_airootfs
+    _run_once _prepare_airootfs_image
+    _run_once _build_iso
+}
+
+while getopts 'p:C:L:P:A:D:w:o:g:vh?' arg; do
     case "${arg}" in
-        p)
-            read -r -a opt_pkg_list <<< "${OPTARG}"
-            pkg_list+=("${opt_pkg_list[@]}")
-            ;;
-        r) run_cmd="${OPTARG}" ;;
-        C) pacman_conf="${OPTARG}" ;;
-        L) iso_label="${OPTARG}" ;;
-        P) iso_publisher="${OPTARG}" ;;
-        A) iso_application="${OPTARG}" ;;
-        D) install_dir="${OPTARG}" ;;
-        w) work_dir="${OPTARG}" ;;
-        o) out_dir="${OPTARG}" ;;
-        s) sfs_mode="${OPTARG}" ;;
-        c) sfs_comp="${OPTARG}" ;;
-        g) gpg_key="${OPTARG}" ;;
-        v) quiet="n" ;;
+        p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
+        C) override_pacman_conf="${OPTARG}" ;;
+        L) override_iso_label="${OPTARG}" ;;
+        P) override_iso_publisher="${OPTARG}" ;;
+        A) override_iso_application="${OPTARG}" ;;
+        D) override_install_dir="${OPTARG}" ;;
+        w) override_work_dir="${OPTARG}" ;;
+        o) override_out_dir="${OPTARG}" ;;
+        g) override_gpg_key="${OPTARG}" ;;
+        v) override_quiet="n" ;;
         h|?) _usage 0 ;;
         *)
             _msg_error "Invalid argument '${arg}'" 0
@@ -429,40 +1001,21 @@ done
 
 shift $((OPTIND - 1))
 
-if [[ $# -lt 1 ]]; then
-    _msg_error "No command specified" 0
+if (( $# < 1 )); then
+    _msg_error "No profile specified" 0
     _usage 1
 fi
-command_name="${1}"
 
-case "${command_name}" in
-    init)
-        command_init
-        ;;
-    install)
-        command_install
-        ;;
-    run)
-        command_run
-        ;;
-    prepare)
-        command_prepare
-        ;;
-    pkglist)
-        command_pkglist
-        ;;
-    iso)
-        if [[ $# -lt 2 ]]; then
-            _msg_error "No image specified" 0
-            _usage 1
-        fi
-        img_name="${2}"
-        command_iso
-        ;;
-    *)
-        _msg_error "Invalid command name '${command_name}'" 0
-        _usage 1
-        ;;
-esac
+if (( EUID != 0 )); then
+    _msg_error "${app_name} must be run as root." 1
+fi
+
+# get the absolute path representation of the first non-option argument
+profile="$(realpath -- "${1}")"
+
+_read_profile
+_set_overrides
+_validate_options
+_build_profile
 
 # vim:ts=4:sw=4:et:
diff --git a/packages.x86_64 b/packages.x86_64
index 9f04173..bcf6995 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -1,46 +1,23 @@
-#
-# Additions from new archiso config files
-bind-tools
-edk2-shell
-#irssi
-#kitty-terminfo
-#lftp
-#lynx
-memtest86+
-nbd
-nmap
-nvme-cli
-rxvt-unicode-terminfo
-sudo
-syslinux
-systemd-resolvconf
-#terminus-font
-#termite-terminfo
-mkinitcpio-archiso
-
-#default.groups.packages
-# now packages
+#base-system
 base
 base-devel
-
-
-# kernel.cachy
-# linux (base-group)
-# not anymore in base-group, needs explicit install
-# adding old base packages here as a list
 linux
 linux-headers
 linux-firmware
 mkinitcpio
 mkinitcpio-busybox
 mkinitcpio-nfs-utils
-#dkms (broadcom-wl-dkms will bring this in)
+cachyos-mirrorlist
+cachyos-keyring
+bind-tools
+edk2-shell
+rxvt-unicode-terminfo
+sudo
+systemd-resolvconf
 cryptsetup
 device-mapper
 diffutils
-e2fsprogs
 inetutils
-jfsutils
 less
 logrotate
 man-db
@@ -48,30 +25,22 @@ man-pages
 mdadm
 nano
 perl
-reiserfsprogs
 s-nail
 sysfsutils
 systemd-sysvcompat
 texinfo
-usbutils
-vi
 which
-xfsprogs
+intel-ucode
+amd-ucode
 
-# hardware-support.packages
-lsscsi
-sdparm
-sg3_utils
-smartmontools
+#ISO-specific
+mkinitcpio-archiso
+syslinux
+memtest86+
+xcompmgr
+arch-install-scripts
 
-# EFI/UEFI.packages
-refind
-
-# keyring_mirros.cachyos
-cachyos-keyring
-cachyos-mirrorlist
-
-# xorg.cachyos
+#x-system
 xf86-video-vesa
 xorg-server
 xorg-xinit
@@ -84,110 +53,46 @@ xf86-video-amdgpu
 xf86-video-ati
 xf86-video-fbdev
 xf86-video-intel
-#xf86-video-nouveau
 nvidia-dkms
 nvidia-utils
-#removed as it is not needed to run nvidia driver
-#nvidia-settings
 
-# loginmanager.packages
-lightdm-gtk-greeter
-lightdm-gtk-greeter-settings
-# now needed for lightdm in some cases
-accountsservice
-
-# default.desktop.cachyos
-plasma-browser-integration
-plasma-desktop
-plasma-firewall
-plasma-framework
-plasma-integration
-plasma-nm
-plasma-pa
-plasma-systemmonitor
-plasma-thunderbolt
-plasma-workspace
-# goodies selection
-# mousepad (issues with sudo)
-xed
-parole
-ristretto
-dolphin
-dolphin-plugins
-konsole
-neofetch
-
-# theme.plasma.cachyos
-capitaine-cursors
-gtk-engine-murrine
-gnome-themes-extra
-adwaita-icon-theme
-cachyos-grub-theme
-
-# extra.desktop.packages
-dconf-editor
-file-roller
-libwnck3
-network-manager-applet
-transmission-gtk
-gnome-calculator
-
-# default.browser.cachyos
-cachy-browser
-
-# fonts
-ttf-dejavu
-ttf-liberation
-ttf-bitstream-vera
-#ttf-ubuntu-font-family
-cantarell-fonts
-#ttf-croscore
-#ttf-carlito
-#ttf-caladea
-noto-fonts
-adobe-source-han-sans-jp-fonts
-adobe-source-han-sans-kr-fonts
-adobe-source-han-sans-cn-fonts
-opendesktop-fonts
-ttf-opensans
-
-# filesystems.packages
+#filesystem
 btrfs-progs
 dosfstools
 f2fs-tools
+xfsprogs
+e2fsprogs
 lvm2
 mtools
 ntfs-3g
-exfat-utils
+reiserfsprogs
+jfsutils
+nvme-cli
+exfatprogs
 nfs-utils
 nilfs-utils
-mlocate
 gvfs
 gvfs-afc
-gvfs-goa
 gvfs-gphoto2
 gvfs-mtp
 gvfs-nfs
 gvfs-smb
 
-# installation.packages
-arch-install-scripts
-pacman-contrib
+# zfs support
+zfs-dkms
+zfs-utils
+
+#general-system
+mlocate
 crda
 dialog
 dmraid
-efibootmgr
-efitools
 fakeroot
 gptfdisk
-grub
 haveged
 hwdetect
 hwinfo
 ntp
-os-prober
-
-# system.packages
 expect
 git
 pkgfile
@@ -199,19 +104,104 @@ wget
 xdg-user-dirs-gtk
 xz
 gpm
-intel-ucode
-amd-ucode
+poppler-glib
+libgsf
+libopenraw
+freetype2
+gpart
+gspell
+pacman-contrib
+rebuild-detector
 
-# for ssh
-gnome-keyring
+#general-hardware
+lsscsi
+sdparm
+sg3_utils
+smartmontools
+usbutils
 
-# network.packages
-#b43-firmware
+#DM
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+accountsservice
+
+#plasma-desktop
+plasma-browser-integration
+plasma-desktop
+plasma-firewall
+plasma-framework
+plasma-integration
+plasma-nm
+plasma-pa
+plasma-systemmonitor
+plasma-thunderbolt
+plasma-workspace
+xed
+parole
+ristretto
+dolphin
+dolphin-plugins
+konsole
+neofetch
+capitaine-cursors
+gtk-engine-murrine
+gnome-themes-extra
+adwaita-icon-theme
+file-roller
+libwnck3
+network-manager-applet
+galculator
+cachy-browser
+kvantum-qt5
+qt5ct
+
+#fonts
+ttf-dejavu
+ttf-liberation
+ttf-bitstream-vera
+cantarell-fonts
+noto-fonts
+adobe-source-han-sans-jp-fonts
+adobe-source-han-sans-kr-fonts
+adobe-source-han-sans-cn-fonts
+opendesktop-fonts
+ttf-opensans
+
+#audio
+alsa-utils
+alsa-plugins
+alsa-firmware
+sof-firmware
+pulseaudio-alsa
+pulseaudio-bluetooth
+pulseaudio-equalizer
+pulseaudio-jack
+pavucontrol
+ffmpegthumbnailer
+gst-libav
+gst-plugins-bad
+gst-plugins-ugly
+gst-plugin-pipewire
+
+#boot
+grub
+efibootmgr
+efitools
+os-prober
+refind
+
+#net-hardware
 b43-fwcutter
 broadcom-wl-dkms
 dnsutils
 ipw2100-fw
 ipw2200-fw
+linux-atm
+r8168
+
+#network
+nbd
+nmap
 modemmanager
 netctl
 net-tools
@@ -226,7 +216,6 @@ dnsmasq
 elinks
 ethtool
 openconnect
-openssh
 openvpn
 rp-pppoe
 wireless-regdb
@@ -234,21 +223,27 @@ wpa_supplicant
 wvdial
 gnu-netcat
 iwd
-linux-atm
 ndisc6
 ppp
 pptpclient
 vpnc
 xl2tpd
-r8168
 
-# calamares.cachy
-calamares
-calamares-branding-cachyos
-#calamares_current
-#calamares_test
+#live-iso-tools
+gparted
+grsync
+clonezilla
+hdparm
+fsarchiver
+glances
+python-defusedxml
+inxi
+bash-completion
+downgrade
+pcurses
+tldr
 
-# calamares.dependencies
+#calamares
 lsb-release
 libpwquality
 cmake
@@ -256,17 +251,8 @@ qt5-svg
 qt5-webengine
 yaml-cpp
 extra-cmake-modules
-boost
-
-# calamares.modules
-# dependencies for installer modules
-#for encrypted swap
-#for showing keyboard layouts
-
-# calamares.welcome
+boost-libs
 upower
-
-# calamares.partition
 kcoreaddons
 kconfig
 ki18n
@@ -274,12 +260,7 @@ kservice
 kwidgetsaddons
 kpmcore
 parted
-gparted
-
-# calamares.unpackfs
 squashfs-tools
-
-# calamares.others
 qt5-xmlpatterns
 doxygen
 tcpdump
@@ -289,73 +270,25 @@ polkit-qt5
 python
 solid
 qt5-tools
-#pythonqt
+calamares
+calamares-branding-cachyos
 
-# liveiso.rescue-tools
-grsync
-#ddrescue
-#dd_rescue
-#testdisk
-clonezilla
-#partclone
-#partimage
-gftp
-hdparm
-fsarchiver
-#mc
-
-# sound
-alsa-utils
-alsa-plugins
-alsa-firmware
-pulseaudio-alsa
-pulseaudio-bluetooth
-pulseaudio-equalizer
-pulseaudio-jack
-
-# developers.wishes
-#htop
-glances
-#rsync (grsync will bring this in)
-hardinfo
-bash-completion
-pcurses
-tldr
-
-# needed.dependencies
-pavucontrol
-ffmpegthumbnailer
-poppler-glib
-libgsf
-libopenraw
-freetype2
-gst-libav
-gst-plugins-bad
-gst-plugins-ugly
-gst-plugin-pipewire
-gpart
-libdvdcss
-
-# AUR-support
+#cachyos-repo
+#rate-mirrors-bin
+mkinitcpio-openswap
+ckbcomp
+cachyos-grub-theme
+#cachyos-theming
 paru
+yad
+#welcome
+meld
+#keyserver-rank-cachy
+reflector-simple
 
-#virtualbox.packages
+#vm-support
+qemu-guest-agent
 virtualbox-guest-utils
-
-#Vmware.packages
 open-vm-tools
 xf86-input-vmmouse
 xf86-video-vmware
-
-#screen tearing at ISO
-xcompmgr
-
-# cachyos.welcome
-yad
-gspell
-#welcome
-meld
-
-# zfs support
-zfs-dkms
-zfs-utils
\ No newline at end of file
diff --git a/pacman.conf b/pacman.conf
index 7271f88..3d7dc92 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -33,11 +33,13 @@ Architecture = auto
 # Misc options
 #UseSyslog
 Color
+ILoveCandy
 #TotalDownload
 # We cannot check disk space from within a chroot environment
 #CheckSpace
-#VerbosePkgLists
-ParallelDownloads = 5
+VerbosePkgLists
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -106,6 +108,10 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
+[chaotic-aur]
+SigLevel = Optional TrustAll
+Server = https://geo-mirror.chaotic.cx/$repo/$arch
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
diff --git a/profiledef.sh b/profiledef.sh
new file mode 100644
index 0000000..364b90a
--- /dev/null
+++ b/profiledef.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="cachyos"
+iso_label="CachyOS_$(date +%Y%m)"
+iso_publisher="CachyOS <https://cachyos.org>"
+iso_application="CachyOS Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="arch"
+work_dir=work
+out_dir=out
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+arch="x86_64"
+pacman_conf="pacman.conf"
+airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
+file_permissions=(
+  ["/etc/shadow"]="0:0:0400"
+  ["/etc/gshadow"]="0:0:0400"
+  ["/root"]="0:0:750"
+  ["/root/.automated_script.sh"]="0:0:755"
+  ["/etc/sudoers.d"]="0:0:750"
+)
diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh
index 7c05cc4..ffaf0ff 100755
--- a/run_before_squashfs.sh
+++ b/run_before_squashfs.sh
@@ -2,13 +2,14 @@
 
 # Made by Fernando "maroto"
 # Run anything in the filesystem right before being "mksquashed"
+# ISO-NEXT specific cleanup removals and additions (08-2021) @killajoe and @manuel
 
 script_path=$(readlink -f ${0%/*})
 work_dir=work
 
 # Adapted from AIS. An excellent bit of code!
 arch_chroot(){
-    arch-chroot $script_path/${work_dir}/airootfs /bin/bash -c "${1}"
+    arch-chroot $script_path/${work_dir}/x86_64/airootfs /bin/bash -c "${1}"
 }
 
 do_merge(){
@@ -20,20 +21,27 @@ locale-gen
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 usermod -s /usr/bin/bash root
 cp -aT /etc/skel/ /root/
+rm /root/xed.dconf
 chmod 700 /root
 useradd -m -p \"\" -g users -G 'sys,rfkill,wheel' -s /bin/bash liveuser
-git clone https://github.com/endeavouros-team/liveuser-desktop-settings.git
+git clone -b 08-2021 --single-branch https://github.com/endeavouros-team/liveuser-desktop-settings.git
+#git clone https://github.com/endeavouros-team/liveuser-desktop-settings.git
 cd liveuser-desktop-settings
 rm -R /home/liveuser/.config
 cp -R .config /home/liveuser/
-chown -R liveuser:users /home/liveuser/.config
+chown -R liveuser:liveuser /home/liveuser/.config
+cp .xinitrc .xprofile .Xauthority /home/liveuser/
+chown liveuser:liveuser /home/liveuser/.xinitrc
+chown liveuser:liveuser /home/liveuser/.xprofile
+chown liveuser:liveuser /home/liveuser/.Xauthority
+cp -R .local /home/liveuser/
+chown -R liveuser:liveuser /home/liveuser/.local
+chmod +x /home/liveuser/.local/bin/*
 cp user_pkglist.txt /home/liveuser/
-chown liveuser:users /home/liveuser/user_pkglist.txt
+chown liveuser:liveuser /home/liveuser/user_pkglist.txt
 rm /home/liveuser/.bashrc
 cp .bashrc /home/liveuser/
-chown liveuser:users /home/liveuser/.bashrc
-cp -R community_editions /home/liveuser/
-chown -R liveuser:users /home/liveuser/community_editions
+chown liveuser:liveuser /home/liveuser/.bashrc
 cp LICENSE /home/liveuser/
 cd ..
 rm -R liveuser-desktop-settings
@@ -47,7 +55,7 @@ chown root:root /etc/sudoers.d
 chown root:root /etc/sudoers.d/g_wheel
 chmod 755 /etc
 sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
-sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist
+# sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist
 sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
 sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
@@ -58,26 +66,29 @@ systemctl set-default multi-user.target
 cp -rf /usr/share/mkinitcpio/hook.preset /etc/mkinitcpio.d/linux.preset
 sed -i 's?%PKGBASE%?linux?' /etc/mkinitcpio.d/linux.preset
 
-pacman-key --init
-pacman-key --add /usr/share/pacman/keyrings/cachyos.gpg && sudo pacman-key --lsign-key F3B607488DB35A47
-pacman-key --populate
-pacman-key --refresh-keys
-pacman -Syy
+# fetch fallback mirrorlist for offline installs:
+wget https://gitlab.com/cachyos/cachyos-archiso/-/raw/master/mirrorlist
+cp mirrorlist /etc/pacman.d/
+rm mirrorlist
+
+# now done with recreating pacman keyring inside calamares:
+# shellprocess_initialize_pacman
+#pacman-key --init
+#pacman-key --add /usr/share/pacman/keyrings/cachyos.gpg && sudo pacman-key --lsign-key F3B607488DB35A47
+#pacman-key --populate
+#pacman-key --refresh-keys
+#pacman -Syy
+
+# now done with recreating pacman keyring inside calamares:
+# shellprocess_initialize_pacman
+#rm -R /etc/pacman.d/gnupg
+
 sed -i 's|^GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"$|GRUB_CMDLINE_LINUX_DEFAULT=\"\1 nowatchdog\"|' /etc/default/grub
 sed -i 's?GRUB_DISTRIBUTOR=.*?GRUB_DISTRIBUTOR=\"CachyOS\"?' /etc/default/grub
 sed -i 's?\#GRUB_THEME=.*?GRUB_THEME=\/boot\/grub\/themes\/CachyOS\/theme.txt?g' /etc/default/grub
 echo 'GRUB_DISABLE_SUBMENU=y' >> /etc/default/grub
 rm /boot/grub/grub.cfg
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/cleaner_script.sh
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/chrooted_cleaner_script.sh
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/calamares_switcher
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/pacstrap_calamares
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/update-mirrorlist
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/calamares_for_testers
-wget https://gitlab.com/cachyos/install-scripts/-/raw/master/prepare-calamares
-chmod +x cleaner_script.sh chrooted_cleaner_script.sh calamares_switcher pacstrap_calamares update-mirrorlist calamares_for_testers prepare-calamares
-mv cleaner_script.sh chrooted_cleaner_script.sh calamares_switcher update-mirrorlist pacstrap_calamares calamares_for_testers prepare-calamares /usr/bin/
-wget https://raw.githubusercontent.com/endeavouros-team/liveuser-desktop-settings/master/dconf/xed.dconf
+wget https://raw.githubusercontent.com/endeavouros-team/liveuser-desktop-settings/08-2021/dconf/xed.dconf
 dbus-launch dconf load / < xed.dconf
 sudo -H -u liveuser bash -c 'dbus-launch dconf load / < xed.dconf'
 rm xed.dconf
diff --git a/syslinux/archiso_head.cfg b/syslinux/archiso_head.cfg
index 898f806..e553e79 100644
--- a/syslinux/archiso_head.cfg
+++ b/syslinux/archiso_head.cfg
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 SERIAL 0 38400
-UI boot/syslinux/vesamenu.c32
-MENU TITLE CachyOS
-MENU BACKGROUND boot/syslinux/splash.png
+UI vesamenu.c32
+MENU TITLE Arch Linux
+MENU BACKGROUND splash.png
 
 MENU WIDTH 78
 MENU MARGIN 4
@@ -28,3 +28,4 @@ MENU COLOR msg07        37;40   #90ffffff #a0000000 std
 MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 
 MENU CLEAR
+MENU IMMEDIATE
diff --git a/syslinux/archiso_pxe-linux.cfg b/syslinux/archiso_pxe-linux.cfg
new file mode 100644
index 0000000..d405f7c
--- /dev/null
+++ b/syslinux/archiso_pxe-linux.cfg
@@ -0,0 +1,35 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LABEL cachyos_nbd
+TEXT HELP
+Boot the CachyOS install medium using NBD.
+It allows you to install CachyOS or perform system maintenance.
+ENDTEXT
+MENU LABEL CachyOS install medium (x86_64, NBD)
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
+SYSAPPEND 3
+
+LABEL cachyos_nfs
+TEXT HELP
+Boot the CachyOS live medium using NFS.
+It allows you to install CachyOS or perform system maintenance.
+ENDTEXT
+MENU LABEL CachyOS install medium (x86_64, NFS)
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
+SYSAPPEND 3
+
+LABEL cachyos_http
+TEXT HELP
+Boot the CachyOS live medium using HTTP.
+It allows you to install CachyOS or perform system maintenance.
+ENDTEXT
+MENU LABEL CachyOS install medium (x86_64, HTTP)
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
+SYSAPPEND 3
diff --git a/syslinux/archiso_pxe.cfg b/syslinux/archiso_pxe.cfg
index ce6f5e9..b005cb1 100644
--- a/syslinux/archiso_pxe.cfg
+++ b/syslinux/archiso_pxe.cfg
@@ -1,39 +1,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
 
-LABEL arch64_nbd
-TEXT HELP
-MENU LABEL Boot CachyOS (x86_64) (NBD)
-It allows you to install CachyOS or perform system maintenance.
-ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, NBD)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-SYSAPPEND 3
+INCLUDE archiso_pxe-linux.cfg
 
-LABEL arch64_nfs
-TEXT HELP
-Boot the CachyOS live medium using NFS.
-It allows you to install CachyOS or perform system maintenance.
-ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, NFS)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-SYSAPPEND 3
-
-LABEL arch64_http
-TEXT HELP
-Boot the CachyOS live medium using HTTP.
-It allows you to install CachyOS or perform system maintenance.
-ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, HTTP)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-SYSAPPEND 3
-
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_tail.cfg
diff --git a/syslinux/archiso_sys-linux.cfg b/syslinux/archiso_sys-linux.cfg
new file mode 100644
index 0000000..fd684bf
--- /dev/null
+++ b/syslinux/archiso_sys-linux.cfg
@@ -0,0 +1,23 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LABEL cachyos
+TEXT HELP
+Boot the CachyOS install medium on BIOS.
+It allows you to install CachyOS or perform system maintenance.
+ENDTEXT
+MENU LABEL CachyOS install default (x86_64, BIOS)
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
+
+# Nvidia propritary (Non-Free)
+LABEL cachyos-nvidia
+TEXT HELP
+Boot the CachyOS install medium on BIOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY.
+It allows you to install CachyOS or perform system maintenance.
+ENDTEXT
+MENU LABEL CachyOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY (x86_64)
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1
diff --git a/syslinux/archiso_sys.cfg b/syslinux/archiso_sys.cfg
index 60ae8da..1e1e751 100644
--- a/syslinux/archiso_sys.cfg
+++ b/syslinux/archiso_sys.cfg
@@ -1,21 +1,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
 
-LABEL arch64
-TEXT HELP
-Boot the CachyOS Linux (x86_64) live medium.
-It allows you to install CachyOS or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot CachyOS Default (x86_64)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
+DEFAULT cachyos
+TIMEOUT 150
 
-LABEL Boot CachyOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY (x86_64)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1
+INCLUDE archiso_sys-linux.cfg
 
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_tail.cfg
diff --git a/syslinux/archiso_tail.cfg b/syslinux/archiso_tail.cfg
index 685e1c8..af172c0 100644
--- a/syslinux/archiso_tail.cfg
+++ b/syslinux/archiso_tail.cfg
@@ -7,19 +7,19 @@ Boot an existing operating system.
 Press TAB to edit the disk and partition number to boot.
 ENDTEXT
 MENU LABEL Boot existing OS
-COM32 boot/syslinux/chain.c32
+COM32 chain.c32
 APPEND hd0 0
 
 # http://www.memtest.org/
 LABEL memtest
 MENU LABEL Run Memtest86+ (RAM test)
-LINUX boot/memtest
+LINUX /%INSTALL_DIR%/boot/memtest
 
 # http://hdt-project.org/
 LABEL hdt
 MENU LABEL Hardware Information (HDT)
-COM32 boot/syslinux/hdt.c32
-APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
+COM32 hdt.c32
+APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
 
 LABEL reboot
 TEXT HELP
@@ -27,7 +27,7 @@ Reboot computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Reboot
-COM32 boot/syslinux/reboot.c32
+COM32 reboot.c32
 
 LABEL poweroff
 TEXT HELP
@@ -35,4 +35,4 @@ Power off computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Power Off
-COM32 boot/syslinux/poweroff.c32
+COM32 poweroff.c32
diff --git a/syslinux/syslinux.cfg b/syslinux/syslinux.cfg
index 3ee98de..847ab6b 100644
--- a/syslinux/syslinux.cfg
+++ b/syslinux/syslinux.cfg
@@ -1,5 +1,14 @@
-DEFAULT loadconfig
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-LABEL loadconfig
-  CONFIG archiso.cfg
-  APPEND ../../
+DEFAULT select
+
+LABEL select
+COM32 whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
+
+LABEL pxe
+CONFIG archiso_pxe.cfg
+
+LABEL sys
+CONFIG archiso_sys.cfg