diff --git a/_devices/samsunggalaxys6.markdown b/_devices/samsunggalaxys6.markdown
index 1c89fee..5661f8b 100644
--- a/_devices/samsunggalaxys6.markdown
+++ b/_devices/samsunggalaxys6.markdown
@@ -1,21 +1,96 @@
 ---
 layout: device
-title:  "Samsung Galaxy S6"
+title: "Samsung Galaxy S6"
 codename: zeroflte
 downloadfolder: zeroflte
 supportstatus: Current
-maintainer: None
+maintainer: "jcadduono, bigbiff"
 oem: Samsung
 ddof: "/dev/block/platform/15570000.ufs/by-name/RECOVERY"
+devicetree: "https://github.com/TeamWin?utf8=%E2%9C%93&query=android_device_samsung_zeroflte"
+xdathread: "http://forum.xda-developers.com/galaxy-s6/orig-development/twrp-t3080940"
 ---
 
 {% include disclaimer.html %}
 
 {% include supportstatus.html %}
 
+{% include dmverity.html %}
+
 {% include appinstall.html %}
 
-{% include download.html %}
+<div class='page-heading'>Download Links:</div>
+<hr />
+<p class="text">International GSM (SM-G920F, SM-G920FD, SM-G920I):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroflte">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Canada (SM-G920W8):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerofltecan">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">T-Mobile (SM-G920T):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerofltetmo">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Sprint (SM-G920P):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerofltespr">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">US Cellular (SM-G920R4):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroflteusc">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">China &amp; China Duos (SM-G9200, SM-G9208, SM-G9209):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerofltezt">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Korea (SM-G920K, SM-G920L, SM-G920S):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroflteskt">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
 
 {% include twrpinstall.html %}
 
diff --git a/_devices/samsunggalaxys6sprint.markdown b/_devices/samsunggalaxys6sprint.markdown
deleted file mode 100644
index a269b64..0000000
--- a/_devices/samsunggalaxys6sprint.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 (Sprint)"
-codename: zerofltespr
-downloadfolder: zerofltespr
-supportstatus: Current
-maintainer: None
-oem: Samsung
-ddof: "/dev/block/platform/15570000.ufs/by-name/RECOVERY"
----
-
-{% 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/samsunggalaxys6uscelluar.markdown b/_devices/samsunggalaxys6uscelluar.markdown
deleted file mode 100644
index c8fbee2..0000000
--- a/_devices/samsunggalaxys6uscelluar.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 (US Celluar)"
-codename: zeroflteusc
-downloadfolder: zeroflteusc
-supportstatus: Current
-maintainer: None
-oem: Samsung
-ddof: "/dev/block/platform/15570000.ufs/by-name/RECOVERY"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include odininstall.html %}
-
-{% include ddinstall.html %}