diff --git a/archiso/airootfs/etc/default/grub b/archiso/airootfs/etc/default/grub
index 6db5c6e..c7206c5 100755
--- a/archiso/airootfs/etc/default/grub
+++ b/archiso/airootfs/etc/default/grub
@@ -43,8 +43,8 @@ GRUB_DISABLE_RECOVERY=true
 #GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
-GRUB_BACKGROUND="/boot/grub/background.png"
-#GRUB_THEME="/path/to/gfxtheme"
+#GRUB_BACKGROUND="/boot/grub/background.png"
+GRUB_THEME="/boot/grub/themes/tms/theme.txt"
 
 # Uncomment to get a beep at GRUB start
 #GRUB_INIT_TUNE="480 440 1"
diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg
index d9393e1..904fb8b 100755
--- a/archiso/grub/grub.cfg
+++ b/archiso/grub/grub.cfg
@@ -9,15 +9,19 @@ insmod exfat
 insmod udf
 
 # Use graphics-mode output
-if loadfont "${prefix}/fonts/unicode.pf2" ; then
+if loadfont "${archiso_device}/boot/grub/fonts/unicode.pf2" ; then
+    loadfont "${archiso_device}/boot/grub/themes/tms/ubuntu_regular_20.pf2"
+    loadfont "${archiso_device}/boot/grub/themes/tms/ubuntu_regular_17.pf2"
+    loadfont "${archiso_device}/boot/grub/themes/tms/terminus-14.pf2"
+
     insmod all_video
     insmod gfxterm
-    
+    insmod png
+
     set gfxmode="auto"
     terminal_input console
     terminal_output gfxterm
-    set background_image="/boot/grub/background.png"
-
+    set theme="${archiso_device}/boot/grub/themes/tms/theme.txt"
 fi
 
 # Enable serial console
@@ -55,13 +59,13 @@ timeout_style=menu
 
 # Menu entries
 
-menuentry "BBTTMS Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
+menuentry "BBTTMS Linux install (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
     set gfxpayload=keep
     linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n quiet splash plymouth.uuid=%ARCHISO_UUID%
     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
 }
 
-menuentry "BBTTMS Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
+menuentry "BBTTMS Linux install with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
     set gfxpayload=keep
     linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n quiet splash plymouth.uuid=%ARCHISO_UUID%
     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
diff --git a/archiso/grub/themes/tms/alci.xcf b/archiso/grub/themes/tms/alci.xcf
new file mode 100644
index 0000000..3e4b28e
Binary files /dev/null and b/archiso/grub/themes/tms/alci.xcf differ
diff --git a/archiso/grub/themes/tms/background.png b/archiso/grub/themes/tms/background.png
new file mode 100644
index 0000000..26989c6
Binary files /dev/null and b/archiso/grub/themes/tms/background.png differ
diff --git a/archiso/grub/themes/tms/icons/4MLinux.png b/archiso/grub/themes/tms/icons/4MLinux.png
new file mode 100644
index 0000000..1c6fe5e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/4MLinux.png differ
diff --git a/archiso/grub/themes/tms/icons/AlpineLinux.png b/archiso/grub/themes/tms/icons/AlpineLinux.png
new file mode 100644
index 0000000..6212a1f
Binary files /dev/null and b/archiso/grub/themes/tms/icons/AlpineLinux.png differ
diff --git a/archiso/grub/themes/tms/icons/Manjaro.i686.png b/archiso/grub/themes/tms/icons/Manjaro.i686.png
new file mode 100644
index 0000000..611a6fb
Binary files /dev/null and b/archiso/grub/themes/tms/icons/Manjaro.i686.png differ
diff --git a/archiso/grub/themes/tms/icons/Manjaro.x86_64.png b/archiso/grub/themes/tms/icons/Manjaro.x86_64.png
new file mode 100644
index 0000000..611a6fb
Binary files /dev/null and b/archiso/grub/themes/tms/icons/Manjaro.x86_64.png differ
diff --git a/archiso/grub/themes/tms/icons/SystemRescueCD.png b/archiso/grub/themes/tms/icons/SystemRescueCD.png
new file mode 100644
index 0000000..7c41182
Binary files /dev/null and b/archiso/grub/themes/tms/icons/SystemRescueCD.png differ
diff --git a/archiso/grub/themes/tms/icons/alma.png b/archiso/grub/themes/tms/icons/alma.png
new file mode 100644
index 0000000..ef56f3e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/alma.png differ
diff --git a/archiso/grub/themes/tms/icons/android.png b/archiso/grub/themes/tms/icons/android.png
new file mode 100644
index 0000000..dad066f
Binary files /dev/null and b/archiso/grub/themes/tms/icons/android.png differ
diff --git a/archiso/grub/themes/tms/icons/anonymous.png b/archiso/grub/themes/tms/icons/anonymous.png
new file mode 100644
index 0000000..7d165b6
Binary files /dev/null and b/archiso/grub/themes/tms/icons/anonymous.png differ
diff --git a/archiso/grub/themes/tms/icons/antergos.png b/archiso/grub/themes/tms/icons/antergos.png
new file mode 100644
index 0000000..32e3a3a
Binary files /dev/null and b/archiso/grub/themes/tms/icons/antergos.png differ
diff --git a/archiso/grub/themes/tms/icons/arch.png b/archiso/grub/themes/tms/icons/arch.png
new file mode 100644
index 0000000..f6cd870
Binary files /dev/null and b/archiso/grub/themes/tms/icons/arch.png differ
diff --git a/archiso/grub/themes/tms/icons/archlinux.png b/archiso/grub/themes/tms/icons/archlinux.png
new file mode 100644
index 0000000..f6cd870
Binary files /dev/null and b/archiso/grub/themes/tms/icons/archlinux.png differ
diff --git a/archiso/grub/themes/tms/icons/arcolinux.png b/archiso/grub/themes/tms/icons/arcolinux.png
new file mode 100644
index 0000000..c5e5e5e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/arcolinux.png differ
diff --git a/archiso/grub/themes/tms/icons/artix.png b/archiso/grub/themes/tms/icons/artix.png
new file mode 100644
index 0000000..0cbeb11
Binary files /dev/null and b/archiso/grub/themes/tms/icons/artix.png differ
diff --git a/archiso/grub/themes/tms/icons/bbttms.png b/archiso/grub/themes/tms/icons/bbttms.png
new file mode 100644
index 0000000..5bfe73e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/bbttms.png differ
diff --git a/archiso/grub/themes/tms/icons/bedrock.png b/archiso/grub/themes/tms/icons/bedrock.png
new file mode 100644
index 0000000..58ff48a
Binary files /dev/null and b/archiso/grub/themes/tms/icons/bedrock.png differ
diff --git a/archiso/grub/themes/tms/icons/cancel.png b/archiso/grub/themes/tms/icons/cancel.png
new file mode 100644
index 0000000..fca2ac9
Binary files /dev/null and b/archiso/grub/themes/tms/icons/cancel.png differ
diff --git a/archiso/grub/themes/tms/icons/centos.png b/archiso/grub/themes/tms/icons/centos.png
new file mode 100644
index 0000000..23fe2fa
Binary files /dev/null and b/archiso/grub/themes/tms/icons/centos.png differ
diff --git a/archiso/grub/themes/tms/icons/chakra.png b/archiso/grub/themes/tms/icons/chakra.png
new file mode 100644
index 0000000..6f63a95
Binary files /dev/null and b/archiso/grub/themes/tms/icons/chakra.png differ
diff --git a/archiso/grub/themes/tms/icons/chromeos.png b/archiso/grub/themes/tms/icons/chromeos.png
new file mode 100644
index 0000000..5aff9c5
Binary files /dev/null and b/archiso/grub/themes/tms/icons/chromeos.png differ
diff --git a/archiso/grub/themes/tms/icons/debian.png b/archiso/grub/themes/tms/icons/debian.png
new file mode 100644
index 0000000..20bea8c
Binary files /dev/null and b/archiso/grub/themes/tms/icons/debian.png differ
diff --git a/archiso/grub/themes/tms/icons/deepin.png b/archiso/grub/themes/tms/icons/deepin.png
new file mode 100644
index 0000000..61c92fb
Binary files /dev/null and b/archiso/grub/themes/tms/icons/deepin.png differ
diff --git a/archiso/grub/themes/tms/icons/devuan.png b/archiso/grub/themes/tms/icons/devuan.png
new file mode 100644
index 0000000..ff65401
Binary files /dev/null and b/archiso/grub/themes/tms/icons/devuan.png differ
diff --git a/archiso/grub/themes/tms/icons/driver.png b/archiso/grub/themes/tms/icons/driver.png
new file mode 100644
index 0000000..1621ee7
Binary files /dev/null and b/archiso/grub/themes/tms/icons/driver.png differ
diff --git a/archiso/grub/themes/tms/icons/edit.png b/archiso/grub/themes/tms/icons/edit.png
new file mode 100644
index 0000000..6a43bd9
Binary files /dev/null and b/archiso/grub/themes/tms/icons/edit.png differ
diff --git a/archiso/grub/themes/tms/icons/efi.png b/archiso/grub/themes/tms/icons/efi.png
new file mode 100644
index 0000000..4ecf3b9
Binary files /dev/null and b/archiso/grub/themes/tms/icons/efi.png differ
diff --git a/archiso/grub/themes/tms/icons/elementary.png b/archiso/grub/themes/tms/icons/elementary.png
new file mode 100644
index 0000000..2840354
Binary files /dev/null and b/archiso/grub/themes/tms/icons/elementary.png differ
diff --git a/archiso/grub/themes/tms/icons/endeavouros.png b/archiso/grub/themes/tms/icons/endeavouros.png
new file mode 100644
index 0000000..6b1e530
Binary files /dev/null and b/archiso/grub/themes/tms/icons/endeavouros.png differ
diff --git a/archiso/grub/themes/tms/icons/fedora.png b/archiso/grub/themes/tms/icons/fedora.png
new file mode 100644
index 0000000..926b56d
Binary files /dev/null and b/archiso/grub/themes/tms/icons/fedora.png differ
diff --git a/archiso/grub/themes/tms/icons/find.efi.png b/archiso/grub/themes/tms/icons/find.efi.png
new file mode 100644
index 0000000..0e32321
Binary files /dev/null and b/archiso/grub/themes/tms/icons/find.efi.png differ
diff --git a/archiso/grub/themes/tms/icons/find.none.png b/archiso/grub/themes/tms/icons/find.none.png
new file mode 100644
index 0000000..87d4d0e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/find.none.png differ
diff --git a/archiso/grub/themes/tms/icons/freebsd.png b/archiso/grub/themes/tms/icons/freebsd.png
new file mode 100644
index 0000000..fb9408c
Binary files /dev/null and b/archiso/grub/themes/tms/icons/freebsd.png differ
diff --git a/archiso/grub/themes/tms/icons/garuda.png b/archiso/grub/themes/tms/icons/garuda.png
new file mode 100644
index 0000000..f699718
Binary files /dev/null and b/archiso/grub/themes/tms/icons/garuda.png differ
diff --git a/archiso/grub/themes/tms/icons/gentoo.png b/archiso/grub/themes/tms/icons/gentoo.png
new file mode 100644
index 0000000..bc0ed70
Binary files /dev/null and b/archiso/grub/themes/tms/icons/gentoo.png differ
diff --git a/archiso/grub/themes/tms/icons/gnu-linux.png b/archiso/grub/themes/tms/icons/gnu-linux.png
new file mode 100644
index 0000000..326b659
Binary files /dev/null and b/archiso/grub/themes/tms/icons/gnu-linux.png differ
diff --git a/archiso/grub/themes/tms/icons/haiku.png b/archiso/grub/themes/tms/icons/haiku.png
new file mode 100644
index 0000000..ce7f818
Binary files /dev/null and b/archiso/grub/themes/tms/icons/haiku.png differ
diff --git a/archiso/grub/themes/tms/icons/help.png b/archiso/grub/themes/tms/icons/help.png
new file mode 100644
index 0000000..d8b5a17
Binary files /dev/null and b/archiso/grub/themes/tms/icons/help.png differ
diff --git a/archiso/grub/themes/tms/icons/kali.png b/archiso/grub/themes/tms/icons/kali.png
new file mode 100644
index 0000000..900dc82
Binary files /dev/null and b/archiso/grub/themes/tms/icons/kali.png differ
diff --git a/archiso/grub/themes/tms/icons/kaos.png b/archiso/grub/themes/tms/icons/kaos.png
new file mode 100644
index 0000000..9fd4e89
Binary files /dev/null and b/archiso/grub/themes/tms/icons/kaos.png differ
diff --git a/archiso/grub/themes/tms/icons/kbd.png b/archiso/grub/themes/tms/icons/kbd.png
new file mode 100644
index 0000000..6ace3ac
Binary files /dev/null and b/archiso/grub/themes/tms/icons/kbd.png differ
diff --git a/archiso/grub/themes/tms/icons/korora.png b/archiso/grub/themes/tms/icons/korora.png
new file mode 100644
index 0000000..456e876
Binary files /dev/null and b/archiso/grub/themes/tms/icons/korora.png differ
diff --git a/archiso/grub/themes/tms/icons/kubuntu.png b/archiso/grub/themes/tms/icons/kubuntu.png
new file mode 100644
index 0000000..7a79ff3
Binary files /dev/null and b/archiso/grub/themes/tms/icons/kubuntu.png differ
diff --git a/archiso/grub/themes/tms/icons/lang.png b/archiso/grub/themes/tms/icons/lang.png
new file mode 100644
index 0000000..3c9c1d7
Binary files /dev/null and b/archiso/grub/themes/tms/icons/lang.png differ
diff --git a/archiso/grub/themes/tms/icons/lfs.png b/archiso/grub/themes/tms/icons/lfs.png
new file mode 100644
index 0000000..326b659
Binary files /dev/null and b/archiso/grub/themes/tms/icons/lfs.png differ
diff --git a/archiso/grub/themes/tms/icons/linux.png b/archiso/grub/themes/tms/icons/linux.png
new file mode 100644
index 0000000..326b659
Binary files /dev/null and b/archiso/grub/themes/tms/icons/linux.png differ
diff --git a/archiso/grub/themes/tms/icons/linuxmint.png b/archiso/grub/themes/tms/icons/linuxmint.png
new file mode 100644
index 0000000..7d9da81
Binary files /dev/null and b/archiso/grub/themes/tms/icons/linuxmint.png differ
diff --git a/archiso/grub/themes/tms/icons/lubuntu.png b/archiso/grub/themes/tms/icons/lubuntu.png
new file mode 100644
index 0000000..0ead7d8
Binary files /dev/null and b/archiso/grub/themes/tms/icons/lubuntu.png differ
diff --git a/archiso/grub/themes/tms/icons/macosx.png b/archiso/grub/themes/tms/icons/macosx.png
new file mode 100644
index 0000000..ea03e77
Binary files /dev/null and b/archiso/grub/themes/tms/icons/macosx.png differ
diff --git a/archiso/grub/themes/tms/icons/mageia.png b/archiso/grub/themes/tms/icons/mageia.png
new file mode 100644
index 0000000..79afa76
Binary files /dev/null and b/archiso/grub/themes/tms/icons/mageia.png differ
diff --git a/archiso/grub/themes/tms/icons/manjaro.png b/archiso/grub/themes/tms/icons/manjaro.png
new file mode 100644
index 0000000..611a6fb
Binary files /dev/null and b/archiso/grub/themes/tms/icons/manjaro.png differ
diff --git a/archiso/grub/themes/tms/icons/mate.png b/archiso/grub/themes/tms/icons/mate.png
new file mode 100644
index 0000000..b2fc22a
Binary files /dev/null and b/archiso/grub/themes/tms/icons/mate.png differ
diff --git a/archiso/grub/themes/tms/icons/memtest.png b/archiso/grub/themes/tms/icons/memtest.png
new file mode 100644
index 0000000..1621ee7
Binary files /dev/null and b/archiso/grub/themes/tms/icons/memtest.png differ
diff --git a/archiso/grub/themes/tms/icons/mx-linux.png b/archiso/grub/themes/tms/icons/mx-linux.png
new file mode 100644
index 0000000..49f1133
Binary files /dev/null and b/archiso/grub/themes/tms/icons/mx-linux.png differ
diff --git a/archiso/grub/themes/tms/icons/neon.png b/archiso/grub/themes/tms/icons/neon.png
new file mode 100644
index 0000000..e41906e
Binary files /dev/null and b/archiso/grub/themes/tms/icons/neon.png differ
diff --git a/archiso/grub/themes/tms/icons/nix.png b/archiso/grub/themes/tms/icons/nix.png
new file mode 100644
index 0000000..dcf33a0
Binary files /dev/null and b/archiso/grub/themes/tms/icons/nix.png differ
diff --git a/archiso/grub/themes/tms/icons/nixos.png b/archiso/grub/themes/tms/icons/nixos.png
new file mode 100644
index 0000000..dcf33a0
Binary files /dev/null and b/archiso/grub/themes/tms/icons/nixos.png differ
diff --git a/archiso/grub/themes/tms/icons/opensuse.png b/archiso/grub/themes/tms/icons/opensuse.png
new file mode 100644
index 0000000..d844fd5
Binary files /dev/null and b/archiso/grub/themes/tms/icons/opensuse.png differ
diff --git a/archiso/grub/themes/tms/icons/parabola.png b/archiso/grub/themes/tms/icons/parabola.png
new file mode 100644
index 0000000..2a7804b
Binary files /dev/null and b/archiso/grub/themes/tms/icons/parabola.png differ
diff --git a/archiso/grub/themes/tms/icons/parrot.png b/archiso/grub/themes/tms/icons/parrot.png
new file mode 100644
index 0000000..3333de9
Binary files /dev/null and b/archiso/grub/themes/tms/icons/parrot.png differ
diff --git a/archiso/grub/themes/tms/icons/pop-os.png b/archiso/grub/themes/tms/icons/pop-os.png
new file mode 100644
index 0000000..014d9f3
Binary files /dev/null and b/archiso/grub/themes/tms/icons/pop-os.png differ
diff --git a/archiso/grub/themes/tms/icons/pop.png b/archiso/grub/themes/tms/icons/pop.png
new file mode 100644
index 0000000..014d9f3
Binary files /dev/null and b/archiso/grub/themes/tms/icons/pop.png differ
diff --git a/archiso/grub/themes/tms/icons/recovery.png b/archiso/grub/themes/tms/icons/recovery.png
new file mode 100644
index 0000000..7b69b14
Binary files /dev/null and b/archiso/grub/themes/tms/icons/recovery.png differ
diff --git a/archiso/grub/themes/tms/icons/regolith.png b/archiso/grub/themes/tms/icons/regolith.png
new file mode 100644
index 0000000..5ece07b
Binary files /dev/null and b/archiso/grub/themes/tms/icons/regolith.png differ
diff --git a/archiso/grub/themes/tms/icons/restart.png b/archiso/grub/themes/tms/icons/restart.png
new file mode 100644
index 0000000..9715302
Binary files /dev/null and b/archiso/grub/themes/tms/icons/restart.png differ
diff --git a/archiso/grub/themes/tms/icons/rocky.png b/archiso/grub/themes/tms/icons/rocky.png
new file mode 100644
index 0000000..be144f6
Binary files /dev/null and b/archiso/grub/themes/tms/icons/rocky.png differ
diff --git a/archiso/grub/themes/tms/icons/shutdown.png b/archiso/grub/themes/tms/icons/shutdown.png
new file mode 100644
index 0000000..fc9cf16
Binary files /dev/null and b/archiso/grub/themes/tms/icons/shutdown.png differ
diff --git a/archiso/grub/themes/tms/icons/siduction.png b/archiso/grub/themes/tms/icons/siduction.png
new file mode 100644
index 0000000..d16549b
Binary files /dev/null and b/archiso/grub/themes/tms/icons/siduction.png differ
diff --git a/archiso/grub/themes/tms/icons/silverblue.png b/archiso/grub/themes/tms/icons/silverblue.png
new file mode 100644
index 0000000..3c20839
Binary files /dev/null and b/archiso/grub/themes/tms/icons/silverblue.png differ
diff --git a/archiso/grub/themes/tms/icons/slackware.png b/archiso/grub/themes/tms/icons/slackware.png
new file mode 100644
index 0000000..4c31a3f
Binary files /dev/null and b/archiso/grub/themes/tms/icons/slackware.png differ
diff --git a/archiso/grub/themes/tms/icons/solus.png b/archiso/grub/themes/tms/icons/solus.png
new file mode 100644
index 0000000..338718b
Binary files /dev/null and b/archiso/grub/themes/tms/icons/solus.png differ
diff --git a/archiso/grub/themes/tms/icons/steamos.png b/archiso/grub/themes/tms/icons/steamos.png
new file mode 100644
index 0000000..df28bcc
Binary files /dev/null and b/archiso/grub/themes/tms/icons/steamos.png differ
diff --git a/archiso/grub/themes/tms/icons/type.png b/archiso/grub/themes/tms/icons/type.png
new file mode 100644
index 0000000..5c48476
Binary files /dev/null and b/archiso/grub/themes/tms/icons/type.png differ
diff --git a/archiso/grub/themes/tms/icons/tz.png b/archiso/grub/themes/tms/icons/tz.png
new file mode 100644
index 0000000..220b29b
Binary files /dev/null and b/archiso/grub/themes/tms/icons/tz.png differ
diff --git a/archiso/grub/themes/tms/icons/ubuntu.png b/archiso/grub/themes/tms/icons/ubuntu.png
new file mode 100644
index 0000000..352fbe0
Binary files /dev/null and b/archiso/grub/themes/tms/icons/ubuntu.png differ
diff --git a/archiso/grub/themes/tms/icons/ultramarine.png b/archiso/grub/themes/tms/icons/ultramarine.png
new file mode 100644
index 0000000..ef307fd
Binary files /dev/null and b/archiso/grub/themes/tms/icons/ultramarine.png differ
diff --git a/archiso/grub/themes/tms/icons/unknown.png b/archiso/grub/themes/tms/icons/unknown.png
new file mode 100644
index 0000000..326b659
Binary files /dev/null and b/archiso/grub/themes/tms/icons/unknown.png differ
diff --git a/archiso/grub/themes/tms/icons/unset.png b/archiso/grub/themes/tms/icons/unset.png
new file mode 100644
index 0000000..15e3d3c
Binary files /dev/null and b/archiso/grub/themes/tms/icons/unset.png differ
diff --git a/archiso/grub/themes/tms/icons/ventoy.png b/archiso/grub/themes/tms/icons/ventoy.png
new file mode 100644
index 0000000..7abdc6c
Binary files /dev/null and b/archiso/grub/themes/tms/icons/ventoy.png differ
diff --git a/archiso/grub/themes/tms/icons/void.png b/archiso/grub/themes/tms/icons/void.png
new file mode 100644
index 0000000..01cc2f3
Binary files /dev/null and b/archiso/grub/themes/tms/icons/void.png differ
diff --git a/archiso/grub/themes/tms/icons/windows.png b/archiso/grub/themes/tms/icons/windows.png
new file mode 100644
index 0000000..d5c7cc3
Binary files /dev/null and b/archiso/grub/themes/tms/icons/windows.png differ
diff --git a/archiso/grub/themes/tms/icons/windows11.png b/archiso/grub/themes/tms/icons/windows11.png
new file mode 100644
index 0000000..fe97d9f
Binary files /dev/null and b/archiso/grub/themes/tms/icons/windows11.png differ
diff --git a/archiso/grub/themes/tms/icons/xero.png b/archiso/grub/themes/tms/icons/xero.png
new file mode 100644
index 0000000..2221c73
Binary files /dev/null and b/archiso/grub/themes/tms/icons/xero.png differ
diff --git a/archiso/grub/themes/tms/icons/xerolinux.png b/archiso/grub/themes/tms/icons/xerolinux.png
new file mode 100644
index 0000000..2221c73
Binary files /dev/null and b/archiso/grub/themes/tms/icons/xerolinux.png differ
diff --git a/archiso/grub/themes/tms/icons/xubuntu.png b/archiso/grub/themes/tms/icons/xubuntu.png
new file mode 100644
index 0000000..f43abc7
Binary files /dev/null and b/archiso/grub/themes/tms/icons/xubuntu.png differ
diff --git a/archiso/grub/themes/tms/icons/zorin.png b/archiso/grub/themes/tms/icons/zorin.png
new file mode 100644
index 0000000..c1506c4
Binary files /dev/null and b/archiso/grub/themes/tms/icons/zorin.png differ
diff --git a/archiso/grub/themes/tms/select_c.png b/archiso/grub/themes/tms/select_c.png
new file mode 100644
index 0000000..b1f8d58
Binary files /dev/null and b/archiso/grub/themes/tms/select_c.png differ
diff --git a/archiso/grub/themes/tms/select_e.png b/archiso/grub/themes/tms/select_e.png
new file mode 100644
index 0000000..9332368
Binary files /dev/null and b/archiso/grub/themes/tms/select_e.png differ
diff --git a/archiso/grub/themes/tms/select_w.png b/archiso/grub/themes/tms/select_w.png
new file mode 100644
index 0000000..28f6424
Binary files /dev/null and b/archiso/grub/themes/tms/select_w.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_c.png b/archiso/grub/themes/tms/terminal_box_c.png
new file mode 100644
index 0000000..d0dd52a
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_c.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_e.png b/archiso/grub/themes/tms/terminal_box_e.png
new file mode 100644
index 0000000..394cbe4
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_e.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_n.png b/archiso/grub/themes/tms/terminal_box_n.png
new file mode 100644
index 0000000..476f8bc
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_n.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_ne.png b/archiso/grub/themes/tms/terminal_box_ne.png
new file mode 100644
index 0000000..9e26959
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_ne.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_nw.png b/archiso/grub/themes/tms/terminal_box_nw.png
new file mode 100644
index 0000000..5c3cba8
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_nw.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_s.png b/archiso/grub/themes/tms/terminal_box_s.png
new file mode 100644
index 0000000..85a8901
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_s.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_se.png b/archiso/grub/themes/tms/terminal_box_se.png
new file mode 100644
index 0000000..d8627ee
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_se.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_sw.png b/archiso/grub/themes/tms/terminal_box_sw.png
new file mode 100644
index 0000000..67c600c
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_sw.png differ
diff --git a/archiso/grub/themes/tms/terminal_box_w.png b/archiso/grub/themes/tms/terminal_box_w.png
new file mode 100644
index 0000000..d066e2d
Binary files /dev/null and b/archiso/grub/themes/tms/terminal_box_w.png differ
diff --git a/archiso/grub/themes/tms/terminus-12.pf2 b/archiso/grub/themes/tms/terminus-12.pf2
new file mode 100644
index 0000000..6092035
Binary files /dev/null and b/archiso/grub/themes/tms/terminus-12.pf2 differ
diff --git a/archiso/grub/themes/tms/terminus-14.pf2 b/archiso/grub/themes/tms/terminus-14.pf2
new file mode 100644
index 0000000..8ab8bd1
Binary files /dev/null and b/archiso/grub/themes/tms/terminus-14.pf2 differ
diff --git a/archiso/grub/themes/tms/terminus-16.pf2 b/archiso/grub/themes/tms/terminus-16.pf2
new file mode 100644
index 0000000..6e6b25d
Binary files /dev/null and b/archiso/grub/themes/tms/terminus-16.pf2 differ
diff --git a/archiso/grub/themes/tms/terminus-18.pf2 b/archiso/grub/themes/tms/terminus-18.pf2
new file mode 100644
index 0000000..129cef1
Binary files /dev/null and b/archiso/grub/themes/tms/terminus-18.pf2 differ
diff --git a/archiso/grub/themes/tms/theme.txt b/archiso/grub/themes/tms/theme.txt
new file mode 100644
index 0000000..806c04f
--- /dev/null
+++ b/archiso/grub/themes/tms/theme.txt
@@ -0,0 +1,41 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 55%
+  height = 65%
+  item_font = "Ubuntu Regular 20"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "Selected OS will start in %d seconds"
+  color = "#cccccc"
+  font = "Ubuntu Regular 17"
+}
diff --git a/archiso/grub/themes/tms/ubuntu_regular_17.pf2 b/archiso/grub/themes/tms/ubuntu_regular_17.pf2
new file mode 100644
index 0000000..9405954
Binary files /dev/null and b/archiso/grub/themes/tms/ubuntu_regular_17.pf2 differ
diff --git a/archiso/grub/themes/tms/ubuntu_regular_20.pf2 b/archiso/grub/themes/tms/ubuntu_regular_20.pf2
new file mode 100644
index 0000000..3d903ba
Binary files /dev/null and b/archiso/grub/themes/tms/ubuntu_regular_20.pf2 differ
diff --git a/installation-scripts/40-build-the-iso-local-again-use-custom-mkarchiso.sh b/installation-scripts/40-build-the-iso-local-again-use-custom-mkarchiso.sh
new file mode 100755
index 0000000..ffd873c
--- /dev/null
+++ b/installation-scripts/40-build-the-iso-local-again-use-custom-mkarchiso.sh
@@ -0,0 +1,174 @@
+#!/bin/bash
+#set -e
+
+# 获取当前脚本的绝对路径所在的目录
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+# 定义同目录下的 mkarchiso 可执行文件的路径
+MKARCHISO_PATH="$SCRIPT_DIR/mkarchiso"
+
+if 	lsblk -f | grep btrfs > /dev/null 2>&1 ; then
+	echo
+	echo "################################################################## "
+	tput setaf 3
+	echo "Message"
+    echo "This script has been known to cause issues on a Btrfs filesystem"
+    echo "Make backups before continuing"
+    echo "Continu at your own risk"
+    tput sgr0
+    echo
+    read -p "Press Enter to continue... CTRL + C to stop"
+fi
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 1 : "
+echo "- Setting General parameters"
+tput sgr0
+echo "################################################################## "
+echo
+
+	# setting of the general parameters
+	archisoRequiredVersion="archiso 83-1"
+	buildFolder=$HOME"/bbttms-build"
+	outFolder=$HOME"/Bbttms-Iso-Out"
+	archisoVersion=$(sudo pacman -Q archiso)
+
+	echo "################################################################## "
+	#echo "Building the desktop                   : "$desktop
+	#echo "Building version                       : "$arcolinuxVersion
+	#echo "Iso label                              : "$isoLabel
+	echo "Do you have the right archiso version? : "$archisoVersion
+	echo "What is the required archiso version?  : "$archisoRequiredVersion
+	echo "Build folder                           : "$buildFolder
+	echo "Out folder                             : "$outFolder
+	echo "################################################################## "
+
+	if [ "$archisoVersion" == "$archisoRequiredVersion" ]; then
+		tput setaf 2
+		echo "##################################################################"
+		echo "Archiso has the correct version. Continuing ..."
+		echo "##################################################################"
+		tput sgr0
+	else
+	tput setaf 1
+	echo "###################################################################################################"
+	echo "You need to install the correct version of Archiso"
+	echo "Use 'sudo downgrade archiso' to do that"
+	echo "or update your system"
+	echo "If a new archiso package comes in and you want to test if you can still build"
+	echo "the iso then change the version in line 37."
+	echo "###################################################################################################"
+	tput sgr0
+	fi
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 2 :"
+echo "- Checking if archiso is installed"
+echo "- Saving current archiso version to archiso.md"
+echo "- Making mkarchiso verbose"
+tput sgr0
+echo "################################################################## "
+echo
+
+	package="archiso"
+
+	#----------------------------------------------------------------------------------
+
+	#checking if application is already installed or else install with aur helpers
+	if pacman -Qi $package &> /dev/null; then
+
+			echo "Archiso is already installed"
+
+	else
+
+		#checking which helper is installed
+		if pacman -Qi yay &> /dev/null; then
+
+			echo "################################################################"
+			echo "######### Installing with yay"
+			echo "################################################################"
+			yay -S --noconfirm $package
+
+		elif pacman -Qi trizen &> /dev/null; then
+
+			echo "################################################################"
+			echo "######### Installing with trizen"
+			echo "################################################################"
+			trizen -S --noconfirm --needed --noedit $package
+
+		fi
+
+		# Just checking if installation was successful
+		if pacman -Qi $package &> /dev/null; then
+
+			echo "################################################################"
+			echo "#########  "$package" has been installed"
+			echo "################################################################"
+
+		else
+
+			echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+			echo "!!!!!!!!!  "$package" has NOT been installed"
+			echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+			exit 1
+		fi
+
+	fi
+
+	echo
+	echo "Saving current archiso version to archiso.md"
+	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.md
+	echo
+	echo "Making mkarchiso verbose"
+	# 注意：这里修改的是系统安装的 mkarchiso 脚本，如果你希望修改的是同目录下的 mkarchiso，则需要调整路径
+	sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 3 :"
+echo "- Deleting the build folder if one exists"
+echo "- Copying the Archiso folder to build folder"
+tput sgr0
+echo "################################################################## "
+echo
+
+	echo "Deleting the build folder if one exists - takes some time"
+	[ -d $buildFolder ] && sudo rm -rf $buildFolder
+	echo
+	echo "Copying the Archiso folder to build work"
+	echo
+	mkdir "$buildFolder" # 加上双引号以防路径中含空格
+	cp -r ../archiso "$buildFolder/archiso" # 加上双引号以防路径中含空格
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 7 :"
+echo "- Building the iso - this can take a while - be patient"
+tput sgr0
+echo "################################################################## "
+echo
+
+	[ -d "$outFolder" ] || mkdir -p "$outFolder" # 加上双引号并使用 -p
+	cd "$buildFolder/archiso/" # 加上双引号
+	# 使用 $MKARCHISO_PATH 确保调用的是同目录下的 mkarchiso
+	sudo "$MKARCHISO_PATH" -v -w "$buildFolder" -o "$outFolder" "$buildFolder/archiso/"
+
+ 	echo "Moving pkglist.x86_64.txt"
+ 	echo "########################"
+	rename=$(date +%Y-%m-%d)
+ 	cp "$buildFolder/iso/BBTTMS/pkglist.x86_64.txt" "$outFolder/BBTTMS-$rename-pkglist.txt" # 加上双引号
+
+
+echo
+echo "##################################################################"
+tput setaf 2
+echo "DONE"
+echo "- Check your out folder :"$outFolder
+tput sgr0
+echo "################################################################## "
+echo
diff --git a/installation-scripts/mkarchiso b/installation-scripts/mkarchiso
new file mode 100755
index 0000000..d790ce4
--- /dev/null
+++ b/installation-scripts/mkarchiso
@@ -0,0 +1,1921 @@
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -e -u
+shopt -s extglob
+
+# Control the environment
+umask 0022
+export LC_ALL="C.UTF-8"
+[[ -v SOURCE_DATE_EPOCH ]] || printf -v SOURCE_DATE_EPOCH '%(%s)T' -1
+export SOURCE_DATE_EPOCH
+
+# Set application name from the script's file name
+app_name="${0##*/}"
+
+# Define global variables. All of them will be overwritten later
+pkg_list=()
+bootstrap_pkg_list=()
+quiet=""
+work_dir=""
+out_dir=""
+gpg_key=""
+gpg_sender=""
+iso_name=""
+iso_label=""
+iso_uuid=""
+iso_publisher=""
+iso_application=""
+iso_version=""
+install_dir=""
+arch=""
+pacman_conf=""
+packages=""
+bootstrap_packages=""
+bootstrap_parent=""
+pacstrap_dir=""
+search_filename=""
+declare -i rm_work_dir=0
+buildmodes=()
+bootmodes=()
+airootfs_image_type=""
+airootfs_image_tool_options=()
+bootstrap_tarball_compression=""
+cert_list=()
+declare -A file_permissions=()
+efibootimg=""
+efiboot_files=()
+# adapted from GRUB_EARLY_INITRD_LINUX_STOCK in https://git.savannah.gnu.org/cgit/grub.git/tree/util/grub-mkconfig.in
+readonly ucodes=('intel-uc.img' 'intel-ucode.img' 'amd-uc.img' 'amd-ucode.img' 'early_ucode.cpio' 'microcode.cpio')
+declare -i need_external_ucodes=0
+readonly -A uefi_arch=(
+    ['x86_64']='x64'
+    ['aarch64']='AA64'
+    ['riscv64']='RISCV64'
+    ['loongarch64']='LOONGARCH64'
+)
+
+
+# Show an INFO message
+# $1: message string
+_msg_info() {
+    local _msg="${1}"
+    [[ "${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
+# $1: message string
+# $2: exit code number (with 0 does not exit)
+_msg_error() {
+    local _msg="${1}"
+    local _error=${2}
+    printf '[%s] ERROR: %s\n' "${app_name}" "${_msg}" >&2
+    if (( _error > 0 )); then
+        exit "${_error}"
+    fi
+}
+
+# Show help usage, with an exit status.
+# $1: exit status number.
+_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 be 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}'
+     -c [cert ..]     Provide certificates for codesigning of netboot artifacts as
+                      well as the rootfs artifact.
+                      Multiple files are provided as quoted, space delimited list.
+                      The first file is considered as the signing certificate,
+                      the second as the key and the third as the optional certificate authority.
+     -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image.
+                      Passed to gpg as the value for --default-key
+     -G <mbox>        Set the PGP signer (must include an email address)
+                      Passed to gpg as the value for --sender
+     -h               This message
+     -m [mode ..]     Build mode(s) to use (valid modes are: 'bootstrap', 'iso' and 'netboot').
+                      Multiple build modes are provided as quoted, space delimited list.
+     -o <out_dir>     Set the output directory
+                      Default: '${out_dir}'
+     -p [package ..]  Package(s) to install.
+                      Multiple packages are provided as quoted, space delimited list.
+     -r               Delete the working directory at the end.
+     -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 options.
+_show_config() {
+    local build_date
+    printf -v build_date '%(%FT%R%z)T' "${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}"
+    _msg_info "               Build date:   ${build_date}"
+    _msg_info "         Output directory:   ${out_dir}"
+    _msg_info "       Current build mode:   ${buildmode}"
+    _msg_info "              Build modes:   ${buildmodes[*]}"
+    _msg_info "                  GPG key:   ${gpg_key:-None}"
+    _msg_info "               GPG signer:   ${gpg_sender:-None}"
+    _msg_info "Code signing certificates:   ${cert_list[*]:-None}"
+    _msg_info "                  Profile:   ${profile}"
+    _msg_info "Pacman configuration file:   ${pacman_conf}"
+    _msg_info "          Image file name:   ${image_name:-None}"
+    _msg_info "         ISO volume label:   ${iso_label}"
+    _msg_info "            ISO publisher:   ${iso_publisher}"
+    _msg_info "          ISO application:   ${iso_application}"
+    _msg_info "               Boot modes:   ${bootmodes[*]:-None}"
+    _msg_info "            Packages File:   ${buildmode_packages}"
+    _msg_info "                 Packages:   ${buildmode_pkg_list[*]}"
+}
+
+# Cleanup airootfs
+_cleanup_pacstrap_dir() {
+    _msg_info "Cleaning up in pacstrap location..."
+
+    # Delete all files in /boot
+    [[ -d "${pacstrap_dir}/boot" ]] && find "${pacstrap_dir}/boot" -mindepth 1 -delete
+    # Delete pacman database sync cache files (*.tar.gz)
+    [[ -d "${pacstrap_dir}/var/lib/pacman" ]] && find "${pacstrap_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
+    # Delete pacman database sync cache
+    [[ -d "${pacstrap_dir}/var/lib/pacman/sync" ]] && find "${pacstrap_dir}/var/lib/pacman/sync" -delete
+    # Delete pacman package cache
+    [[ -d "${pacstrap_dir}/var/cache/pacman/pkg" ]] && find "${pacstrap_dir}/var/cache/pacman/pkg" -type f -delete
+    # Delete all log files, keeps empty dirs.
+    [[ -d "${pacstrap_dir}/var/log" ]] && find "${pacstrap_dir}/var/log" -type f -delete
+    # Delete all temporary files and dirs
+    [[ -d "${pacstrap_dir}/var/tmp" ]] && find "${pacstrap_dir}/var/tmp" -mindepth 1 -delete
+    # Delete package pacman related files.
+    find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
+    # Create /etc/machine-id with special value 'uninitialized': the final id is
+    # generated on first boot, systemd's first-boot mechanism applies (see machine-id(5))
+    rm -f -- "${pacstrap_dir}/etc/machine-id"
+    printf 'uninitialized\n' >"${pacstrap_dir}/etc/machine-id"
+
+    _msg_info "Done!"
+}
+
+# Create a squashfs image and place it in the ISO 9660 file system.
+# $@: options to pass to mksquashfs
+_run_mksquashfs() {
+    local mksquashfs_options=() image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    rm -f -- "${image_path}"
+    [[ ! "${quiet}" == "y" ]] || mksquashfs_options+=('-no-progress' '-quiet')
+    mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" "${mksquashfs_options[@]}"
+}
+
+# Create an ext4 image containing the root file system and pack it inside a squashfs image.
+# Save the squashfs image on the ISO 9660 file system.
+_mkairootfs_ext4+squashfs() {
+    local ext4_hash_seed mkfs_ext4_options=()
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
+
+    _msg_info "Creating ext4 image of 32 GiB and copying '${pacstrap_dir}/' to it..."
+
+    ext4_hash_seed="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 \
+        --name "${SOURCE_DATE_EPOCH} ext4 hash seed")"
+    mkfs_ext4_options=(
+        '-d' "${pacstrap_dir}"
+        '-O' '^has_journal,^resize_inode'
+        '-E' "lazy_itable_init=0,root_owner=0:0,hash_seed=${ext4_hash_seed}"
+        '-m' '0'
+        '-F'
+        '-U' 'clear'
+    )
+    [[ ! "${quiet}" == "y" ]] || mkfs_ext4_options+=('-q')
+    rm -f -- "${pacstrap_dir}.img"
+    mkfs.ext4 "${mkfs_ext4_options[@]}" -- "${pacstrap_dir}.img" 32G
+    _msg_info "Done!"
+
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
+    _msg_info "Creating SquashFS image, this may take some time..."
+    _run_mksquashfs "${pacstrap_dir}.img"
+    _msg_info "Done!"
+    rm -- "${pacstrap_dir}.img"
+}
+
+# Create a squashfs image containing the root file system and saves it on the ISO 9660 file system.
+_mkairootfs_squashfs() {
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
+
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
+    _msg_info "Creating SquashFS image, this may take some time..."
+    _run_mksquashfs "${pacstrap_dir}"
+}
+
+# Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
+_mkairootfs_erofs() {
+    local mkfs_erofs_options=()
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
+
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
+    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    rm -f -- "${image_path}"
+    [[ ! "${quiet}" == "y" ]] || mkfs_erofs_options+=('--quiet')
+    mkfs_erofs_options+=('-U' '00000000-0000-0000-0000-000000000000' "${airootfs_image_tool_options[@]}")
+    _msg_info "Creating EROFS image, this may take some time..."
+    mkfs.erofs "${mkfs_erofs_options[@]}" -- "${image_path}" "${pacstrap_dir}"
+    _msg_info "Done!"
+}
+
+# Create checksum file for the rootfs image.
+_mkchecksum() {
+    _msg_info "Creating checksum file for self-test..."
+    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
+    cd -- "${OLDPWD}"
+    _msg_info "Done!"
+}
+
+# GPG sign the root file system image.
+_mk_pgp_signature() {
+    local gpg_options=()
+    local airootfs_image_filename="${1}"
+    _msg_info "Signing rootfs image using GPG..."
+
+    rm -f -- "${airootfs_image_filename}.sig"
+    # Add gpg sender option if the value is provided
+    [[ -z "${gpg_sender}" ]] || gpg_options+=('--sender' "${gpg_sender}")
+    # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
+    gpg --batch --no-armor --no-include-key-block --output "${airootfs_image_filename}.sig" --detach-sign \
+        --default-key "${gpg_key}" "${gpg_options[@]}" "${airootfs_image_filename}"
+    _msg_info "Done!"
+}
+
+# Helper function to run functions only one time.
+# $1: function name
+_run_once() {
+    if [[ ! -e "${work_dir}/${run_once_mode}.${1}" ]]; then
+        "$1"
+        touch "${work_dir}/${run_once_mode}.${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
+
+    _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 = ${pacstrap_dir}/etc/pacman.d/hooks/" >"${work_dir}/${buildmode}.pacman.conf"
+}
+
+# Prepare working directory and copy custom root file system files.
+_make_custom_airootfs() {
+    local passwd=()
+    local filename permissions
+
+    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
+
+    if [[ -d "${profile}/airootfs" ]]; then
+        _msg_info "Copying custom airootfs files..."
+        cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${pacstrap_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 $pacstrap_dir
+            if [[ "$(realpath -q -- "${pacstrap_dir}${filename}")" != "${pacstrap_dir}"* ]]; then
+                _msg_error "Failed to set permissions on '${pacstrap_dir}${filename}'. Outside of valid path." 1
+            # Warn if the file does not exist
+            elif [[ ! -e "${pacstrap_dir}${filename}" ]]; then
+                _msg_warning "Cannot change permissions of '${pacstrap_dir}${filename}'. The file or directory does not exist."
+            else
+                if [[ "${filename: -1}" == "/" ]]; then
+                    chown -fhR -- "${permissions[0]}:${permissions[1]}" "${pacstrap_dir}${filename}"
+                    chmod -fR -- "${permissions[2]}" "${pacstrap_dir}${filename}"
+                else
+                    chown -fh -- "${permissions[0]}:${permissions[1]}" "${pacstrap_dir}${filename}"
+                    chmod -f -- "${permissions[2]}" "${pacstrap_dir}${filename}"
+                fi
+            fi
+        done
+        _msg_info "Done!"
+    fi
+}
+
+# Install desired packages to the root file system
+_make_packages() {
+    _msg_info "Installing packages to '${pacstrap_dir}/'..."
+
+    if [[ -v gpg_publickey ]]; then
+        exec {ARCHISO_GNUPG_FD}<"$gpg_publickey"
+        export ARCHISO_GNUPG_FD
+    fi
+    if [[ -v cert_list[0] ]]; then
+        exec {ARCHISO_TLS_FD}<"${cert_list[0]}"
+        export ARCHISO_TLS_FD
+    fi
+    if [[ -v cert_list[2] ]]; then
+        exec {ARCHISO_TLSCA_FD}<"${cert_list[2]}"
+        export ARCHISO_TLSCA_FD
+    fi
+
+
+    # Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
+    if [[ "${quiet}" = "y" ]]; then
+        env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" >/dev/null
+    else
+        env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
+    fi
+
+    if [[ -v cert_list[0] ]]; then
+        exec {ARCHISO_TLS_FD}<&-
+        unset ARCHISO_TLS_FD
+    fi
+    if [[ -v cert_list[2] ]]; then
+        exec {ARCHISO_TLSCA_FD}<&-
+        unset ARCHISO_TLSCA_FD
+    fi
+    if [[ -v gpg_publickey ]]; then
+        exec {ARCHISO_GNUPG_FD}<&-
+        unset ARCHISO_GNUPG_FD
+    fi
+
+    _msg_info "Done! Packages installed successfully."
+}
+
+# Customize installation.
+_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 $pacstrap_dir
+            if [[ "$(realpath -q -- "${pacstrap_dir}${passwd[5]}")" == "${pacstrap_dir}"* ]]; then
+                if [[ ! -d "${pacstrap_dir}${passwd[5]}" ]]; then
+                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${pacstrap_dir}${passwd[5]}"
+                fi
+                cp -dRT --update=none --preserve=mode,timestamps,links -- "${pacstrap_dir}/etc/skel/." "${pacstrap_dir}${passwd[5]}"
+                chmod -f 0750 -- "${pacstrap_dir}${passwd[5]}"
+                chown -hR -- "${passwd[2]}:${passwd[3]}" "${pacstrap_dir}${passwd[5]}"
+            else
+                _msg_error "Failed to set permissions on '${pacstrap_dir}${passwd[5]}'. Outside of valid path." 1
+            fi
+        done <"${profile}/airootfs/etc/passwd"
+        _msg_info "Done!"
+    fi
+
+    if [[ -e "${pacstrap_dir}/root/customize_airootfs.sh" ]]; then
+        _msg_info "Running customize_airootfs.sh in '${pacstrap_dir}' chroot..."
+        _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
+        chmod -f -- +x "${pacstrap_dir}/root/customize_airootfs.sh"
+        # Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
+        eval -- env -u TMPDIR arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+        rm -- "${pacstrap_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
+
+    if [[ "${bootmodes[*]}" != *grub* ]]; then
+        _run_once _make_common_grubenv_and_loopbackcfg
+    fi
+}
+
+# Copy kernel and initramfs to ISO 9660
+_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 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
+
+    if (( need_external_ucodes )); then
+        for ucode_image in "${ucodes[@]}"; do
+            if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
+                install -m 0644 -- "${pacstrap_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
+                if [[ -e "${pacstrap_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
+                    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+                    install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/${ucode_image%.*}/"* \
+                        "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+                fi
+            fi
+        done
+    fi
+    _msg_info "Done!"
+}
+
+# Prepare syslinux for booting from MBR (isohybrid) and El-Torito booting
+_make_bootmode_bios.syslinux() {
+    _msg_info "Setting up SYSLINUX for BIOS booting..."
+    install -d -m 0755 -- "${isofs_dir}/boot/syslinux"
+    for _cfg in "${profile}/syslinux/"*.cfg; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%ARCHISO_UUID%|${iso_uuid}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_cfg}" >"${isofs_dir}/boot/syslinux/${_cfg##*/}"
+    done
+    if [[ -e "${profile}/syslinux/splash.png" ]]; then
+        install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/boot/syslinux/"
+    fi
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/boot/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/boot/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/boot/syslinux/"
+
+    if [[ -e "${isofs_dir}/boot/syslinux/hdt.c32" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/boot/syslinux/hdt"
+        if [[ -e "${pacstrap_dir}/usr/share/hwdata/pci.ids" ]]; then
+            gzip -cn9 "${pacstrap_dir}/usr/share/hwdata/pci.ids" > \
+                "${isofs_dir}/boot/syslinux/hdt/pciids.gz"
+        fi
+        find "${pacstrap_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -cn9 '{}' ';' -quit > \
+            "${isofs_dir}/boot/syslinux/hdt/modalias.gz"
+    fi
+
+    # Add other aditional/extra files to ${install_dir}/boot/
+    if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.bin" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/boot/memtest86+/"
+        # rename for PXE: https://wiki.archlinux.org/title/Syslinux#Using_memtest
+        install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/boot/memtest86+/memtest"
+        install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" "${isofs_dir}/boot/memtest86+/LICENSE"
+    fi
+
+    install -d -m 0755 -- "${isofs_dir}/boot/syslinux"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/boot/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/boot/syslinux/"
+
+    _msg_info "Done! SYSLINUX set up for BIOS booting successfully."
+}
+# Deprecated boot modes
+_make_bootmode_bios.syslinux.eltorito() {
+    return 1
+}
+_make_bootmode_bios.syslinux.mbr() {
+    return 1
+}
+
+# Copy kernel and initramfs to FAT image
+_make_boot_on_fat() {
+    local ucode_image all_ucode_images=()
+    _msg_info "Preparing kernel and initramfs for the FAT file system..."
+    mmd -i "${efibootimg}" \
+        "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
+    mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \
+        "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
+    if (( need_external_ucodes )); then
+        for ucode_image in "${ucodes[@]}"; do
+            if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
+                all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}")
+            fi
+        done
+        if (( ${#all_ucode_images[@]} )); then
+            mcopy -i "${efibootimg}" "${all_ucode_images[@]}" "::/${install_dir}/boot/"
+        fi
+    fi
+    _msg_info "Done!"
+}
+
+# Create a FAT image (efiboot.img) which will serve as the EFI system partition
+_make_efibootimg() {
+    local -i imgsize_kib=0
+    local mkfs_fat_opts=(-C -n ARCHISO_EFI)
+
+    # Calculate the file size in bytes, convert to KiB and round up to the next full MiB with an additional 8 MiB for
+    # reserved sectors, file and directory entries and to allow adding custom files when repacking the ISO.
+    imgsize_kib="$(du -bcs -- "${efiboot_files[@]}" 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)+8192)/1024))}'
+    )"
+
+    # Use FAT32 as early as possible. mkfs.fat selects FAT32 if the size ≥ 512 MiB, but a FAT32 file system can already
+    # be created at 36 MiB size (assuming 512 byte logical sector size).
+    if (( imgsize_kib >= 36864 )); then
+        mkfs_fat_opts+=(-F 32)
+    fi
+
+    # 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
+    rm -f -- "${efibootimg}"
+    _msg_info "Creating FAT image of size: $(( imgsize_kib / 1024 )) MiB..."
+    if [[ "${quiet}" == "y" ]]; then
+        # mkfs.fat does not have a -q/--quiet option, so redirect stdout to /dev/null instead
+        # https://github.com/dosfstools/dosfstools/issues/103
+        mkfs.fat "${mkfs_fat_opts[@]}" "${efibootimg}" "${imgsize_kib}" >/dev/null
+    else
+        mkfs.fat "${mkfs_fat_opts[@]}" "${efibootimg}" "${imgsize_kib}"
+    fi
+
+    # Create the default/fallback boot path in which a boot loaders will be placed later.
+    mmd -i "${efibootimg}" ::/EFI ::/EFI/BOOT
+}
+
+# Check if initramfs files contain microcode update files
+_check_if_initramfs_has_ucode() {
+    local initrd
+
+    for initrd in $(compgen -G "${pacstrap_dir}"'/boot/initramfs-*.img'); do
+        if ! bsdtar -tf "$initrd" 'early_cpio' 'kernel/x86/microcode/*.bin' &>/dev/null; then
+            need_external_ucodes=1
+            _msg_info "Initramfs file does not contain microcode update files. External microcode initramfs images will be copied."
+            return
+        fi
+    done
+}
+
+# Prepare GRUB configuration files
+_make_common_bootmode_grub_cfg() {
+    local _cfg
+
+    install -d -- "${work_dir}/grub"
+
+    # Fill GRUB configuration files
+    for _cfg in "${profile}/grub/"*'.cfg'; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%ARCHISO_UUID%|${iso_uuid}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g;
+             s|%ARCHISO_SEARCH_FILENAME%|${search_filename}|g" \
+            "${_cfg}" >"${work_dir}/grub/${_cfg##*/}"
+    done
+
+    # Prepare grub.cfg that will be embedded inside the GRUB binaries
+    IFS='' read -r -d '' grubembedcfg <<'EOF' || true
+if ! [ -d "$cmdpath" ]; then
+    # On some firmware, GRUB has a wrong cmdpath when booted from an optical disc. During El Torito boot, GRUB is
+    # launched from a case-insensitive FAT-formatted EFI system partition, but it seemingly cannot access that partition
+    # and sets cmdpath to the whole cd# device which has case-sensitive ISO 9660 + Rock Ridge + Joliet file systems.
+    # See https://gitlab.archlinux.org/archlinux/archiso/-/issues/183 and https://savannah.gnu.org/bugs/?62886
+    if regexp --set=1:archiso_bootdevice '^\(([^)]+)\)\/?[Ee][Ff][Ii]\/[Bb][Oo][Oo][Tt]\/?$' "${cmdpath}"; then
+        set cmdpath="(${archiso_bootdevice})/EFI/BOOT"
+        set ARCHISO_HINT="${archiso_bootdevice}"
+    fi
+fi
+
+# Prepare a hint for the search command using the device in cmdpath
+if [ -z "${ARCHISO_HINT}" ]; then
+    regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
+fi
+
+# Search for the ISO volume
+if search --no-floppy --set=archiso_device --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}"; then
+    set ARCHISO_HINT="${archiso_device}"
+    if probe --set ARCHISO_UUID --fs-uuid "${ARCHISO_HINT}"; then
+        export ARCHISO_UUID
+    fi
+else
+    echo "Could not find a volume with a '%ARCHISO_SEARCH_FILENAME%' file on it!"
+fi
+
+# Load grub.cfg
+if [ "${ARCHISO_HINT}" == 'memdisk' -o -z "${ARCHISO_HINT}" ]; then
+    echo 'Could not find the ISO volume!'
+elif [ -e "(${ARCHISO_HINT})/boot/grub/grub.cfg" ]; then
+    export ARCHISO_HINT
+    set root="${ARCHISO_HINT}"
+    configfile "(${ARCHISO_HINT})/boot/grub/grub.cfg"
+else
+    echo "File '(${ARCHISO_HINT})/boot/grub/grub.cfg' not found!"
+fi
+EOF
+    grubembedcfg="${grubembedcfg//'%ARCHISO_SEARCH_FILENAME%'/"${search_filename}"}"
+    printf '%s\n' "$grubembedcfg" >"${work_dir}/grub-embed.cfg"
+
+    # Write grubenv
+    printf '%.1024s' \
+        "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\nARCHISO_LABEL=%s\nINSTALL_DIR=%s\nARCH=%s\nARCHISO_SEARCH_FILENAME=%s\n%s' \
+            "${iso_name}" \
+            "${iso_version}" \
+            "${iso_label}" \
+            "${install_dir}" \
+            "${arch}" \
+            "${search_filename}" \
+            "$(printf '%0.1s' "#"{1..1024})")" \
+        >"${work_dir}/grub/grubenv"
+}
+
+# Create GRUB specific configuration files when GRUB is not used as a boot loader
+_make_common_grubenv_and_loopbackcfg() {
+
+    install -d -m 0755 -- "${isofs_dir}/boot/grub"
+    # Write grubenv
+    printf '%.1024s' \
+        "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\nARCHISO_LABEL=%s\nINSTALL_DIR=%s\nARCH=%s\nARCHISO_SEARCH_FILENAME=%s\n%s' \
+            "${iso_name}" \
+            "${iso_version}" \
+            "${iso_label}" \
+            "${install_dir}" \
+            "${arch}" \
+            "${search_filename}" \
+            "$(printf '%0.1s' "#"{1..1024})")" \
+        >"${isofs_dir}/boot/grub/grubenv"
+
+    # Copy loopback.cfg to /boot/grub/ on ISO 9660
+    if [[ -e "${profile}/grub/loopback.cfg" ]]; then
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%ARCHISO_UUID%|${iso_uuid}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g;
+             s|%ARCHISO_SEARCH_FILENAME%|${search_filename}|g" \
+            "${profile}/grub/loopback.cfg" >"${isofs_dir}/boot/grub/loopback.cfg"
+    fi
+}
+
+# Prepare GRUB
+_make_bootmode_uefi.grub() {
+    local grub_target grubmodules=() files_to_copy=()
+
+    _msg_info "Setting up GRUB for UEFI booting..."
+
+    # Get GRUB-specific architecture name
+    case "$arch" in
+        'aarch64') grub_target='arm64-efi' ;;
+        *) grub_target="${arch}-efi" ;;
+    esac
+
+    # Prepare configuration files
+    _run_once _make_common_bootmode_grub_cfg
+
+    # Create EFI binary
+    # Module list from https://bugs.archlinux.org/task/71382#comment202911
+    grubmodules=(all_video at_keyboard boot btrfs cat chain configfile echo efifwsetup efinet exfat ext2 f2fs fat font \
+                 gfxmenu gfxterm gzio halt hfsplus iso9660 jpeg keylayouts linux loadenv loopback lsefi lsefimmap \
+                 minicmd normal ntfs ntfscomp part_apple part_gpt part_msdos png read reboot regexp search \
+                 search_fs_file search_fs_uuid search_label serial sleep tpm udf usb usbserial_common usbserial_ftdi \
+                 usbserial_pl2303 usbserial_usbdebug video xfs zstd)
+    grub-mkstandalone -O "$grub_target" \
+        --modules="${grubmodules[*]}" \
+        --locales="en@quot" \
+        --themes="/boot/grub/themes/tms/theme.txt" \
+        --sbat=/usr/share/grub/sbat.csv \
+        --disable-shim-lock \
+        -o "${work_dir}/BOOT${uefi_arch[$arch]}.EFI" "boot/grub/grub.cfg=${work_dir}/grub-embed.cfg"
+    # Add GRUB to the list of files used to calculate the required FAT image size.
+    efiboot_files+=("${work_dir}/BOOT${uefi_arch[$arch]}.EFI"
+                    "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi")
+
+    # Create IA32 EFI binary for mixed-mode booting on x86_64 systems with IA32 UEFI
+    if [[ "$arch" == 'x86_64' ]]; then
+        grub-mkstandalone -O i386-efi \
+            --modules="${grubmodules[*]}" \
+            --locales="en@quot" \
+            --themes="/boot/grub/themes/tms/theme.txt" \
+            --sbat=/usr/share/grub/sbat.csv \
+            --disable-shim-lock \
+            -o "${work_dir}/BOOTIA32.EFI" "boot/grub/grub.cfg=${work_dir}/grub-embed.cfg"
+        efiboot_files+=("${work_dir}/BOOTIA32.EFI"
+                        "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi")
+    fi
+
+    # Create a FAT image for the EFI system partition
+    _make_efibootimg
+
+    # Additionally set up GRUB in ISO 9660. This allows creating a medium for the live environment by using
+    # manual partitioning and simply copying the ISO 9660 file system contents.
+    # This is not related to El Torito booting and no firmware uses these files.
+    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
+
+    # Copy GRUB EFI binary to the default/fallback boot path
+    mcopy -i "${efibootimg}" "${work_dir}/BOOT${uefi_arch[$arch]}.EFI" "::/EFI/BOOT/BOOT${uefi_arch[$arch]}.EFI"
+    install -m 0644 -- "${work_dir}/BOOT${uefi_arch[$arch]}.EFI" "${isofs_dir}/EFI/BOOT/BOOT${uefi_arch[$arch]}.EFI"
+    # Set up mixed mode booting for x86_64 systems with IA32 UEFI
+    if [[ "$arch" == 'x86_64' ]]; then
+        mcopy -i "${efibootimg}" "${work_dir}/BOOTIA32.EFI" ::/EFI/BOOT/BOOTIA32.EFI
+        install -m 0644 -- "${work_dir}/BOOTIA32.EFI" "${isofs_dir}/EFI/BOOT/BOOTIA32.EFI"
+    fi
+
+    # Copy GRUB files from profile and work_dir (e.g., grub.cfg, background.png)
+    files_to_copy+=("${work_dir}/grub/"*)
+    if compgen -G "${profile}/grub/!(*.cfg)" &>/dev/null; then
+        files_to_copy+=("${profile}/grub/"!(*.cfg))
+    fi
+    install -d -m 0755 -- "${isofs_dir}/boot/grub"
+    cp -r --remove-destination -- "${files_to_copy[@]}" "${isofs_dir}/boot/grub/"
+
+    # --- START Correction: Copy GRUB modules and fonts from pacstrap_dir to ISO 9660 ---
+    _msg_info "Copying GRUB modules and fonts from pacstrap_dir to ISO 9660..."
+
+    # Copy fonts (e.g., unicode.pf2)
+    if [[ -d "${pacstrap_dir}/usr/share/grub/fonts" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/boot/grub/fonts"
+        # Copy all contents of the fonts directory
+        cp -r --remove-destination -- "${pacstrap_dir}/usr/share/grub/fonts/"* "${isofs_dir}/boot/grub/fonts/"
+    fi
+
+    # Copy architecture-specific GRUB modules (e.g., x86_64-efi, i386-pc)
+    # These are needed for the grub.cfg to load additional modules at runtime
+    # The grub_target is already set for the current architecture (e.g., x86_64-efi)
+    if [[ -d "${pacstrap_dir}/usr/lib/grub/${grub_target}" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/boot/grub/${grub_target}"
+        cp -r --remove-destination -- "${pacstrap_dir}/usr/lib/grub/${grub_target}/"* "${isofs_dir}/boot/grub/${grub_target}/"
+    fi
+
+    # If building for x86_64, also copy i386-pc modules for BIOS booting,
+    # as this function prepares the common ISO 9660 GRUB files.
+    if [[ "$arch" == 'x86_64' && -d "${pacstrap_dir}/usr/lib/grub/i386-pc" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/boot/grub/i386-pc"
+        cp -r --remove-destination -- "${pacstrap_dir}/usr/lib/grub/i386-pc/"* "${isofs_dir}/boot/grub/i386-pc/"
+    fi
+
+    _msg_info "Done copying GRUB modules and fonts."
+    # --- END Correction ---
+
+    # edk2-shell based UEFI shell
+    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi" ]]; then
+        mcopy -i "${efibootimg}" \
+            "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi" "::/shell${uefi_arch[$arch],,}.efi"
+        install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi" \
+            "${isofs_dir}/shell${uefi_arch[$arch],,}.efi"
+    fi
+    if [[ "$arch" == 'x86_64' ]]; then
+        # UEFI shell for x86_64 systems with IA32 UEFI
+        if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi" ]]; then
+            mcopy -i "${efibootimg}" "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi" ::/shellia32.efi
+            install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi" "${isofs_dir}/shellia32.efi"
+        fi
+
+        # Copy Memtest86+
+        # Only the x64 binary is built. See https://gitlab.archlinux.org/archlinux/packaging/packages/memtest86plus/-/merge_requests/2
+        if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.efi" ]]; then
+            install -d -m 0755 -- "${isofs_dir}/boot/memtest86+/"
+            install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.efi" "${isofs_dir}/boot/memtest86+/memtest.efi"
+            install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" "${isofs_dir}/boot/memtest86+/LICENSE"
+        fi
+    fi
+
+    _msg_info "Done! GRUB set up for UEFI booting successfully."
+}
+
+# Deprecated boot modes
+_make_bootmode_uefi-ia32.grub.esp() {
+    return 1
+}
+_make_bootmode_uefi-ia32.grub.eltorito() {
+    return 1
+}
+_make_bootmode_uefi-x64.grub.esp() {
+    return 1
+}
+_make_bootmode_uefi-x64.grub.eltorito() {
+    return 1
+}
+
+# Copy UEFI-architecture-specific files
+_make_common_bootmode_uefi.systemd-boot_copy_files() {
+    local target_arch="$1"
+
+    # Copy systemd-boot EFI binary to the default/fallback boot path
+    mcopy -i "${efibootimg}" \
+        "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-boot${target_arch,,}.efi" "::/EFI/BOOT/BOOT${target_arch}.EFI"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-boot${target_arch,,}.efi" \
+        "${isofs_dir}/EFI/BOOT/BOOT${target_arch}.EFI"
+
+    # edk2-shell based UEFI shell
+    # shell*.efi is picked up automatically when on /
+    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/${target_arch,,}/Shell_Full.efi" ]]; then
+        mcopy -i "${efibootimg}" \
+            "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "::/shell${target_arch,,}.efi"
+        install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/${target_arch,,}/Shell_Full.efi" \
+            "${isofs_dir}/shell${target_arch,,}.efi"
+    fi
+
+    # Copy Memtest86+
+    # Only the x64 binary is built. See https://gitlab.archlinux.org/archlinux/packaging/packages/memtest86plus/-/merge_requests/2
+    if [[ "$target_arch" == 'x64' ]]; then
+        if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.efi" ]]; then
+            mmd -i "${efibootimg}" ::/boot ::/boot/memtest86+
+            mcopy -i "${efibootimg}" \
+                "${pacstrap_dir}/boot/memtest86+/memtest.efi" ::/boot/memtest86+/
+            mcopy -i "${efibootimg}" \
+                "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" ::/boot/memtest86+/LICENSE
+            install -d -m 0755 -- "${isofs_dir}/boot/memtest86+/"
+            install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.efi" "${isofs_dir}/boot/memtest86+/memtest.efi"
+            install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" "${isofs_dir}/boot/memtest86+/LICENSE"
+        fi
+    fi
+}
+
+# Prepare systemd-boot
+_make_bootmode_uefi.systemd-boot() {
+    local _conf _file _available_ucodes=() boot_entry_arch
+
+    _msg_info "Setting up systemd-boot for UEFI booting..."
+
+    # Prepare configuration files
+    install -d -m 0755 -- "${work_dir}/loader" "${work_dir}/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/loader"
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        # Extract the UEFI architecture from the boot entry file
+        if boot_entry_arch="$(grep -Pao -- '^architecture\s+\K\w+' "${_conf}" 2>/dev/null)"; then
+            # Skip adding boot entry files for foreign UEFI architectures (unless when on x86_64 and adding IA32 boot entries)
+            if ! [[ "${boot_entry_arch^^}" == "${uefi_arch[$arch]^^}" || ( "$arch" == 'x86_64' && "${boot_entry_arch^^}" == 'IA32' ) ]]; then
+                continue
+            fi
+        fi
+
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%ARCHISO_UUID%|${iso_uuid}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" >"${work_dir}/loader/entries/${_conf##*/}"
+    done
+
+    if (( need_external_ucodes )); then
+        for _file in "${ucodes[@]}"; do
+            if [[ -e "${pacstrap_dir}/boot/${_file}" ]]; then
+                _available_ucodes+=("${pacstrap_dir}/boot/${_file}")
+            fi
+        done
+    fi
+    # Calculate the required FAT image size in bytes
+    efiboot_files+=("${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-boot${uefi_arch[$arch],,}.efi"
+                    "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi"
+                    "${work_dir}/loader/"
+                    "${pacstrap_dir}/boot/vmlinuz-"*
+                    "${pacstrap_dir}/boot/initramfs-"*".img"
+                    "${_available_ucodes[@]}")
+
+    # Files specific to x86_64: IA32 UEFI binaries for mixed mode booting, memtest86+
+    if [[ "$arch" == 'x86_64' ]]; then
+        efiboot_files+=("${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootia32.efi"
+                        "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi"
+                        "${pacstrap_dir}/boot/memtest86+/memtest.efi"
+                        "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt")
+    fi
+    # Create a FAT image for the EFI system partition
+    _make_efibootimg
+
+    # Additionally set up systemd-boot in ISO 9660. This allows creating a medium for the live environment by using
+    # manual partitioning and simply copying the ISO 9660 file system contents.
+    # This is not related to El Torito booting and no firmware uses these files.
+    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
+
+    # Copy systemd-boot configuration files
+    mcopy -i "${efibootimg}" -s "${work_dir}/loader" ::/
+    cp -r --remove-destination -- "${work_dir}/loader" "${isofs_dir}/"
+
+    # Copy EFI binaries and related files
+    _make_common_bootmode_uefi.systemd-boot_copy_files "${uefi_arch[$arch]}"
+    # Set up mixed mode booting for x86_64 systems with IA32 UEFI
+    if [[ "$arch" == 'x86_64' ]]; then
+        _make_common_bootmode_uefi.systemd-boot_copy_files 'IA32'
+    fi
+
+    # Copy kernel and initramfs to FAT image.
+    # systemd-boot can only access files from the EFI system partition it was launched from.
+    _run_once _make_boot_on_fat
+
+    _msg_info "Done! systemd-boot set up for UEFI booting successfully."
+}
+# Deprecated boot modes
+_make_bootmode_uefi-x64.systemd-boot.eltorito() {
+    return 1
+}
+_make_bootmode_uefi-x64.systemd-boot.esp() {
+    return 1
+}
+_make_bootmode_uefi-ia32.systemd-boot.eltorito() {
+    return 1
+}
+_make_bootmode_uefi-ia32.systemd-boot.esp() {
+    return 1
+}
+
+_validate_requirements_bootmode_bios.syslinux() {
+    # Check if the architecture supports BIOS booting
+    if [[ "$arch" != @('x86_64'|'i686') ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': BIOS boot modes are not supported on the '${arch}' architecture!" 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() {
+    # bios.syslinux.eltorito has the exact same requirements as bios.syslinux.mbr
+    _validate_requirements_bootmode_bios.syslinux.mbr
+}
+
+_validate_requirements_bootmode_bios.syslinux.mbr() {
+    _msg_warning "The '${bootmode}' boot mode is deprecated. Use 'bios.syslinux' instead."
+    _remove_deprecated_boot_mode
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' bios.syslinux ' ]]; then
+        bootmodes+=('bios.syslinux')
+        _validate_requirements_bootmode_bios.syslinux
+    fi
+}
+
+_validate_common_requirements_bootmode_uefi() {
+    # Check if the architecture supports UEFI
+    if [[ ! -v uefi_arch["$arch"] ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': UEFI boot modes are not supported on the '${arch}' architecture!" 0
+    fi
+
+    # 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
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
+    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
+    # shellcheck disable=SC2076
+    if [[ "$arch" == 'x86_64'  && ! " ${pkg_list[*]} " =~ ' memtest86+-efi ' ]]; then
+        _msg_info "Validating '${bootmode}': 'memtest86+-efi' is not in the package list. Memory testing will not be available from the UEFI boot loader."
+    fi
+}
+
+_validate_requirements_bootmode_uefi.systemd-boot() {
+    _validate_common_requirements_bootmode_uefi
+
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' uefi.grub ' ]]; then
+        _msg_error "Validating '${bootmode}': cannot be used with the 'uefi.grub' bootmode!" 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
+}
+
+_validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
+    _msg_warning "The '${bootmode}' boot mode is deprecated. Use 'uefi.systemd-boot' instead."
+    _remove_deprecated_boot_mode
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' uefi.systemd-boot ' ]]; then
+        bootmodes+=('uefi.systemd-boot')
+        _validate_requirements_bootmode_uefi.systemd-boot
+    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
+}
+_validate_requirements_bootmode_uefi-ia32.systemd-boot.esp() {
+    # uefi-ia32.systemd-boot.esp has the exact same requirements as uefi-x64.systemd-boot.esp
+    _validate_requirements_bootmode_uefi-x64.systemd-boot.esp
+}
+_validate_requirements_bootmode_uefi-ia32.systemd-boot.eltorito() {
+    # uefi-ia32.systemd-boot.eltorito has the exact same requirements as uefi-x64.systemd-boot.esp
+    _validate_requirements_bootmode_uefi-x64.systemd-boot.esp
+}
+
+_validate_requirements_bootmode_uefi.grub() {
+    _validate_common_requirements_bootmode_uefi
+
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' uefi.systemd-boot ' ]]; then
+        _msg_error "Validating '${bootmode}': cannot be used with the 'uefi.systemd-boot' bootmode!" 0
+    fi
+
+    # Check if GRUB is available
+    if ! command -v grub-mkstandalone &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': grub-install is not available on this host. Install 'grub'!" 0
+    fi
+
+    # Check if GRUB configuration files exist
+    if [[ ! -d "${profile}/grub" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/grub' directory is missing!" 0
+    else
+        if [[ ! -e "${profile}/grub/grub.cfg" ]]; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Validating '${bootmode}': File '${profile}/grub/grub.cfg' not found!" 0
+        fi
+        local conffile
+        for conffile in "${profile}/grub/"*'.cfg'; do
+            if [[ -e "${conffile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/grub/'!" 0
+            fi
+        done
+    fi
+}
+
+_validate_requirements_bootmode_uefi-ia32.grub.esp() {
+    # uefi-ia32.grub.esp has the exact same requirements as uefi-x64.grub.esp
+    _validate_requirements_bootmode_uefi-x64.grub.esp
+}
+_validate_requirements_bootmode_uefi-ia32.grub.eltorito() {
+    # uefi-ia32.grub.eltorito has the exact same requirements as uefi-x64.grub.esp
+    _validate_requirements_bootmode_uefi-x64.grub.esp
+}
+_validate_requirements_bootmode_uefi-x64.grub.esp() {
+    _msg_warning "The '${bootmode}' boot mode is deprecated. Use 'uefi.grub' instead."
+    _remove_deprecated_boot_mode
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' uefi.grub ' ]]; then
+        bootmodes+=('uefi.grub')
+        _validate_requirements_bootmode_uefi.grub
+    fi
+}
+_validate_requirements_bootmode_uefi-x64.grub.eltorito() {
+    # uefi-x64.grub.eltorito has the exact same requirements as uefi-x64.grub.esp
+    _validate_requirements_bootmode_uefi-x64.grub.esp
+}
+
+# Remove deprecated boot mode from the bootmodes array
+_remove_deprecated_boot_mode() {
+    local -i bootmodes_index
+
+    # Find the array index of the deprecated boot mode
+    for bootmodes_index in "${!bootmodes[@]}"; do
+        if [[ "$bootmode" == "${bootmodes[${bootmodes_index}]}" ]]; then
+            # Remove the deprecated boot mode
+            unset "bootmodes[${bootmodes_index}]"
+            # Reindex the array
+            bootmodes=("${bootmodes[@]}")
+            break
+        fi
+    done
+}
+
+# Build airootfs filesystem image
+_prepare_airootfs_image() {
+    _run_once "_mkairootfs_${airootfs_image_type}"
+    _mkchecksum
+
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    fi
+
+    if [[ -n "${gpg_key}" ]]; then
+        _mk_pgp_signature "${airootfs_image_filename}"
+    fi
+    if [[ -v cert_list ]]; then
+        _cms_sign_artifact "${airootfs_image_filename}"
+    fi
+}
+
+# export build artifacts for netboot
+_export_netboot_artifacts() {
+    _msg_info "Exporting netboot artifacts..."
+    install -d -m 0755 "${out_dir}"
+    cp -a -- "${isofs_dir}/${install_dir}/" "${out_dir}/"
+
+    # Remove grubenv since it serves no purpose in netboot artifacts
+    rm -f -- "${out_dir}/${install_dir}/grubenv"
+
+    _msg_info "Done!"
+    du -hs -- "${out_dir}/${install_dir}"
+}
+
+_cms_sign_artifact() {
+    local artifact="${1}"
+    local openssl_flags=(
+        "-sign"
+        "-binary"
+        "-nocerts"
+        "-noattr"
+        "-outform" "DER" "-out" "${artifact}.cms.sig"
+        "-in" "${artifact}"
+        "-signer" "${cert_list[0]}"
+        "-inkey" "${cert_list[1]}"
+    )
+
+    if (( ${#cert_list[@]} > 2 )); then
+        openssl_flags+=("-certfile" "${cert_list[2]}")
+    fi
+
+    _msg_info "Signing ${artifact} image using openssl cms..."
+
+    rm -f -- "${artifact}.cms.sig"
+
+    openssl cms "${openssl_flags[@]}"
+
+    _msg_info "Done!"
+}
+
+# sign build artifacts for netboot
+_sign_netboot_artifacts() {
+    local _file _dir
+    local _files_to_sign=()
+    _msg_info "Signing netboot artifacts..."
+    _dir="${isofs_dir}/${install_dir}/boot/"
+    for _file in "${ucodes[@]}"; do
+        if [[ -e "${_dir}${_file}" ]]; then
+            _files_to_sign+=("${_dir}${_file}")
+        fi
+    done
+    for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"!(*.sig) "${_dir}${arch}/initramfs-"*.img; do
+        rm -f -- "${_file}".ipxe.sig
+        openssl cms \
+            -sign \
+            -binary \
+            -noattr \
+            -in "${_file}" \
+            -signer "${cert_list[0]}" \
+            -inkey "${cert_list[1]}" \
+            -outform DER \
+            -out "${_file}".ipxe.sig
+    done
+    _msg_info "Done!"
+}
+
+_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 &>/dev/null; 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
+}
+
+_validate_common_requirements_buildmode_all() {
+    if ! command -v pacman &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': pacman is not available on this host. Install 'pacman'!" 0
+    fi
+    if ! command -v find &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': find is not available on this host. Install 'findutils'!" 0
+    fi
+    if ! command -v gzip &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': gzip is not available on this host. Install 'gzip'!" 0
+    fi
+}
+
+_validate_requirements_buildmode_bootstrap() {
+    local bootstrap_pkg_list_from_file=()
+
+    # Check if packages for the bootstrap image are specified
+    if [[ -e "${bootstrap_packages}" ]]; then
+        mapfile -t bootstrap_pkg_list_from_file < \
+            <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
+        bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
+        if (( ${#bootstrap_pkg_list_from_file[@]} < 1 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "No package specified in '${bootstrap_packages}'." 0
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Bootstrap packages file '${bootstrap_packages}' does not exist." 0
+    fi
+
+    _validate_common_requirements_buildmode_all
+    if ! command -v bsdtar &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': bsdtar is not available on this host. Install 'libarchive'!" 0
+    fi
+
+    # Check if the compressor is installed
+    if (( ${#bootstrap_tarball_compression[@]} )); then
+        case "${bootstrap_tarball_compression[0]}" in
+            'bzip'|'gzip'|'lrzip'|'lzip'|'lzop'|'xz'|'zstd'|'zstdmt')
+                if ! command -v "${bootstrap_tarball_compression[0]}" &>/dev/null; then
+                    (( validation_error=validation_error+1 ))
+                    _msg_error "Validating build mode '${_buildmode}': '${bootstrap_tarball_compression[0]}' is not available on this host. Install '${bootstrap_tarball_compression[0]/zstdmt/zstd}'!" 0
+                fi
+                ;;
+            'cat')
+                if ! command -v cat &>/dev/null; then
+                    (( validation_error=validation_error+1 ))
+                    _msg_error "Validating build mode '${_buildmode}': 'cat' is not available on this host. Install 'coreutils'!" 0
+                fi
+                if (( ${#bootstrap_tarball_compression[@]} > 1 )); then
+                    (( validation_error=validation_error+1 ))
+                    _msg_error "Validating build mode '${_buildmode}': 'cat' compression does not accept arguments!" 0
+                fi
+                ;;
+            *)
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating build mode '${_buildmode}': '${bootstrap_tarball_compression[0]}' is not a supported compression method!" 0
+                ;;
+        esac
+    fi
+}
+
+_validate_common_requirements_buildmode_iso_netboot() {
+    local bootmode
+    local pkg_list_from_file=()
+
+    # 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
+        (( validation_error=validation_error+1 ))
+        _msg_error "Packages file '${packages}' does not exist." 0
+    fi
+
+    if [[ -v cert_list ]]; then
+        # Check if the certificate files exist
+        for _cert in "${cert_list[@]}"; do
+            if [[ ! -e "${_cert}" ]]; then
+                (( validation_error=validation_error+1 ))
+                _msg_error "File '${_cert}' does not exist." 0
+            fi
+        done
+        # Check if there are at least three certificate files to sign netboot and rootfs.
+        if (( ${#cert_list[@]} < 2 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Two certificates are required for codesigning netboot artifacts, but '${cert_list[*]}' is provided." 0
+        fi
+
+        if ! command -v openssl &>/dev/null; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Validating build mode '${_buildmode}': openssl is not available on this host. Install 'openssl'!" 0
+        fi
+    fi
+
+    # 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
+}
+
+_validate_requirements_buildmode_iso() {
+    _validate_common_requirements_buildmode_iso_netboot
+    _validate_common_requirements_buildmode_all
+    # Check if the specified bootmodes are supported
+    if (( ${#bootmodes[@]} < 1 )); then
+        (( validation_error=validation_error+1 ))
+        _msg_error "No boot modes specified in '${profile}/profiledef.sh'." 0
+    fi
+    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
+
+    if ! command -v awk &>/dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
+    fi
+}
+
+_validate_requirements_buildmode_netboot() {
+    _validate_common_requirements_buildmode_iso_netboot
+    _validate_common_requirements_buildmode_all
+}
+
+# SYSLINUX MBR (isohybrid) and El Torito
+_add_xorrisofs_options_bios.syslinux() {
+    xorrisofs_options+=(
+        # El Torito boot image for x86 BIOS
+        '-eltorito-boot' 'boot/syslinux/isolinux.bin'
+        # El Torito boot catalog file
+        '-eltorito-catalog' 'boot/syslinux/boot.cat'
+        # Required options to boot with ISOLINUX
+        '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
+        # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot syslinux/isolinux.bin"
+        '-isohybrid-mbr' "${isofs_dir}/boot/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
+        # May allow booting on some systems
+        # https://wiki.archlinux.org/title/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+        '--mbr-force-bootable'
+        # 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'
+    )
+}
+
+# UEFI boot loader in an attached EFI system partition and El Torito
+_add_common_xorrisofs_options_uefi() {
+    # 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')
+    # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
+    xorrisofs_options+=('-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${efibootimg}")
+    # Ensure GPT is used as some systems do not support UEFI booting without it
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' bios.syslinux ' ]]; then
+        # Use valid GPT if BIOS booting support will not be required
+        xorrisofs_options+=('-appended_part_as_gpt')
+    else
+        # A valid GPT prevents BIOS booting on some systems, use an invalid GPT instead.
+        # If '-isohybrid-gpt-basdat' is specified before '-e', then the appended EFI system partition will have the
+        # EFI system partition type ID/GUID in both MBR and GPT. If '-isohybrid-gpt-basdat' is specified after '-e',
+        # the appended EFI system partition will have the Microsoft basic data type GUID in GPT.
+        xorrisofs_options+=('-isohybrid-gpt-basdat')
+    fi
+    # 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'
+    )
+
+    # Specify where to save the El Torito boot catalog file in case it is not already set by bios.syslinux
+    # shellcheck disable=SC2076
+    [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
+}
+
+# systemd-boot in an attached EFI system partition and El Torito
+_add_xorrisofs_options_uefi.systemd-boot() {
+    _add_common_xorrisofs_options_uefi
+}
+
+# GRUB in an attached EFI system partition and El Torito
+_add_xorrisofs_options_uefi.grub() {
+    _add_common_xorrisofs_options_uefi
+}
+
+# Build bootstrap image
+_build_bootstrap_image() {
+    # Set default tarball compression to uncompressed
+    if (( ! "${#bootstrap_tarball_compression[@]}" )); then
+        bootstrap_tarball_compression=('cat')
+    fi
+
+    [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
+
+    cd -- "${bootstrap_parent}"
+
+    _msg_info "Creating bootstrap image..."
+    rm -f -- "${out_dir:?}/${image_name:?}"
+    bsdtar -cf - "root.${arch}" "pkglist.${arch}.txt" 'version' \
+        | "${bootstrap_tarball_compression[@]}" >"${out_dir}/${image_name}"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${image_name}"
+    cd -- "${OLDPWD}"
+}
+
+# Build ISO
+_build_iso_image() {
+    # Remove the pacstrap directory early to lower the maximum size of the working directory.
+    # The creation of the airootfs image has already been completed.
+    if (( rm_work_dir )); then
+        _msg_info 'Removing pacstrap directory...'
+        rm -rf -- "${work_dir:?}/${arch}/airootfs"
+    fi
+
+    local xorriso_options=() xorrisofs_options=()
+    local bootmode
+
+    [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
+
+    # Do not read xorriso startup files to prevent interference and unintended behavior.
+    # For it to work, -no_rc must be the first argument passed to xorriso.
+    xorriso_options=('-no_rc')
+
+
+    if [[ "${quiet}" == "y" ]]; then
+        # The when xorriso is run in mkisofs compatibility mode (xorrisofs), the mkisofs option -quiet is interpreted
+        # too late (e.g. messages about SOURCE_DATE_EPOCH still get shown).
+        # Instead use native xorriso option to silence the output.
+        xorriso_options+=('-report_about' 'SORRY')
+    fi
+
+    # 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
+
+    # Remove 300 KiB padding needed for CDs if the ISO exceeds the max size of a CD
+    if (( $(du -s --apparent-size -B1M "${isofs_dir}/" | awk '{ print $1 }') > 900 )); then
+        xorrisofs_options+=('-no-pad')
+    fi
+
+    rm -f -- "${out_dir}/${image_name}"
+    _msg_info "Creating ISO image..."
+    xorriso "${xorriso_options[@]}" -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 ${app_name}" \
+        "${xorrisofs_options[@]}" \
+        -output "${out_dir}/${image_name}" \
+        "${isofs_dir}/"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${image_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
+        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 "$arch" ]] || arch="$(uname -m)"
+        # Use "packages" if it exists but "packages.${arch}" does not
+        if [[ -z "$packages" && ! -e "${profile}/packages.${arch}" && -e "${profile}/packages" ]]; then
+            packages="${profile}/packages"
+        fi
+        packages="$(realpath -- "${packages:-${profile}/packages.${arch}}")"
+        # Use "bootstrap_packages" if it exists but "bootstrap_packages.${arch}" does not
+        if [[ -z "$bootstrap_packages" && ! -e "${profile}/bootstrap_packages.${arch}" && -e "${profile}/bootstrap_packages" ]]; then
+            bootstrap_packages="${profile}/bootstrap_packages"
+        fi
+        bootstrap_packages="$(realpath -- "${bootstrap_packages:-${profile}/bootstrap_packages.${arch}}")"
+        pacman_conf="$(realpath -- "${pacman_conf}")"
+
+        cd -- "${OLDPWD}"
+    fi
+}
+
+# Validate set options
+_validate_options() {
+    local validation_error=0 _buildmode certfile
+
+    _msg_info "Validating options..."
+
+    # 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 code signing certificate files exist
+    for certfile in "${cert_list[@]}"; do
+        if [[ ! -e "$certfile" ]]; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Code signing certificate '${certfile}' does not exist." 0
+        fi
+    done
+
+    # Check if the specified buildmodes are supported
+    for _buildmode in "${buildmodes[@]}"; do
+        if typeset -f "_build_buildmode_${_buildmode}" &>/dev/null; then
+            if typeset -f "_validate_requirements_buildmode_${_buildmode}" &>/dev/null; then
+                "_validate_requirements_buildmode_${_buildmode}"
+            else
+                _msg_warning "Function '_validate_requirements_buildmode_${_buildmode}' does not exist. Validating the requirements of '${_buildmode}' build mode will not be possible."
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "${_buildmode} is not a valid build mode!" 0
+        fi
+    done
+
+    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
+    [[ ! -v override_buildmodes ]] || buildmodes=("${override_buildmodes[@]}")
+    if (( ${#buildmodes[@]} < 1 )); then
+        buildmodes+=('iso')
+    fi
+    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[@]}")
+    # TODO: allow overriding bootstrap_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"
+    [[ ! -v override_gpg_sender ]] || gpg_sender="$override_gpg_sender"
+    [[ ! -v override_cert_list ]] || mapfile -t cert_list < <(realpath -- "${override_cert_list[@]}")
+    if [[ -v override_quiet ]]; then
+        quiet="$override_quiet"
+    elif [[ -z "$quiet" ]]; then
+        quiet="n"
+    fi
+    if [[ -v override_rm_work_dir ]]; then
+        rm_work_dir="$override_rm_work_dir"
+    fi
+
+    # Set variables that do not have overrides
+    [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
+    [[ -n "$iso_name" ]] || iso_name="${app_name}"
+    # Precalculate the ISO's modification date in UTC, i.e. its "UUID"
+    TZ=UTC printf -v iso_uuid '%(%F-%H-%M-%S-00)T' "$SOURCE_DATE_EPOCH"
+}
+
+_export_gpg_publickey() {
+    gpg_publickey="${work_dir}/pubkey.gpg"
+    rm -f -- "$gpg_publickey"
+    gpg --batch --no-armor --output "$gpg_publickey" --export "${gpg_key}"
+    [[ -s "$gpg_publickey" ]] || return
+}
+
+_make_version() {
+    local _os_release
+
+    _msg_info "Creating version files..."
+
+    if [[ "${buildmode}" == @("iso"|"netboot") ]]; then
+        # Write version file to system installation dir
+        rm -f -- "${pacstrap_dir}/version"
+        printf '%s\n' "${iso_version}" >"${pacstrap_dir}/version"
+
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+        # Write version file to ISO 9660
+        printf '%s\n' "${iso_version}" >"${isofs_dir}/${install_dir}/version"
+    elif [[ "${buildmode}" == 'bootstrap' ]]; then
+        # Write version file to the root of the tarball
+        rm -f -- "${bootstrap_parent}/version"
+        printf '%s\n' "${iso_version}" >"${bootstrap_parent}/version"
+    fi
+    if [[ "${buildmode}" == "iso" ]]; then
+        # Write a limited grubenv with version information to install_dir on ISO 9660 for use cases where only the
+        # install_dir is used.
+        rm -f -- "${isofs_dir}/${install_dir}/grubenv"
+        printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
+            "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
+            >"${isofs_dir}/${install_dir}/grubenv"
+
+        # Create a /boot/YYYY-mm-dd-HH-MM-SS-00.uuid file on ISO 9660. GRUB will search for it to find the ISO
+        # volume. This is similar to what grub-mkrescue does, except it places the file in /.disk/, but we opt to use a
+        # directory that does not start with a dot to avoid it being accidentally missed when copying the ISO's contents.
+        search_filename="/boot/${iso_uuid}.uuid"
+        install -d -m 755 -- "${isofs_dir}/boot"
+        : >"${isofs_dir}${search_filename}"
+    fi
+
+    # Append IMAGE_ID & IMAGE_VERSION to os-release
+    _os_release="$(realpath -- "${pacstrap_dir}/etc/os-release")"
+    if [[ ! -e "${pacstrap_dir}/etc/os-release" && -e "${pacstrap_dir}/usr/lib/os-release" ]]; then
+        _os_release="$(realpath -- "${pacstrap_dir}/usr/lib/os-release")"
+    fi
+    if [[ "${_os_release}" != "${pacstrap_dir}"* ]]; then
+        _msg_warning "os-release file '${_os_release}' is outside of valid path."
+    else
+        [[ ! -e "${_os_release}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${_os_release}"
+        printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >>"${_os_release}"
+    fi
+
+    # Touch /usr/lib/clock-epoch to give another hint on date and time
+    # for systems with screwed or broken RTC.
+    touch -m -d"@${SOURCE_DATE_EPOCH}" -- "${pacstrap_dir}/usr/lib/clock-epoch"
+
+    _msg_info "Done!"
+}
+
+_make_pkglist() {
+    _msg_info "Creating a list of installed packages on live-enviroment..."
+    case "${buildmode}" in
+        "bootstrap")
+            pacman -Q --sysroot "${pacstrap_dir}" >"${bootstrap_parent}/pkglist.${arch}.txt"
+            ;;
+        "iso"|"netboot")
+            install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+            pacman -Q --sysroot "${pacstrap_dir}" >"${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
+            ;;
+    esac
+    _msg_info "Done!"
+}
+
+# Create working directory
+_make_work_dir() {
+    if [[ ! -d "${work_dir}" ]]; then
+        install -d -- "${work_dir}"
+    elif (( rm_work_dir )); then
+        rm_work_dir=0
+        _msg_warning "Working directory removal requested, but '${work_dir}' already exists. It will not be removed!" 0
+    fi
+}
+
+# build the base for an ISO and/or a netboot target
+_build_iso_base() {
+    local run_once_mode="base"
+    local buildmode_packages="${packages}"
+    # Set the package list to use
+    local buildmode_pkg_list=("${pkg_list[@]}")
+    # Set up essential directory paths
+    pacstrap_dir="${work_dir}/${arch}/airootfs"
+    isofs_dir="${work_dir}/iso"
+
+    # Create working directory
+    _run_once _make_work_dir
+    # Write build date to file if it does not exist already
+    [[ -e "${work_dir}/build_date" ]] || printf '%s\n' "$SOURCE_DATE_EPOCH" >"${work_dir}/build_date"
+
+    [[ "${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
+    if [[ "$arch" == @('x86_64'|'i686') ]]; then
+        _run_once _check_if_initramfs_has_ucode
+    fi
+    # Copy the kernel and initramfs to ISO 9660 for boot loaders that can read the ISO 9660 file system and also for
+    # UEFI-bootable installation medium creation via file system transposition.
+    _run_once _make_boot_on_iso9660
+    if [[ "${buildmode}" != 'netboot' ]]; then
+        _make_bootmodes
+    fi
+    _run_once _cleanup_pacstrap_dir
+    _run_once _prepare_airootfs_image
+}
+
+# Build the bootstrap buildmode
+_build_buildmode_bootstrap() {
+    local image_name="${iso_name}-bootstrap-${iso_version}-${arch}.tar"
+    local run_once_mode="${buildmode}"
+    local buildmode_packages="${bootstrap_packages}"
+    # Set the package list to use
+    local buildmode_pkg_list=("${bootstrap_pkg_list[@]}")
+
+    # Set up essential directory paths
+    pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
+    bootstrap_parent="$(dirname -- "${pacstrap_dir}")"
+    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
+
+    # Set tarball extension
+    case "${bootstrap_tarball_compression[0]}" in
+        'bzip') image_name="${image_name}.b2z" ;;
+        'gzip') image_name="${image_name}.gz" ;;
+        'lrzip') image_name="${image_name}.lrz" ;;
+        'lzip') image_name="${image_name}.lz" ;;
+        'lzop') image_name="${image_name}.lzo" ;;
+        'xz') image_name="${image_name}.xz" ;;
+        'zstd'|'zstdmt') image_name="${image_name}.zst" ;;
+    esac
+
+    [[ "${quiet}" == "y" ]] || _show_config
+    _run_once _make_pacman_conf
+    _run_once _make_packages
+    _run_once _make_version
+    _run_once _make_pkglist
+    _run_once _cleanup_pacstrap_dir
+    _run_once _build_bootstrap_image
+}
+
+# Build the netboot buildmode
+_build_buildmode_netboot() {
+    local run_once_mode="${buildmode}"
+
+    _build_iso_base
+
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    fi
+
+    if [[ -v cert_list ]]; then
+        _run_once _sign_netboot_artifacts
+    fi
+    _run_once _export_netboot_artifacts
+}
+
+# Build the ISO buildmode
+_build_buildmode_iso() {
+    local image_name="${iso_name}-${iso_version}-${arch}.iso"
+    local run_once_mode="${buildmode}"
+    efibootimg="${work_dir}/efiboot.img"
+    _build_iso_base
+    _run_once _build_iso_image
+}
+
+# build all buildmodes
+_build() {
+    local buildmode
+    local run_once_mode="build"
+
+    for buildmode in "${buildmodes[@]}"; do
+        _run_once "_build_buildmode_${buildmode}"
+    done
+    if (( rm_work_dir )); then
+        _msg_info 'Removing the working directory...'
+        rm -rf -- "${work_dir:?}/"
+        _msg_info 'Done!'
+    fi
+}
+
+while getopts 'c:p:C:L:P:A:D:w:m:o:g:G:vrh?' arg; do
+    case "${arg}" in
+        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}" ;;
+        c) read -r -a override_cert_list <<<"${OPTARG}" ;;
+        w) override_work_dir="${OPTARG}" ;;
+        m) read -r -a override_buildmodes <<<"${OPTARG}" ;;
+        o) override_out_dir="${OPTARG}" ;;
+        g) override_gpg_key="${OPTARG}" ;;
+        G) override_gpg_sender="${OPTARG}" ;;
+        v) override_quiet="n" ;;
+        r) declare -i override_rm_work_dir=1 ;;
+        h|?) _usage 0 ;;
+        *)
+            _msg_error "Invalid argument '${arg}'" 0
+            _usage 1
+            ;;
+    esac
+done
+
+shift $((OPTIND - 1))
+
+if (( $# < 1 )); then
+    _msg_error "No profile specified" 0
+    _usage 1
+fi
+
+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 SOURCE_DATE_EPOCH from file early
+build_date_file="$(realpath -q -- "${override_work_dir:-./work}/build_date")" || :
+if [[ -f "$build_date_file" ]]; then
+    SOURCE_DATE_EPOCH="$(<"$build_date_file")"
+fi
+unset build_date_file
+
+_read_profile
+_set_overrides
+_validate_options
+_build
+
+# vim:ts=4:sw=4:et: