diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt
index 3569b381..0db33111 100644
--- a/mpq/arr/portdata.txt
+++ b/mpq/arr/portdata.txt
@@ -1,61 +1,61 @@
-Marine
-Ghost
-Firebat
+Maverick
+Eidolon
+Harakan
 Vulture
-Spider Mine
+Lobotomy Mine
 Goliath
-Siege Tank
-SCV
+Phalanx
+Mason
 Wraith
-Science Vessel
-Dropship
-Battlecruiser
-Sarah Kerrigan
-Jim Raynor
-Edmund Duke
-Civilian
+Seraph
+Trojan
+Minotaur
+Silvertongue
+Penumbra
+Madrigal
+Blackjack
 Arcturus Mengsk
 Terran Advisor
 Larva
 Egg
 Zethrokor
 Hydralisk
-Ultralisk
-Broodling
-Drone
-Overlord
+Ultrokor
+Rilirokor
+Droleth
+Ovileth
 Mutalisk
-Guardian
-Queen
-Defiler
-Scourge
+Geszithalor
+Matraleth
+Isthrathaleth
+Skryling
 Cocoon
 Mature Chrysalis
-Infested Terran
+Cohort
 Zasz
 Daggoth
 Infested Kerrigan
 Hunter Killer
 Overmind
-Probe
+Scribe
 Zealot
-Dragoon
-High Templar
+Dracadin
+Cantavis
 Archon
-Shuttle
-Scout
-Arbiter
-Carrier
-Interceptor
-Dark Templar
-Fenix (Zealot)
-Fenix (Dragoon)
-Zeratul
-Tassadar
+Envoy
+Panoptus
+Didact
+Solarion
+Steward
+Cabalist
+Amaranth
+Atreus
+Anthelion
+Vagrant
 Gantrithor
-Observer
-Reaver
-Scarab
+Witness
+Accantor
+Plasma Shell
 Khaydarin Crystal Formation
 Aldaris
 Protoss Advisor
@@ -88,18 +88,18 @@ Flag (Orange) (Pl.5)
 Flag (Brown) (Pl.6)
 Flag (White) (Pl.7)
 Flag (Yellow) (Pl.8)
-Medic
+Cleric
 Valkyrie
 Dugalle
-Stukov
+Autocrat
 Duran
-Artanis
-Raszagal
-Devourer
-Lurker
-Dark Archon
-Corsair
-Scantid
+Exemplar
+Empress
+Vithrilisk
+Lakizilisk
+Mind Tyrant
+Lanifect
+Konvilisk
 Kakaru
 Ursadon
 Uraj Crystal
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 0760f5f8..1721a7ee 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/patchnotes.md b/patchnotes.md
index d854e0be..f5d8f657 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -74,6 +74,8 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 	- Repair HP amount now 75% of the previous amount per second
 - [Cleric](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cleric):
 	- Healing rate now 9 HP per second, from 12
+- [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman):
+	- Visionary Mode transport space now 6, from 3
 - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops):
 	- Mineral cost now 100, from 75
 	- HP now 85, from 80
@@ -83,6 +85,8 @@ More rebalancings, more new sprites, more bugfixes, and a more useful patch desc
 	- Fragmentary Shells removed
 	- **New: Recursion Rounds:**
 		- Each Cyclops attack leaves behind a latent shell that detonates after 2 seconds, dealing 10 damage to all enemies within 2 range
+- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- Cinder Mode transport space now 4, from 2
 - [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
 	- Arclite Cannon:
 		- Armor penetration now 0, from 3
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 6a9e7d8f..8a790aed 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ