diff --git a/_devices/bqaquarisu.markdown b/_devices/bqaquarisu.markdown
new file mode 100644
index 0000000..48fa534
--- /dev/null
+++ b/_devices/bqaquarisu.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "BQ Aquaris U (chaozu)"
+codename: chaozu
+downloadfolder: chaozu
+supportstatus: Current
+maintainer: Kra1o5
+oem: BQ
+devicetree: https://github.com/TeamWin/android_device_bq_chaozu
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/bqaquarisulite.markdown b/_devices/bqaquarisulite.markdown
new file mode 100644
index 0000000..18d72de
--- /dev/null
+++ b/_devices/bqaquarisulite.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "BQ Aquaris U Lite (chaozulite)"
+codename: chaozulite
+downloadfolder: chaozulite
+supportstatus: Current
+maintainer: Kra1o5
+oem: BQ
+devicetree: https://github.com/TeamWin/android_device_bq_chaozulite
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/bqaquarisuplus.markdown b/_devices/bqaquarisuplus.markdown
new file mode 100644
index 0000000..9c2fa79
--- /dev/null
+++ b/_devices/bqaquarisuplus.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "BQ Aquaris U Plus (tenshi)"
+codename: tenshi
+downloadfolder: tenshi
+supportstatus: Current
+maintainer: Kra1o5
+oem: BQ
+devicetree: https://github.com/TeamWin/android_device_bq_tenshi
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/googlepixel.markdown b/_devices/googlepixel.markdown
index 4e0ca04..3b075f1 100644
--- a/_devices/googlepixel.markdown
+++ b/_devices/googlepixel.markdown
@@ -12,7 +12,8 @@
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
-NOTE: This is an early build and is not heavily tested. You may lose data. You may miss an important phone call.
+Restoring a backup made with an alpha using RC1 may result in loss of data including internal storage. If you need your backups from those versions, restore the backup using alpha2, then install RC1 and run a new backup with RC1.
+NOTE: This is an early build and is not heavily tested. You may lose data during a backup and restore.
 
 {% include download.html %}
 
@@ -21,7 +22,7 @@
 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 deviceYou 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:
+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
 
diff --git a/_devices/googlepixelxl.markdown b/_devices/googlepixelxl.markdown
index d6bda89..4fe5f98 100644
--- a/_devices/googlepixelxl.markdown
+++ b/_devices/googlepixelxl.markdown
@@ -12,7 +12,8 @@
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
-NOTE: This is an early build and is not heavily tested. You may lose data. You may miss an important phone call.
+Restoring a backup made with an alpha using RC1 may result in loss of data including internal storage. If you need your backups from those versions, restore the backup using alpha2, then install RC1 and run a new backup with RC1.
+NOTE: This is an early build and is not heavily tested. You may lose data during a backup and restore.
 
 {% include download.html %}
 
@@ -21,7 +22,7 @@
 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 deviceYou 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:
+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
 
diff --git a/_devices/huaweip8.markdown b/_devices/huaweip8.markdown
index 30726cb..4945811 100644
--- a/_devices/huaweip8.markdown
+++ b/_devices/huaweip8.markdown
@@ -1,12 +1,14 @@
 ---
 layout: device
 title:  "Huawei P8"
-codename: p8
-downloadfolder: p8
+codename: grace
+downloadfolder: grace
 supportstatus: Current
-maintainer: reas0n
+maintainer: AD2076
 oem: Huawei
-devicetree: https://github.com/TeamWin/android_device_huawei_p8
+devicetree: https://github.com/TeamWin/android_device_huawei_grace
+xdathread: http://forum.xda-developers.com/huawei-p8/development/twrp-huawei-p8-gra-l09-t3511067
+
 ---
 
 {% include disclaimer.html %}
diff --git a/_devices/leecole2.markdown b/_devices/leecole2.markdown
new file mode 100644
index 0000000..320807a
--- /dev/null
+++ b/_devices/leecole2.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "LeEco Le 2"
+codename: s2
+downloadfolder: s2
+supportstatus: Current
+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
+---
+
+{% 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
new file mode 100644
index 0000000..5ca64e4
--- /dev/null
+++ b/_devices/oneplus3t.markdown
@@ -0,0 +1,29 @@
+---
+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: "http://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/_devices/oneplusx.markdown b/_devices/oneplusx.markdown
index ff952ca..c9491cc 100644
--- a/_devices/oneplusx.markdown
+++ b/_devices/oneplusx.markdown
@@ -4,9 +4,10 @@
 codename: onyx
 downloadfolder: onyx
 supportstatus: Current
-maintainer: Dees_Troy
+maintainer: Nachiket.Namjoshi
 oem: OnePlus
 devicetree: https://github.com/TeamWin/android_device_oneplus_onyx
+xdathread: http://forum.xda-developers.com/oneplus-x/development/unofficial-twrp-3-0-2-0-recovery-onyx-t3471584
 ---
 
 {% include disclaimer.html %}
diff --git a/_devices/samsunggalaxygrandprime.markdown b/_devices/samsunggalaxygrandprime.markdown
new file mode 100644
index 0000000..14f9ad4
--- /dev/null
+++ b/_devices/samsunggalaxygrandprime.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Grand Prime"
+codename: fortuna3g
+downloadfolder: fortuna3g
+supportstatus: Current
+maintainer: Carlos Arriaga
+oem: Samsung
+ddof: "/dev/block/mmcblk0p17"
+devicetree: https://github.com/TeamWin/android_device_samsung_fortuna3g.git
+xdathread: http://forum.xda-developers.com/grand-prime/development/twrp-twrp-3-0-2-r4-fortunaxx3g-t3486433
+---
+
+{% 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/samsunggalaxytabs105.markdown b/_devices/samsunggalaxytabs105.markdown
index 36c1024..75825fb 100644
--- a/_devices/samsunggalaxytabs105.markdown
+++ b/_devices/samsunggalaxytabs105.markdown
@@ -1,11 +1,11 @@
 ---
 layout: device
-title:  "Samsung Galaxy Tab S 10.5 Wi-Fi"
+title: "Samsung Galaxy Tab S 10.5 WiFi"
 codename: chagallwifi
 downloadfolder: chagallwifi
 oldurl: http://teamw.in/project/twrp2/239
 supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
 oem: Samsung
 ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 devicetree: "https://github.com/TeamWin/android_device_samsung_chagallwifi"
@@ -16,6 +16,8 @@
 
 {% include supportstatus.html %}
 
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
 {% include appinstall.html %}
 
 {% include download.html %}
diff --git a/_devices/samsunggalaxytabs105lte.markdown b/_devices/samsunggalaxytabs105lte.markdown
index f7a4ca7..701bea5 100644
--- a/_devices/samsunggalaxytabs105lte.markdown
+++ b/_devices/samsunggalaxytabs105lte.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
-title:  "Samsung Galaxy Tab S 10.5 LTE"
+title: "Samsung Galaxy Tab S 10.5 LTE"
 codename: chagalllte
 downloadfolder: chagalllte
 supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
 oem: Samsung
 ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 devicetree: "https://github.com/TeamWin/android_device_samsung_chagalllte"
@@ -15,6 +15,8 @@
 
 {% include supportstatus.html %}
 
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
 {% include appinstall.html %}
 
 {% include download.html %}
diff --git a/_devices/samsunggalaxytabs84.markdown b/_devices/samsunggalaxytabs84.markdown
index 0c5deb0..e8e75fd 100644
--- a/_devices/samsunggalaxytabs84.markdown
+++ b/_devices/samsunggalaxytabs84.markdown
@@ -1,11 +1,11 @@
 ---
 layout: device
-title:  "Samsung Galaxy Tab S 8.4 Wi-Fi"
+title: "Samsung Galaxy Tab S 8.4 WiFi"
 codename: klimtwifi
 downloadfolder: klimtwifi
 oldurl: http://teamw.in/project/twrp2/238
 supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
 oem: Samsung
 ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 devicetree: "https://github.com/TeamWin/android_device_samsung_klimtwifi"
@@ -16,6 +16,8 @@
 
 {% include supportstatus.html %}
 
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
 {% include appinstall.html %}
 
 {% include download.html %}
diff --git a/_devices/samsunggalaxytabs84lte.markdown b/_devices/samsunggalaxytabs84lte.markdown
index b1dc077..5b4f86b 100644
--- a/_devices/samsunggalaxytabs84lte.markdown
+++ b/_devices/samsunggalaxytabs84lte.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
-title:  "Samsung Galaxy Tab S 8.4 LTE"
+title: "Samsung Galaxy Tab S 8.4 LTE"
 codename: klimtlte
 downloadfolder: klimtlte
 supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
 oem: Samsung
 ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 devicetree: "https://github.com/TeamWin/android_device_samsung_klimtlte"
@@ -15,6 +15,8 @@
 
 {% include supportstatus.html %}
 
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
 {% include appinstall.html %}
 
 {% include download.html %}
diff --git a/_devices/zteaxon7a2017u.markdown b/_devices/zteaxon7a2017u.markdown
new file mode 100644
index 0000000..e26349b
--- /dev/null
+++ b/_devices/zteaxon7a2017u.markdown
@@ -0,0 +1,31 @@
+---
+layout: device
+title: "ZTE Axon 7 (North America)"
+codename: a2017u
+oem: ZTE
+downloadfolder: a2017u
+supportstatus: Current
+maintainer: jcadduono
+ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
+devicetree: https://github.com/TeamWin/android_device_zte_a2017u
+xdathread: "http://forum.xda-developers.com/axon-7/development/recovery-official-twrp-zte-axon-7-t3515715"
+fastbootunlock: true
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+<p class="text">Note: At the moment you may only unlock your bootloader using the ZTE official B20 unlock fastboot. See the XDA thread for more information.</p>
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_faq/pgpkeys.markdown b/_faq/pgpkeys.markdown
new file mode 100644
index 0000000..722b18f
--- /dev/null
+++ b/_faq/pgpkeys.markdown
@@ -0,0 +1,21 @@
+---
+layout: post
+title:  "How do I verify TWRP files with PGP?"
+---
+
+Recently we implemented signing TWRP files with OpenPGP for security minded people who want to verify
+the non-repudiation of twrp.me files. You can read more about OpenPGP <a href="http://openpgp.org/about/">here</a>
+
+To verify a file, you will need to install our <a href="https://dl.twrp.me/public.asc">public key</a> into
+your keyring. The public key is also listed on each device's download page. Please download the key to a new file.
+When you click on the page, you will see a link for the PGP verification file as
+"Download PGP Signature twrp-device-version.type.asc". This file is in binary format and is created using our
+private key the first time the download page is created for the file. You can then perform
+the following steps to verify non-repudiation (Linux steps only):
+
+<ol>
+<li><pre>gpg --import twrp-public.asc</pre></li>
+<li><pre>gpg --verify twrp-device-version.type.asc twrp-device-version.type</pre></li>
+</ol>
+
+For Windows, please find a OpenPGP implementation and read the documentation to perform these steps.