diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index f9dc704..e029881 100644
--- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -2,4 +2,4 @@ title   CachyOS x86_64 UEFI Default
 sort-key A
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
+options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf
deleted file mode 100644
index 9c23feb..0000000
--- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title   CachyOS x86_64 UEFI NVIDIA (Turing or newer (16/20xx))
-sort-key B
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes module_blacklist=pcspkr
diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg
index 3cb757f..1a07def 100644
--- a/archiso/grub/grub.cfg
+++ b/archiso/grub/grub.cfg
@@ -55,13 +55,7 @@ insmod ext2
 # Menu entries
 menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' {
     set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
-    initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-}
-
-menuentry "CachyOS with NVIDIA open-source module (latest cards only 16/20xx++)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' {
-    set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes module_blacklist=pcspkr
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 }
 
diff --git a/archiso/grub/loopback.cfg b/archiso/grub/loopback.cfg
index 51cc08e..f2ffdb2 100644
--- a/archiso/grub/loopback.cfg
+++ b/archiso/grub/loopback.cfg
@@ -31,13 +31,7 @@ insmod ext2
 # Menu entries
 menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' {
     set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
-    initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-}
-
-menuentry "CachyOS with NVIDIA closed-source Driver (latest cards only 900+)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' {
-    set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes module_blacklist=pcspkr
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 }
 
diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg
index e6a2ab0..bf2f46d 100644
--- a/archiso/syslinux/archiso_sys-linux.cfg
+++ b/archiso/syslinux/archiso_sys-linux.cfg
@@ -6,18 +6,7 @@ ENDTEXT
 MENU LABEL CachyOS default (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
 INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
-
-# Nvidia propritary (Non-Free)
-LABEL cos64nv
-TEXT HELP
-Boot the CachyOS install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS NO-LEGACY
-It allows you to install CachyOS or perform system maintenance.
-ENDTEXT
-MENU LABEL CachyOS NVIDIA (latest cards, x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
-APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
+APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
 
 # Fallback (nomodeset)
 LABEL cos64fb