Merge "Unify LGG4 H815 and H811"
diff --git a/_data/mirrors.yml b/_data/mirrors.yml
index 238ebdd..5ca288d 100644
--- a/_data/mirrors.yml
+++ b/_data/mirrors.yml
@@ -1,2 +1,4 @@
 - description: Primary (Recommended)
   baseurl: https://dl.twrp.me/
+- description: Primary (Backup)
+  baseurl: https://eu.dl.twrp.me/
diff --git a/_devices/gprimeltecan.markdown b/_devices/gprimeltecan.markdown
new file mode 100644
index 0000000..fd7a79d
--- /dev/null
+++ b/_devices/gprimeltecan.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Grand Prime"
+codename: gprimeltecan
+downloadfolder: gprimeltecan
+supportstatus: Current
+maintainer: Vincent Zvikaramba
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: https://github.com/TeamWin/android_device_samsung_gprimeltecan.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/gprimeltemtr.markdown b/_devices/gprimeltemtr.markdown
new file mode 100644
index 0000000..2cca797
--- /dev/null
+++ b/_devices/gprimeltemtr.markdown
@@ -0,0 +1,26 @@
+---
+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/gprimeltetmo.markdown b/_devices/gprimeltetmo.markdown
new file mode 100644
index 0000000..e983d66
--- /dev/null
+++ b/_devices/gprimeltetmo.markdown
@@ -0,0 +1,26 @@
+---
+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/huaweihonor6x.markdown b/_devices/huaweihonor6x.markdown
new file mode 100644
index 0000000..4fb414a
--- /dev/null
+++ b/_devices/huaweihonor6x.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "Huawei Honor 6X"
+codename: berlin
+downloadfolder: berlin
+supportstatus: Current
+maintainer: Dees_Troy
+oem: Huawei
+devicetree: https://github.com/TeamWin/android_device_huawei_berlin
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/leecole2.markdown b/_devices/leecole2.markdown
index 320807a..4327ce4 100644
--- a/_devices/leecole2.markdown
+++ b/_devices/leecole2.markdown
@@ -7,7 +7,7 @@
 maintainer: Rishabh Rao
 oem: LeEco
 devicetree: https://github.com/TeamWin/android_device_leeco_s2
-xdathread: http://http://forum.xda-developers.com/le-2/development/twrp-3-0-2-0-s2-built-source-custom-t3512723
+xdathread: http://forum.xda-developers.com/le-2/development/twrp-3-0-2-0-s2-built-source-custom-t3512723
 ---
 
 {% include disclaimer.html %}
@@ -21,3 +21,5 @@
 {% include twrpinstall.html %}
 
 {% include fastbootinstall.html %}
+
+
diff --git a/_devices/lenovop2a42.markdown b/_devices/lenovop2a42.markdown
new file mode 100644
index 0000000..b7c4ed1
--- /dev/null
+++ b/_devices/lenovop2a42.markdown
@@ -0,0 +1,29 @@
+---
+layout: device
+title: "Lenovo P2a42"
+codename: kuntao_row
+oem: Lenovo
+downloadfolder: p2a42
+supportstatus: Current
+maintainer: Celoxocis
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: https://github.com/TeamWin/android_device_lenovo_p2a42
+xdathread: "https://forum.xda-developers.com/android/development/recovery-unofficial-twrp-lenovo-p2-3-0-t3533659"
+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/_devices/lenovoyt_x703f.markdown b/_devices/lenovoyt_x703f.markdown
new file mode 100644
index 0000000..3d2a133
--- /dev/null
+++ b/_devices/lenovoyt_x703f.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "Lenovo Yoga Tab 3 Plus Wifi"
+codename: yt_x703f
+downloadfolder: yt_x703f
+supportstatus: Current
+maintainer: Matshias
+oem: Lenovo
+devicetree: https://github.com/teamwin/android_device_lenovo_yt_x703f
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/lenovoyt_x703l.markdown b/_devices/lenovoyt_x703l.markdown
new file mode 100644
index 0000000..54874cf
--- /dev/null
+++ b/_devices/lenovoyt_x703l.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "Lenovo Yoga Tab 3 Plus LTE"
+codename: yt_x703l
+downloadfolder: yt_x703l
+supportstatus: Current
+maintainer: Matshias
+oem: Lenovo
+devicetree: https://github.com/teamwin/android_device_lenovo_yt_x703l
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/oneplus3t.markdown b/_devices/oneplus3t.markdown
index 5ca64e4..e39720f 100644
--- a/_devices/oneplus3t.markdown
+++ b/_devices/oneplus3t.markdown
@@ -1,6 +1,6 @@
 ---
 layout: device
-title:  "OnePlus 3T"
+title: "OnePlus 3T"
 codename: oneplus3t
 oem: OnePlus
 downloadfolder: oneplus3t
@@ -8,7 +8,7 @@
 maintainer: jcadduono
 ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
 devicetree: https://github.com/TeamWin/android_device_oneplus_oneplus3t
-xdathread: "http://forum.xda-developers.com/oneplus-3t/development/recovery-twrp-oneplus-3t-t3507308"
+xdathread: "https://forum.xda-developers.com/oneplus-3t/development/recovery-twrp-oneplus-3t-t3507308"
 fastbootunlock: true
 ---
 
diff --git a/_devices/oneplusthree.markdown b/_devices/oneplusthree.markdown
index a9dec62..e3e693d 100644
--- a/_devices/oneplusthree.markdown
+++ b/_devices/oneplusthree.markdown
@@ -1,18 +1,23 @@
 ---
 layout: device
-title:  "OnePlus 3"
+title: "OnePlus 3"
 codename: oneplus3
+oem: OnePlus
 downloadfolder: oneplus3
 supportstatus: Current
-maintainer: Dees_Troy
-oem: OnePlus
+maintainer: jcadduono
+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"
+fastbootunlock: true
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
 
+{% include dmverity.html %}
+
 {% include appinstall.html %}
 
 {% include download.html %}
@@ -20,3 +25,5 @@
 {% include twrpinstall.html %}
 
 {% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytabs280wifi2016.markdown b/_devices/samsunggalaxytabs280wifi2016.markdown
new file mode 100644
index 0000000..3ae4fd3
--- /dev/null
+++ b/_devices/samsunggalaxytabs280wifi2016.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy Tab S2 8.0 WiFi (2016)"
+codename: gts28vewifi
+downloadfolder: gts28vewifi
+supportstatus: Current
+maintainer: LuK1337, luca020400
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_gts28vewifi"
+xdathread: "http://forum.xda-developers.com/showthread.php?t=3545683"
+---
+
+{% 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/samsunggalaxytabs297wifi2016.markdown b/_devices/samsunggalaxytabs297wifi2016.markdown
new file mode 100644
index 0000000..8e5f4f4
--- /dev/null
+++ b/_devices/samsunggalaxytabs297wifi2016.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy Tab S2 9.7 WiFi (2016)"
+codename: gts210vewifi
+downloadfolder: gts210vewifi
+supportstatus: Current
+maintainer: LuK1337, luca020400
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_gts210vewifi"
+xdathread: "http://forum.xda-developers.com/showthread.php?t=3543921"
+---
+
+{% 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/wileyfoxswift.markdown b/_devices/wileyfoxswift.markdown
new file mode 100644
index 0000000..9579a5f
--- /dev/null
+++ b/_devices/wileyfoxswift.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Wileyfox Swift"
+codename: crackling
+downloadfolder: crackling
+supportstatus: Current
+maintainer: beroid
+oem: Wileyfox
+devicetree: https://github.com/teamwin/android_device_wileyfox_crackling
+xdathread: "http://forum.xda-developers.com/showthread.php?t=3350351"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
\ No newline at end of file
diff --git a/_devices/wileyfoxswift2.markdown b/_devices/wileyfoxswift2.markdown
index 526f2e7..2fcccb9 100644
--- a/_devices/wileyfoxswift2.markdown
+++ b/_devices/wileyfoxswift2.markdown
@@ -1,6 +1,6 @@
 ---
 layout: device
-title:  "Wileyfox Swift 2 and Swift 2 Plus"
+title:  "Wileyfox Swift 2, 2 Plus, and 2 X"
 codename: marmite
 downloadfolder: marmite
 supportstatus: Current
diff --git a/_devices/zukz2.markdown b/_devices/zukz2.markdown
index 58a4c41..e6b3ce3 100644
--- a/_devices/zukz2.markdown
+++ b/_devices/zukz2.markdown
@@ -4,7 +4,7 @@
 codename: z2
 downloadfolder: z2
 supportstatus: Current
-maintainer: mauoronofrio
+maintainer: mauronofrio
 xdathread: https://forum.xda-developers.com/zuk-z2-pro/development/twrp-twrp-3-0-3-0-teamwin-recovery-t3529601
 oem: Zuk
 devicetree: https://github.com/TeamWin/android_device_zuk_z2
diff --git a/_includes/appinstall.html b/_includes/appinstall.html
index bdaf53d..3598b77 100644
--- a/_includes/appinstall.html
+++ b/_includes/appinstall.html
@@ -2,10 +2,10 @@
 <div class='page-heading' id='app-install'>App Install Method (Requires Root):</div>
 <a id='app'></a>
 <hr />
-<p class="text">Download the TWRP&nbsp;Manager app:</p>
+<p class="text">Download the Official TWRP App (root required):</p>
 <ul class="text">
-    <li><a href="http://play.google.com/store/apps/details?id=com.jmz.soft.twrpmanager">Play Store</a></li>
-    <li><a href="http://download.jmzsoftware.com/TWRPManager.apk">No Play Store?&nbsp;Find a direct download link at the bottom of this page.</a></li>
+    <li><a href="https://play.google.com/store/apps/details?id=me.twrp.twrpapp">Play Store (recommended)</a></li>
+    <li><a href="https://dl.twrp.me/twrpapp/">No Play Store?&nbsp;Download the latest version here.</a></li>
 </ul>
-<p class="text">Install the app and open it.&nbsp; Tap on Install&nbsp;TWRP. Select your device from the device list ({{ page.codename }}) and then tap on Install Recovery. The file will download and be installed automatically.</p>
+<p class="text">Install the app and open it.&nbsp;Agree to the Terms.&nbsp;Select TWRP Flash. Select your device from the device list ({{ page.codename }}) and choose a version. The file will download to your Downloads folder. Browse to and select the file. Tap on Flash to Recovery. Find out <a href="https://twrp.me/app/">more about the app here.</a></p>
 </html>
diff --git a/_posts/2017-01-05-official-twrp-app.markdown b/_posts/2017-01-05-official-twrp-app.markdown
new file mode 100644
index 0000000..25334a8
--- /dev/null
+++ b/_posts/2017-01-05-official-twrp-app.markdown
@@ -0,0 +1,8 @@
+---
+layout: post
+title:  "Official TWRP App Released"
+date:   2017-01-05 14:21:42
+categories: site update
+---
+
+We now have a first-party app for TWRP users to use to help keep their TWRP version up to date. [Find out more here.](https://twrp.me/app)