diff --git a/_devices/androidonefourthgeneration.markdown b/_devices/androidonefourthgeneration.markdown
new file mode 100644
index 0000000..b8d9f9f
--- /dev/null
+++ b/_devices/androidonefourthgeneration.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Android One Fourth Generation"
+codename: GM6_s_sprout
+downloadfolder: GM6_s_sprout
+supportstatus: Current
+maintainer: Rygebin
+oem: Google
+devicetree: https://github.com/TeamWin/android_device_google_GM6_s_sprout
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
diff --git a/_devices/asuszenfone2.markdown b/_devices/asuszenfone2.markdown
index 6346635..413783a 100644
--- a/_devices/asuszenfone2.markdown
+++ b/_devices/asuszenfone2.markdown
@@ -4,15 +4,16 @@
 codename: Z00A
 downloadfolder: Z00A
 supportstatus: Current
-maintainer: Dees_Troy or bigbiff
+maintainer: jrior001
 oem: Asus
-devicetree: https://github.com/teamwin/android_device_asus_zenfone2
+devicetree: https://github.com/teamwin/android_device_asus_Z00A
 ddof: /dev/block/by-name/recovery
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
+TWRP 3.1.1+ releases work only on Stock M bootloader, all previous versions should work on LP bootlaoder
 Starting with TWRP 3.0.0, Z008 and Z00A TWRP builds are unified. The same image will work on both models.
 
 {% include appinstall.html %}
diff --git a/_devices/asuszenfone2720p.markdown b/_devices/asuszenfone2720p.markdown
index 4f33d97..37bb7b0 100644
--- a/_devices/asuszenfone2720p.markdown
+++ b/_devices/asuszenfone2720p.markdown
@@ -6,13 +6,14 @@
 supportstatus: Current
 maintainer: jrior001
 oem: Asus
-devicetree: https://github.com/teamwin/android_device_asus_zenfone2
+devicetree: https://github.com/teamwin/android_device_asus_Z008
 ddof: /dev/block/by-name/recovery
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
+TWRP 3.1.1+ releases work only on Stock M bootloader, all previous versions should work on LP bootlaoder.
 Starting with TWRP 3.0.0, Z008 and Z00A TWRP builds are unified. The same image will work on both models.
 
 {% include appinstall.html %}
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimelte.markdown
similarity index 82%
copy from _devices/gprimeltecan.markdown
copy to _devices/gprimelte.markdown
index fd7a79d..36c2aee 100644
--- a/_devices/gprimeltecan.markdown
+++ b/_devices/gprimelte.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltecan
-downloadfolder: gprimeltecan
+title:  "Samsung Galaxy Grand Prime (SM-G530T/T1/W)"
+codename: gprimelte
+downloadfolder: gprimelte
 supportstatus: Current
 maintainer: Vincent Zvikaramba
 oem: Samsung
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.git
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimelte.git
 xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
 ---
 
diff --git a/_devices/gprimeltemtr.markdown b/_devices/gprimeltemtr.markdown
deleted file mode 100644
index 2cca797..0000000
--- a/_devices/gprimeltemtr.markdown
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltemtr
-downloadfolder: gprimeltemtr
-supportstatus: Current
-maintainer: Vincent Zvikaramba
-oem: Samsung
-ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltemtr.git
-xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include odininstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimeltespr.markdown
similarity index 82%
copy from _devices/gprimeltecan.markdown
copy to _devices/gprimeltespr.markdown
index fd7a79d..aa1e37f 100644
--- a/_devices/gprimeltecan.markdown
+++ b/_devices/gprimeltespr.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltecan
-downloadfolder: gprimeltecan
+title:  "Samsung Galaxy Grand Prime (SM-G530P)"
+codename: gprimeltespr
+downloadfolder: gprimeltespr
 supportstatus: Current
 maintainer: Vincent Zvikaramba
 oem: Samsung
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.git
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltespr.git
 xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
 ---
 
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimeltetfnvzw.markdown
similarity index 81%
copy from _devices/gprimeltecan.markdown
copy to _devices/gprimeltetfnvzw.markdown
index fd7a79d..56e6ae9 100644
--- a/_devices/gprimeltecan.markdown
+++ b/_devices/gprimeltetfnvzw.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltecan
-downloadfolder: gprimeltecan
+title:  "Samsung Galaxy Grand Prime (SM-S920L)"
+codename: gprimeltetfnvzw
+downloadfolder: gprimeltetfnvzw
 supportstatus: Current
 maintainer: Vincent Zvikaramba
 oem: Samsung
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.git
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltetfnvzw.git
 xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
 ---
 
diff --git a/_devices/gprimeltetmo.markdown b/_devices/gprimeltetmo.markdown
deleted file mode 100644
index e983d66..0000000
--- a/_devices/gprimeltetmo.markdown
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltetmo
-downloadfolder: gprimeltetmo
-supportstatus: Current
-maintainer: Vincent Zvikaramba
-oem: Samsung
-ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltetmo.git
-xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include odininstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimeltexx.markdown
similarity index 82%
copy from _devices/gprimeltecan.markdown
copy to _devices/gprimeltexx.markdown
index fd7a79d..1e45a8a 100644
--- a/_devices/gprimeltecan.markdown
+++ b/_devices/gprimeltexx.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltecan
-downloadfolder: gprimeltecan
+title:  "Samsung Galaxy Grand Prime (SM-G530FZ)"
+codename: gprimeltexx
+downloadfolder: gprimeltexx
 supportstatus: Current
 maintainer: Vincent Zvikaramba
 oem: Samsung
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.git
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltexx.git
 xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
 ---
 
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimeltezt.markdown
similarity index 82%
rename from _devices/gprimeltecan.markdown
rename to _devices/gprimeltezt.markdown
index fd7a79d..e0428b0 100644
--- a/_devices/gprimeltecan.markdown
+++ b/_devices/gprimeltezt.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Grand Prime"
-codename: gprimeltecan
-downloadfolder: gprimeltecan
+title:  "Samsung Galaxy Grand Prime (SM-G530MU)"
+codename: gprimeltezt
+downloadfolder: gprimeltezt
 supportstatus: Current
 maintainer: Vincent Zvikaramba
 oem: Samsung
 ddof: "/dev/block/bootdevice/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.git
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltezt.git
 xdathread: https://forum.xda-developers.com/grand-prime/development/official-twrp-3-x-grand-prime-sm-g530t-t3533998
 ---
 
diff --git a/_devices/leecolepro3.markdown b/_devices/leecolepro3.markdown
new file mode 100644
index 0000000..85231e1
--- /dev/null
+++ b/_devices/leecolepro3.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "LeEco Le Pro 3"
+codename: zl1
+downloadfolder: zl1
+supportstatus: Current
+maintainer: jrior001
+oem: LeEco
+devicetree: https://github.com/TeamWin/android_device_leeco_zl1
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
diff --git a/_devices/lenovop2a42.markdown b/_devices/lenovop2a42.markdown
index b7c4ed1..7b83614 100644
--- a/_devices/lenovop2a42.markdown
+++ b/_devices/lenovop2a42.markdown
@@ -3,7 +3,7 @@
 title: "Lenovo P2a42"
 codename: kuntao_row
 oem: Lenovo
-downloadfolder: p2a42
+downloadfolder: kuntao_row
 supportstatus: Current
 maintainer: Celoxocis
 ddof: "/dev/block/bootdevice/by-name/recovery"
diff --git a/_devices/lgg4.markdown b/_devices/lgg4.markdown
index 6019cb0..1aab057 100644
--- a/_devices/lgg4.markdown
+++ b/_devices/lgg4.markdown
@@ -2,11 +2,11 @@
 layout: device
 title:  "LG G4"
 codename: H811, H815
-downloadfolder: lgg4
+downloadfolder: g4
 supportstatus: Current
 maintainer: steadfasterX
 oem: LG
-devicetree: https://github.com/TeamWin/android_device_lge_h815
+devicetree: https://github.com/TeamWin/android_device_lge_g4
 ddof: "/dev/block/bootdevice/by-name/recovery"
 xdathread: "http://forum.xda-developers.com/g4/development/recovery-twrp-3-touch-recovery-t3442424"
 ---
@@ -24,28 +24,40 @@
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
-    <a href="{{ mirror.baseurl }}lgg4">
+    <a href="{{ mirror.baseurl }}g4">
       {{ mirror.description }}
     </a>
   </li>
 {% endfor %}
 </ul>
 
-<div class='page-heading' id='fastboot-install'>Unlocking + Fastboot Install Method (No Root Required):</div>
-<a id='fastboot'></a>
+<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.</p>
+<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. You can NOT proceed withouth completing this step!</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 adb push twrp.img /sdcard)</p>
-<p class="text">Flash the twrp.img with the twrp GUI to the recovery(!) partition (choose the button at the bottom named 'Image' to show the copied image)</p>
-<p class="text">done. You can now reboot into recovery again to check it has worked.</p>
-<p class="text">Note many devices will replace your custom recovery automatically during first boot. To prevent this, use the key combo <a href="https://forum.xda-developers.com/showpost.php?p=68249027&postcount=3" target=_blank>explained in this FAQ</a> 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">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>
+<p class="text">After installing TWRP correctly, you will still have the original LG factory reset screen/menu booting before TWRP, every time! So the correct and only way to get into TWRP with a key combo is to select <b>two times "Yes"</b> in the official LG factory reset menu, and only then you will get into TWRP (This a restriction by LG. There is no key combo available in some / all / most LG devices to boot directly into recovery and so TWRP).</p>
+<p class="text">Power down and pull out the battery. Do not forget to remove any USB cable. <br />
+Press power down and hold it down. Put battery back while keeping vol down pressed. Press power button and keep now both buttons pressed. Directly you see the LG logo the first time just release <b>only</b> the power button for 1 second ( do not release vol down ) and then press power again and keep both pressed until you see the factory reset screen. Proceed like you would to the factory reset (as long as TWRP is installed it will not reset but just open TWRP instead).
+
 
 {% include twrpinstall.html %}
 
diff --git a/_devices/samsunggalaxys5miniexynos.markdown b/_devices/samsunggalaxys5miniexynos.markdown
new file mode 100644
index 0000000..fde0353
--- /dev/null
+++ b/_devices/samsunggalaxys5miniexynos.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy S5 Mini Exynos"
+codename: kminilte
+downloadfolder: kminilte
+supportstatus: Current
+maintainer: aykevl
+oem: Samsung
+ddof: "/dev/block/mmcblk0p10"
+devicetree: "https://github.com/TeamWin/android_device_samsung_kminilte"
+xdathread: "https://forum.xda-developers.com/galaxy-s5-mini/development/g800f-m-y-lineageos-14-1-g800f-m-y-t3549055"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytabs297lte2016.markdown b/_devices/samsunggalaxytabs297lte2016.markdown
new file mode 100644
index 0000000..7cf126d
--- /dev/null
+++ b/_devices/samsunggalaxytabs297lte2016.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy Tab S2 9.7 LTE (2016)"
+codename: gts210velte
+downloadfolder: gts210velte
+supportstatus: Current
+maintainer: LuK1337, luca020400
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_gts210velte"
+xdathread: ""
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/xiaomimi4c.markdown b/_devices/xiaomimi4c.markdown
index 2861da8..ac3ac3f 100644
--- a/_devices/xiaomimi4c.markdown
+++ b/_devices/xiaomimi4c.markdown
@@ -4,15 +4,18 @@
 codename: libra
 downloadfolder: libra
 supportstatus: Current
-maintainer: juliusssssmiui
+maintainer: AndropaX
 oem: Xiaomi
 devicetree: https://github.com/TeamWin/android_device_xiaomi_libra
+xdathread: "https://forum.xda-developers.com/mi-4c/development/libra-twrp-3-0-t3315059"
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
 
+{% include xiaomiunlock.html %}
+
 {% include appinstall.html %}
 
 {% include download.html %}