diff --git a/_devices/samsunggalaxytab2101gms.markdown b/_devices/samsunggalaxytab2101gms.markdown
index 46baa02..3856330 100644
--- a/_devices/samsunggalaxytab2101gms.markdown
+++ b/_devices/samsunggalaxytab2101gms.markdown
@@ -4,7 +4,7 @@
 codename: p5100
 downloadfolder: p5100
 oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
+supportstatus: Discontinued
 maintainer: None
 oem: Samsung
 devicetree: "https://github.com/omnirom/android_device_samsung_p5100"
@@ -19,6 +19,8 @@
 
 {% include download.html %}
 
+<a href="https://twrp.me/devices/samsunggalaxytab2gsmunified.html">Continued as unified TWRP ("espresso3g")</a>
+
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
diff --git a/_devices/samsunggalaxytab2101wifi.markdown b/_devices/samsunggalaxytab2101wifi.markdown
index df91c30..9a35d33 100644
--- a/_devices/samsunggalaxytab2101wifi.markdown
+++ b/_devices/samsunggalaxytab2101wifi.markdown
@@ -4,7 +4,7 @@
 codename: p5110
 downloadfolder: p5110
 oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
+supportstatus: Discontinued
 maintainer: None
 oem: Samsung
 devicetree: "https://github.com/omnirom/android_device_samsung_p5110"
@@ -19,6 +19,8 @@
 
 {% include download.html %}
 
+<a href="https://twrp.me/devices/samsunggalaxytab2wifiunified.html">Continued as unified TWRP ("espressowifi")</a>
+
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
diff --git a/_devices/samsunggalaxytab270gsm.markdown b/_devices/samsunggalaxytab270gsm.markdown
index 441e72a..51fb651 100644
--- a/_devices/samsunggalaxytab270gsm.markdown
+++ b/_devices/samsunggalaxytab270gsm.markdown
@@ -4,7 +4,7 @@
 codename: p3100
 downloadfolder: p3100
 oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
+supportstatus: Discontinued
 maintainer: None
 oem: Samsung
 devicetree: "https://github.com/omnirom/android_device_samsung_p3100"
@@ -19,6 +19,8 @@
 
 {% include download.html %}
 
+<a href="https://twrp.me/devices/samsunggalaxytab2gsmunified.html">Continued as unified TWRP ("espresso3g")</a>
+
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
diff --git a/_devices/samsunggalaxytab270wifi.markdown b/_devices/samsunggalaxytab270wifi.markdown
index 8ab69f4..ff2f0da 100644
--- a/_devices/samsunggalaxytab270wifi.markdown
+++ b/_devices/samsunggalaxytab270wifi.markdown
@@ -4,7 +4,7 @@
 codename: p3110
 downloadfolder: p3110
 oldurl: http://teamw.in/project/twrp2/283
-supportstatus: Current
+supportstatus: Discontinued
 maintainer: None
 oem: Samsung
 devicetree: "https://github.com/omnirom/android_device_samsung_p3110"
@@ -19,6 +19,8 @@
 
 {% include download.html %}
 
+<a href="https://twrp.me/devices/samsunggalaxytab2wifiunified.html">Continued as unified TWRP ("espressowifi")</a>
+
 {% include twrpinstall.html %}
 
 {% include odininstall.html %}
diff --git a/_devices/samsunggalaxytab2gmsunified.markdown b/_devices/samsunggalaxytab2gmsunified.markdown
new file mode 100644
index 0000000..a62afe5
--- /dev/null
+++ b/_devices/samsunggalaxytab2gmsunified.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 (GSM - unified)"
+codename: espresso3g
+downloadfolder: espresso3g
+supportstatus: Current
+maintainer: Android-Andi
+oem: Samsung
+devicetree: "https://github.com/TeamWin/android_device_samsung_espresso3g"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% include disclaimer.html %}
+
+<b>NOTE:</b> This version of TWRP works on: p3100 and p5100.
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytab2wifiunified.markdown b/_devices/samsunggalaxytab2wifiunified.markdown
new file mode 100644
index 0000000..2f8ee4d
--- /dev/null
+++ b/_devices/samsunggalaxytab2wifiunified.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab 2 (Wi-Fi - unified)"
+codename: espressowifi
+downloadfolder: espressowifi
+supportstatus: Current
+maintainer: Android-Andi
+oem: Samsung
+devicetree: "https://github.com/TeamWin/android_device_samsung_espressowifi"
+ddof: "/dev/block/mmcblk0p6"
+---
+
+{% include disclaimer.html %}
+
+<b>NOTE:</b> This version of TWRP works on: p3110, p3113, p5110 and p5113.
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}