diff --git a/_data/mirrors.yml b/_data/mirrors.yml
index 5ca288d..9d180d2 100644
--- a/_data/mirrors.yml
+++ b/_data/mirrors.yml
@@ -1,4 +1,4 @@
-- description: Primary (Recommended)
+- description: Primary (Americas)
   baseurl: https://dl.twrp.me/
-- description: Primary (Backup)
+- description: Primary (Europe)
   baseurl: https://eu.dl.twrp.me/
diff --git a/_devices/acerZ500.markdown b/_devices/acerZ500.markdown
new file mode 100644
index 0000000..1804220
--- /dev/null
+++ b/_devices/acerZ500.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Acer Liquid Z500"
+codename: Z500
+downloadfolder: Z500
+supportstatus: Current
+maintainer: hejsekvojtech
+oem: Acer
+devicetree: https://github.com/TeamWin/android_device_acer_Z500
+ddof: "/dev/recovery"
+mtkchipset: mt6582
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+Note, you should be able to root this device using kingo root app.
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
+
+{% include mtkinstall.html %}
diff --git a/_devices/asustransformerinfinityTF700T.markdown b/_devices/asustransformerinfinityTF700T.markdown
index ba1322b..5a14f32 100644
--- a/_devices/asustransformerinfinityTF700T.markdown
+++ b/_devices/asustransformerinfinityTF700T.markdown
@@ -28,4 +28,4 @@
 <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="text">adb reboot bootloader</p>
 <p class="text">You should now be in fastboot mode. Download the correct blob file and copy the file into the same folder as your adb and fastboot binaries. Rename the image to twrp.blob and type:</p>
-<p class="text">fastboot -i 0x0b05 flash staging twrp.img<p></p>fastboot reboot</p>
+<p class="text">fastboot -i 0x0b05 flash staging twrp.blob<p></p>fastboot reboot</p>
diff --git a/_devices/asustransformerprimeTF201.markdown b/_devices/asustransformerprimeTF201.markdown
index 6bfe7d5..70a6cac 100644
--- a/_devices/asustransformerprimeTF201.markdown
+++ b/_devices/asustransformerprimeTF201.markdown
@@ -31,4 +31,4 @@
 <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="text">adb reboot bootloader</p>
 <p class="text">You should now be in fastboot mode. Download the correct blob file and copy the file into the same folder as your adb and fastboot binaries. Rename the image to twrp.blob and type:</p>
-<p class="text">fastboot -i 0x0b05 flash staging twrp.img<p></p>fastboot reboot</p>
+<p class="text">fastboot -i 0x0b05 flash staging twrp.blob<p></p>fastboot reboot</p>
diff --git a/_devices/fairphone2.markdown b/_devices/fairphone2.markdown
new file mode 100644
index 0000000..04b11ae
--- /dev/null
+++ b/_devices/fairphone2.markdown
@@ -0,0 +1,22 @@
+---
+layout: device
+title:  "Fairphone 2"
+codename: fp2
+downloadfolder: fp2
+supportstatus: Current
+maintainer: z3ntu
+oem: Fairphone
+devicetree: https://github.com/TeamWin/android_device_fairphone_fp2
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/googlepixelc.markdown b/_devices/googlepixelc.markdown
new file mode 100644
index 0000000..48201ac
--- /dev/null
+++ b/_devices/googlepixelc.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Google Pixel C"
+codename: dragon
+downloadfolder: dragon
+supportstatus: Current
+maintainer: followmsi
+oem: Google
+devicetree: https://github.com/TeamWin/android_device_google_dragon
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
diff --git a/_devices/htc10.markdown b/_devices/htc10.markdown
index cf43da7..fa7ed91 100644
--- a/_devices/htc10.markdown
+++ b/_devices/htc10.markdown
@@ -19,6 +19,6 @@
 
 {% include twrpinstall.html %}
 
-{% include fastbootinstall.html %}
+{% include fastbootinstallhtc.html %}
 
 {% include ddinstall.html %}
diff --git a/_devices/htcbolt10evo.markdown b/_devices/htcbolt10evo.markdown
new file mode 100644
index 0000000..215efb6
--- /dev/null
+++ b/_devices/htcbolt10evo.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "HTC Bolt/10 Evo"
+codename: aca
+downloadfolder: aca
+supportstatus: Current
+maintainer: CaptainThrowback
+oem: HTC
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_htc_aca"
+xdathread: "https://forum.xda-developers.com/bolt/development/recovery-twrp-touch-recovery-t3519304"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstallhtc.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/htcdesire626s.markdown b/_devices/htcdesire626s.markdown
index 199c8fb..e4aaccc 100644
--- a/_devices/htcdesire626s.markdown
+++ b/_devices/htcdesire626s.markdown
@@ -19,6 +19,6 @@
 
 {% include twrpinstall.html %}
 
-{% include fastbootinstall.html %}
+{% include fastbootinstallhtc.html %}
 
 {% include ddinstall.html %}
diff --git a/_devices/htconea9.markdown b/_devices/htconea9.markdown
index 5d10f1c..5f91b34 100644
--- a/_devices/htconea9.markdown
+++ b/_devices/htconea9.markdown
@@ -19,6 +19,6 @@
 
 {% include twrpinstall.html %}
 
-{% include fastbootinstall.html %}
+{% include fastbootinstallhtc.html %}
 
 {% include ddinstall.html %}
diff --git a/_devices/htconem9.markdown b/_devices/htconem9.markdown
index b68f843..0add0e0 100644
--- a/_devices/htconem9.markdown
+++ b/_devices/htconem9.markdown
@@ -22,6 +22,6 @@
 
 {% include twrpinstall.html %}
 
-{% include fastbootinstall.html %}
+{% include fastbootinstallhtc.html %}
 
 {% include ddinstall.html %}
diff --git a/_devices/htcuultra.markdown b/_devices/htcuultra.markdown
new file mode 100644
index 0000000..20256d9
--- /dev/null
+++ b/_devices/htcuultra.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "HTC U Ultra"
+codename: oce
+downloadfolder: oce
+supportstatus: Current
+maintainer: CaptainThrowback
+oem: HTC
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_htc_oce"
+xdathread: "https://forum.xda-developers.com/u-ultra/development/recovery-twrp-touch-recovery-t3558540"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstallhtc.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/hyundaititanlte.markdown b/_devices/hyundaititanlte.markdown
new file mode 100644
index 0000000..891d065
--- /dev/null
+++ b/_devices/hyundaititanlte.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Hyundai Titan LTE"
+codename: titanlte
+downloadfolder: titanlte
+supportstatus: Current
+maintainer: Dees_Troy
+oem: LG
+devicetree: https://github.com/TeamWin/android_device_hyundai_titanlte
+ddof: "/dev/block/bootdevice/by-name/recovery"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/lgg3europe.markdown b/_devices/lgg3europe.markdown
index 816042d..498ff13 100644
--- a/_devices/lgg3europe.markdown
+++ b/_devices/lgg3europe.markdown
@@ -5,7 +5,7 @@
 downloadfolder: d855
 oldurl: http://teamw.in/project/twrp2/262
 supportstatus: Current
-maintainer: None
+maintainer: Exodus,invisiblek
 oem: LG
 devicetree: https://github.com/TeamWin/android_device_lge_d855
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
diff --git a/_devices/lgg3tmo.markdown b/_devices/lgg3tmo.markdown
index b57b840..88a41ff 100644
--- a/_devices/lgg3tmo.markdown
+++ b/_devices/lgg3tmo.markdown
@@ -5,7 +5,7 @@
 downloadfolder: d851
 oldurl: http://teamw.in/project/twrp2/249
 supportstatus: Current
-maintainer: None
+maintainer: bryan2894
 oem: LG
 devicetree: https://github.com/TeamWin/android_device_lge_d851
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
diff --git a/_devices/lgg4.markdown b/_devices/lgg4.markdown
index e1ae2f9..6019cb0 100644
--- a/_devices/lgg4.markdown
+++ b/_devices/lgg4.markdown
@@ -1,8 +1,8 @@
 ---
 layout: device
-title:  "LG G4 International"
-codename: H815 , H811
-downloadfolder: h815 | h811
+title:  "LG G4"
+codename: H811, H815
+downloadfolder: lgg4
 supportstatus: Current
 maintainer: steadfasterX
 oem: LG
@@ -20,21 +20,11 @@
 
 <div class='page-heading'>Download Links:</div>
 <hr />
-<p class="text">International (H815):</p>
+<p class="text">LG G4 (any model):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
-    <a href="{{ mirror.baseurl }}h815">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">T-Mobile (H811):</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}h811">
+    <a href="{{ mirror.baseurl }}lgg4">
       {{ mirror.description }}
     </a>
   </li>
@@ -44,17 +34,18 @@
 <div class='page-heading' id='fastboot-install'>Unlocking + 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="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! To unlock your device you have to go to:</p>
-<p class="text"><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">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">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">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="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">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>
 
 {% include twrpinstall.html %}
 
diff --git a/_devices/lgk10.markdown b/_devices/lgk10.markdown
new file mode 100644
index 0000000..edb3da3
--- /dev/null
+++ b/_devices/lgk10.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "LG K10"
+codename: m216
+downloadfolder: m216
+supportstatus: Current
+maintainer: PVineeth
+oem: LG
+devicetree: https://github.com/TeamWin/android_device_lge_m216
+ddof: "/dev/block/bootdevice/by-name/recovery"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/lgspiritlte.markdown b/_devices/lgspiritlte.markdown
new file mode 100644
index 0000000..cee06ba
--- /dev/null
+++ b/_devices/lgspiritlte.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "LG Spirit LTE (H440N)"
+codename: c70n
+downloadfolder: c70n
+supportstatus: Current
+maintainer: Jakov Glavina
+oem: LGE
+ddof: "/dev/block/mmcblk0p19"
+devicetree: https://github.com/TeamWin/android_device_lge_c70n
+xdathread: https://forum.xda-developers.com/lg-spirit/development/recovery-unofficial-twrp-lg-spirit-h440n-t3564488
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/motorolamotog2015.markdown b/_devices/motorolamotog2015.markdown
new file mode 100644
index 0000000..438932a
--- /dev/null
+++ b/_devices/motorolamotog2015.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Motorola Moto G 2015"
+codename: osprey
+downloadfolder: osprey
+supportstatus: Current
+maintainer: Dees_Troy
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/motorolamotog2016.markdown b/_devices/motorolamotog2016.markdown
index d7ccde2..ce8a0f6 100644
--- a/_devices/motorolamotog2016.markdown
+++ b/_devices/motorolamotog2016.markdown
@@ -1,10 +1,10 @@
 ---
 layout: device
-title:  "Motorola Moto G 2016"
-codename: athene
-downloadfolder: athene
+title:  "Motorola Moto G Play 2016"
+codename: harpia
+downloadfolder: harpia
 supportstatus: Current
-maintainer: yeshwanthvshenoy, pranav01
+maintainer: Dees_Troy
 oem: Motorola
 ---
 
diff --git a/_devices/motorolamotogplus2016.markdown b/_devices/motorolamotogplus2016.markdown
new file mode 100644
index 0000000..65537e9
--- /dev/null
+++ b/_devices/motorolamotogplus2016.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Motorola Moto G 2016/Moto G Plus 2016"
+codename: athene
+downloadfolder: athene
+supportstatus: Current
+maintainer: yeshwanthvshenoy, pranav01
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/nubianx512j.markdown b/_devices/nubianx512j.markdown
new file mode 100644
index 0000000..fde985c
--- /dev/null
+++ b/_devices/nubianx512j.markdown
@@ -0,0 +1,20 @@
+---
+layout: device
+title:  "Nubia ZTE Z9Max"
+codename: nx512j
+downloadfolder: nx512j
+supportstatus: Current
+maintainer: Bauuuuu
+oem: Nubia
+devicetree: https://github.com/TeamWin/android_device_nubia_nx512j
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
diff --git a/_devices/samsunggalaxycoreplus.markdown b/_devices/samsunggalaxycoreplus.markdown
new file mode 100644
index 0000000..7bc2931
--- /dev/null
+++ b/_devices/samsunggalaxycoreplus.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Samsung Galaxy Core Plus"
+codename: cs02
+downloadfolder: cs02
+supportstatus: Current
+maintainer: TimSchumi
+oem: Samsung
+devicetree: https://www.github.com/TeamWin/android_device_samsung_cs02
+ddof: "/dev/block/platform/sdhci.1/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+<b>WARNING:</b> This version of TWRP is only for the SM-G350, not for any other variants of this Phone.
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxynote4qualcomm.markdown b/_devices/samsunggalaxynote4qualcomm.markdown
index 5949bbd..debeedc 100644
--- a/_devices/samsunggalaxynote4qualcomm.markdown
+++ b/_devices/samsunggalaxynote4qualcomm.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Samsung Galaxy Note 4 Qualcomm"
+title: "Samsung Galaxy Note 4 Qualcomm"
 codename: trlte
-downloadfolder: "Canada|trltecan|India|trltedt|International (N910-F)|trltexx|Sprint|trltespr|T-Mobile|trltetmo|Verizon|trltevzw|US Cellular|trlteusc|International Duos|trlteduoszh"
-oldurl: http://teamw.in/project/twrp2/266
+downloadfolder: International &amp; Americas (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910T/trltetmo, SM-N910W8/trltecan, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910V/trltevzw)|trlte|International Duos (SM-N9100/trlteduoszh)|trlteduoszh
 supportstatus: Current
 maintainer: bigbiff
 oem: Samsung
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_trlte"
 xdathread: "http://forum.xda-developers.com/note-4/orig-development/tool-utility-twrp-2-8-1-x-teamwin-t2956011"
 ---
 
@@ -19,77 +19,17 @@
 
 <div class='page-heading'>Download Links:</div>
 <hr />
-<p class="text">Canada:</p>
+<p class="text">International &amp; Americas (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910T/trltetmo, SM-N910W8/trltecan, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910V/trltevzw):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
-    <a href="{{ mirror.baseurl }}trltecan">
+    <a href="{{ mirror.baseurl }}trlte">
       {{ mirror.description }}
     </a>
   </li>
 {% endfor %}
 </ul>
-<p class="text">India:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trltedt">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">International (N910-F):</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trltexx">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">Sprint:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trltespr">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">T-Mobile:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trltetmo">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">Verizon:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trltevzw">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">US Celluar:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}trlteusc">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">International Duos:</p>
+<p class="text">International Duos (SM-N9100/trlteduoszh):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
@@ -100,7 +40,6 @@
 {% endfor %}
 </ul>
 
-
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
diff --git a/_devices/samsunggalaxys4internationalexynos.markdown b/_devices/samsunggalaxys4internationalexynos.markdown
index 2c0645e..e460d72 100644
--- a/_devices/samsunggalaxys4internationalexynos.markdown
+++ b/_devices/samsunggalaxys4internationalexynos.markdown
@@ -1,13 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S4 International Exynos"
+title:  "Samsung Galaxy S4 Exynos (ja3g)"
 codename: i9500
 downloadfolder: i9500
-oldurl: http://teamw.in/project/twrp2/191
 supportstatus: Current
-maintainer: None
+maintainer: Alberto96
+devicetree: https://github.com/TeamWin/android_device_samsung_i9500
+xdathread: https://forum.xda-developers.com/showthread.php?t=2361122
 oem: Samsung
-ddof: "/dev/block/mmcblk0p10"
+ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 ---
 
 {% include disclaimer.html %}
diff --git a/_devices/samsunggalaxys5exynos.markdown b/_devices/samsunggalaxys5exynos.markdown
new file mode 100644
index 0000000..58872c4
--- /dev/null
+++ b/_devices/samsunggalaxys5exynos.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title: "Samsung Galaxy S5 Exynos"
+codename: k3gxx
+downloadfolder: k3gxx
+oldurl: http://teamw.in/project/twrp2/229
+supportstatus: Current
+maintainer: somadsul
+oem: Samsung
+ddof: "/dev/block/mmcblk0p10"
+devicetree: "https://github.com/TeamWin/android_device_samsung_k3gxx"
+xdathread: "https://forum.xda-developers.com/galaxy-s5/galaxy-s-5-android-development-exynos/recovery-twrp-galaxy-s5-k3gxx-t3464750"
+---
+
+{% 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/samsunggalaxys5ltea.markdown b/_devices/samsunggalaxys5ltea.markdown
new file mode 100644
index 0000000..f339903
--- /dev/null
+++ b/_devices/samsunggalaxys5ltea.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Samsung Galaxy S5 LTE-A"
+codename: lentislte
+downloadfolder: lentislte
+supportstatus: Current
+maintainer: cygwin
+oem: Samsung
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_lentislte"
+---
+
+{% 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/samsunggalaxys5plus.markdown b/_devices/samsunggalaxys5plus.markdown
index 50aa3f7..b392286 100644
--- a/_devices/samsunggalaxys5plus.markdown
+++ b/_devices/samsunggalaxys5plus.markdown
@@ -4,7 +4,7 @@
 codename: kccat6
 downloadfolder: kccat6
 supportstatus: Current
-maintainer: jcadduono
+maintainer: cygwin, jcadduono
 devicetree: "https://github.com/TeamWin/android_device_samsung_kccat6"
 xdathread: "http://forum.xda-developers.com/galaxy-s5/orig-development/recovery-team-win-recovery-project-t3350160"
 oem: Samsung
diff --git a/_devices/samsunggalaxys8.markdown b/_devices/samsunggalaxys8.markdown
new file mode 100644
index 0000000..6cebea2
--- /dev/null
+++ b/_devices/samsunggalaxys8.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "Samsung Galaxy S8 (Exynos)"
+codename: dreamlte
+downloadfolder: dreamlte
+supportstatus: Current
+maintainer: jesec
+devicetree: "https://github.com/TeamWin/android_device_samsung_dreamlte"
+xdathread: "https://forum.xda-developers.com/galaxy-s8/development/recovery-twrp-galaxy-s8-exynos-t3595102"
+oem: Samsung
+ddof: "/dev/block/platform/11120000.ufs/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxys8plus.markdown b/_devices/samsunggalaxys8plus.markdown
new file mode 100644
index 0000000..9160342
--- /dev/null
+++ b/_devices/samsunggalaxys8plus.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "Samsung Galaxy S8+ (Exynos)"
+codename: dream2lte
+downloadfolder: dream2lte
+supportstatus: Current
+maintainer: jesec
+devicetree: "https://github.com/TeamWin/android_device_samsung_dream2lte"
+xdathread: "https://forum.xda-developers.com/galaxy-s8+/development/recovery-twrp-galaxy-s8-exynos-t3594756"
+oem: Samsung
+ddof: "/dev/block/platform/11120000.ufs/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/sonyxperiazr.markdown b/_devices/sonyxperiazr.markdown
index bc932cc..5ed01ca 100644
--- a/_devices/sonyxperiazr.markdown
+++ b/_devices/sonyxperiazr.markdown
@@ -4,9 +4,10 @@
 codename: dogo
 downloadfolder: dogo
 supportstatus: Current
-maintainer: Chippa-a
-devicetree: https://github.com/TeamWin/android_device_sony_dogo.git
+maintainer: Chippa_a
 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
 ---
 
diff --git a/_devices/xiaomimi5splus.markdown b/_devices/xiaomimi5splus.markdown
new file mode 100644
index 0000000..4cec044
--- /dev/null
+++ b/_devices/xiaomimi5splus.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Xiaomi Mi 5s Plus"
+codename: natrium
+downloadfolder: natrium
+supportstatus: Current
+maintainer: LuK1337, luca020400
+oem: Xiaomi
+devicetree: https://github.com/TeamWin/android_device_xiaomi_natrium
+xdathread: "http://forum.xda-developers.com/showthread.php?t=3574737"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/xiaomimax.markdown b/_devices/xiaomimimax.markdown
similarity index 65%
rename from _devices/xiaomimax.markdown
rename to _devices/xiaomimimax.markdown
index 3ae86d9..a42d8c6 100644
--- a/_devices/xiaomimax.markdown
+++ b/_devices/xiaomimimax.markdown
@@ -1,19 +1,23 @@
 ---
 layout: device
 title:  "Xiaomi Mi Max"
-codename: hydrogen
+codename: hydrogen/helium
 downloadfolder: hydrogen
 supportstatus: Current
-maintainer: Abdess
+maintainer: Parth Bhatia (TheStrix)
 devicetree: https://github.com/TeamWin/android_device_xiaomi_hydrogen.git
 oem: Xiaomi
-devicetree: https://github.com/TeamWin/android_device_xiaomi_hydrogen
+ddof: "/dev/block/bootdevice/by-name/recovery"
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
 
+{% include dmverity.html %}
+
+{% include xiaomiunlock.html %}
+
 {% include appinstall.html %}
 
 {% include download.html %}
@@ -21,3 +25,5 @@
 {% include twrpinstall.html %}
 
 {% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/xiaomiredminote3.markdown b/_devices/xiaomiredminote3.markdown
index 46f74bf..50a6499 100644
--- a/_devices/xiaomiredminote3.markdown
+++ b/_devices/xiaomiredminote3.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
 title:  "Xiaomi Redmi Note 3"
-codename: kenzo
+codename: kenzo/kate
 downloadfolder: kenzo
 supportstatus: Current
-maintainer: Vibhor Chaudhary (vibhu0009)
+maintainer: Parth Bhatia (TheStrix)
 devicetree: https://github.com/TeamWin/android_device_xiaomi_kenzo.git
 oem: Xiaomi
-ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
+ddof: "/dev/block/bootdevice/by-name/recovery"
 ---
 
 {% include disclaimer.html %}
@@ -16,12 +16,14 @@
 
 {% include dmverity.html %}
 
+{% include xiaomiunlock.html %}
+
 {% include appinstall.html %}
 
 {% include download.html %}
 
 {% include twrpinstall.html %}
 
-{% include odininstall.html %}
+{% include fastbootinstall.html %}
 
 {% include ddinstall.html %}
diff --git a/_devices/xiaomiredminote4.markdown b/_devices/xiaomiredminote4.markdown
new file mode 100644
index 0000000..7341288
--- /dev/null
+++ b/_devices/xiaomiredminote4.markdown
@@ -0,0 +1,29 @@
+---
+layout: device
+title:  "Xiaomi Redmi Note 4(x)"
+codename: mido
+downloadfolder: mido
+supportstatus: Current
+maintainer: Abhishek Aggarwal
+devicetree: https://github.com/TeamWin/android_device_xiaomi_mido.git
+oem: Xiaomi
+ddof: "/dev/block/bootdevice/by-name/recovery"
+---
+
+{% 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/_devices/zukz2.markdown b/_devices/zukz2.markdown
index e6b3ce3..dd08702 100644
--- a/_devices/zukz2.markdown
+++ b/_devices/zukz2.markdown
@@ -1,13 +1,13 @@
 ---
 layout: device
-title:  "Zuk Z2"
-codename: z2
-downloadfolder: z2
+title:  "ZUK Z2 / Lenovo Z2 Plus"
+codename: z2_plus
+downloadfolder: z2_plus
 supportstatus: Current
-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
+maintainer: ontherunvaro
+oem: ZUK / Lenovo
+devicetree: https://github.com/TeamWin/android_device_zuk_z2_plus
+xdathread: https://forum.xda-developers.com/lenovo-zuk-z2/development/recovery-official-twrp-3-1-0-zuk-z2-t3587092
 ---
 
 {% include disclaimer.html %}
diff --git a/_faq/openrecoveryscript.markdown b/_faq/openrecoveryscript.markdown
new file mode 100644
index 0000000..7cb7e62
--- /dev/null
+++ b/_faq/openrecoveryscript.markdown
@@ -0,0 +1,145 @@
+---
+layout: post
+title: "TWRP Commandline Guide"
+---
+<style>
+.command {
+}
+.desc {
+	font-size: smaller;
+	clear: both;
+}
+.inline-table
+{
+	border-collapse: collapse;
+	border-spacing: 0;
+	background-color: transparent;
+	text-align: center;
+	table-layout: fixed;
+	float: left;
+	margin-top: 10px;
+	margin-bottom: 10px;
+	margin-left: 2px;
+	margin-right: 2px;
+}
+.literal {
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	background-color: #eef;
+	border-radius: 3px;
+	border: 1px solid #e8e8e8;
+	padding: 2px 4px;
+	white-space: nowrap;
+}
+</style>
+</style>
+<div class="home">
+<ul class="page-heading">CLIENT SIDE/SCRIPT</ul>
+<pre class="command"><b>install</b> FILENAME :
+<div class="desc">	install <b>FILENAME</b> zip file.</div>
+
+<b>wipe</b> PARTITION :
+<div class="desc">	format <b>PARTITON</b>, one by line:
+		cache,
+		system,
+		dalvik,
+		data.</div>
+
+<b>backup</b> PARTITIONS-TO-BACKUP [BACKUP-NAME] :
+<div class="desc"> 	backup partition <b>PARTITIONS-TO-BACKUP</b> to [<b>BACKUP-NAME</b>]
+	<b>PARTITIONS-TO-BACKUP</b>, multiples selection allowed:
+		S: system,
+		D: data,
+		C: cache,
+		R: recovery,
+		B: boot,
+		A: and-sec,
+		E: sd-ext,
+		M: skip md5 creation.
+	[<b>BACKUP-NAME</b>] If not provided, current date/time is used.</div>
+
+<b>restore</b> PARTITION-TO-RESTORE BACKUP-NAME :
+<div class="desc"> 	restore <b>PARTITION-TO-RESTORE</b> from existant <b>BACKUP-NAME</b>:
+	<b>PARTITION-TO-RESTORE</b>, multiples selection allowed:
+		S: system,
+		D: data,
+		C: cache,
+		R: recovery,
+		B: boot,
+		A: and-sec,
+		E: sd-ext,
+		M: skip md5 check.
+	<b>BACKUP-NAME</b>: could be full path or name of twrp backup in current twrp backup folder.
+	Backup can't be encrypted.</div>
+
+<b>remountrw</b> :
+<div class="desc"> 	revert <i>/system</i> mount type (read-only/read-write).</div>
+
+<b>mount</b> PATH.
+
+<b>set</b> VARIABLE [VALUE] :
+<div class="desc"> 	set <b>VARIABLE</b> to <b>VALUE</b>. If <b>VALUE</b> is empty, empty <b>VARIABLE</b>.</div>
+
+<b>mkdir</b> DIRECTORY.
+
+<b>reboot</b> [recovery|poweroff|bootloader|download] :
+<div class="desc">	reboot into system (no argument), recovery, bootloader, download mode or turn off device.</div>
+
+<b>sideload</b> :
+<div class="desc">	sideload zip from host adb.</div>
+
+<b>fixperms</b> :
+<div class="desc"> 	launch fix permissions script.</div>
+
+<b>decrypt</b> password :
+<div class="desc"> 	decrypt /data with provided <b>password</b>.
+		Password could be numeric, alphanumeric. For pattern see note bellow.</div></pre>
+
+<ul class="page-heading">HOST SIDE</ul>
+<pre class="command"><b>adb backup</b> :
+<div class="desc">	Use the <i>adb backup</i> command of the host computer to backup the device:
+        adb backup --twrp [compress] [PARTITION-LIST]
+            PARTITION-LIST: partition(s) name(s) without leading '/'. Only partition present into fstab can be backuped.</div>
+
+<b>adb restore</b>  FILENAME :
+<div class="desc">    Use the <i>adb restore</i> command of the host computer to restore <b>FILENAME</b> where <b>FILENAME</b> is a previously backup taken with <i>adb backup</i>.</div></pre>
+
+
+
+<ul class="page-heading">Specific pattern decrypt note</ul>
+<div class="desc" >Use the table bellow to determine what your password will be: </div>
+<table border="1" class="inline-table">
+ <colgroup>
+  <col width="33%" /><col width="33%" /><col width="33%" />
+ </colgroup>
+ <tbody valign="top">
+  <tr><td>1</td><td>2</td><td>3</td></tr>
+  <tr><td>4</td><td>5</td><td>6</td></tr>
+  <tr><td>7</td><td>8</td><td>9</td></tr>
+ </tbody>
+</table>
+<table border="1" class="inline-table">
+ <colgroup>
+  <col width="25%" /><col width="25%" /><col width="25%" /><col width="25%" />
+ </colgroup>
+ <tbody valign="top">
+  <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
+  <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+  <tr><td>9</td><td>:</td><td>;</td><td>&lt;</td></tr>
+  <tr><td>=</td><td>&gt;</td><td>?</td><td>&#64;</td></tr>
+ </tbody>
+</table>
+<table border="1" class="inline-table">
+ <colgroup>
+  <col width="20%" /><col width="20%" /><col width="20%" /><col width="20%" /><col width="20%" />
+ </colgroup>
+ <tbody valign="top">
+  <tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td></tr>
+  <tr><td>6</td><td>7</td><td>8</td><td>9</td><td>:</td></tr>
+  <tr><td>;</td><td>&lt;</td><td>=</td><td>&gt;</td><td>?</td></tr>
+  <tr><td>&#64;</td><td>A</td><td>B</td><td>C</td><td>D</td></tr>
+  <tr><td>E</td><td>F</td><td>G</td><td>H</td><td>I</td></tr>
+ </tbody>
+</table>
+<div class="desc" >Example: if your pattern is a &quot;U&quot; shape in the middle of the 5x5, enter <tt class="literal">twrp decrypt '7&lt;ABC&gt;9'</tt> in the terminal or ADB shell. Note that characters <tt class="literal"><span class="pre">;&lt;&gt;?</span></tt> are special to the shell and require backslash escaping or single quotes around the string.
+<a href='https://blog.alxu.ca/unlocking-large-pattern-encryption-in-twrp.html'>Source</a></div>
diff --git a/_includes/fastbootinstall.html b/_includes/fastbootinstall.html
index ca27b0d..3b9c373 100644
--- a/_includes/fastbootinstall.html
+++ b/_includes/fastbootinstall.html
@@ -4,7 +4,7 @@
 <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="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">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>
diff --git a/_includes/fastbootinstallhtc.html b/_includes/fastbootinstallhtc.html
new file mode 100644
index 0000000..c32aaa3
--- /dev/null
+++ b/_includes/fastbootinstallhtc.html
@@ -0,0 +1,19 @@
+{% capture fastboot %}fastboot{% if page.fastbootvendor %} -i 0x{{ page.fastbootvendor }}{% endif %}{% endcapture %}
+<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="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 download</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 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>
+</html>
diff --git a/_includes/footer.html b/_includes/footer.html
index fd6ea3a..1a97d92 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-    <p class="text">&copy; 2014 to 2016 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
+    <p class="text">&copy; 2014 to 2017 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
     <div class="footer-col-wrapper">
 
       <div class="footer-col  footer-col-2">
diff --git a/_includes/header.html b/_includes/header.html
index a98f424..1686499 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,16 +1,3 @@
-  <div class="wrapper">
-    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<!-- twrp.me 320x100 large mobile banner -->
-<ins class="adsbygoogle"
-     style="display:inline-block;width:320px;height:100px"
-     data-ad-client="ca-pub-3594204119287048"
-     data-ad-slot="1141077597"></ins>
-<script>
-(adsbygoogle = window.adsbygoogle || []).push({});
-</script>
-  </div>
-
-
 <!-- Page level adsense ad -->
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <script>
@@ -20,6 +7,19 @@
   });
 </script>
 
+  <div class="wrapper">
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- twrp.me top responsive -->
+<ins class="adsbygoogle"
+     style="display:block"
+     data-ad-client="ca-pub-3594204119287048"
+     data-ad-slot="6628325992"
+     data-ad-format="auto"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+  </div>
+
 <header class="site-header">
 
   <div class="wrapper">
diff --git a/_posts/2017-03-10-twrp-3.1.0-0-released.markdown b/_posts/2017-03-10-twrp-3.1.0-0-released.markdown
new file mode 100644
index 0000000..238fb33
--- /dev/null
+++ b/_posts/2017-03-10-twrp-3.1.0-0-released.markdown
@@ -0,0 +1,38 @@
+---
+layout: post
+title:  "TWRP 3.1.0-0 Released"
+date:   2017-03-10 14:21:42
+categories: site update
+version: 3.1.0-0
+---
+
+TWRP {{ page.version }} is out now for all currently supported devices.
+
+What's new in {{ page.version }}:
+
+  * vold decrypt on a few select HTC devices, TWRP will now attempt to use the system partition's vold and vdc binaries and libraries to decrypt the data partition (nkk71 and CaptainThrowback)
+  * adb backup to stream a backup directly to or from your PC, see documentation [here](https://github.com/omnirom/android_bootable_recovery/commit/ce8f83c48d200106ff61ad530c863b15c16949d9) (bigbiff)
+  * tweak MTP startup routines (mdmower)
+  * support new Android 7.x xattrs for backup and restore to fix loss of data after a restore (Dees_Troy)
+  * support POSIX file capabilities backup and restore to fix VoLTE on HTC devices and possibly other issues (Dees_Troy)
+  * better indicate to users that internal storage is not backed up (Dees_Troy)
+  * improve automatic determination of TW_THEME (mdmower)
+  * minimal getcap and setcap support (_that)
+  * try mounting both ext4 and f2fs during decrypt (jcadduono and Dees_Troy)
+  * shut off backlight with power key (mdmower)
+  * timeout during FDE decrypt (Dees_Troy and nkk71)
+  * support for FBE decrypt and backing up and restoring FBE policies (Dees_Troy)
+  * boot slot support (Dees_Troy)
+  * TWRP app install prompt during reboot (Dees_Troy)
+  * support for AB OTA zips (Dees_Troy)
+  * support new Android 7.x log command (Dees_Troy)
+  * update recovery sources to AOSP 7.1 (Dees_Troy)
+  * numerous bugfixes and improvements by too many people to mention
+
+Want to get notifications when we release new versions of TWRP? [Install the TWRP app and select your device!](https://twrp.me/app)
+
+We need your help! The bulk of TWRP work is done by a handful of people on a volunteer basis. We have pushed most of our device files to [our github](http://github.com/TeamWin/) and we have [a gerrit instance](http://gerrit.twrp.me). If you have the ability, please help us maintain our official devices and/or add your device to our official device list. Thanks in advance!
+
+[You can track the progress of builds here](https://jenkins.twrp.me)
+
+Head over to the [devices page](http://twrp.me/Devices) to find install instructions and download links.
diff --git a/_posts/2017-05-19-twrp-3.1.1-0-released.markdown b/_posts/2017-05-19-twrp-3.1.1-0-released.markdown
new file mode 100644
index 0000000..c4abf05
--- /dev/null
+++ b/_posts/2017-05-19-twrp-3.1.1-0-released.markdown
@@ -0,0 +1,25 @@
+---
+layout: post
+title:  "TWRP 3.1.1-0 Released"
+date:   2017-05-19 14:21:42
+categories: site update
+version: 3.1.1-0
+---
+
+TWRP {{ page.version }} is out now for all currently supported devices.
+
+What's new in {{ page.version }}:
+
+  * Backups will now include adopted storage keys (Dees_Troy)
+  * Fixed an adb restore issue (bigbiff)
+  * Fixed rebooting when no OS is present (Dees_Troy)
+  * Fixed line wrapping in the GUI terminal (_that)
+  * Updated TWRP source code to AOSP 7.1.2 (Dees_Troy)Updated TWRP source code to AOSP 7.1.2
+
+Want to get notifications when we release new versions of TWRP? [Install the TWRP app and select your device!](https://twrp.me/app)
+
+We need your help! The bulk of TWRP work is done by a handful of people on a volunteer basis. We have pushed most of our device files to [our github](http://github.com/TeamWin/) and we have [a gerrit instance](http://gerrit.twrp.me). If you have the ability, please help us maintain our official devices and/or add your device to our official device list. Thanks in advance!
+
+[You can track the progress of builds here](https://jenkins.twrp.me)
+
+Head over to the [devices page](http://twrp.me/Devices) to find install instructions and download links.
diff --git a/about.md b/about.md
index 3eb7fef..421ca71 100644
--- a/about.md
+++ b/about.md
@@ -10,4 +10,4 @@
 
 A custom recovery is used for installing custom software on your device. This custom software can include smaller modifications like rooting your device or even replacing the firmware of the device with a completely custom "ROM" like [OmniROM](http://omnirom.org/)
 
-You can find the source code for TWRP at [github.com/omnirom/android_bootable_recovery/](https://github.com/omnirom/android_bootable_recovery/)
+You can find the source code for TWRP at [github.com/omnirom/android\_bootable\_recovery/](https://github.com/omnirom/android_bootable_recovery/)