diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd
index 4ad726e1..646d96dd 100755
--- a/.bin/Scripts/build-ufd
+++ b/.bin/Scripts/build-ufd
@@ -77,10 +77,12 @@ if __name__ == '__main__':
 
     # Update boot entries
     try_and_print(
-      message='Enabling boot entries...',
-      function=enable_boot_entries,
+      message='Updating boot entries...',
+      function=update_boot_entries,
       boot_entries=BOOT_ENTRIES,
       boot_files=BOOT_FILES,
+      iso_label=ISO_LABEL,
+      ufd_label=UFD_LABEL,
       )
 
     # Install syslinux
diff --git a/.bin/Scripts/functions/ufd.py b/.bin/Scripts/functions/ufd.py
index dbce5bb6..f6083da0 100644
--- a/.bin/Scripts/functions/ufd.py
+++ b/.bin/Scripts/functions/ufd.py
@@ -68,8 +68,8 @@ def copy_source(source, items, overwrite=False):
   unmount('/mnt/Source')
 
 
-def enable_boot_entries(boot_entries, boot_files):
-  """Enable boot entries if related paths exist."""
+def update_boot_entries(boot_entries, boot_files, iso_label, ufd_label):
+  """Update boot files for UFD usage"""
   configs = []
 
   # Find config files
@@ -79,7 +79,17 @@ def enable_boot_entries(boot_entries, boot_files):
       if item.name.lower().endswith(c_ext.lower()):
         configs.append(item.path)
 
-  # Uncomment found entries
+  # Update Linux labels
+  cmd = [
+    'sed',
+    '--in-place',
+    '--regexp-extended',
+    's/{}/{}/'.format(iso_label, ufd_label),
+    *configs,
+    ]
+  run_program(cmd)
+
+  # Uncomment extra entries if present
   for b_path, b_comment in boot_entries:
     try:
       find_path('/mnt/UFD{}'.format(b_path))
@@ -87,7 +97,7 @@ def enable_boot_entries(boot_entries, boot_files):
       # Entry not found, continue to next entry
       continue
 
-    # Update config files
+    # Entry found, update config files
     cmd = [
       'sed',
       '--in-place',
diff --git a/.linux_items/include/EFI/boot/icons/dgpu.png b/.linux_items/include/EFI/boot/icons/dgpu.png
new file mode 100644
index 00000000..e9770abd
Binary files /dev/null and b/.linux_items/include/EFI/boot/icons/dgpu.png differ
diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
index 4ab3be7b..62a639f7 100644
--- a/.linux_items/include/EFI/boot/refind.conf
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -26,15 +26,30 @@ menuentry "Linux" {
     initrd /arch/boot/amd_ucode.img
     initrd /arch/boot/x86_64/archiso.img
     options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
-    submenuentry "Linux (i3)" {
-        add_options "i3"
-    }
     submenuentry "Linux (CLI)" {
-        add_options "loglevel=4 nomodeset nox"
+        add_options "nox"
     }
+    #UFD-MINIMAL#submenuentry "Linux (Minimal)" {
+    #UFD-MINIMAL#    loader /arch_minimal/vmlinuz
+    #UFD-MINIMAL#    initrd
+    #UFD-MINIMAL#    initrd /arch/boot/intel_ucode.img
+    #UFD-MINIMAL#    initrd /arch/boot/amd_ucode.img
+    #UFD-MINIMAL#    initrd /arch_minimal/archiso.img
+    #UFD-MINIMAL#    options
+    #UFD-MINIMAL#    options "archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
+    #UFD-MINIMAL#}
 }
 #UFD-WINPE#menuentry "WindowsPE" {
 #UFD-WINPE#    ostype windows
 #UFD-WINPE#    icon /EFI/boot/icons/wk_win.png
 #UFD-WINPE#    loader /EFI/microsoft/bootx64.efi
 #UFD-WINPE#}
+#UFD-DGPU#menuentry "Mac dGPU Disable Tool" {
+#UFD-DGPU#    icon /EFI/boot/icons/dgpu.png
+#UFD-DGPU#    loader /dgpu/vmlinuz
+#UFD-DGPU#    initrd /arch/boot/intel_ucode.img
+#UFD-DGPU#    initrd /arch/boot/amd_ucode.img
+#UFD-DGPU#    initrd /dgpu/archiso.img
+#UFD-DGPU#    options "archisobasedir=dgpu archisolabel=%ARCHISO_LABEL% nomodeset"
+#UFD-DGPU#}
+
diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg
index d4319c00..b6a9370c 100644
--- a/.linux_items/include/syslinux/wk_sys_linux.cfg
+++ b/.linux_items/include/syslinux/wk_sys_linux.cfg
@@ -8,17 +8,6 @@ LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3
 
-LABEL wk_linux_i3
-TEXT HELP
-A live Linux environment (i3)
-  * HW diagnostics, file-based backups, data recovery, etc
-ENDTEXT
-MENU LABEL Linux (i3)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 i3
-SYSAPPEND 3
-
 LABEL wk_linux_cli
 TEXT HELP
 A live Linux environment (CLI)
@@ -27,5 +16,17 @@ ENDTEXT
 MENU LABEL Linux (CLI)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox nomodeset
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox
 SYSAPPEND 3
+
+#UFD-MINIMAL#LABEL wk_linux_minimal
+#UFD-MINIMAL#TEXT HELP
+#UFD-MINIMAL#A live Linux environment (Minimal)
+#UFD-MINIMAL#  * HW diagnostics, file-based backups, data recovery, etc
+#UFD-MINIMAL#ENDTEXT
+#UFD-MINIMAL#MENU LABEL Linux (Minimal)
+#UFD-MINIMAL#LINUX ../arch_minimal/vmlinuz
+#UFD-MINIMAL#INITRD boot/intel_ucode.img,boot/amd_ucode.img,../arch_minimal/archiso.img
+#UFD-MINIMAL#APPEND archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3
+#UFD-MINIMAL#SYSAPPEND 3
+