diff --git a/_oneplus/oneplus3t.markdown b/_oneplus/oneplus3t.markdown
deleted file mode 100644
index e39720f..0000000
--- a/_oneplus/oneplus3t.markdown
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: device
-title: "OnePlus 3T"
-codename: oneplus3t
-oem: OnePlus
-downloadfolder: oneplus3t
-supportstatus: Current
-maintainer: jcadduono
-ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
-devicetree: https://github.com/TeamWin/android_device_oneplus_oneplus3t
-xdathread: "https://forum.xda-developers.com/oneplus-3t/development/recovery-twrp-oneplus-3t-t3507308"
-fastbootunlock: true
----
-
-{% include disclaimer.html %}
-
-{% include supportstatus.html %}
-
-{% include dmverity.html %}
-
-{% include appinstall.html %}
-
-{% include download.html %}
-
-{% include twrpinstall.html %}
-
-{% include fastbootinstall.html %}
-
-{% include ddinstall.html %}
diff --git a/_oneplus/oneplusthree.markdown b/_oneplus/oneplusthree.markdown
index e3e693d..33ea3fa 100644
--- a/_oneplus/oneplusthree.markdown
+++ b/_oneplus/oneplusthree.markdown
@@ -1,14 +1,14 @@
 ---
 layout: device
-title: "OnePlus 3"
+title: "OnePlus 3/3T"
 codename: oneplus3
 oem: OnePlus
 downloadfolder: oneplus3
 supportstatus: Current
-maintainer: jcadduono
+maintainer: dianlujitao
 ddof: "/dev/block/platform/soc/624000.ufshc/by-name/recovery"
 devicetree: https://github.com/TeamWin/android_device_oneplus_oneplus3
-xdathread: "https://forum.xda-developers.com/oneplus-3/development/recovery-official-twrp-oneplus-3-t3539129"
+xdathread: "https://forum.xda-developers.com/oneplus-3/oneplus-3--3t-cross-device-development/recovery-official-twrp-touch-recovery-t3742894"
 fastbootunlock: true
 ---
 
diff --git a/_samsung/samsunggalaxys3internationallte.markdown b/_samsung/samsunggalaxys3internationallte.markdown
index 54c85e6..1dd33aa 100644
--- a/_samsung/samsunggalaxys3internationallte.markdown
+++ b/_samsung/samsunggalaxys3internationallte.markdown
@@ -1,13 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S3 International LTE"
+title:  "Samsung Galaxy S III (International LTE)"
 codename: i9305
 downloadfolder: i9305
-oldurl: http://teamw.in/project/twrp2/145
 supportstatus: Current
-maintainer: None
+maintainer: ripee
 oem: Samsung
-ddof: "/dev/block/mmcblk0p9"
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_i9305"
+xdathread: "https://forum.xda-developers.com/galaxy-s3/development-i9305/recovery-twrp-3-2-1-0-t3741413"
 ---
 
 {% include disclaimer.html %}
@@ -22,4 +23,4 @@
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_samsung/samsunggalaxys4internationalqualcomm.markdown b/_samsung/samsunggalaxys4internationalqualcomm.markdown
index 55d5490..c8943e2 100644
--- a/_samsung/samsunggalaxys4internationalqualcomm.markdown
+++ b/_samsung/samsunggalaxys4internationalqualcomm.markdown
@@ -1,14 +1,14 @@
 ---
 layout: device
-title:  "Samsung Galaxy S4 International Qualcomm"
+title:  "Samsung Galaxy S4 (GT-I9505/G, SGH-M919)"
 codename: jfltexx
 downloadfolder: jfltexx
-oldurl: http://teamw.in/project/twrp2/182
 supportstatus: Current
-maintainer: None
+maintainer: ripee
 oem: Samsung
-ddof: "/dev/block/mmcblk0p21"
+ddof: "/dev/block/bootdevice/by-name/recovery"
 devicetree: "https://github.com/TeamWin/android_device_samsung_jfltexx"
+xdathread: "https://forum.xda-developers.com/galaxy-s4/i9505-orig-develop/recovery-twrp-3-2-1-0-t3742880"
 ---
 
 {% include disclaimer.html %}
@@ -23,4 +23,4 @@
 
 {% include odininstall.html %}
 
-{% include ddinstall.html %}
+{% include ddinstall.html %}
\ No newline at end of file
diff --git a/_sony/sonyxperiatabletzlte.markdown b/_sony/sonyxperiatabletzlte.markdown
new file mode 100644
index 0000000..b970ae7
--- /dev/null
+++ b/_sony/sonyxperiatabletzlte.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Sony Xperia Tablet Z LTE"
+codename: pollux
+downloadfolder: pollux
+supportstatus: Current
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_pollux
+oem: Sony
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-tablet-z/orig-development/ub-twrp-v3-2-1-xperia-tablet-z-t3735110"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include fotakernelnote.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_sony/sonyxperiaztablet.markdown b/_sony/sonyxperiatabletzwifi.markdown
similarity index 62%
rename from _sony/sonyxperiaztablet.markdown
rename to _sony/sonyxperiatabletzwifi.markdown
index 1588af8..20d36bd 100644
--- a/_sony/sonyxperiaztablet.markdown
+++ b/_sony/sonyxperiatabletzwifi.markdown
@@ -1,15 +1,14 @@
 ---
 layout: device
-title:  "Sony Xperia Z Tablet"
+title:  "Sony Xperia Tablet Z Wi-Fi"
 codename: pollux_windy
 downloadfolder: pollux_windy
-oldurl: http://teamw.in/project/twrp2/185
 supportstatus: Current
-maintainer: Dees_Troy
+maintainer: CyberWalkMaN
 devicetree: https://github.com/TeamWin/android_device_sony_pollux_windy.git
 oem: Sony
-xdathread: "http://forum.xda-developers.com/showthread.php?t=2413289"
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-tablet-z/orig-development/ub-twrp-v3-2-1-xperia-tablet-z-t3735110"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiaz.markdown b/_sony/sonyxperiaz.markdown
index d5dcd96..e6e9345 100644
--- a/_sony/sonyxperiaz.markdown
+++ b/_sony/sonyxperiaz.markdown
@@ -3,12 +3,12 @@
 title:  "Sony Xperia Z"
 codename: yuga
 downloadfolder: yuga
-oldurl: http://teamw.in/project/twrp2/187
 supportstatus: Current
-maintainer: Dees_Troy
-devicetree: https://github.com/TeamWin/android_device_sony_yuga.git
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_yuga
 oem: Sony
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-z/orig-development/ub-twrp-v3-2-1-xperia-z-t3735098"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiazl.markdown b/_sony/sonyxperiazl.markdown
index d99cac3..a0bdd0e 100644
--- a/_sony/sonyxperiazl.markdown
+++ b/_sony/sonyxperiazl.markdown
@@ -4,10 +4,11 @@
 codename: odin
 downloadfolder: odin
 supportstatus: Current
-maintainer: humberos
-devicetree: https://github.com/TeamWin/android_device_sony_odin.git
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_odin
 oem: Sony
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-zl/orig-development/ub-twrp-v3-2-1-xperia-zl-t3720156"
 ---
 
 {% include disclaimer.html %}
diff --git a/_sony/sonyxperiazr.markdown b/_sony/sonyxperiazr.markdown
index 5ed01ca..a023b1b 100644
--- a/_sony/sonyxperiazr.markdown
+++ b/_sony/sonyxperiazr.markdown
@@ -4,11 +4,11 @@
 codename: dogo
 downloadfolder: dogo
 supportstatus: Current
-maintainer: Chippa_a
+maintainer: CyberWalkMaN
+devicetree: https://github.com/TeamWin/android_device_sony_dogo
 oem: Sony
-devicetree: https://github.com/TeamWin/android_device_sony_dogo.git
-xdathread: "http://forum.xda-developers.com/showthread.php?t=3317670"
-ddof: /dev/block/platform/msm_sdcc.1/by-name/FOTAKernel
+ddof: "/dev/block/platform/msm_sdcc.1/by-name/FOTAKernel"
+xdathread: "https://forum.xda-developers.com/xperia-zr/orig-development/ub-twrp-v3-2-1-xperia-zr-t3744868"
 ---
 
 {% include disclaimer.html %}