diff --git a/recovery/root/etc/twrp.fstab b/recovery/root/etc/twrp.fstab
index b689bb0..1b2533a 100644
--- a/recovery/root/etc/twrp.fstab
+++ b/recovery/root/etc/twrp.fstab
@@ -1,16 +1,15 @@
-# TWRP defaults Crypto_Key_Location="footer", so no need to add flags=encryptable=footer to /data
+# mount_point   fstype    device                                             flags
+/system         ext4      /dev/block/bootdevice/by-name/system
+/data           ext4      /dev/block/bootdevice/by-name/userdata             flags=length=-16384
+/cache          ext4      /dev/block/bootdevice/by-name/cache
+/recovery       emmc      /dev/block/bootdevice/by-name/recovery             flags=backup=1
+/boot           emmc      /dev/block/bootdevice/by-name/boot
+/recovery       emmc      /dev/block/bootdevice/by-name/recovery
 
-# device                                 mount_point     fstype  mount_flags                             fs_flags    twrp_flags
-/dev/block/bootdevice/by-name/system     /system         ext4    defaults                                defaults
-/dev/block/bootdevice/by-name/userdata   /data           ext4    noatime,nosuid,nodev,noauto_da_alloc    defaults    twrp=length=-16384
-/dev/block/bootdevice/by-name/cache      /cache          ext4    noatime,nosuid,nodev                    defaults
-/dev/block/bootdevice/by-name/recovery   /recovery       emmc    defaults                                defaults
-/dev/block/bootdevice/by-name/boot       /boot           emmc    defaults                                defaults
-/dev/block/bootdevice/by-name/recovery   /recovery       emmc    defaults                                defaults    twrp=backup=1
+/factory        ext4      /dev/block/bootdevice/by-name/factory              flags=display="Factory";backup=1
+/firmware       vfat      /dev/block/bootdevice/by-name/modem                flags=display="Firmware";mounttodecrypt
+/persist        ext4      /dev/block/bootdevice/by-name/persist              flags=display="Persist";backup=1
 
-/dev/block/bootdevice/by-name/factory    /factory        ext4    defaults                                defaults    twrp=display="Factory";backup=1
-/dev/block/bootdevice/by-name/modem      /firmware       vfat    ro                                      defaults    twrp=display="Firmware";mounttodecrypt
-/dev/block/bootdevice/by-name/persist    /persist        ext4    defaults                                defaults    twrp=display="Persist";backup=1
+/sdcard1        auto      /dev/block/mmcblk1p1                               flags=twrp=display="MicroSD";storage;wipeingui;removable
+/usb-otg        auto      /dev/block/sda1                                    flags=twrp=display="USB OTG";storage;wipeingui;removable
 
-/dev/block/mmcblk1p1                     /sdcard1        auto    defaults                                defaults    twrp=display="MicroSD";storage;wipeingui;removable
-/dev/block/sda1                          /usb-otg        auto    defaults                                defaults    twrp=display="USB OTG";storage;wipeingui;removable