diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall
index 0c1f98b..4db6864 100755
--- a/pikainstall/usr/lib/pika/pikainstall/pikainstall
+++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall
@@ -16,16 +16,16 @@ print("pikainstall " + version + ": PikaOS terminal installer! for " + dist + ".
 ### text files
 _REFIND_SETUP_FILE = """#!/usr/bin/bash
 touch /boot/refind_linux.conf
-echo '"'Boot with standard options'"'  '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} quiet splash ---'"'  > /boot/refind_linux.conf
-echo '"'Boot with logging'"'  '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} ---'"'  >>  /boot/refind_linux.conf
+echo '"'Boot with standard options'"'  '"'nowatchdog nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} quiet splash ---'"'  > /boot/refind_linux.conf
+echo '"'Boot with logging'"'  '"'nowatchdog nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} ---'"'  >>  /boot/refind_linux.conf
 echo '"'Boot with safe graphics'"'  '"'amd_pstate=active nowatchdog amd_prefcore=enable rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} nomodeset ---'"'  >>  /boot/refind_linux.conf
 """
 
 _REFIND_CRYPT_SETUP_FILE = """#!/usr/bin/bash
 touch /boot/refind_linux.conf
-echo '"'Boot with standard options'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} quiet splash ---'"'  > /boot/refind_linux.conf
-echo '"'Boot with logging'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} ---'"'  >>  /boot/refind_linux.conf
-echo '"'Boot with safe graphics'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} nomodeset ---'"'  >>  /boot/refind_linux.conf
+echo '"'Boot with standard options'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} rd.luks.options=discard nowatchdog nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} quiet splash ---'"'  > /boot/refind_linux.conf
+echo '"'Boot with logging'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} rd.luks.options=discard nowatchdog nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} ---'"'  >>  /boot/refind_linux.conf
+echo '"'Boot with safe graphics'"'  '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} rd.luks.options=discard amd_pstate=active nowatchdog amd_prefcore=enable rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} nomodeset ---'"'  >>  /boot/refind_linux.conf
 """
 
 _CRYPTTAB_ROOT_SETUP_FILE = """#!/usr/bin/bash