Merge "Add 404 page."
diff --git a/_htc/htcbolt10evo.markdown b/_htc/htcbolt10evo.markdown
index 215efb6..b6be42d 100644
--- a/_htc/htcbolt10evo.markdown
+++ b/_htc/htcbolt10evo.markdown
@@ -4,7 +4,7 @@
 codename: aca
 downloadfolder: aca
 supportstatus: Current
-maintainer: CaptainThrowback
+maintainer: None
 oem: HTC
 ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_htc_aca"
diff --git a/_htc/htcevo3dcdma.markdown b/_htc/htcevo3dcdma.markdown
index 663180d..cfb6002 100644
--- a/_htc/htcevo3dcdma.markdown
+++ b/_htc/htcevo3dcdma.markdown
@@ -4,8 +4,8 @@
 codename: shooter
 downloadfolder: shooter
 oldurl: http://teamw.in/project/twrp2/67
-supportstatus: Active
-maintainer: CaptainThrowback
+supportstatus: Current
+maintainer: None
 oem: HTC
 devicetree: https://github.com/TeamWin/android_device_htc_shooter
 xdathread: "http://forum.xda-developers.com/htc-evo-3d/cdma-development/recovery-twrp-touch-recovery-selinux-t3063642"
diff --git a/_htc/htconea9.markdown b/_htc/htconea9.markdown
index 5f91b34..dc41359 100644
--- a/_htc/htconea9.markdown
+++ b/_htc/htconea9.markdown
@@ -4,7 +4,7 @@
 codename: hiae
 downloadfolder: hiae
 supportstatus: Current
-maintainer: CaptainThrowback
+maintainer: None
 oem: HTC
 ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/teamwin/android_device_htc_hiae"
diff --git a/_htc/htconee8.markdown b/_htc/htconee8.markdown
index e293b2a..d19161c 100644
--- a/_htc/htconee8.markdown
+++ b/_htc/htconee8.markdown
@@ -4,7 +4,7 @@
 codename: e8
 downloadfolder: e8
 supportstatus: Current
-maintainer: CaptainThrowback
+maintainer: None
 oem: HTC
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_htc_e8"
diff --git a/_htc/htcuultra.markdown b/_htc/htcuultra.markdown
index 20256d9..19adf08 100644
--- a/_htc/htcuultra.markdown
+++ b/_htc/htcuultra.markdown
@@ -4,7 +4,7 @@
 codename: oce
 downloadfolder: oce
 supportstatus: Current
-maintainer: CaptainThrowback
+maintainer: None
 oem: HTC
 ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_htc_oce"
diff --git a/_huawei/huaweihonorview10.markdown b/_huawei/huaweihonorview10.markdown
new file mode 100644
index 0000000..bef3530
--- /dev/null
+++ b/_huawei/huaweihonorview10.markdown
@@ -0,0 +1,39 @@
+---
+layout: device
+title:  "Huawei Honor View 10"
+codename: berkeley
+downloadfolder: berkeley
+supportstatus: Current
+maintainer: Dees_Troy
+oem: Huawei
+devicetree: https://github.com/TeamWin/android_device_huawei_berkeley
+xdathread: "https://forum.xda-developers.com/honor-view-10/development/recovery-twrp-3-2-1-0-touch-recovery-t3752397"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+Note: Data cannot be decrypted in TWRP at this time. MTP also does not work, but you can still use adb to push and pull files.
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+<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">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>
+{% if page.fastbootunlock %}
+<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="code">{{ fastboot }} flash recovery_ramdisk 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>
diff --git a/_huawei/huaweimate10pro.markdown b/_huawei/huaweimate10pro.markdown
new file mode 100644
index 0000000..666ade5
--- /dev/null
+++ b/_huawei/huaweimate10pro.markdown
@@ -0,0 +1,39 @@
+---
+layout: device
+title:  "Huawei Mate 10 Pro"
+codename: blanc
+downloadfolder: blanc
+supportstatus: Current
+maintainer: Dees_Troy
+oem: Huawei
+devicetree: https://github.com/TeamWin/android_device_huawei_blanc
+xdathread: "https://forum.xda-developers.com/mate-10/development/recovery-twrp-3-2-1-0-touch-recovery-t3752399"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+Note: Data cannot be decrypted in TWRP at this time. MTP also does not work, but you can still use adb to push and pull files.
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+<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">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>
+{% if page.fastbootunlock %}
+<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="code">{{ fastboot }} flash recovery_ramdisk 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>
diff --git a/_leeco/leecolemax2.markdown b/_leeco/leecolemax2.markdown
index 3cba435..95d3813 100644
--- a/_leeco/leecolemax2.markdown
+++ b/_leeco/leecolemax2.markdown
@@ -4,10 +4,10 @@
 codename: x2
 downloadfolder: x2
 supportstatus: Current
-maintainer: deadman96385
+maintainer: ThEMarD
 oem: LeEco
 devicetree: https://github.com/TeamWin/android_device_leeco_x2
-xdathread: http://forum.xda-developers.com/le-max-2/development/recovery-twrp-3-0-2-0-unofficial-t3443611
+xdathread: https://forum.xda-developers.com/le-max-2/development/test-twrp-3-2-1-0-leeco-le-max-2-t3734209
 ---
 
 {% include disclaimer.html %}
diff --git a/_leeco/leecolepro3.markdown b/_leeco/leecolepro3.markdown
index 85231e1..8955a22 100644
--- a/_leeco/leecolepro3.markdown
+++ b/_leeco/leecolepro3.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
-title:  "LeEco Le Pro 3"
+title:  "LeEco Le Pro3"
 codename: zl1
 downloadfolder: zl1
 supportstatus: Current
-maintainer: jrior001
+maintainer: codeworkx
 oem: LeEco
 devicetree: https://github.com/TeamWin/android_device_leeco_zl1
 ---
diff --git a/_leeco/leecolepro3elite.markdown b/_leeco/leecolepro3elite.markdown
new file mode 100644
index 0000000..811fffb
--- /dev/null
+++ b/_leeco/leecolepro3elite.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "LeEco Le Pro3 Elite"
+codename: zl0
+downloadfolder: zl0
+supportstatus: Current
+maintainer: codeworkx
+oem: LeEco
+devicetree: https://github.com/TeamWin/android_device_leeco_zl0
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
diff --git a/_lg/lgg3europe.markdown b/_lg/lgg3europe.markdown
index 498ff13..c3ea913 100644
--- a/_lg/lgg3europe.markdown
+++ b/_lg/lgg3europe.markdown
@@ -5,7 +5,7 @@
 downloadfolder: d855
 oldurl: http://teamw.in/project/twrp2/262
 supportstatus: Current
-maintainer: Exodus,invisiblek
+maintainer: Exodus
 oem: LG
 devicetree: https://github.com/TeamWin/android_device_lge_d855
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
diff --git a/_lg/lgg4.markdown b/_lg/lgg4.markdown
index 1aab057..55fc574 100644
--- a/_lg/lgg4.markdown
+++ b/_lg/lgg4.markdown
@@ -16,8 +16,44 @@
 {% include supportstatus.html %}
 NOTE: You must unlock the bootloader first before installing TWRP!
 
+<div class='page-heading' id='unlock'>Unlock your device:</div>
+<hr />
+<p class="text">The recommended way is to use <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>FWUL - a simple adb/fastboot ISO</a> which has all drivers etc included and provides an easy and ready-to-use adb environment.</p>
+<p class="text">Consider a full backup in Download Mode with <a href="https://bit.do/SALTatXDA" target=_blank>SALT</a> first before you begin..</p>
+<p class="text">If you still want to use Windows <a href="http://developer.android.com/sdk/index.html#linux-bundle-size">you will need the platform-tools from the Android SDK</a> on your computer. 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 also need proper drivers installed on their computer. You can try 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="http://www.koushikdutta.com/post/universal-adb-driver">Universal ADB drivers</a> if you don't already have a working driver installed</p>
+<p class="text">Your device needs to be officially unlocked by LG before it can flash custom images! (Hint: There is a <b>completely unsupported method</b> available for locked devices here: <a href="https://forum.xda-developers.com/g4/development/locked-twrpinfish-locked-g4-devices-t3573048">TWRP-in-FIsH for all locked G4 devices like: H810, H812, H818, ...</a>)</p>
+<p class="text">To unlock your device you have to go to: <a href="http://developer.lge.com/resource/mobile/RetrieveBootloader.dev" target=_blank>http://developer.lge.com</a> and follow all steps there to get and flash your LG unlock binary onece received. You can NOT proceed without completing this step!</p>
+
 {% include appinstall.html %}
 
+<div class='page-heading' id='fastboot-install-lpmm'>Fastboot Installation Method (LP/MM bootloader - for N bootloader scroll down!):</div>
+<hr />
+<p class="text">This method works <b>only</b> when you have a <b>Lollipop or Marshmallow</b> bootloader / ROM installed! If you have flashed <b>Nougat</b> scroll down to the next topic!</p>
+<p class="text">TWRP requires an unlocked device - read the above topic and ensure you have your device unlocked and <b>adb/fastboot</b> ready (read above topic if not)!</p>
+<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="code">fastboot boot twrp.img</p>
+<p class="text">This will boot up TWRP but for the moment in <i>memory</i> only. To complete the installation and making it persistent:</p>
+<p class="text">Copy the twrp.img to your device <u>while still in twrp</u> (e.g. with a file explorer or by typing <i>adb push twrp.img /sdcard</i>)</p>
+<p class="text">Flash the twrp.img with the twrp GUI to the <b>recovery(!)</b> partition (choose the button at the bottom named <b>'Image'</b> to display the copied image)</p>
+<p class="text">Android would <b>overwrite</b> TWRP on boot so: you need to boot TWRP once again <b>NOW</b>: Choose Reboot -> <b>Recovery</b><br />
+or on your PC type: <i><b>adb reboot recovery</b></i></p>
+<p class="text">If you see TWRP afterwards then you are safe to use the key combo described in the next topic. If NOT: <b>RE-DO all steps!</b> DO <b>NOT</b> USE THE KEY COMBO described in the next topic until the reboot into recovery worked!</p>
+
+<div class='page-heading' id='fastboot-install-n'>Fastboot Installation Method (N bootloader - for LP/MM bootloader scroll up!):</div>
+<hr />
+<p class="text">This method works <b>only</b> when you have a <b>Nougat</b> bootloader / ROM installed! If you have flashed <b>Lollipop or Marshmallow</b> scroll up to the previous topic!</p>
+<p class="text">Consider a full backup with <a href="https://bit.do/SALTatXDA" target=_blank>SALT</a> first before you begin..</p>
+<p class="text">TWRP requires an unlocked device - read the above topic and ensure you have your device unlocked and <b>adb/fastboot</b> ready (read above topic if not)!</p>
+<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="code">fastboot flash recovery twrp.img</p>
+<p class="text">There is no 100% way to verify your TWRP installation on the N bootloader so you have to take the risk (did you made a SALT backup before?) but ensure you follow this next step briefly:</p>
+<p class="text">Take out the battery and disconnect the USB cable. Now follow the topic: <i><b>Boot into TWRP with a key combination</b></i> (as you can not verify the TWRP installation just do it). If you skip this step and boot into Android before doing this TWRP will be overwritten by Android so it is <b>crucial</b> important to do this step above <b>directly after flashing TWRP</b>!! if you miss it you will have to flash TWRP <b>again!</b></p>
+<p class="text">If all went well TWRP should boot up.</p>
+<p class="text">Android would <b>overwrite</b> TWRP on boot so: you need to boot TWRP once again <b>NOW</b>: Choose Reboot -> <b>Recovery</b><br />
+or on your PC type: <i><b>adb reboot recovery</b></i></p>
+<p class="text">If you see TWRP afterwards again then you are safe to use the key combo described in the next topic. If NOT: <b>RE-DO all steps!</b> DO <b>NOT</b> USE THE KEY COMBO described in the next topic until the reboot into recovery worked!</p>
+
 <div class='page-heading'>Download Links:</div>
 <hr />
 <p class="text">LG G4 (any model):</p>
@@ -31,26 +67,6 @@
 {% endfor %}
 </ul>
 
-<div class='page-heading' id='unlock'>Unlock your device:</div>
-<hr />
-<p class="text">The recommended way is to use <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>FWUL - a simple adb/fastboot ISO</a> which has all drivers etc included and provides an easy and ready-to-use adb environment.</p>
-<p class="text">If you still want to use Windows <a href="http://developer.android.com/sdk/index.html#linux-bundle-size">you will need the platform-tools from the Android SDK</a> on your computer. 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 also need proper drivers installed on their computer. You can try 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="http://www.koushikdutta.com/post/universal-adb-driver">Universal ADB drivers</a> if you don't already have a working driver installed</p>
-<p class="text">Your device needs to be officially unlocked by LG before it can flash custom images! (Hint: There is a <b>completely unsupported method</b> available for locked devices here: <a href="https://forum.xda-developers.com/g4/development/locked-twrpinfish-locked-g4-devices-t3573048">TWRP-in-FIsH for all locked G4 devices like: H810, H812, H818, ...</a>)</p>
-<p class="text">To unlock your device you have to go to: <a href="http://developer.lge.com/resource/mobile/RetrieveBootloader.dev" target=_blank>http://developer.lge.com</a> and follow all steps there to get and flash your LG unlock binary onece received. You can NOT proceed without completing this step!</p>
-
-<div class='page-heading' id='fastboot-install'>Fastboot Installation Method (RECOMMENDED method! No Root Required):</div>
-<hr />
-<p class="text">TWRP requires an unlocked device - read the above topic and ensure you have your device unlocked and <b>adb/fastboot</b> ready (read above topic if not)!</p>
-<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="code">fastboot boot twrp.img</p>
-<p class="text">This will boot up TWRP but for the moment in memory only. To complete the installation and making it persistent:</p>
-<p class="text">Copy the twrp.img to your device while still in twrp (e.g. with a file explorer or by typing <i>adb push twrp.img /sdcard</i>)</p>
-<p class="text">Flash the twrp.img with the twrp GUI to the recovery(!) partition (choose the button at the bottom named <b>'Image'</b> to display the copied image)</p>
-<p class="text">It is highly recommended to verify your TWRP installation by booting into Android <b>NOW</b>. When Android is booted up execute: <i><b>adb reboot recovery</b></i><br />
-or in an Android terminal app just execute: <i><b>reboot recovery</b></i></p>
-<p class="text">If you see TWRP afterwards then you are safe to use the key combo described in the next topic. If NOT: <b>RE-DO all steps!</b> DO <b>NOT</b> USE THE KEY COMBO described in the next topic until the reboot into recovery worked!</p>
-
 <div class='page-heading'>Boot into TWRP with a key combination:</div>
 <hr />
 <p class="text">Ensure you have validated the TWRP installation first! Check the above topic and proceed when verification was successful <b>only</b>!<p>
diff --git a/_meizu/m1721.markdown b/_meizu/m1721.markdown
new file mode 100644
index 0000000..12d6fa4
--- /dev/null
+++ b/_meizu/m1721.markdown
@@ -0,0 +1,16 @@
+---
+layout: device
+title: "Meizu M6 Note"
+codename: m1721
+downloadfolder: m1721
+supportstatus: Current
+maintainer: aiden09
+oem: Meizu
+devicetree: https://github.com/TeamWin/android_device_meizu_m1721
+---
+
+{% include disclaimer.html %}
+{% include supportstatus.html %}
+{% include appinstall.html %}
+{% include download.html %}
+{% include twrpinstall.html %}
diff --git a/_motorola/motorolamotoz2force.markdown b/_motorola/motorolamotoz2force.markdown
new file mode 100644
index 0000000..f1af177
--- /dev/null
+++ b/_motorola/motorolamotoz2force.markdown
@@ -0,0 +1,29 @@
+---
+layout: device
+title:  "Motorola Moto Z2 Force"
+codename: nash
+downloadfolder: nash
+devicetree: https://github.com/TeamWin/android_device_motorola_nash
+supportstatus: Current
+maintainer: kaneawk, erfanoabdi
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.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.
+
+If you do not already have TWRP installed:
+Download both the img and the zip. Copy the zip to your device. 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. If you are using a lockscreen pin/pattern/password and do not get prompted to enter your password, reboot to the bootloader and try again. 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 firmware for your device and reflash the boot image.
diff --git a/_nubia/nubianx511j.markdown b/_nubia/nubianx511j.markdown
new file mode 100644
index 0000000..b796d04
--- /dev/null
+++ b/_nubia/nubianx511j.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Nubia ZTE Z9 mini"
+codename: nx511j
+downloadfolder: nx511j
+supportstatus: Current
+maintainer: TTTT555
+oem: Nubia
+devicetree: https://github.com/TeamWin/android_device_nubia_nx511j
+4pdathread: http://4pda.ru/forum/index.php?s=&showtopic=702119&view=findpost&p=69744779
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
diff --git a/_nvidia/nvidiahshieldandroidtv.markdown b/_nvidia/nvidiahshieldandroidtv.markdown
index 54875a6..1d4c08c 100644
--- a/_nvidia/nvidiahshieldandroidtv.markdown
+++ b/_nvidia/nvidiahshieldandroidtv.markdown
@@ -6,7 +6,7 @@
 supportstatus: Current
 maintainer: webgeek1234
 oem: NVidia
-devicetree: https://github.com/TeamWin/android_device_nvidia_foster
+devicetree: https://github.com/LineageOS/android_device_nvidia_foster
 xdathread: http://forum.xda-developers.com/shield-tv/development/recovery-twrp-shield-android-tv-t3510456
 ---
 
diff --git a/_nvidia/nvidiahshieldportable.markdown b/_nvidia/nvidiahshieldportable.markdown
index 682e296..561f6e6 100644
--- a/_nvidia/nvidiahshieldportable.markdown
+++ b/_nvidia/nvidiahshieldportable.markdown
@@ -6,7 +6,7 @@
 supportstatus: Current
 maintainer: webgeek1234
 oem: NVidia
-devicetree: https://github.com/TeamWin/android_device_nvidia_roth
+devicetree: https://github.com/LineageOS/android_device_nvidia_roth
 ddof: "/dev/block/platform/sdhci-tegra.3/by-name/SOS"
 xdathread: http://forum.xda-developers.com/nvidia-shield/development/recovery-twrp-shield-portable-t3390017
 ---
diff --git a/_nvidia/nvidiahshieldtablet.markdown b/_nvidia/nvidiahshieldtablet.markdown
index fb373c6..c1bacb6 100644
--- a/_nvidia/nvidiahshieldtablet.markdown
+++ b/_nvidia/nvidiahshieldtablet.markdown
@@ -6,7 +6,7 @@
 supportstatus: Current
 maintainer: webgeek1234
 oem: NVidia
-devicetree: https://github.com/TeamWin/android_device_nvidia_shieldtablet
+devicetree: https://github.com/LineageOS/android_device_nvidia_shieldtablet
 ddof: "/dev/block/platform/sdhci-tegra.3/by-name/SOS"
 xdathread: http://forum.xda-developers.com/shield-tablet/orig-development/recovery-twrp-2-8-7-0-touch-recovery-t3257172
 ---
diff --git a/_oneplus/oneplus3t.markdown b/_oneplus/oneplus3t.markdown
deleted file mode 100644
index e39720f..0000000
--- a/_oneplus/oneplus3t.markdown
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: device
-title: "OnePlus 3T"
-codename: oneplus3t
-oem: OnePlus
-downloadfolder: oneplus3t
-supportstatus: Current
-maintainer: jcadduono
-ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_oneplus_oneplus3t
-xdathread: "https://forum.xda-developers.com/oneplus-3t/development/recovery-twrp-oneplus-3t-t3507308"
-fastbootunlock: true
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include dmverity.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include fastbootinstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_oneplus/oneplusthree.markdown b/_oneplus/oneplusthree.markdown
index e3e693d..33ea3fa 100644
--- a/_oneplus/oneplusthree.markdown
+++ b/_oneplus/oneplusthree.markdown
@@ -1,14 +1,14 @@
 ---
 layout: device
-title: "OnePlus 3"
+title: "OnePlus 3/3T"
 codename: oneplus3
 oem: OnePlus
 downloadfolder: oneplus3
 supportstatus: Current
-maintainer: jcadduono
+maintainer: dianlujitao
 ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
 devicetree: https://github.com/TeamWin/android_device_oneplus_oneplus3
-xdathread: "https://forum.xda-developers.com/oneplus-3/development/recovery-official-twrp-oneplus-3-t3539129"
+xdathread: "https://forum.xda-developers.com/oneplus-3/oneplus-3--3t-cross-device-development/recovery-official-twrp-touch-recovery-t3742894"
 fastbootunlock: true
 ---
 
diff --git a/_samsung/samsunggalaxya32016exynos.markdown b/_samsung/samsunggalaxya32016exynos.markdown
new file mode 100644
index 0000000..7db2721
--- /dev/null
+++ b/_samsung/samsunggalaxya32016exynos.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Samsung Galaxy A3 2016 (Exynos)"
+codename: a3xelte
+downloadfolder: a3xelte
+supportstatus: Current
+maintainer: Stricted
+devicetree: "https://github.com/TeamWin/android_device_samsung_a3xelte"
+oem: Samsung
+ddof: "/dev/block/platform/13540000.dwmmc0/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxya52016exynos.markdown b/_samsung/samsunggalaxya52016exynos.markdown
new file mode 100644
index 0000000..73a64f3
--- /dev/null
+++ b/_samsung/samsunggalaxya52016exynos.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Samsung Galaxy A5 2016 (Exynos)"
+codename: a5xelte
+downloadfolder: a5xelte
+supportstatus: Current
+maintainer: Stricted
+devicetree: "https://github.com/TeamWin/android_device_samsung_a5xelte"
+oem: Samsung
+ddof: "/dev/block/platform/13540000.dwmmc0/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxya72016exynos.markdown b/_samsung/samsunggalaxya72016exynos.markdown
new file mode 100644
index 0000000..1d6675a
--- /dev/null
+++ b/_samsung/samsunggalaxya72016exynos.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Samsung Galaxy A7 2016 (Exynos)"
+codename: a7xelte
+downloadfolder: a7xelte
+supportstatus: Current
+maintainer: Stricted
+devicetree: "https://github.com/TeamWin/android_device_samsung_a7xelte"
+oem: Samsung
+ddof: "/dev/block/platform/13540000.dwmmc0/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxyj7exynos.markdown b/_samsung/samsunggalaxyj7exynos.markdown
index 1ad1b37..0d2e1b1 100644
--- a/_samsung/samsunggalaxyj7exynos.markdown
+++ b/_samsung/samsunggalaxyj7exynos.markdown
@@ -1,10 +1,11 @@
 ---
 layout: device
-title:  "Samsung Galaxy J7 Exynos SM-J700"
+title: "Samsung Galaxy J7 Exynos SM-J700"
 codename: j7elte
 downloadfolder: j7elte
 supportstatus: Current
-maintainer: Dees_Troy
+maintainer: Stricted
+devicetree: "https://github.com/TeamWin/android_device_samsung_j7elte"
 oem: Samsung
 ddof: "/dev/block/platform/13540000.dwmmc0/by-name/RECOVERY"
 ---
diff --git a/_samsung/samsunggalaxynote3qualcomm.markdown b/_samsung/samsunggalaxynote3qualcomm.markdown
index 8838bc8..76bd3e7 100644
--- a/_samsung/samsunggalaxynote3qualcomm.markdown
+++ b/_samsung/samsunggalaxynote3qualcomm.markdown
@@ -1,15 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy Note 3 Qualcomm"
+title:  "Samsung Galaxy Note 3 (Americas, China, Europe & Korea)"
 codename: hlte
-downloadfolder: "Europe &amp; Americas (SM-N9005, SM-N900A, SM-N900W8, SM-N900T, SM-N900R4, SM-N900P, SM-N900V)|hlte|Korea (SM-N900K, SM-N900L, SM-N900S)|hlteskt|Japan (SCL22, SC-01F)|hltekdi"
-oldurl: http://teamw.in/project/twrp2/202
+downloadfolder: "Americas, Korea &amp; Europe (SM-N9005/hltexx, SM-N900K/hltekor, SM-N900L/hltekor, SM-N900P/hltespr, SM-N900R4/hlteusc, SM-N900S/hltekor, SM-N900T/hltetmo, SM-N900V/hltevzw, SM-N900W8/hltecan):|hlte|Japan (SCL22, SC-01F)|hltekdi"
 supportstatus: Current
-maintainer: jcadduono
+maintainer: ripee
 oem: Samsung
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_samsung_hlte"
-xdathread: "http://forum.xda-developers.com/showthread.php?t=2494245"
+xdathread: "https://forum.xda-developers.com/galaxy-note-3/development/recovery-twrp-3-2-1-1-t3746760"
 ---
 
 {% include disclaimer.html %}
@@ -22,7 +21,7 @@
 
 <div class='page-heading'>Download Links:</div>
 <hr />
-<p class="text">Europe &amp; Americas (SM-N9005, SM-N900A, SM-N900W8, SM-N900T, SM-N900R4, SM-N900P, SM-N900V):</p>
+<p class="text">Americas, Europe &amp; Korea (SM-N9005/hltexx, SM-N900K/hltekor, SM-N900L/hltekor, SM-N900P/hltespr, SM-N900R4/hlteusc, SM-N900S/hltekor, SM-N900T/hltetmo, SM-N900V/hltevzw, SM-N900W8/hltecan):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
@@ -32,11 +31,11 @@
   </li>
 {% endfor %}
 </ul>
-<p class="text">Korea (SM-N900K, SM-N900L, SM-N900S):</p>
+<p class="text">China (SM-N9006/hltechn):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
-    <a href="{{ mirror.baseurl }}hlteskt">
+    <a href="{{ mirror.baseurl }}hltechn">
       {{ mirror.description }}
     </a>
   </li>
@@ -57,4 +56,4 @@
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys3internationallte.markdown b/_samsung/samsunggalaxys3internationallte.markdown
index 54c85e6..1dd33aa 100644
--- a/_samsung/samsunggalaxys3internationallte.markdown
+++ b/_samsung/samsunggalaxys3internationallte.markdown
@@ -1,13 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S3 International LTE"
+title:  "Samsung Galaxy S III (International LTE)"
 codename: i9305
 downloadfolder: i9305
-oldurl: http://teamw.in/project/twrp2/145
 supportstatus: Current
-maintainer: None
+maintainer: ripee
 oem: Samsung
-ddof: "/dev/block/mmcblk0p9"
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_i9305"
+xdathread: "https://forum.xda-developers.com/galaxy-s3/development-i9305/recovery-twrp-3-2-1-0-t3741413"
 ---
 
 {% include disclaimer.html %}
@@ -22,4 +23,4 @@
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys4internationalqualcomm.markdown b/_samsung/samsunggalaxys4internationalqualcomm.markdown
index 55d5490..c8943e2 100644
--- a/_samsung/samsunggalaxys4internationalqualcomm.markdown
+++ b/_samsung/samsunggalaxys4internationalqualcomm.markdown
@@ -1,14 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S4 International Qualcomm"
+title:  "Samsung Galaxy S4 (GT-I9505/G, SGH-M919)"
 codename: jfltexx
 downloadfolder: jfltexx
-oldurl: http://teamw.in/project/twrp2/182
 supportstatus: Current
-maintainer: None
+maintainer: ripee
 oem: Samsung
-ddof: "/dev/block/mmcblk0p21"
+ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_samsung_jfltexx"
+xdathread: "https://forum.xda-developers.com/galaxy-s4/i9505-orig-develop/recovery-twrp-3-2-1-0-t3742880"
 ---
 
 {% include disclaimer.html %}
@@ -23,4 +23,4 @@
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys4mini3gxx.markdown b/_samsung/samsunggalaxys4mini3gxx.markdown
new file mode 100644
index 0000000..f88f574
--- /dev/null
+++ b/_samsung/samsunggalaxys4mini3gxx.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy S4 Mini (International 3G)"
+codename: serrano3gxx
+downloadfolder: serrano3gxx
+supportstatus: Current
+maintainer: ripee
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_serrano3gxx"
+xdathread: "https://forum.xda-developers.com/galaxy-s4-mini/orig-development/recovery-twrp-3-2-1-0-t3736888"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys4minidsdd.markdown b/_samsung/samsunggalaxys4minidsdd.markdown
new file mode 100644
index 0000000..b03f494
--- /dev/null
+++ b/_samsung/samsunggalaxys4minidsdd.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy S4 Mini (International Dual SIM)"
+codename: serranodsdd
+downloadfolder: serranodsdd
+supportstatus: Current
+maintainer: ripee
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_serranodsdd"
+xdathread: "https://forum.xda-developers.com/galaxy-s4-mini/orig-development/recovery-twrp-3-2-1-0-t3736888"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys4minilte.markdown b/_samsung/samsunggalaxys4minilte.markdown
new file mode 100644
index 0000000..73c31df
--- /dev/null
+++ b/_samsung/samsunggalaxys4minilte.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy S4 Mini (International LTE)"
+codename: serranoltexx
+downloadfolder: serranoltexx
+supportstatus: Current
+maintainer: ripee
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_serranoltexx"
+xdathread: "https://forum.xda-developers.com/galaxy-s4-mini/orig-development/recovery-twrp-3-2-1-0-t3736888"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxytabs297ltexx2015.markdown b/_samsung/samsunggalaxytabs297ltexx2015.markdown
index 2c10454..106e49c 100644
--- a/_samsung/samsunggalaxytabs297ltexx2015.markdown
+++ b/_samsung/samsunggalaxytabs297ltexx2015.markdown
@@ -1,6 +1,6 @@
 ---
 layout: device
-title: "Samsung Galaxy Tab S2 9.7 2015 (Wi-Fi)"
+title: "Samsung Galaxy Tab S2 9.7 2015 (LTE)"
 codename: gts210ltexx
 downloadfolder: gts210ltexx
 supportstatus: Current
diff --git a/_sony/sonyxperiatabletzlte.markdown b/_sony/sonyxperiatabletzlte.markdown
new file mode 100644
index 0000000..b970ae7
--- /dev/null
+++ b/_sony/sonyxperiatabletzlte.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Sony Xperia Tablet Z LTE"
+codename: pollux
+downloadfolder: pollux
+supportstatus: Current
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_pollux
+oem: Sony
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-tablet-z/orig-development/ub-twrp-v3-2-1-xperia-tablet-z-t3735110"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include fotakernelnote.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_sony/sonyxperiaztablet.markdown b/_sony/sonyxperiatabletzwifi.markdown
similarity index 62%
rename from _sony/sonyxperiaztablet.markdown
rename to _sony/sonyxperiatabletzwifi.markdown
index 1588af8..20d36bd 100644
--- a/_sony/sonyxperiaztablet.markdown
+++ b/_sony/sonyxperiatabletzwifi.markdown
@@ -1,15 +1,14 @@
 ---
 layout: device
-title:  "Sony Xperia Z Tablet"
+title:  "Sony Xperia Tablet Z Wi-Fi"
 codename: pollux_windy
 downloadfolder: pollux_windy
-oldurl: http://teamw.in/project/twrp2/185
 supportstatus: Current
-maintainer: Dees_Troy
+maintainer: CyberWalkMaN
 devicetree: https://github.com/TeamWin/android_device_sony_pollux_windy.git
 oem: Sony
-xdathread: "http://forum.xda-developers.com/showthread.php?t=2413289"
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-tablet-z/orig-development/ub-twrp-v3-2-1-xperia-tablet-z-t3735110"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiaz.markdown b/_sony/sonyxperiaz.markdown
index d5dcd96..e6e9345 100644
--- a/_sony/sonyxperiaz.markdown
+++ b/_sony/sonyxperiaz.markdown
@@ -3,12 +3,12 @@
 title:  "Sony Xperia Z"
 codename: yuga
 downloadfolder: yuga
-oldurl: http://teamw.in/project/twrp2/187
 supportstatus: Current
-maintainer: Dees_Troy
-devicetree: https://github.com/TeamWin/android_device_sony_yuga.git
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_yuga
 oem: Sony
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-z/orig-development/ub-twrp-v3-2-1-xperia-z-t3735098"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiazl.markdown b/_sony/sonyxperiazl.markdown
index d99cac3..a0bdd0e 100644
--- a/_sony/sonyxperiazl.markdown
+++ b/_sony/sonyxperiazl.markdown
@@ -4,10 +4,11 @@
 codename: odin
 downloadfolder: odin
 supportstatus: Current
-maintainer: humberos
-devicetree: https://github.com/TeamWin/android_device_sony_odin.git
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_odin
 oem: Sony
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-zl/orig-development/ub-twrp-v3-2-1-xperia-zl-t3720156"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiazr.markdown b/_sony/sonyxperiazr.markdown
index 5ed01ca..a023b1b 100644
--- a/_sony/sonyxperiazr.markdown
+++ b/_sony/sonyxperiazr.markdown
@@ -4,11 +4,11 @@
 codename: dogo
 downloadfolder: dogo
 supportstatus: Current
-maintainer: Chippa_a
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_dogo
 oem: Sony
-devicetree: https://github.com/TeamWin/android_device_sony_dogo.git
-xdathread: "http://forum.xda-developers.com/showthread.php?t=3317670"
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-zr/orig-development/ub-twrp-v3-2-1-xperia-zr-t3744868"
 ---
 
 {% include disclaimer.html %}
diff --git a/_xiaomi/xiaomiredmi3s.markdown b/_xiaomi/xiaomiredmi3s.markdown
index 5b51c0f..c54aaf8 100644
--- a/_xiaomi/xiaomiredmi3s.markdown
+++ b/_xiaomi/xiaomiredmi3s.markdown
@@ -8,6 +8,7 @@
 devicetree: https://github.com/TeamWin/android_device_xiaomi_land.git
 oem: Xiaomi
 ddof: "/dev/block/bootdevice/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/xiaomi-redmi-3s/development/recovery-twrp-3-1-0-0-xiaomi-redmi-3s-t3585945"
 ---
 
 {% include disclaimer.html %}
diff --git a/_xiaomi/xiaomiredmi4a.markdown b/_xiaomi/xiaomiredmi4a.markdown
index 909c9aa..13dd906 100644
--- a/_xiaomi/xiaomiredmi4a.markdown
+++ b/_xiaomi/xiaomiredmi4a.markdown
@@ -8,6 +8,7 @@
 devicetree: https://github.com/TeamWin/android_device_xiaomi_rolex.git
 oem: Xiaomi
 ddof: "/dev/block/bootdevice/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/redmi-4a/development/recovery-twrp-3-1-0-0-xiaomi-redmi-4a-t3576024"
 ---
 
 {% include disclaimer.html %}
diff --git a/_xiaomi/xiaomiredmi5a.markdown b/_xiaomi/xiaomiredmi5a.markdown
new file mode 100644
index 0000000..0ce8184
--- /dev/null
+++ b/_xiaomi/xiaomiredmi5a.markdown
@@ -0,0 +1,30 @@
+---
+layout: device
+title:  "Xiaomi Redmi 5A"
+codename: riva
+downloadfolder: riva
+supportstatus: Current
+maintainer: Darshan M. (darshan1205)
+devicetree: https://github.com/TeamWin/android_device_xiaomi_riva.git
+oem: Xiaomi
+ddof: "/dev/block/bootdevice/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/android/development/recovery-twrp-3-1-1-0-xiaomi-redmi-5a-t3712243"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_xiaomi/xiaomiredminote5a.markdown b/_xiaomi/xiaomiredminote5a.markdown
new file mode 100644
index 0000000..7817140
--- /dev/null
+++ b/_xiaomi/xiaomiredminote5a.markdown
@@ -0,0 +1,30 @@
+---
+layout: device
+title:  "Xiaomi Redmi Note 5A or Xiaomi Redmi Y1 Lite"
+codename: ugglite
+downloadfolder: ugglite
+supportstatus: Current
+maintainer: Darshan M. (darshan1205)
+devicetree: https://github.com/TeamWin/android_device_xiaomi_ugglite.git
+oem: Xiaomi
+ddof: "/dev/block/bootdevice/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/android/development/recovery-twrp-3-1-1-0-xiaomi-redmi-note-t3710142"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_xiaomi/xiaomiredminote5aprime.markdown b/_xiaomi/xiaomiredminote5aprime.markdown
new file mode 100644
index 0000000..e14f308
--- /dev/null
+++ b/_xiaomi/xiaomiredminote5aprime.markdown
@@ -0,0 +1,30 @@
+---
+layout: device
+title:  "Xiaomi Redmi Note 5A or Xiaomi Redmi Y1"
+codename: ugg
+downloadfolder: ugg
+supportstatus: Current
+maintainer: Darshan M. (darshan1205)
+devicetree: https://github.com/TeamWin/android_device_xiaomi_ugg.git
+oem: Xiaomi
+ddof: "/dev/block/bootdevice/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/android/development/recovery-twrp-3-1-1-0-xiaomi-redmi-note-t3710205"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}