diff --git a/.bin/Scripts/settings/ufd.py b/.bin/Scripts/settings/ufd.py
index db4a2127..94cf333e 100644
--- a/.bin/Scripts/settings/ufd.py
+++ b/.bin/Scripts/settings/ufd.py
@@ -59,40 +59,40 @@ BOOT_FILES = {
 ##        Sources use rsync's trailing slash syntax
 ITEMS = {
   'Extra Dir': (
-    ('/',                         '/'),
+    ('/',                             '/'),
     ),
   'Linux': (
-    ('/arch',                     '/'),
-    ('/isolinux',                 '/'),
-    ('/EFI/boot',                 '/EFI/'),
-    ('/EFI/memtest86',            '/EFI/'),
+    ('/arch',                         '/'),
+    ('/isolinux',                     '/'),
+    ('/EFI/boot',                     '/EFI/'),
+    ('/EFI/memtest86',                '/EFI/'),
     ),
   'Linux (dGPU)': (
-    ('/arch/boot/archiso.img',    '/dgpu/'),
-    ('/arch/boot/vmlinuz',        '/dgpu/'),
-    ('/arch/pkglist.x86_64.txt',  '/dgpu/'),
-    ('/arch/x86_64',              '/dgpu/'),
+    ('/arch/boot/x86_64/archiso.img', '/dgpu/'),
+    ('/arch/boot/x86_64/vmlinuz',     '/dgpu/'),
+    ('/arch/pkglist.x86_64.txt',      '/dgpu/'),
+    ('/arch/x86_64',                  '/dgpu/'),
     ),
   'Linux (Minimal)': (
-    ('/arch/boot/archiso.img',    '/arch_minimal/'),
-    ('/arch/boot/vmlinuz',        '/arch_minimal/'),
-    ('/arch/pkglist.x86_64.txt',  '/arch_minimal/'),
-    ('/arch/x86_64',              '/arch_minimal/'),
+    ('/arch/boot/x86_64/archiso.img', '/arch_minimal/'),
+    ('/arch/boot/x86_64/vmlinuz',     '/arch_minimal/'),
+    ('/arch/pkglist.x86_64.txt',      '/arch_minimal/'),
+    ('/arch/x86_64',                  '/arch_minimal/'),
     ),
   'Main Kit': (
-    ('/',                         '/{}/'.format(KIT_NAME_FULL)),
+    ('/',                             '/{}/'.format(KIT_NAME_FULL)),
     ),
   'WinPE': (
-    ('/bootmgr',                  '/'),
-    ('/bootmgr.efi',              '/'),
-    ('/en_us',                    '/'),
-    ('/Boot/',                    '/boot/'),
-    ('/EFI/Boot/',                '/EFI/Microsoft/'),
-    ('/EFI/Microsoft/',           '/EFI/Microsoft/'),
-    ('/Boot/BCD',                 '/sources/'),
-    ('/Boot/boot.sdi',            '/sources/'),
-    ('/bootmgr',                  '/sources/'),
-    ('/sources/boot.wim',         '/sources/'),
+    ('/bootmgr',                      '/'),
+    ('/bootmgr.efi',                  '/'),
+    ('/en_us',                        '/'),
+    ('/Boot/',                        '/boot/'),
+    ('/EFI/Boot/',                    '/EFI/Microsoft/'),
+    ('/EFI/Microsoft/',               '/EFI/Microsoft/'),
+    ('/Boot/BCD',                     '/sources/'),
+    ('/Boot/boot.sdi',                '/sources/'),
+    ('/bootmgr',                      '/sources/'),
+    ('/sources/boot.wim',             '/sources/'),
     ),
   }
 ITEMS_HIDDEN = (