diff --git a/_devices/htconemaxsprint.markdown b/_devices/htconemaxsprint.markdown
deleted file mode 100644
index 1c83467..0000000
--- a/_devices/htconemaxsprint.markdown
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: device
-title:  "HTC One Max Sprint"
-codename: t6spr
-downloadfolder: t6spr
-oldurl: http://teamw.in/project/twrp2/211
-supportstatus: Current
-maintainer: FlyHalf205
-oem: HTC
-ddof: "/dev/block/mmcblk0p38"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include fastbootinstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_devices/htconemaxgsm.markdown b/_devices/htconemaxuniv.markdown
similarity index 63%
rename from _devices/htconemaxgsm.markdown
rename to _devices/htconemaxuniv.markdown
index 8ff82c3..fda77fa 100644
--- a/_devices/htconemaxgsm.markdown
+++ b/_devices/htconemaxuniv.markdown
@@ -1,10 +1,12 @@
 ---
 layout: device
-title:  "HTC One Max GSM"
-codename: t6ul
-downloadfolder: t6ul
+title:  "HTC One Max Universal"
+codename: t6univ
+downloadfolder: t6univ
 supportstatus: Current
 maintainer: FlyHalf205
+devicetree: https://github.com/TeamWin/android_device_htc_t6univ
+xdathread: http://forum.xda-developers.com/showthread.php?t=2498746
 oem: HTC
 ddof: "/dev/block/platform/msm_sdcc.1/by-name/recovery"
 ---
diff --git a/_devices/htconemaxverizon.markdown b/_devices/htconemaxverizon.markdown
deleted file mode 100644
index b28041e..0000000
--- a/_devices/htconemaxverizon.markdown
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: device
-title:  "HTC One Max Verizon"
-codename: t6vzw
-downloadfolder: t6vzw
-oldurl: http://teamw.in/project/twrp2/210
-supportstatus: Current
-maintainer: FlyHalf205
-oem: HTC
-ddof: "/dev/block/mmcblk0p38"
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include fastbootinstall.html %}
-
-{% include ddinstall.html %}