diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index fb13de58..b15f0500 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index b9c26829..9324f478 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -86,7 +86,7 @@ Protoss Witness
 Protoss Plasma Shell (deprecated)
 Protoss Demiurge
 Protoss Pariah
-Protoss Vassal (old)
+Tassadar
 Protoss Simulacrum
 Protoss Charlatan
 Terran Wyvern
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 086952a7..5ed4c665 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt
index d143e2a6..29e85506 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -31,7 +31,7 @@ Longbolt Missiles (Watchdog)
 Yamato Cannon (Magnetar ability)
 Nuclear Missile
 Lobotomy Grenade (Goska)
-EMP Shockwave (unused)
+Psi Assault (Tassadar)
 Irradiate (Seraph ability)
 Zethrok Claws (Zethrokor)
 Vorvrok Claws (Vorvrokor)
@@ -57,9 +57,9 @@ Suicide (Skryrokor)
 Parasitic Excision (Matraleth ability)
 Twintorch (Dyad)
 Screaming Venom 2 (Keskathalor)
-Dark Swarm (Isthrathaleth ability)
+Carapace Swarm (Isthrathaleth ability)
 Plague (Isthrathaleth ability)
-Consume (Zoryusthaleth ability)
+Consume (unused ability)
 Particle Beam (Scribe)
 Particle Beam (Harvest)
 Phase Blades (Zealot)
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index ef82f66f..e7a0e605 100644
Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ
diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft
index b9c1128d..37d99414 100644
Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ
diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp
index a2c58524..8a0f7097 100644
Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ
diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl
index 964227d9..7907da6e 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/mpq/sound/protoss/fenixd/ufdyes00.wav b/mpq/sound/protoss/fenixd/ufdyes00.wav
new file mode 100644
index 00000000..d6b023b2
Binary files /dev/null and b/mpq/sound/protoss/fenixd/ufdyes00.wav differ
diff --git a/mpq/sound/protoss/fenixd/ufdyes01.wav b/mpq/sound/protoss/fenixd/ufdyes01.wav
new file mode 100644
index 00000000..52c69a62
Binary files /dev/null and b/mpq/sound/protoss/fenixd/ufdyes01.wav differ
diff --git a/mpq/sound/protoss/fenixd/ufdyes02.wav b/mpq/sound/protoss/fenixd/ufdyes02.wav
new file mode 100644
index 00000000..aebf77c3
Binary files /dev/null and b/mpq/sound/protoss/fenixd/ufdyes02.wav differ
diff --git a/mpq/sound/protoss/fenixd/ufdyes03.wav b/mpq/sound/protoss/fenixd/ufdyes03.wav
new file mode 100644
index 00000000..1a501a24
Binary files /dev/null and b/mpq/sound/protoss/fenixd/ufdyes03.wav differ
diff --git a/mpq/sound/protoss/fenixz/ufeyes00.wav b/mpq/sound/protoss/fenixz/ufeyes00.wav
new file mode 100644
index 00000000..d389a560
Binary files /dev/null and b/mpq/sound/protoss/fenixz/ufeyes00.wav differ
diff --git a/mpq/sound/protoss/fenixz/ufeyes01.wav b/mpq/sound/protoss/fenixz/ufeyes01.wav
new file mode 100644
index 00000000..4dcc62f5
Binary files /dev/null and b/mpq/sound/protoss/fenixz/ufeyes01.wav differ
diff --git a/mpq/sound/protoss/fenixz/ufeyes02.wav b/mpq/sound/protoss/fenixz/ufeyes02.wav
new file mode 100644
index 00000000..a04bdadc
Binary files /dev/null and b/mpq/sound/protoss/fenixz/ufeyes02.wav differ
diff --git a/mpq/sound/protoss/fenixz/ufeyes03.wav b/mpq/sound/protoss/fenixz/ufeyes03.wav
new file mode 100644
index 00000000..69c15700
Binary files /dev/null and b/mpq/sound/protoss/fenixz/ufeyes03.wav differ
diff --git a/mpq/sound/protoss/tassadar/utayes00.wav b/mpq/sound/protoss/tassadar/utayes00.wav
new file mode 100644
index 00000000..d71b883a
Binary files /dev/null and b/mpq/sound/protoss/tassadar/utayes00.wav differ
diff --git a/mpq/sound/protoss/tassadar/utayes01.wav b/mpq/sound/protoss/tassadar/utayes01.wav
new file mode 100644
index 00000000..bbd00090
Binary files /dev/null and b/mpq/sound/protoss/tassadar/utayes01.wav differ
diff --git a/mpq/sound/protoss/tassadar/utayes02.wav b/mpq/sound/protoss/tassadar/utayes02.wav
new file mode 100644
index 00000000..68f73a54
Binary files /dev/null and b/mpq/sound/protoss/tassadar/utayes02.wav differ
diff --git a/mpq/sound/protoss/tassadar/utayes03.wav b/mpq/sound/protoss/tassadar/utayes03.wav
new file mode 100644
index 00000000..24825cd4
Binary files /dev/null and b/mpq/sound/protoss/tassadar/utayes03.wav differ
diff --git a/mpq/sound/protoss/zeratul/uzeyes00.wav b/mpq/sound/protoss/zeratul/uzeyes00.wav
new file mode 100644
index 00000000..9ecee93c
Binary files /dev/null and b/mpq/sound/protoss/zeratul/uzeyes00.wav differ
diff --git a/mpq/sound/protoss/zeratul/uzeyes01.wav b/mpq/sound/protoss/zeratul/uzeyes01.wav
new file mode 100644
index 00000000..9fb1ab35
Binary files /dev/null and b/mpq/sound/protoss/zeratul/uzeyes01.wav differ
diff --git a/mpq/sound/protoss/zeratul/uzeyes02.wav b/mpq/sound/protoss/zeratul/uzeyes02.wav
new file mode 100644
index 00000000..d4734896
Binary files /dev/null and b/mpq/sound/protoss/zeratul/uzeyes02.wav differ
diff --git a/mpq/sound/protoss/zeratul/uzeyes03.wav b/mpq/sound/protoss/zeratul/uzeyes03.wav
new file mode 100644
index 00000000..b0e7139f
Binary files /dev/null and b/mpq/sound/protoss/zeratul/uzeyes03.wav differ
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index 0f9503db..23f3be7c 100644
Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ
diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp
index 524d797b..bac9f8bd 100644
Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index fc2d3443..ecb99af9 100644
Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ
diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp
index 012affe9..c8109645 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 165a4b7c..25807c3b 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ