Merge "Add device: Moto E4 Plus"
diff --git a/404.md b/404.md
index 668dd59..00c75eb 100644
--- a/404.md
+++ b/404.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: notfound
 title: Not Found
 exclude: true
 permalink: /404.html
diff --git a/_google/googlepixel2.markdown b/_google/googlepixel2.markdown
index d0f6e8b..98157e0 100644
--- a/_google/googlepixel2.markdown
+++ b/_google/googlepixel2.markdown
@@ -12,7 +12,7 @@
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
-NOTE: Montly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to tra
+NOTE: Monthly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to transfer files.
 
 {% include download.html %}
 
diff --git a/_google/googlepixel2xl.markdown b/_google/googlepixel2xl.markdown
index 7142a6d..26dc0a0 100644
--- a/_google/googlepixel2xl.markdown
+++ b/_google/googlepixel2xl.markdown
@@ -12,7 +12,7 @@
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
-NOTE: Montly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to tra
+NOTE: Monthly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to transfer files.
 
 {% include download.html %}
 
diff --git a/_includes/footer.html b/_includes/footer.html
index 837cb01..b1497b0 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -34,16 +34,6 @@
       </div>
     </div>
 
-<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>
 
 </footer>
diff --git a/_includes/footer404.html b/_includes/footer404.html
new file mode 100644
index 0000000..d8df263
--- /dev/null
+++ b/_includes/footer404.html
@@ -0,0 +1,40 @@
+<footer class="site-footer">
+
+  <div class="wrapper">
+    <p class="text">&copy; 2014 to 2018 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">
+        <ul class="social-media-list">
+          {% if site.github_username %}
+          <li>
+            <a href="https://github.com/{{ site.github_username }}">
+              <span class="icon  icon--github">
+                <svg viewBox="0 0 16 16">
+                  <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
+                </svg>
+              </span>
+
+              <span class="username">{{ site.github_username }}</span>
+            </a>
+          </li>
+          {% endif %}
+
+          <li>
+            <a href="https://plus.google.com/communities/106804207647688456928">
+
+              <span class="username">TWRP on G+</span>
+            </a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="footer-col  footer-col-3">
+        <p class="text">{{ site.description }}</p>
+      </div>
+    </div>
+
+
+  </div>
+
+</footer>
diff --git a/_includes/header404.html b/_includes/header404.html
new file mode 100644
index 0000000..64c3b32
--- /dev/null
+++ b/_includes/header404.html
@@ -0,0 +1,27 @@
+<header>
+<div class="wrapper">
+    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+
+    <nav class="site-nav">
+      <a href="#" class="menu-icon">
+        <svg viewBox="0 0 18 15">
+          <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+          <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+          <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+        </svg>
+      </a>
+
+      <div class="trigger">
+        {% for page in site.pages %}
+	  {% unless page.exclude %}
+          {% if page.title %}
+          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+          {% endif %}
+	  {% endunless %}
+        {% endfor %}
+      </div>
+    </nav>
+
+  </div>
+
+</header>
diff --git a/_layouts/notfound.html b/_layouts/notfound.html
new file mode 100644
index 0000000..704c257
--- /dev/null
+++ b/_layouts/notfound.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+
+  {% include head.html %}
+
+  <body>
+
+    {% include header404.html %}
+
+    <div class="page-content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </div>
+
+    {% include footer404.html %}
+
+  </body>
+
+</html>
diff --git a/_motorola/motorolamotozplay2016.markdown b/_motorola/motorolamotozplay2016.markdown
new file mode 100644
index 0000000..f88bcc0
--- /dev/null
+++ b/_motorola/motorolamotozplay2016.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title:  "Motorola Moto Z Play 2016"
+codename: addison
+downloadfolder: addison
+devicetree: https://github.com/TeamWin/android_device_motorola_addison
+supportstatus: Current
+maintainer: Alberto97
+oem: Motorola
+xdathread: "https://forum.xda-developers.com/moto-z-play/development/recovery-unofficial-twrp-moto-z-play-t3495629"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_planet/planetgeminipda.markdown b/_planet/planetgeminipda.markdown
new file mode 100644
index 0000000..a8a3bb8
--- /dev/null
+++ b/_planet/planetgeminipda.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Planet Gemini PDA"
+codename: geminipda
+downloadfolder: geminipda
+supportstatus: Current
+maintainer: deadman96385
+oem: Planet
+devicetree: https://github.com/TeamWin/android_device_planet_geminipda
+ddof: "/dev/block/platform/mtk-msdc.0/11230000.msdc0/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/gemini-pda/development/recovery-twrp-3-2-1-0-t3763855"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include mtkinstall.html %}
+
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxynote4qualcomm.markdown b/_samsung/samsunggalaxynote4qualcomm.markdown
index 24e9864..81fdc43 100644
--- a/_samsung/samsunggalaxynote4qualcomm.markdown
+++ b/_samsung/samsunggalaxynote4qualcomm.markdown
@@ -2,7 +2,7 @@
 layout: device
 title: "Samsung Galaxy Note 4 Qualcomm"
 codename: trlte
-downloadfolder: International &amp; Americas (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910T/trltetmo, SM-N910V/trltevzw, SM-N910W8/trltecan)|trlte|International Duos (SM-N9100ZC/trlteduoszc, SM-N9100ZH/trlteduoszh, SM-N9106W/trlteduoszn, SM-N9109W/trlteduosctc)|trlteduos
+downloadfolder: International, Americas, Duos & Edge (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910T/trltetmo, SM-N910V/trltevzw, SM-N910W8/trltecan)|trlte|International Duos (SM-N9100ZC/trlteduoszc, SM-N9100ZH/trlteduoszh, SM-N9106W/trlteduoszn, SM-N9109W/trlteduosctc)|trlteduos
 supportstatus: Current
 maintainer: bigbiff
 oem: Samsung
@@ -19,7 +19,7 @@
 
 <div class='page-heading'>Download Links:</div>
 <hr />
-<p class="text">International &amp; Americas (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910T/trltetmo, SM-N910V/trltevzw, SM-N910W8/trltecan):</p>
+<p class="text">International & Americas (SM-N910F/trltexx, SM-N910G/trltedt, SM-N910P/trltespr, SM-N910R4/trlteusc, SM-N910T/trltetmo, SM-N910V/trltevzw, SM-N910W8/trltecan):</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
@@ -39,9 +39,19 @@
   </li>
 {% endfor %}
 </ul>
+<p class="text">International Edge (SM-N915F/tblte, SM-N915FY/tbltexx, SM-N915G/tbltedt, SM-N915P/tbltespr, SM-N915R4/tblteusc, SM-N915T/tbltetmo, SM-N915V/tbltevzw, SM-N915W8/tbltecan):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}tblte">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
 
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_sony/sonyxperiaxa2.markdown b/_sony/sonyxperiaxa2.markdown
new file mode 100644
index 0000000..8089245
--- /dev/null
+++ b/_sony/sonyxperiaxa2.markdown
@@ -0,0 +1,34 @@
+---
+layout: device
+title:  "Sony Xperia XA2"
+codename: pioneer
+downloadfolder: pioneer
+supportstatus: Current
+maintainer: LuK1337
+devicetree: https://github.com/TeamWin/android_device_sony_pioneer.git
+oem: Sony
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+NOTE: Monthly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to transfer files.
+
+{% include download.html %}
+
+<div class='page-heading'>Installation:</div>
+If you already have TWRP installed:
+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. 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
+
+This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
+
+adb push path/to/twrp.zip /
+
+Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
+
+If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
diff --git a/_xiaomi/xiaomiminote2.markdown b/_xiaomi/xiaomiminote2.markdown
new file mode 100644
index 0000000..937e8a2
--- /dev/null
+++ b/_xiaomi/xiaomiminote2.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title:  "Xiaomi Mi Note 2"
+codename: scorpio
+downloadfolder: scorpio
+supportstatus: Current
+maintainer: Giuseppe Barillari (joe2k01)
+oem: Xiaomi
+devicetree: https://github.com/TeamWin/android_device_xiaomi_scorpio
+xdathread: "https://forum.xda-developers.com/mi-note-2/development/recovery-twrp-xiaomi-mi-note-2-t3774171"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}