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/lgg4.markdown b/_devices/lgg4.markdown
index 22c912f..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,10 +34,11 @@
 <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="text">This will boot up TWRP but for the moment in memory only. To complete the installation and making it persistent:</p>
diff --git a/_devices/lgoptimusl7ii.markdown b/_devices/lgoptimusl7ii.markdown
deleted file mode 100644
index c7788b2..0000000
--- a/_devices/lgoptimusl7ii.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: device
-title:  "LG Optimus L7 II"
-codename: vee7
-downloadfolder: vee7
-supportstatus: Current
-maintainer: nicknitewolf
-oem: LG
-ddof: "/dev/block/mmcblk0p17"
-devicetree: "https://github.com/TeamWin/android_device_lge_vee7"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include ddinstall.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/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/xiaomimi5s.markdown b/_devices/xiaomimi5s.markdown
new file mode 100644
index 0000000..4b2aff5
--- /dev/null
+++ b/_devices/xiaomimi5s.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Xiaomi Mi 5s"
+codename: capricorn
+downloadfolder: capricorn
+supportstatus: Current
+maintainer: LuK1337
+oem: Xiaomi
+devicetree: https://github.com/TeamWin/android_device_xiaomi_capricorn
+xdathread: "http://forum.xda-developers.com/showthread.php?t=3610987"
+---
+
+{% 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/zukz2.markdown b/_devices/zukz2.markdown
index 805492e..dd08702 100644
--- a/_devices/zukz2.markdown
+++ b/_devices/zukz2.markdown
@@ -2,7 +2,7 @@
 layout: device
 title:  "ZUK Z2 / Lenovo Z2 Plus"
 codename: z2_plus
-downloadfolder: z2
+downloadfolder: z2_plus
 supportstatus: Current
 maintainer: ontherunvaro
 oem: ZUK / Lenovo
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
index e32a0a2..c32aaa3 100644
--- a/_includes/fastbootinstallhtc.html
+++ b/_includes/fastbootinstallhtc.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="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="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>
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/_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.