diff --git a/_devices/samsunggalaxytab2101.markdown b/_devices/samsunggalaxytab2101.markdown
deleted file mode 100644
index 3a74696..0000000
--- a/_devices/samsunggalaxytab2101.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy Tab 2 10.1"
-codename: p5100
-downloadfolder: "p5100|p5100|p5110|p5110"
-oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
-maintainer: None
-oem: Samsung
-devicetree: "https://github.com/omnirom/android_device_samsung_p5100"
-ddof: "/dev/block/mmcblk0p6"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-<div class='page-heading'>Download Links:</div>
-<hr />
-<p class="text">p5100:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}p5100">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">p5110:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}p5110">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-
-{% include twrpinstall.html %}
-
-{% include odininstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytab2101gms.markdown b/_devices/samsunggalaxytab2101gms.markdown
new file mode 100644
index 0000000..46baa02
--- /dev/null
+++ b/_devices/samsunggalaxytab2101gms.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 10.1 (GSM)"
+codename: p5100
+downloadfolder: p5100
+oldurl: http://teamw.in/project/twrp2/283
+supportstatus: Current
+maintainer: None
+oem: Samsung
+devicetree: "https://github.com/omnirom/android_device_samsung_p5100"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% 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/samsunggalaxytab2101wifi.markdown b/_devices/samsunggalaxytab2101wifi.markdown
new file mode 100644
index 0000000..df91c30
--- /dev/null
+++ b/_devices/samsunggalaxytab2101wifi.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 10.1 (Wi-Fi)"
+codename: p5110
+downloadfolder: p5110
+oldurl: http://teamw.in/project/twrp2/283
+supportstatus: Current
+maintainer: None
+oem: Samsung
+devicetree: "https://github.com/omnirom/android_device_samsung_p5110"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% 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/samsunggalaxytab270.markdown b/_devices/samsunggalaxytab270.markdown
deleted file mode 100644
index 046eddb..0000000
--- a/_devices/samsunggalaxytab270.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: device
-title:  "Samsung Galaxy Tab 2 7.0"
-codename: p3100
-downloadfolder: "p3100|p3100|p3110|p3110"
-oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
-maintainer: None
-oem: Samsung
-devicetree: "https://github.com/omnirom/android_device_samsung_p3100"
-ddof: "/dev/block/mmcblk0p6"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-<div class='page-heading'>Download Links:</div>
-<hr />
-<p class="text">p3100:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}p3100">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">p3110:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}p3110">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-
-{% include twrpinstall.html %}
-
-{% include odininstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytab270gsm.markdown b/_devices/samsunggalaxytab270gsm.markdown
new file mode 100644
index 0000000..441e72a
--- /dev/null
+++ b/_devices/samsunggalaxytab270gsm.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 7.0 (GSM)"
+codename: p3100
+downloadfolder: p3100
+oldurl: http://teamw.in/project/twrp2/283
+supportstatus: Current
+maintainer: None
+oem: Samsung
+devicetree: "https://github.com/omnirom/android_device_samsung_p3100"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% 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/samsunggalaxytab270wifi.markdown b/_devices/samsunggalaxytab270wifi.markdown
new file mode 100644
index 0000000..8ab69f4
--- /dev/null
+++ b/_devices/samsunggalaxytab270wifi.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 7.0 (Wi-Fi)"
+codename: p3110
+downloadfolder: p3110
+oldurl: http://teamw.in/project/twrp2/283
+supportstatus: Current
+maintainer: None
+oem: Samsung
+devicetree: "https://github.com/omnirom/android_device_samsung_p3110"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}