diff --git a/_amazon/amazonsoho.markdown b/_amazon/amazonsoho.markdown
index 4f469e3..68acade 100644
--- a/_amazon/amazonsoho.markdown
+++ b/_amazon/amazonsoho.markdown
@@ -61,9 +61,9 @@
 adb wait-for-device
 adb shell su -c 'mount -o remount,rw /system && rm /system/etc/install-recovery.sh && mount -o remount,ro /system'
 adb push recovery.img /sdcard/recovery.img
-adb shell su -c "dd if=/sdcard/recovery.img of=/dev/block/platform/omap_hsmmc.1/by-name/recovery"
+adb shell su -c "dd if=/sdcard/recovery.img of=/dev/block/platform/omap\_hsmmc.1/by-name/recovery"
 adb push exploit.img /sdcard/exploit.img
-adb shell su -c "dd if=/sdcard/exploit.img of=/dev/block/platform/omap_hsmmc.1/by-name/exploit"
+adb shell su -c "dd if=/sdcard/exploit.img of=/dev/block/platform/omap\_hsmmc.1/by-name/exploit"
 adb shell rm /sdcard/recovery.img /sdcard/exploit.img
 </pre>
 <p class="text">TWRP can now be accessed holding the volume down button when powering on the device</p>
diff --git a/_asus/rogphone2.markdown b/_asus/rogphone2.markdown
new file mode 100644
index 0000000..c6db88e
--- /dev/null
+++ b/_asus/rogphone2.markdown
@@ -0,0 +1,31 @@
+---
+layout: device
+title: "ASUS Rog Phone 2"
+codename: I001D
+oem: Asus
+downloadfolder: I001D
+supportstatus: Current
+maintainer: mauronofrio
+devicetree: https://github.com/TeamWin/android_device_asus_I001D
+xdathread: "https://forum.xda-developers.com/rog-phone-2/development/recovery-unofficial-twrp-recovery-asus-t4026801"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+<div class="page-heading">Installation</div>
+Please unlock your bootloader according to instructions documented <a href="https://www.xda-developers.com/asus-rog-phone-ii-bootloader-unlock-tool-kernel-source-code/">here</a>
+
+Next download twrp-3.3.1-x-I001D.img and do
+<pre>
+fastboot boot twrp-3.3.1-x-I001D.img
+</pre>
+
+This will allow you to install the permanent version. Download twrp-I001D-installer-3.3.1-x.zip and install it normally through the Install button in TWRP.
diff --git a/_includes/avb.html b/_includes/avb.html
new file mode 100644
index 0000000..6a49ee3
--- /dev/null
+++ b/_includes/avb.html
@@ -0,0 +1,3 @@
+<div class='page-heading'>This device uses Android Verified Boot (AVB)</div>
+<hr />
+<p class="text">This means that installing TWRP or swiping to allow system modifications will prevent you from being able to boot. To bypass AVB's boot prevention, you will have to disable it or install a custom ROM that ships with disabled AVB.</p>
diff --git a/_includes/fastbootabinstall.html b/_includes/fastbootabinstall.html
index b4988fd..6b25116 100644
--- a/_includes/fastbootabinstall.html
+++ b/_includes/fastbootabinstall.html
@@ -1,20 +1,22 @@
-<html>
 <div class='page-heading'>Installation:</div>
-If you already have TWRP installed:
-Download the latest zip and install the zip using TWRP.
+WARNING: If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
 
-If you do not already have TWRP installed:
-Download both the img and the zip. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader. Connect the device to your PC. Open a command window and run the following command from the proper location:
+<p class="text"><a href="https://developer.android.com/studio/releases/platform-tools">You will need the platform-tools from the Android SDK on your computer.</a> Download the platform-tools as per your operating system.</p>
 
-fastboot boot path/to/twrp.img
+Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="http://www.xda-developers.com/universal-naked-driver-solves-your-adb-driver-problems-on-windows/">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed
 
-This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
+Download the correct image file and copy the file into the same folder as your platform-tools as well as device's storage. Rename the image to twrp.img.
 
-<pre>
-adb push path/to/twrp.zip /
-</pre>
+Now reboot to fastboot/download/bootloader mode by using adb or manual key combos (Use Google to find that if you are not sure). To use adb to reboot, use the following command:
 
-Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
+<code>adb reboot bootloader</code>
 
-If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
-</html>
+Temporary boot the downloaded image using the following command:
+
+<code>fastboot boot twrp.img</code>
+
+Once booted, navigate to the Advanced > Install Recovery Ramdisk option. This will ask you to select the image you want to install TWRP from. Select the TWRP image you just downloaded and copied into device storage. Proceed to install this image.
+
+You also need to use the "Fix Recovery Bootloop" option present in the same Advanced Tab. Use that option after you have installed the recovery ramdisk successfully to avoid boot loops happening from installing TWRP Permanently.
+
+After this is done, you have successfully installed TWRP on your device.
diff --git a/_includes/fastbootabinstall_old.html b/_includes/fastbootabinstall_old.html
new file mode 100644
index 0000000..b4988fd
--- /dev/null
+++ b/_includes/fastbootabinstall_old.html
@@ -0,0 +1,20 @@
+<html>
+<div class='page-heading'>Installation:</div>
+If you already have TWRP installed:
+Download the latest zip and install the zip using TWRP.
+
+If you do not already have TWRP installed:
+Download both the img and the zip. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader. Connect the device to your PC. Open a command window and run the following command from the proper location:
+
+fastboot boot path/to/twrp.img
+
+This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
+
+<pre>
+adb push path/to/twrp.zip /
+</pre>
+
+Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
+
+If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
+</html>
diff --git a/_includes/fastbootinstall.html b/_includes/fastbootinstall.html
index 3b9c373..4e21892 100644
--- a/_includes/fastbootinstall.html
+++ b/_includes/fastbootinstall.html
@@ -3,8 +3,8 @@
 <div class='page-heading' id='fastboot-install'>Fastboot Install Method (No Root Required):</div>
 <a id='fastboot'></a>
 <hr />
-<p class="text"><a href="http://developer.android.com/sdk/index.html#linux-bundle-size">You will need the platform-tools from the Android SDK on your computer.</a> Find the Android command line tools section on the page linked and install the SDK tools package. From the SDK Manager, download only the platform-tools to get adb and fastboot binaries.</p>
-<p class="text">Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="http://www.xda-developers.com/universal-naked-driver-solves-your-adb-driver-problems-on-windows/">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed</p>
+<p class="text"><a href="https://developer.android.com/studio/releases/platform-tools">You will need the platform-tools from the Android SDK on your computer.</a> Download the platform-tools as per your operating system.</p>
+<p class="text">Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="https://forum.xda-developers.com/google-nexus-5/development/adb-fb-apx-driver-universal-naked-t2513339">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed</p>
 <p class="text">On your device, go into Settings -> About and find the Build Number and tap on it 7 times to enable developer settings. Press back and go into Developer Options and enable USB debugging. From your computer, open a command prompt and type:</p>
 <p class="code">adb reboot bootloader</p>
 <p class="text">You should now be in fastboot mode.</p>
@@ -12,8 +12,8 @@
 <p class="text">Your device needs to be unlocked before it can flash custom images. To unlock your device type:</p>
 <p class="code">{{ fastboot }} oem unlock</p>
 {% endif %}
-<p class="text">Download the correct image file and copy the file into the same folder as your adb and fastboot binaries. Rename the image to twrp.img and type:</p>
+<p class="text">Download the correct image file and copy the file into the same folder as your platform-tools. Rename the image to twrp.img and type:</p>
 <p class="code">{{ fastboot }} flash recovery twrp.img</p>
 <p class="code">{{ fastboot }} reboot</p>
-<p class="text">Note many devices will replace your custom recovery automatically during first boot. To prevent this, use <a href="http://www.google.com">Google</a> to find the proper key combo to enter recovery. After typing <span class="code">{{ fastboot }} reboot</span>, hold the key combo and boot to TWRP. Once TWRP is booted, TWRP will patch the stock ROM to prevent the stock ROM from replacing TWRP. If you don't follow this step, you will have to repeat the install.</p>
+<p class="text">Note many devices will replace your custom recovery automatically during first boot. To prevent this, use <a href="https://www.google.com">Google</a> to find the proper key combo to enter recovery. After typing <span class="code">{{ fastboot }} reboot</span>, hold the key combo and boot to TWRP. Once TWRP is booted, TWRP will patch the stock ROM to prevent the stock ROM from replacing TWRP. If you don't follow this step, you will have to repeat the install.</p>
 </html>
diff --git a/_includes/xiaomiunlock.html b/_includes/xiaomiunlock.html
index a8a4956..a754fc1 100644
--- a/_includes/xiaomiunlock.html
+++ b/_includes/xiaomiunlock.html
@@ -1,7 +1,7 @@
 <div class='page-heading'>Notes About Xiaomi Mi Devices:</div>
 <hr />
 <p class="text">
-Some Xiaomi Mi devices have bootloaders that require additional steps to unlock before you are able to flash custom images. This typically involves filling out an application to have your device unlocked.<br>
+Some Xiaomi Mi devices have bootloaders that require additional steps to unlock before you are able to flash custom images. This typically involves using MI Unlock Tool to apply & wait for certain time period to have your device unlocked.<br>
 You will need to follow the steps on Xiaomi's MIUI website in order to unlock your device.<br>
 Understand that unlocking your device will wipe all of your personal data, settings, and apps from its memory.
 </p>
diff --git a/_lyf/lyfpanda01a.markdown b/_lyf/lyfpanda01a.markdown
new file mode 100644
index 0000000..ca8a342
--- /dev/null
+++ b/_lyf/lyfpanda01a.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "LYF Water F1s"
+codename: panda01a
+downloadfolder: panda01a
+supportstatus: Current
+maintainer: Mohd Faraz
+devicetree: https://github.com/TeamWin/android_device_LYF_panda01a
+oem: Lyf
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_motorola/motorolamotoe4snapdragon.markdown b/_motorola/motorolamotoe4snapdragon.markdown
new file mode 100644
index 0000000..4e81d38
--- /dev/null
+++ b/_motorola/motorolamotoe4snapdragon.markdown
@@ -0,0 +1,32 @@
+---
+layout: device
+title:  "Motorola Moto E4 Snapdragon"
+codename: perry
+downloadfolder: perry
+supportstatus: Current
+maintainer: Jarl-Penguin
+oem: Motorola
+devicetree: https://github.com/TeamWin/android_device_motorola_perry
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include mtkinstall.html %}
+
+Read these instructions and follow them carefully.
+
+On your device, go into Settings -> About and find the Build Number and tap on it 7 times to enable developer settings. Press back and go into Developer Options and enable OEM unlocking.
+
+unlock bootloader and flash twrp
+
+fastboot oem unlock
+
+fastboot flash recovery twrp.img
diff --git a/_nokia/nokia6_1.markdown b/_nokia/nokia6_1.markdown
index 7772894..ce94cd8 100644
--- a/_nokia/nokia6_1.markdown
+++ b/_nokia/nokia6_1.markdown
@@ -14,33 +14,21 @@
 {% include supportstatus.html %}
 NOTE: Monthly security updates may break decrypt in TWRP.
 
+{% include dmverity.html %}
+
 {% include download.html %}
 
 <div class='page-heading'>Installation:</div>
-If you already have TWRP installed:
-Download the latest zip and install the zip using TWRP.
+WARNING: If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
 
-If you do not already have TWRP installed:
-Download both the img and the zip.You will need to have fastboot binaries and the correct drivers installed.
+To install TWRP permanently on your device, copy the downloaded image into your device's storage.
 
-You can grab latest platform-tools (fastboot binaries) from [here]https://developer.android.com/studio/releases/platform-tools
+Now reboot to fastboot/download mode by using adb or manual key combos (Volume down + Power). Temporary boot the downloaded image using the following command:
 
-Now go in the directory where your adb/fastboot binaries exists.Connect the device to your PC.Enable USB debugging in developer options & then open a command window and run the following command from the proper location: 
+<code>fastboot boot path/to/twrp.img</code>
 
-adb reboot bootloader
+Once booted, navigate to the Advanced > Install Recovery Ramdisk option. This will ask you to select the image you want to install TWRP from. Select the TWRP image you just downloaded and copied into device storage. Proceed to install this image.
 
-Your device should now be in the bootloader.
+You also need to use the "Fix Recovery Bootloop" option present in the same Advanced Tab. Use that option after you have installed the recovery ramdisk successfully to avoid boot loops happening from installing TWRP Permanently.
 
-Then again from command window run the following command from the proper location:
-
-fastboot boot path/to/twrp.img
-
-This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
-
-adb push path/to/twrp.zip /
-
-Even MTP is working you can also directly copy zip from your pc and paste to your device.
-
-Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
-
-If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
+After this is done, you have successfully installed TWRP on your device.
diff --git a/_nokia/nokia7.1.markdown b/_nokia/nokia7.1.markdown
new file mode 100644
index 0000000..9062916
--- /dev/null
+++ b/_nokia/nokia7.1.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Nokia 7.1"
+codename: CTL_sprout
+downloadfolder: CTL_sprout
+supportstatus: Current
+maintainer: Raghu Varma
+devicetree: https://github.com/TeamWin/android_device_nokia_CTL_sprout
+oem: Nokia
+xdathread: https://forum.xda-developers.com/nokia-7-1/development/twrp-3-2-3-0-team-win-recovery-project-t3935859
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_realme/realmex2.markdown b/_realme/realmex2.markdown
new file mode 100644
index 0000000..2cac883
--- /dev/null
+++ b/_realme/realmex2.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Realme X2"
+codename: RMX1991
+downloadfolder: RMX1991
+supportstatus: Current
+maintainer: Mauronofrio
+devicetree: https://github.com/TeamWin/android_device_realme_RMX1991
+oem: Realme
+xdathread: "https://forum.xda-developers.com/realme-x2/development/recovery-unofficial-twrp-realme-x2-t4011231"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_samsung/samsunggalaxys3internationalexynos.markdown b/_samsung/samsunggalaxys3internationalexynos.markdown
index bc4a6e8..f9b48d7 100644
--- a/_samsung/samsunggalaxys3internationalexynos.markdown
+++ b/_samsung/samsunggalaxys3internationalexynos.markdown
@@ -1,15 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S3 International Exynos"
+title:  "Samsung Galaxy S III (International Exynos)"
 codename: i9300
 downloadfolder: i9300
-oldurl: http://teamw.in/project/twrp2/114
-supportstatus: Not Current
-maintainer: None
+supportstatus: Current
+maintainer: ripee
 oem: Samsung
-ddof: "/dev/block/mmcblk0p6"
+ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_samsung_i9300"
-xdathread: "http://forum.xda-developers.com/galaxy-s3/orig-development/recovery-twrp-2-7-1-0-touch-recovery-t1943592"
+xdathread: "https://forum.xda-developers.com/galaxy-s3/orig-development/recovery-twrp-3-3-1-0-t4023605"
 ---
 
 {% include disclaimer.html %}
diff --git a/_xiaomi/xiaomimi9lite.markdown b/_xiaomi/xiaomimi9lite.markdown
new file mode 100644
index 0000000..f20173f
--- /dev/null
+++ b/_xiaomi/xiaomimi9lite.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Xiaomi Mi 9 Lite/CC9"
+codename: pyxis/vela
+downloadfolder: pyxis
+supportstatus: Current
+maintainer: Mauronofrio
+devicetree: https://github.com/TeamWin/android_device_xiaomi_pyxis
+oem: Xiaomi
+xdathread: "https://forum.xda-developers.com/mi-cc9/development/recovery-unofficial-twrp-xiaomi-mi-9-t4029705"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_xiaomi/xiaomimia2.markdown b/_xiaomi/xiaomimia2.markdown
index 5bda100..74056b3 100644
--- a/_xiaomi/xiaomimia2.markdown
+++ b/_xiaomi/xiaomimia2.markdown
@@ -21,4 +21,4 @@
 
 {% include twrpinstall.html %}
 
-{% include fastbootabinstall.html %}
+{% include fastbootabinstall_old.html %}
diff --git a/_xiaomi/xiaomimia3.markdown b/_xiaomi/xiaomimia3.markdown
new file mode 100644
index 0000000..20f3512
--- /dev/null
+++ b/_xiaomi/xiaomimia3.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Xiaomi Mi A3"
+codename: laurel_sprout
+downloadfolder: laurel_sprout
+supportstatus: Current
+maintainer: Nikesh001
+oem: Xiaomi
+devicetree: https://github.com/TeamWin/android_device_xiaomi_laurel_sprout
+xdathread: https://forum.xda-developers.com/mi-a3/development/recovery-unoffical-twrp-xiaomi-mi-a3-t3987759
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootabinstall.html %}
diff --git a/_xiaomi/xiaomiredmi8.markdown b/_xiaomi/xiaomiredmi8.markdown
new file mode 100644
index 0000000..8fcea55
--- /dev/null
+++ b/_xiaomi/xiaomiredmi8.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "Xiaomi Redmi 8"
+codename: olive
+downloadfolder: olive
+supportstatus: Current
+maintainer: oguzbakir
+devicetree: https://github.com/TeamWin/android_device_xiaomi_olive
+oem: Xiaomi
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_xiaomi/xiaomiredminote8pro.markdown b/_xiaomi/xiaomiredminote8pro.markdown
new file mode 100644
index 0000000..5a4db4a
--- /dev/null
+++ b/_xiaomi/xiaomiredminote8pro.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Xiaomi Redmi note 8 Pro"
+codename: begonia
+downloadfolder: begonia
+supportstatus: Current
+maintainer: theimpulson
+devicetree: https://github.com/TeamWin/android_device_redmi_begonia
+oem: Xiaomi
+xdathread: "https://forum.xda-developers.com/redmi-note-8-pro/development/recovery-twrp-3-3-1-0-touch-recovery-t4039691"
+---
+
+{% include disclaimer.html %}
+
+WARNING: This device hard bricks really easily for unknown reasons. Restoring device without spending real money is impossible as of now. Don't flash TWRP unless you are an advanced user who knows what he is doing.
+
+{% include supportstatus.html %}
+
+WARNING: Updates break data decryption support in this device's TWRP.
+
+{% include xiaomiunlock.html %}
+
+{% include download.html %}
+
+{% include avb.html %}
+
+{% include fastbootinstall.html %}