diff --git a/_devices/samsunggalaxys6edge.markdown b/_devices/samsunggalaxys6edge.markdown
new file mode 100644
index 0000000..909fffb
--- /dev/null
+++ b/_devices/samsunggalaxys6edge.markdown
@@ -0,0 +1,99 @@
+---
+layout: device
+title: "Samsung Galaxy S6 edge"
+codename: zerolte
+downloadfolder: zerolte
+supportstatus: Current
+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_zerolte"
+xdathread: "http://forum.xda-developers.com/galaxy-s6-edge/orig-development/recovery-official-twrp-galaxy-s6-edge-t3354508"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include appinstall.html %}
+
+<div class='page-heading'>Download Links:</div>
+<hr />
+<p class="text">International GSM (SM-G925F, SM-G925FD, SM-G925I):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerolte">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Canada (SM-G925W8):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroltecan">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">T-Mobile (SM-G925T):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroltetmo">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Sprint (SM-G925P):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroltespr">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">US Cellular (SM-G925R4):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerolteusc">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">China (SM-G9250):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zeroltezt">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+<p class="text">Korea (SM-G925K, SM-G925L, SM-G925S):</p>
+<ul>
+{% for mirror in site.data.mirrors %}
+  <li>
+    <a href="{{ mirror.baseurl }}zerolteskt">
+      {{ mirror.description }}
+    </a>
+  </li>
+{% endfor %}
+</ul>
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxys6edgechina.markdown b/_devices/samsunggalaxys6edgechina.markdown
deleted file mode 100644
index 4a6a0d2..0000000
--- a/_devices/samsunggalaxys6edgechina.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 Edge (Chinese)"
-codename: zeroltezt
-downloadfolder: zeroltezt
-supportstatus: Current
-maintainer: Bigbiff
-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/samsunggalaxys6edgeeu.markdown b/_devices/samsunggalaxys6edgeeu.markdown
deleted file mode 100644
index d7718d0..0000000
--- a/_devices/samsunggalaxys6edgeeu.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 Edge (Europe)"
-codename: zerolteeu
-downloadfolder: zerolteeu
-supportstatus: Current
-maintainer: Bigbiff
-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/samsunggalaxys6edgetmobile.markdown b/_devices/samsunggalaxys6edgetmobile.markdown
deleted file mode 100644
index 9c7de75..0000000
--- a/_devices/samsunggalaxys6edgetmobile.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 Edge (T-Mobile)"
-codename: zeroltetmo
-downloadfolder: zeroltetmo
-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/samsunggalaxys6edgeuscelluar.markdown b/_devices/samsunggalaxys6edgeuscelluar.markdown
deleted file mode 100644
index 27a165b..0000000
--- a/_devices/samsunggalaxys6edgeuscelluar.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy S6 Edge (US Celluar)"
-codename: zerolteusc
-downloadfolder: zerolteusc
-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 %}