diff --git a/setup/ufd/EFI/Boot/refind.conf b/setup/ufd/EFI/Boot/refind.conf
index 0efc626f..413245a6 100644
--- a/setup/ufd/EFI/Boot/refind.conf
+++ b/setup/ufd/EFI/Boot/refind.conf
@@ -22,9 +22,15 @@ menuentry "Linux" {
     initrd /arch/boot/amd_ucode.img
     initrd /arch/boot/x86_64/initramfs-linux.img
     options "archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______  copytoram loglevel=3"
+    submenuentry "Linux (Safe Video)" {
+        add_options "nomodeset i915.modeset=0 nouveau.modeset=0"
+    }
     submenuentry "Linux (CLI)" {
         add_options "nox"
     }
+    submenuentry "Linux (CLI w/ Safe Video)" {
+        add_options "nox nomodeset i915.modeset=0 nouveau.modeset=0"
+    }
 }
 
 menuentry "MemTest86+" {
diff --git a/setup/ufd/syslinux/linux.cfg b/setup/ufd/syslinux/linux.cfg
index 53687799..7dadac83 100644
--- a/setup/ufd/syslinux/linux.cfg
+++ b/setup/ufd/syslinux/linux.cfg
@@ -8,14 +8,14 @@ LINUX /arch/boot/x86_64/vmlinuz-linux
 INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram loglevel=3
 
-LABEL wk_linux_cli
+LABEL wk_linux_safe
 TEXT HELP
-A live Linux environment (CLI)
+A live Linux environment (Safe Video)
   * HW diagnostics, file-based backups, data recovery, etc
 ENDTEXT
-MENU LABEL Linux (CLI)
+MENU LABEL Linux (Safe Video)
 LINUX /arch/boot/x86_64/vmlinuz-linux
 INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
-APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram nox
+APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram nomodeset i915.modeset=0 nouveau.modeset=0
 SYSAPPEND 3
 
diff --git a/setup/ufd/syslinux/memtest.cfg b/setup/ufd/syslinux/memtest.cfg
index 6fdb42d7..1ee456be 100644
--- a/setup/ufd/syslinux/memtest.cfg
+++ b/setup/ufd/syslinux/memtest.cfg
@@ -5,3 +5,4 @@ TEXT HELP
 Perform RAM diagnostics
 ENDTEXT
 LINUX memtest.bin
+APPEND nobigstatus nopause