diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
index de5f4318..3ed5fd9d 100644
--- a/.linux_items/include/EFI/boot/refind.conf
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -25,12 +25,48 @@ menuentry "Linux" {
     initrd /arch/boot/intel_ucode.img
     initrd /arch/boot/amd_ucode.img
     initrd /arch/boot/x86_64/archiso.img
-    options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
+    options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3"
     submenuentry "Linux (i3)" {
         add_options "i3"
     }
     submenuentry "Linux (CLI)" {
-        add_options "nox"
+        add_options "loglevel=4 nomodeset nox"
+    }
+    submenuentry "Linux (Mac CLI)" {
+        add_options "loglevel=5 nomodeset nox"
+    }
+    submenuentry "Linux (MacBook9,1)" {
+        add_options "loglevel=5 intremap=nosid noacpi nomodeset"
+    }
+    submenuentry "Linux (MacBookAir5,2)" {
+        add_options "loglevel=5 intremap=off"
+    }
+    submenuentry "Linux (MacBookAir6,x)" {
+        add_options "loglevel=5 libata.force=1:noncq"
+    }
+    submenuentry "Linux (MacBookPro7,1)" {
+        add_options "loglevel=5 acpi_osi=! acpi_osi="Darwin" intremap=off nomodeset"
+    }
+    submenuentry "Linux (MacBookPro10,x)" {
+        add_options "loglevel=5 noapic"
+    }
+    submenuentry "Linux (MacBookPro11,x)" {
+        add_options "loglevel=5 acpi_osi="
+    }
+    submenuentry "Linux (Mac Generic Fix 1)" {
+        add_options "loglevel=5 acpi=force irqpoll noapic"
+    }
+    submenuentry "Linux (Mac Generic Fix 2)" {
+        add_options "loglevel=5 acpi=off"
+    }
+    submenuentry "Linux (Mac Generic Fix 3)" {
+        add_options "loglevel=5 acpi_osi=! acpi_osi="Darwin""
+    }
+    submenuentry "Linux (Mac Generic Fix 4)" {
+        add_options "loglevel=5 add_efi_memmap"
+    }
+    submenuentry "Linux (DEBUG)" {
+        add_options "loglevel=7 nomodeset"
     }
 }
 #UFD#menuentry "WindowsPE" {
diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg
index c36606f5..af388ed3 100644
--- a/.linux_items/include/syslinux/wk_sys.cfg
+++ b/.linux_items/include/syslinux/wk_sys.cfg
@@ -4,6 +4,6 @@ INCLUDE boot/syslinux/wk_sys_linux.cfg
 #UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 #UFD#INCLUDE boot/syslinux/1201_hdclone.cfg
 #UFD#INCLUDE boot/syslinux/1201_eset.cfg
-#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 
+#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg
index 55b5f239..b65047ad 100644
--- a/.linux_items/include/syslinux/wk_sys_linux.cfg
+++ b/.linux_items/include/syslinux/wk_sys_linux.cfg
@@ -6,26 +6,12 @@ ENDTEXT
 MENU LABEL Linux
 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% quiet copytoram loglevel=3
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3
 
-LABEL wk_linux_i3
+LABEL wk_sys_linux_extras
 TEXT HELP
-A live Linux environment (i3)
-  * HW diagnostics, file-based backups, data recovery, etc
+Show extra Linux options
 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% quiet copytoram loglevel=3 i3
-SYSAPPEND 3
-
-LABEL wk_linux_cli
-TEXT HELP
-A live Linux environment (CLI)
-  * HW diagnostics, file-based backups, data recovery, etc
-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
-SYSAPPEND 3
+MENU LABEL Linux (Extras)
+KERNEL vesamenu.c32
+APPEND boot/syslinux/wk_sys_linux_extras.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_linux_extras.cfg b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg
new file mode 100644
index 00000000..b27c7c9b
--- /dev/null
+++ b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg
@@ -0,0 +1,196 @@
+LABEL wk_linux
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux
+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)
+  * HW diagnostics, file-based backups, data recovery, etc
+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 loglevel=4 nox nomodeset
+SYSAPPEND 3
+
+LABEL wk_linux_mac_generic
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (Mac)
+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=5 reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_mac_cli
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (Mac 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 loglevel=5 nomodeset nox reboot=pci
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_linux_macbook52
+TEXT HELP
+A live Linux environment
+  * WARNING System will be limited to one CPU/thread
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBook5,2)
+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=5 acpi=off irqpoll maxcpus=1 noapic reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_macbook91
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBook9,1)
+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=5 intremap=nosid noacpi nomodeset reboot=pci
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_linux_macbookair52
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBookAir5,2)
+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=5 intremap=off reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_macbookair6_
+TEXT HELP
+A live Linux environment
+  * WARNING Drive I/O performance will be impacted
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBookAir6,x)
+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=5 libata.force=1:noncq reboot=pci
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_linux_macbookpro71
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBookPro7,1)
+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=5 acpi_osi=! acpi_osi="Darwin" intremap=off nomodeset reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_macbookpro10_
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBookPro10,x)
+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=5 noapic reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_macbookpro11_
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (MacBookPro11,x)
+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=5 acpi_osi= reboot=pci
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_linux_mac_misc1
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (Misc Mac Fix 1)
+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=5 acpi=force irqpoll noapic reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_mac_misc2
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (Misc Mac Fix 2)
+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=5 acpi=off reboot=pci
+SYSAPPEND 3
+
+LABEL wk_linux_mac_misc3
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (Misc Mac Fix 3)
+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=5 acpi_osi=! acpi_osi="Darwin" reboot=pci
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_linux_debug
+TEXT HELP
+A live Linux environment
+  * HW diagnostics, file-based backups, data recovery, etc
+ENDTEXT
+MENU LABEL Linux (DEBUG)
+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=7 nomodeset
+SYSAPPEND 3
+
+MENU SEPARATOR
+
+LABEL wk_return
+TEXT HELP
+Show Return to the main menu
+ENDTEXT
+MENU LABEL Main Menu
+KERNEL vesamenu.c32
+APPEND boot/syslinux/wk_sys.cfg