diff --git a/BoardConfig.mk b/BoardConfig.mk
index 92eb60e..7209207 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -121,3 +121,8 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 # inherit from the proprietary version
 include vendor/samsung/mondrianwifi/BoardConfigVendor.mk
+
+# TWRP Support - Optional
+ifeq ($(WITH_TWRP),true)
+-include $(DEVICE_PATH)/twrp.mk
+endif
diff --git a/recovery/root/etc/twrp.fstab b/recovery/root/etc/twrp.fstab
new file mode 100755
index 0000000..5c29bf8
--- /dev/null
+++ b/recovery/root/etc/twrp.fstab
@@ -0,0 +1,10 @@
+/efs  ext4 /dev/block/mmcblk0p11 flags=display="EFS";backup=1
+/boot emmc /dev/block/mmcblk0p14 flags=display="Boot";backup=1
+/data ext4 /dev/block/mmcblk0p26 flags=display=backup=1 
+/system ext4 /dev/block/mmcblk0p23 flags=display="System";backup=1
+/cache ext4 /dev/block/mmcblk0p24 flags=display="Cache";backup=1
+/recovery emmc /dev/block/mmcblk0p15 flags=display="Recovery";backup=1
+/misc emmc /dev/block/mmcblk0p16
+/fimware-modem vfat /dev/block/mmcblk0p2 flags=display="modem";backup=1
+/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable
+/usb-otg auto /dev/block/sda1 /dev/block/sda flags=display="USB-OTG";storage;wipeingui;removable
diff --git a/twrp.mk b/twrp.mk
index 09a6ab5..b564e50 100755
--- a/twrp.mk
+++ b/twrp.mk
@@ -21,10 +21,7 @@ TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/msm_dwc3/f9200000.dwc3/gadget/l
 TW_BRIGHTNESS_PATH := "/sys/devices/mdp.0/qcom\x2cmdss_fb_primary.191/leds/lcd-backlight/brightness"
 TW_DEFAULT_BRIGHTNESS := 162
 TW_HAS_DOWNLOAD_MODE := true
-TW_INCLUDE_CRYPTO := true
+TW_NO_REBOOT_BOOTLOADER := true
 TW_MAX_BRIGHTNESS := 255
 TW_MTP_DEVICE := "/dev/mtp_usb"
-TW_NO_EXFAT_FUSE := true
-TW_NO_LEGACY_PROPS := true
-TW_NO_REBOOT_BOOTLOADER := true
-TW_THEME := landscape_hdpi
+TW_THEME := portrait_hdpi