diff --git a/master changelog.md b/master changelog.md
index f85b4a5..03217c2 100644
--- a/master changelog.md	
+++ b/master changelog.md	
@@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes.
 See patchnotes.md for info on the most recent patch!
 
 # Table of Contents
+- [28 December 2024](#28-december-2024)
 - [22 November 2024](#22-november-2024)
 - [25 October 2024](#25-october-2024)
 - [22 July 2024](#22-july-2024)
@@ -91,6 +92,198 @@ See patchnotes.md for info on the most recent patch!
 - [13 August 2020](#13-august-2020)
 - [12 August 2020](#12-august-2020)
 
+# 28 December 2024
+## Year 2, month 12, patch 1
+## Acropolis #2 - End of Tournament
+
+This patch will include new features, balance adjustments, bugfixes, and audiovisual improvements.
+
+Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! Version 2.2 and up now includes an automatic download of CrownLink, a networking alternative for Cosmonarchy!
+
+We are still hunting for desyncs! Please submit your `Critical` and `Sync Randoms` text files from the `logs` folder to the **cm-issues** "[Desync error megathread](https://discord.com/channels/139276012058968064/1251318131671175198)" on [our Discord server](https://discord.com/invite/s5SKBmY).
+
+## Patch summary
+
+A video going over all changes is forthcoming. This section will be edited with a link and more text at that time.
+
+## Core Mechanics
+- **Height advantage:**
+	- Range bonus +2 per level » +1 per level
+
+## Mapmaking
+- **NEW: Collision brushes** (c. Veeq7)
+	- Neutral (P12) **Spider Mine**s:
+		- Makes pathfinder regions unpathable and disconnects it from walkable space
+		- You can preview pathfinder regions in SCMDraft 2, where each region is denoted by a bold yellow outline
+	- Neutral (P12) **Supply Depot**s:
+		- Sets the tile they are placed on to full collision (unwalkable)
+		- This is not as reliable as **Spider Mine**s
+
+## Game Modes
+- **Massacre:**
+	- Now gives 2x units per training / morphing
+- **NEW: Dark Ages** (c. Veeq7)
+	- -20% to base sight range and base weapon range
+	- Cliff advantage gives 0.5 weapon range, from 1
+	- Attacking flyers are forbidden
+		- **Caveat:** AI still train them currently
+- **Massacre:**
+	- Unit creation now gives twice as many units
+
+## Bugfixes
+- **The Turning:**
+	- Fixed cancelled units being added to the dead unit pool (c. Veeq7)
+	- Improved performance during all stages of the game (c. Veeq7)
+- **Gameplay:**
+	- Significantly improve melee air unit target tracking (c. DF)
+	- Lardfix: Resolve rare ownership jank with Morningstars (c. DF)
+- **Audiovisual:**
+	- Fixed improper mineral chunk being used for non-depleted Mineral Field harvests (r. jakulangski)
+	- `celebrations-enabled` config option functionality restored (c. Veeq7)
+	- Added aura displays for **Barghest Repentent Chorus** and **Manifold Concurring Chorus** (r. shopkeeper dog)
+	- **Hypnagogue Through the Looking Glass** tooltip corrected (displayed incorrect range; r. GreenEggs'NSpam)
+	- **Cleric Nanorepair** tooltip corrected (displayed incorrect heal amount)
+
+## Terran
+- [Maverick](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick):
+	- HP 50 » 60
+- [Cleric](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cleric):
+	- HP 75 » 80
+	- **Nanorepair:**
+		- Now adds non-stacking +1 armor to affected units; expires after 1 second
+		- *Visual read not yet implemented*
+- [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman):
+	- **Nanite Field** ability range 4/8 » 4/6
+- [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant):
+	- HP 95 » 110
+	- Armor penetration 2 » 3
+- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap):
+	- Resource costs 125/0 » 100/0
+	- *While Madcaps seem very powerful statistically, it may be safe to make them more spammable. We shall see...*
+- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles):
+	- HP 150 » 180
+- [Striga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/striga):
+	- HP 120 » 160
+- [Olympian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/olympian):
+	- HP 180 » 220
+- [Dilettante](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/dilettante):
+	- HP 90 » 110
+- [Vulture](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture):
+	- HP 90 » 100
+	- Movement speed 7.71 » 8.33
+- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath):
+	- HP 200 » 220
+- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack):
+	- Armor 2 » 1
+	- **Monogun:**
+		- Weapon cooldown 0.49 » 0.54
+- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- HP 140 » 150
+- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
+	- HP 200 » 240
+- [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal):
+	- HP 225 » 260
+- [Tarasque](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tarasque):
+	- Build time 32 » 30
+	- Vision range 9 » 8
+
+## Protoss
+- [Witness](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/witness):
+	- Shields 20 » 40
+	- Movement speed 4.58 » 5.41
+- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
+	- HP 120 » 150
+- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth):
+	- Shields 40 » 60
+- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald):
+	- HP 120 » 160
+- [Atreus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/atreus):
+	- HP 150 » 160
+- [Cabalist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cabalist):
+	- **Silent Strides**:
+		- After decloaking, the first strike deals 150% damage
+- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan):
+	- **Fervent Blaster:**
+		- Weapon range 5 » 6
+		- Splash radii 8/16/24 » 12/24/32
+		- Projectile speed 60 » 90
+		- Projectile acceleration ~300% faster
+- [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah):
+	- HP 300 » 400
+- [Sycophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/sycophant):
+	- HP 100 » 200
+- [Archon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/archon):
+	- Build time 45 » 30
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- **Sunsplit Beam:**
+		- Weapon damage 10x10 » 12x12
+		- Weapon range 10 » 12
+- [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold):
+	- **Concurring Chorus:**
+		- Effect range 2 » 3
+- [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem):
+	- Shields 60 » 120
+- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol):
+	- **Prismatic Blaster:**
+		- Weapon damage 1x10 » 2x6
+		- Armor penetration 2 » 0
+		- Weapon cooldown 0.92 » 0.71
+- [Servitor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/servitor):
+	- HP 80 » 100
+	- Build time 18 » 15
+- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron):
+	- Movement speed 4.16 » 5.83
+- [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact):
+	- HP 150 » 200
+- [Steward](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/steward):
+	- HP 70 » 80
+- [Star Sovereign](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/star-sovereign):
+	- Shields 150 » 200
+- [Embassy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/embassy):
+	- Resource costs 125/75 » 125/50
+- [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery):
+	- Resource costs 150/100 » 150/75
+	- Build time 50 » 55
+- [Lattice](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lattice):
+	- Resource costs 150/50 » 150/25
+
+## Zerg
+- **Broodspawn**
+	- Incubation procs now complete on unit death (c. Veeq7)
+- [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor):
+	- **Vestigial Strike:**
+		- Weapon damage 1x8 » 1x4
+		- Weapon cooldown 0.83 » 0.75
+	- **Nathrok Claws:**
+		- Weapon damage 2x4 » 2x6
+- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk):
+	- Weapon range 6 » 5
+- [Mortothrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mortothrokor):
+	- HP 180 » 250
+- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk):
+	- Movement speed 6.16 » 6.52
+	- Attack windup 4 frames » 2 frames
+- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor):
+	- HP 130 » 160
+- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor):
+	- Armor 1 » 2
+	- **Skittering Spores:**
+		- Projectile speed 60 » 30
+		- Projectile acceleration now ~50% slower
+- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
+	- HP 180 » 240
+- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
+	- HP 180 » 200
+- [Rilirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rilirokor) and [Rililisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rililisk):
+	- **Death Cycle:**
+		- On death and expiry, now applies Ensnare to hostiles within 2 range; lasts 1 second.
+- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor):
+	- HP 220 » 250
+- [Vilgorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vilgorokor):
+	- HP 200 » 280
+- [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor):
+	- HP 440 » 500
+
 # 22 November 2024
 ## Year 2, month 11, patch 1
 ## Acropolis #2 - Main Stages
diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index fcc58f4..b5a2f6d 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index 3e9e93b..4bff642 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -531,11 +531,11 @@ Zealot (Starbound)
 Ecclesiast (Khalendric Knights)
 Vibrance
 Charlatan Projectile
-Extended Flingy #325
-Extended Flingy #326
-Extended Flingy #327
-Extended Flingy #328
-Extended Flingy #329
+Phase Disruptor Large
+Harakan (Golden)
+Iziralisk
+Cicatus
+White Circle (Instant)
 Extended Flingy #330
 Extended Flingy #331
 Extended Flingy #332
diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 77d3ff8..defd5b1 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl
index cf31cc4..f9098c8 100644
Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index d5d7105..e455fc1 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1947,19 +1947,19 @@ Ecclesiast Shadow (Khalendric Knights)
 Vibrance
 Vibrance Shadow
 Blackjack (Damaged)
-Extended Image #947
-Extended Image #948
-Extended Image #949
-Extended Image #950
-Extended Image #951
-Extended Image #952
-Extended Image #953
-Extended Image #954
-Extended Image #955
-Extended Image #956
-Extended Image #957
-Extended Image #958
-Extended Image #959
+Phase Disruptor Large
+Harakan (Golden)
+Harakan (Golden) Shadow
+Iziralisk
+Iziralisk Shadow
+Iziralisk Remains
+Iziralisk Birth
+Iziralisk Spore
+Iziralisk Mutate
+Cicatus
+Cicatus Shadow
+White Circle (Instant)
+Gorgrokor Remains
 Extended Image #960
 Extended Image #961
 Extended Image #962
diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index cb3d2f9..4bac3b5 100644
Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ
diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index 912fd63..4e801e5 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3240,30 +3240,30 @@ Zerg Construction Start 01
 Broodspawn Overlay Proc
 Terran Construction End 01
 Terran Construction Start 01
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Broodspawn Spawn Proc
+Potentate Ready 01
+Potentate Ready 02
+Potentate Ready 03
+Potentate Selected 01
+Potentate Selected 02
+Potentate Selected 03
+Potentate Selected 04
+Potentate Order Passive 01
+Potentate Order Passive 02
+Potentate Order Passive 03
+Potentate Order Passive 04
+Potentate Order Aggressive 01
+Potentate Order Aggressive 02
+Potentate Order Aggressive 03
+Potentate Order Aggressive 04
+Potentate Under Attack 01
+Potentate Under Attack 02
+Potentate Under Attack 03
+Potentate Under Attack 04
+Potentate Banter 01
+Potentate Banter 02
+Potentate Banter 03
+Potentate Banter 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index aa86d10..dbda51d 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -1352,10 +1352,10 @@ caw.wav
 cm\p\lanifect\dth-01.wav
 cm\e\lazarus\revive-scribe-01.wav
 cm\t\phobos\pas-01.wav
-cm\p\ecclesiast\what-01.wav
-cm\p\ecclesiast\what-02.wav
-cm\p\ecclesiast\what-03.wav
-cm\p\ecclesiast\what-04.wav
+cm\p\ecclesiast\wht-01.wav
+cm\p\ecclesiast\wht-02.wav
+cm\p\ecclesiast\wht-03.wav
+cm\p\ecclesiast\wht-04.wav
 cm\p\ecclesiast\yes-01.wav
 cm\p\ecclesiast\yes-02.wav
 cm\p\ecclesiast\yes-03.wav
@@ -1993,12 +1993,12 @@ cm\p\pariah\agg-01.wav
 cm\p\pariah\agg-02.wav
 cm\p\pariah\agg-03.wav
 cm\p\pariah\agg-04.wav
-cm\p\ecclesiast\ready-01.wav
-cm\p\ecclesiast\ready-02.wav
-cm\p\ecclesiast\ready-03.wav
-cm\p\ecclesiast\help-01.wav
-cm\p\ecclesiast\help-02.wav
-cm\p\ecclesiast\help-03.wav
+cm\p\ecclesiast\rdy-01.wav
+cm\p\ecclesiast\rdy-02.wav
+cm\p\ecclesiast\rdy-03.wav
+cm\p\ecclesiast\hlp-01.wav
+cm\p\ecclesiast\hlp-02.wav
+cm\p\ecclesiast\hlp-03.wav
 cm\p\starsovereign\rdy-01.wav
 cm\p\starsovereign\rdy-02.wav
 cm\p\starsovereign\rdy-03.wav
@@ -3239,4 +3239,28 @@ cm\z\_building\z-construction-03.wav
 cm\z\_building\z-construction-start-01.wav
 Zerg\BROODLING\ZBrPss02.WAV
 cm\t\_building\t-construction-end-01.wav
-cm\t\_building\t-construction-start-01.wav
\ No newline at end of file
+cm\t\_building\t-construction-start-01.wav
+Zerg\BROODLING\ZBrRdy00.WAV
+cm\p\potentate\rdy-01.wav
+cm\p\potentate\rdy-02.wav
+cm\p\potentate\rdy-03.wav
+cm\p\potentate\wht-01.wav
+cm\p\potentate\wht-02.wav
+cm\p\potentate\wht-03.wav
+cm\p\potentate\wht-04.wav
+cm\p\potentate\yes-01.wav
+cm\p\potentate\yes-02.wav
+cm\p\potentate\yes-03.wav
+cm\p\potentate\yes-04.wav
+cm\p\potentate\agg-01.wav
+cm\p\potentate\agg-02.wav
+cm\p\potentate\agg-03.wav
+cm\p\potentate\agg-04.wav
+cm\p\potentate\hlp-01.wav
+cm\p\potentate\hlp-02.wav
+cm\p\potentate\hlp-03.wav
+cm\p\potentate\hlp-04.wav
+cm\p\potentate\bnt-01.wav
+cm\p\potentate\bnt-02.wav
+cm\p\potentate\bnt-03.wav
+cm\p\potentate\bnt-04.wav
\ No newline at end of file
diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex
index 8cd16f2..7c187f4 100644
Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index 90e8482..15730d9 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -761,7 +761,7 @@ Arclite Shock Cannon (Damageless, Silent)
 Magnetar
 Izirokor
 Izirokor Projectile
-Izirokor Remnants
+Izirokor Remains
 Entropy Gauntlets Overlay
 Cyclops Fragmentary Explosion
 Zerg Air Explosion (Large)
@@ -955,13 +955,13 @@ Zealot (Starbound)
 Ecclesiast (Khalendric Knights)
 Vibrance
 Blackjack (Damaged)
-Extended Sprite #1
-Extended Sprite #1
-Extended Sprite #1
-Extended Sprite #1
-Extended Sprite #1
-Extended Sprite #1
-Extended Sprite #1
+Phase Disruptor Large
+Harakan (Golden)
+Iziralisk
+Iziralisk Remains
+Cicatus
+White Circle (Instant)
+Gorgrokor Remains
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 4a07b7d..06fd095 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 62c57fb..6309c7c 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -411,10 +411,10 @@ Ackmed
 Terran Cyclops (Futurist Federation)
 Protoss Zealot (Starbound)
 Protoss Ecclesiast (Khalendric Knights)
-Extended Unit #186
-Extended Unit #187
-Extended Unit #188
-Extended Unit #189
+Terran Harakan (Golden Republic)
+Protoss Cicatus (Starbound)
+Zerg Inzorthrokor (Imicren)
+Volatile Egg
 Extended Unit #190
 Extended Unit #191
 Extended Unit #192
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 05de4fb..f08681e 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 964e98a..1c0e34a 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -218,9 +218,9 @@ Angeltear Rockets (Salamander)
 Brontes Payload (Cyclops)
 Flak Cannons (Cyclops Futurist)
 Sensory Overload (Vibrance)
-Extended Weapon #91
-Extended Weapon #92
-Extended Weapon #93
+Flamethrower (Harakan, Golden)
+Corrosive Bioplasma (Iziralisk)
+Phase Claws (Cicatus)
 Extended Weapon #94
 Extended Weapon #95
 Extended Weapon #96
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index 127f610..dc1f3fe 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 978aa3c..039c2c1 100644
Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ
diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft
index 40eef1c..7eb6915 100644
Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ
diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp
index 97b8e90..e00bd4d 100644
Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 555bad6..09ebc80 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl
index 6e8bac1..caaf1b0 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini
index afcb599..3182672 100644
--- a/mpq/samase/config.ini
+++ b/mpq/samase/config.ini
@@ -23,7 +23,7 @@ gptp_globals = true
 debug_upgrade_req = false
 #
 #
-###COSMONARCHY BW
+###COSMONARCHY
 ##
 ##
 ##
@@ -55,6 +55,7 @@ unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1)
 unit_morph_prerequisites = Add(vilgorokor, isthrathaleth, 1)
 unit_morph_prerequisites = Add(matraleth, akistrokor, 1)
 unit_morph_prerequisites = Add(zoryusthaleth, ultrokor, 1)
+unit_morph_prerequisites = Add(inzorthrokor, ultrokor, 1)
 unit_morph_prerequisites = Add(lakizilisk, zobriolisk, 1)
 unit_morph_prerequisites = Add(gorgrokor, zarcavrokor, 1)
 #
@@ -101,6 +102,7 @@ morph_train_ai = Add(konvilisk, tetcaerokor)
 morph_train_ai = Add(vilgorokor, isthrathaleth)
 morph_train_ai = Add(matraleth, akistrokor)
 morph_train_ai = Add(zoryusthaleth, ultrokor)
+morph_train_ai = Add(inzorthrokor, ultrokor)
 morph_train_ai = Add(lakizilisk, zobriolisk)
 morph_train_ai = Add(gorgrokor, zarcavrokor)
 #
diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt
index 35d3fd9..94c5996 100644
--- a/mpq/samase/unitdef.txt
+++ b/mpq/samase/unitdef.txt
@@ -31,6 +31,12 @@ building xelnaga_temple = 345
 building warp_gate = 346
 building stasis_cell = 347
 
+# Heroes
+military ackmed = 408
+military goska = 500
+military stroluum = 501
+building tuzor = 502
+
 # Terran factional units
 military cohort = 50
 military luminary = 150
@@ -40,14 +46,20 @@ military philoc = 328
 military hotshot = 395
 military qilin = 398
 military auriel = 399
+military cyclops_futurist = 410
+military harakan_golden = 413
 
 # Protoss factional units
 military adherent = 400
 military extatus = 401
+military zealot_starbound = 411
+military ecclesiast_khalendric = 412
+military cicatus = 414
 
 # Zerg factional units
 military nathrelisk = 402
 military iziralisk = 403
+military iziralisk = 415
 
 # Terran military units
 military maverick = 0
@@ -166,6 +178,7 @@ building parthenon = 288
 building iron_council = 295
 building amphitheater = 296
 building throneroom = 299
+building tencendur = 408
 
 # Protoss military units
 military lanifect = 60
@@ -329,6 +342,7 @@ military oztukrokor = 325
 military kethrostalor = 326
 military rakzilisk = 327
 military sasyrvoleth = 407
+military skryrokor = 503
 
 # Zerg misc
 military larva = 35
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index f01298a..b4e5c1c 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -22707,7 +22707,7 @@ GorgrokorDeath:
 	playsnd           	852	# Zerg\Guardian\ZGuDth00.WAV
 	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
 	wait              	1
-	lowsprul			186 0 42 # Zerg Building Rubble Small
+	lowsprul			963 0 42 # Zerg Building Rubble Small
 	wait              	1
 	end
 
@@ -23197,7 +23197,7 @@ CentaurUnused1:
 	wait				1
 	nobrkcodestart
 	playsndbtwn			2024 2026 # Centaur death 01, 02, 03
-	sprol				744 0 0
+	imgol				1443 0 0
 	wait				7
 	playsndbtwn			2024 2026 # Centaur death 01, 02, 03
 	imgol				334 5 5
@@ -29533,31 +29533,31 @@ AirAttkInit   	[NONE]
 
 MaelstromProjectileInit:
 	playsnd           	99	# Bullet\DragBull.wav
-	wait              	1 
-	sigorder          	1 
-	wait              	1 
+	wait              	1
+	sigorder          	1
+	wait              	1
 MaelstromProjectileGndAttkInit:
-	playfram          	0x00	# Frame set 0
-	wait              	1 
-	playfram          	1	# Frame set 0, direction 1
-	wait              	1 
-	playfram          	2	# Frame set 0, direction 2
-	wait              	1 
-	playfram          	3	# Frame set 0, direction 3
-	wait              	1 
+	playfram          	0x00
+	wait              	1
+	playfram          	1
+	wait              	1
+	playfram          	2
+	wait              	1
+	playfram          	3
+	wait              	1
 	playfram			4
-	wait              	1 
+	wait              	1
 	playfram			5
-	wait              	1 
+	wait              	1
 	playfram			6
-	wait              	1 
+	wait              	1
 	playfram			7
 	wait				1
 	goto              	MaelstromProjectileGndAttkInit
 
 MaelstromProjectileDeath:
 	domissiledmg
-	wait              	1 
+	wait              	1
 	end
 	
 # ----------------------------------------------------------------------------- #
@@ -33721,10 +33721,10 @@ Type          	12
 Init          	HeraclesInit
 Death         	HeraclesDeath
 GndAttkInit   	HeraclesGndAttkInit
-AirAttkInit   	HeraclesAirAttkInit
+AirAttkInit   	HeraclesGndAttkInit
 Unused1       	HeraclesUnused1
 GndAttkRpt    	HeraclesGndAttkInit
-AirAttkRpt    	HeraclesAirAttkInit
+AirAttkRpt    	HeraclesGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	HeraclesGndAttkToIdle
 AirAttkToIdle 	HeraclesGndAttkToIdle
@@ -33778,47 +33778,31 @@ HeraclesGndAttkToIdle:
 	playfram			0xbb
 	goto              	HeraclesWalkingToIdle
 
-HeraclesAirAttkInit:
-	playfram          	0xbb
-	wait              	1
-	nobrkcodestart
-	playfram			0x99
-	playsndbtwn			1369 1371
-	attack
-	wait              	1
-	playfram			0xaa
-	wait				1
-	playfram			0xbb
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-	goto              	HeraclesWalkingToIdle
-
 HeraclesWalking:
-	move              	4 
-	wait              	1 
-	playfram          	0x11	# Frame set 1
-	move              	4 
-	wait              	1 
-	playfram          	0x22	# Frame set 2
-	move              	4 
-	wait              	1 
-	playfram          	0x33	# Frame set 3
-	move              	4 
-	wait              	1 
-	playfram          	0x44	# Frame set 4
-	move              	4 
-	wait              	1 
-	playfram          	0x55	# Frame set 5
-	move              	4 
-	wait              	1 
-	playfram          	0x66	# Frame set 6
-	move              	4 
-	wait              	1 
-	playfram          	0x77	# Frame set 7
-	move              	4 
-	wait              	1 
-	playfram          	0x88	# Frame set 8
+	move              	4
+	wait              	1
+	playfram          	0x11
+	move              	4
+	wait              	1
+	playfram          	0x22
+	move              	4
+	wait              	1
+	playfram          	0x33
+	move              	4
+	wait              	1
+	playfram          	0x44
+	move              	4
+	wait              	1
+	playfram          	0x55
+	move              	4
+	wait              	1
+	playfram          	0x66
+	move              	4
+	wait              	1
+	playfram          	0x77
+	move              	4
+	wait              	1
+	playfram          	0x88
 	goto              	HeraclesWalking
 	
 # ----------------------------------------------------------------------------- #
@@ -34222,11 +34206,11 @@ IsId          	569
 Type          	21
 Init          	ClarionInit
 Death         	ClarionDeath
-GndAttkInit   	ClarionGndAttkInit
-AirAttkInit   	ClarionGndAttkInit
+GndAttkInit   	ClarionGndAttkToIdle
+AirAttkInit   	ClarionGndAttkToIdle
 Unused1       	[NONE]
-GndAttkRpt    	ClarionGndAttkRpt
-AirAttkRpt    	ClarionGndAttkRpt
+GndAttkRpt    	ClarionGndAttkToIdle
+AirAttkRpt    	ClarionGndAttkToIdle
 CastSpell     	[NONE]
 GndAttkToIdle 	ClarionGndAttkToIdle
 AirAttkToIdle 	ClarionGndAttkToIdle
@@ -34293,18 +34277,6 @@ ClarionDeath:
 	wait              	1
 	end
 
-ClarionGndAttkInit:
-	playfram          	0x00
-ClarionGndAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsnd           	66 # Bullet\HKMISSLE.wav
-	attackwith        	1
-	wait              	1
-	nobrkcodeend
-	gotorepeatattk
-	goto              	ScourgeLocal00
-
 ClarionWalking:
 	playfram          	0x00
 	wait				1
@@ -34599,13 +34571,13 @@ Type          	26
 Init          	CohortInit
 Death         	CohortDeath
 GndAttkInit   	CohortGndAttkInit
-AirAttkInit   	CohortAirAttkInit
+AirAttkInit   	CohortGndAttkInit
 Unused1       	CohortUnused1
 GndAttkRpt    	CohortGndAttkRpt
-AirAttkRpt    	CohortAirAttkRpt
+AirAttkRpt    	CohortGndAttkRpt
 CastSpell     	[NONE]
 GndAttkToIdle 	CohortGndAttkToIdle
-AirAttkToIdle 	CohortAirAttkToIdle
+AirAttkToIdle 	CohortGndAttkToIdle
 Unused2       	[NONE]
 Walking       	CohortWalking
 WalkingToIdle 	CohortWalkingToIdle
@@ -34776,36 +34748,6 @@ CohortGndAttkToIdle:
 	wait              	1
 	goto              	CohortWalkingToIdle
 
-CohortAirAttkInit:
-	playfram          	0x00
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-CohortAirAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsndbtwn       	1402 1404 # Cohort weapon fire 01, 02, 03
-	attackwith        	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	attackwith        	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-CohortAirAttkToIdle:
-	playfram          	0x11
-	wait              	1
-	playfram          	0x00
-	wait              	1
-	goto              	CohortWalkingToIdle
-
 CohortSpecialState2:
 	playfram          	0xee
 	goto              	ScourgeLocal00
@@ -37347,13 +37289,13 @@ Type          	12
 Init          	AutocratInit
 Death         	AutocratDeath
 GndAttkInit   	AutocratGndAttkInit
-AirAttkInit   	AutocratAirAttkInit
+AirAttkInit   	AutocratGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	AutocratGndAttkRpt
-AirAttkRpt    	AutocratAirAttkRpt
+AirAttkRpt    	AutocratGndAttkRpt
 CastSpell     	[NONE]
 GndAttkToIdle 	AutocratGndAttkToIdle
-AirAttkToIdle 	AutocratAirAttkToIdle
+AirAttkToIdle 	AutocratGndAttkToIdle
 Unused2       	[NONE]
 Walking       	AutocratWalking
 WalkingToIdle 	AutocratWalkingToIdle
@@ -37451,24 +37393,6 @@ AutocratGndAttkToIdle:
 	wait              	1 
 	goto              	AutocratWalkingToIdle
 
-AutocratAirAttkInit:
-	playfram          	0xaa
-AutocratAirAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsndbtwn			1474 1478
-	attack
-	playfram          	0x99
-	wait              	1
-	playfram          	0xaa
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-AutocratAirAttkToIdle:
-	playfram          	0x00
-	wait              	1
-	goto              	AutocratWalkingToIdle
-
 AutocratWalking:
 	move              	4
 	wait              	1
@@ -38016,10 +37940,10 @@ Type          	21
 Init          	AnthelionInit
 Death         	AnthelionDeath
 GndAttkInit   	AnthelionGndAttkInit
-AirAttkInit   	AnthelionAirAttkInit
+AirAttkInit   	AnthelionGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	AnthelionGndAttkInit
-AirAttkRpt    	AnthelionAirAttkInit
+AirAttkRpt    	AnthelionGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	AnthelionGndAttkToIdle
 AirAttkToIdle 	AnthelionGndAttkToIdle
@@ -38109,7 +38033,6 @@ AnthelionDeath:
 	end
 
 AnthelionGndAttkInit:
-	#playsndbtwn       	1227 1230
 	attackwith        	1 
 	attackwith        	1 
 	wait              	2
@@ -38120,14 +38043,6 @@ AnthelionLocal00:
 	wait              	125 
 	goto              	AnthelionGndAttkToIdle
 
-AnthelionAirAttkInit:
-	#playsndbtwn       	1227 1230
-	attackwith        	1 
-	attackwith        	1 
-	wait              	2
-	gotorepeatattk
-	goto              	AnthelionGndAttkToIdle
-
 AnthelionWalking:
 	playfram			1
 	wait				1
@@ -38184,10 +38099,10 @@ Type          	12
 Init          	AnticthonInit
 Death         	AnticthonDeath
 GndAttkInit   	AnticthonGndAttkInit
-AirAttkInit   	AnticthonAirAttkInit
+AirAttkInit   	AnticthonGndAttkInit
 Unused1       	AnticthonUnused1
 GndAttkRpt    	AnticthonGndAttkInit
-AirAttkRpt    	AnticthonAirAttkInit
+AirAttkRpt    	AnticthonGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	AnticthonGndAttkToIdle
 AirAttkToIdle 	AnticthonGndAttkToIdle
@@ -38255,14 +38170,6 @@ AnticthonGndAttkInit:
 	wait              	1
 	gotorepeatattk
 	goto              	AnticthonGndAttkToIdle
-	
-AnticthonAirAttkInit:
-	playsndbtwn       	1634 1636 # Anticthon weapon fire 01, 02, 03
-	attackwith        	1 
-	imgol				978 0 0 # Anticthon/Anthelion weaponfire
-	wait              	1
-	gotorepeatattk
-	goto              	AnticthonGndAttkToIdle
 
 AnticthonWalking:
 	playfram			1
@@ -38692,10 +38599,10 @@ Type          	21
 Init          	EmpressInit
 Death         	EmpressDeath
 GndAttkInit   	EmpressGndAttkInit
-AirAttkInit   	EmpressAirAttkInit
+AirAttkInit   	EmpressGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	EmpressGndAttkInit
-AirAttkRpt    	EmpressAirAttkInit
+AirAttkRpt    	EmpressGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	EmpressGndAttkToIdle
 AirAttkToIdle 	EmpressGndAttkToIdle
@@ -38747,16 +38654,6 @@ EmpressGndAttkInit:
 	gotorepeatattk
 	goto              	EmpressGndAttkToIdle
 
-EmpressAirAttkInit:
-	wait              	1 
-	nobrkcodestart
-	playsndbtwn       	1781 1783 # Empress weapon fire 01, 02, 03
-	attackwith        	1 
-	wait              	2
-	nobrkcodeend
-	gotorepeatattk
-	goto              	EmpressGndAttkToIdle
-
 EmpressWalking:
 	setvertpos        	0 
 	#imgol             	1203 0 0 # Empress Engines (cm\shared\empress-engine.grp)
@@ -45221,11 +45118,11 @@ IsId          	700
 Type          	12
 Init          	AzazelInit
 Death         	AzazelDeath
-GndAttkInit   	AzazelGndAttkInit
-AirAttkInit   	AzazelGndAttkInit
+GndAttkInit   	AzazelGndAttkToIdle
+AirAttkInit   	AzazelGndAttkToIdle
 Unused1       	[NONE]
-GndAttkRpt    	AzazelGndAttkInit
-AirAttkRpt    	AzazelGndAttkInit
+GndAttkRpt    	AzazelGndAttkToIdle
+AirAttkRpt    	AzazelGndAttkToIdle
 CastSpell     	AzazelCastSpell
 GndAttkToIdle 	AzazelGndAttkToIdle
 AirAttkToIdle 	AzazelGndAttkToIdle
@@ -45260,12 +45157,6 @@ AzazelDeath:
 	wait              	1
 	end
 
-AzazelGndAttkInit:
-	wait              	1
-	attack
-	gotorepeatattk
-	goto              	AzazelLocal00
-
 AzazelLocal00:
 	wait              	125
 	goto              	AzazelLocal00
@@ -51877,7 +51768,7 @@ AckmedInit:
 .headerstart
 IsId          	795
 Type          	13
-Init          	LiiraliskGlaveInit
+Init          	GlaveWurmInit
 Death         	LiiraliskGlaveDeath
 GndAttkInit   	GlaveWurmGndAttkInit
 AirAttkInit   	[NONE]
@@ -51894,13 +51785,6 @@ SpecialState1 	LiiraliskGlaveSpecialState1
 .headerend
 # ----------------------------------------------------------------------------- #
 
-LiiraliskGlaveInit:
-	playfram          	0x00
-	wait              	1
-	sigorder          	1
-	wait              	1
-	goto				GlaveWurmGndAttkInit
-
 LiiraliskGlaveDeath:
 	playsnd           	93 # Bullet\ZQuHit02.wav
 	sprol             	944 0 0 # Spore Hit Green Small (cm\zerg\spore-hit-green-small.grp)
@@ -52021,5 +51905,86 @@ SpecialState1 	[NONE]
 #	playfram          	0x00
 #	wait				2
 #	goto				AnalogueGndAttkToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1960 White Circle Instant (bullet\circle14.grp)
+.headerstart
+IsId          	799
+Type          	2
+Init          	WhiteCircleInstantInit
+Death         	WhiteCircleInstantDeath
+GndAttkInit   	WhiteCircleInstantDeath
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+WhiteCircleInstantInit:
+	wait              	1
+	sigorder          	1
+	wait              	1
+WhiteCircleInstantDeath:
+	playfram          	0x00
+	wait              	1
+	domissiledmg
+	wait              	1
+	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1958 Cicatus (cm\faction-p\cicatus.grp)
+.headerstart
+IsId          	800
+Type          	21
+Init          	CicatusInit
+Death         	LegionnaireDeath
+GndAttkInit   	CicatusGndAttkInit
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	CicatusGndAttkRpt
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	LegionnaireGndAttkToIdle
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	LegionnaireWalking
+WalkingToIdle 	LegionnaireWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	LegionnaireWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CicatusInit:
+	imgul             	1959 0 0 # Cicatus Shadow (cm\faction-p\cicatus-shadow.grp)
+	goto				HarakanWalkingToIdle
 	
-## Next free IsId: 799
\ No newline at end of file
+CicatusGndAttkInit:
+	playfram          	0x100
+CicatusGndAttkRpt:
+	playfram          	0x100
+	nobrkcodestart
+	wait              	1
+	playsnd				1896 # Legionnaire weapon fire 01
+	playfram          	0x120
+	attackmelee       	1 1897 # Legionnaire weapon hit 01
+	wait              	1
+	playfram          	0x140
+	attackmelee       	1 1897 # Legionnaire weapon hit 01
+	wait              	1
+	playfram          	0x160
+	wait              	1
+	nobrkcodeend
+	playfram          	0x120
+	wait              	1
+	gotorepeatattk
+	ignorerest
+	goto				LegionnaireGndAttkToIdle
+	
+## Next free IsId: 801
\ No newline at end of file
diff --git a/mpq/sound/cm/p/ecclesiast/agg-01.wav b/mpq/sound/cm/p/ecclesiast/agg-01.wav
index bc0fd0a..0fd8e7a 100644
Binary files a/mpq/sound/cm/p/ecclesiast/agg-01.wav and b/mpq/sound/cm/p/ecclesiast/agg-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/agg-02.wav b/mpq/sound/cm/p/ecclesiast/agg-02.wav
index 92bad5a..91de60e 100644
Binary files a/mpq/sound/cm/p/ecclesiast/agg-02.wav and b/mpq/sound/cm/p/ecclesiast/agg-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/agg-03.wav b/mpq/sound/cm/p/ecclesiast/agg-03.wav
index bf24209..d83e33c 100644
Binary files a/mpq/sound/cm/p/ecclesiast/agg-03.wav and b/mpq/sound/cm/p/ecclesiast/agg-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/agg-04.wav b/mpq/sound/cm/p/ecclesiast/agg-04.wav
index 68fd595..d093601 100644
Binary files a/mpq/sound/cm/p/ecclesiast/agg-04.wav and b/mpq/sound/cm/p/ecclesiast/agg-04.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/bnt-01.wav b/mpq/sound/cm/p/ecclesiast/bnt-01.wav
new file mode 100644
index 0000000..55e7146
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/bnt-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/bnt-02.wav b/mpq/sound/cm/p/ecclesiast/bnt-02.wav
new file mode 100644
index 0000000..4e31514
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/bnt-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/bnt-03.wav b/mpq/sound/cm/p/ecclesiast/bnt-03.wav
new file mode 100644
index 0000000..d363743
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/bnt-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/help-01.wav b/mpq/sound/cm/p/ecclesiast/help-01.wav
deleted file mode 100644
index d61b290..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/help-01.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/help-02.wav b/mpq/sound/cm/p/ecclesiast/help-02.wav
deleted file mode 100644
index 54c7889..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/help-02.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/help-03.wav b/mpq/sound/cm/p/ecclesiast/help-03.wav
deleted file mode 100644
index afddbfa..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/help-03.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/hlp-01.wav b/mpq/sound/cm/p/ecclesiast/hlp-01.wav
new file mode 100644
index 0000000..96dc2d3
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/hlp-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/hlp-02.wav b/mpq/sound/cm/p/ecclesiast/hlp-02.wav
new file mode 100644
index 0000000..d85675e
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/hlp-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/hlp-03.wav b/mpq/sound/cm/p/ecclesiast/hlp-03.wav
new file mode 100644
index 0000000..02833f0
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/hlp-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/hlp-04.wav b/mpq/sound/cm/p/ecclesiast/hlp-04.wav
new file mode 100644
index 0000000..954ac8e
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/hlp-04.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/rdy-01.wav b/mpq/sound/cm/p/ecclesiast/rdy-01.wav
new file mode 100644
index 0000000..41a9d01
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/rdy-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/rdy-02.wav b/mpq/sound/cm/p/ecclesiast/rdy-02.wav
new file mode 100644
index 0000000..aee3dcd
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/rdy-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/rdy-03.wav b/mpq/sound/cm/p/ecclesiast/rdy-03.wav
new file mode 100644
index 0000000..e01a6c4
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/rdy-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/ready-01.wav b/mpq/sound/cm/p/ecclesiast/ready-01.wav
deleted file mode 100644
index 92c3c8e..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/ready-01.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/ready-02.wav b/mpq/sound/cm/p/ecclesiast/ready-02.wav
deleted file mode 100644
index 9fc1716..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/ready-02.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/ready-03.wav b/mpq/sound/cm/p/ecclesiast/ready-03.wav
deleted file mode 100644
index 1f98b93..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/ready-03.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/what-01.wav b/mpq/sound/cm/p/ecclesiast/what-01.wav
deleted file mode 100644
index ec7b15f..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/what-01.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/what-02.wav b/mpq/sound/cm/p/ecclesiast/what-02.wav
deleted file mode 100644
index 3ce2b9e..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/what-02.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/what-03.wav b/mpq/sound/cm/p/ecclesiast/what-03.wav
deleted file mode 100644
index 61520c0..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/what-03.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/what-04.wav b/mpq/sound/cm/p/ecclesiast/what-04.wav
deleted file mode 100644
index 972ea9f..0000000
Binary files a/mpq/sound/cm/p/ecclesiast/what-04.wav and /dev/null differ
diff --git a/mpq/sound/cm/p/ecclesiast/wht-01.wav b/mpq/sound/cm/p/ecclesiast/wht-01.wav
new file mode 100644
index 0000000..d6768b3
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/wht-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/wht-02.wav b/mpq/sound/cm/p/ecclesiast/wht-02.wav
new file mode 100644
index 0000000..ce84792
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/wht-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/wht-03.wav b/mpq/sound/cm/p/ecclesiast/wht-03.wav
new file mode 100644
index 0000000..f022ec8
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/wht-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/wht-04.wav b/mpq/sound/cm/p/ecclesiast/wht-04.wav
new file mode 100644
index 0000000..aa5f365
Binary files /dev/null and b/mpq/sound/cm/p/ecclesiast/wht-04.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/yes-01.wav b/mpq/sound/cm/p/ecclesiast/yes-01.wav
index 105d106..e185405 100644
Binary files a/mpq/sound/cm/p/ecclesiast/yes-01.wav and b/mpq/sound/cm/p/ecclesiast/yes-01.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/yes-02.wav b/mpq/sound/cm/p/ecclesiast/yes-02.wav
index 38fafd0..ec8d31b 100644
Binary files a/mpq/sound/cm/p/ecclesiast/yes-02.wav and b/mpq/sound/cm/p/ecclesiast/yes-02.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/yes-03.wav b/mpq/sound/cm/p/ecclesiast/yes-03.wav
index 2436b2a..9b21267 100644
Binary files a/mpq/sound/cm/p/ecclesiast/yes-03.wav and b/mpq/sound/cm/p/ecclesiast/yes-03.wav differ
diff --git a/mpq/sound/cm/p/ecclesiast/yes-04.wav b/mpq/sound/cm/p/ecclesiast/yes-04.wav
index df0e223..fe7d99d 100644
Binary files a/mpq/sound/cm/p/ecclesiast/yes-04.wav and b/mpq/sound/cm/p/ecclesiast/yes-04.wav differ
diff --git a/mpq/sound/cm/p/potentate/agg-01.wav b/mpq/sound/cm/p/potentate/agg-01.wav
new file mode 100644
index 0000000..194ab5b
Binary files /dev/null and b/mpq/sound/cm/p/potentate/agg-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/agg-02.wav b/mpq/sound/cm/p/potentate/agg-02.wav
new file mode 100644
index 0000000..37c50ea
Binary files /dev/null and b/mpq/sound/cm/p/potentate/agg-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/agg-03.wav b/mpq/sound/cm/p/potentate/agg-03.wav
new file mode 100644
index 0000000..e072d6a
Binary files /dev/null and b/mpq/sound/cm/p/potentate/agg-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/agg-04.wav b/mpq/sound/cm/p/potentate/agg-04.wav
new file mode 100644
index 0000000..2b05b52
Binary files /dev/null and b/mpq/sound/cm/p/potentate/agg-04.wav differ
diff --git a/mpq/sound/cm/p/potentate/bnt-01.wav b/mpq/sound/cm/p/potentate/bnt-01.wav
new file mode 100644
index 0000000..e1135e1
Binary files /dev/null and b/mpq/sound/cm/p/potentate/bnt-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/bnt-02.wav b/mpq/sound/cm/p/potentate/bnt-02.wav
new file mode 100644
index 0000000..43438c7
Binary files /dev/null and b/mpq/sound/cm/p/potentate/bnt-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/bnt-03.wav b/mpq/sound/cm/p/potentate/bnt-03.wav
new file mode 100644
index 0000000..b834e1e
Binary files /dev/null and b/mpq/sound/cm/p/potentate/bnt-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/bnt-04.wav b/mpq/sound/cm/p/potentate/bnt-04.wav
new file mode 100644
index 0000000..0c0c666
Binary files /dev/null and b/mpq/sound/cm/p/potentate/bnt-04.wav differ
diff --git a/mpq/sound/cm/p/potentate/hlp-01.wav b/mpq/sound/cm/p/potentate/hlp-01.wav
new file mode 100644
index 0000000..7a50fe9
Binary files /dev/null and b/mpq/sound/cm/p/potentate/hlp-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/hlp-02.wav b/mpq/sound/cm/p/potentate/hlp-02.wav
new file mode 100644
index 0000000..8ed5f2b
Binary files /dev/null and b/mpq/sound/cm/p/potentate/hlp-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/hlp-03.wav b/mpq/sound/cm/p/potentate/hlp-03.wav
new file mode 100644
index 0000000..3521abf
Binary files /dev/null and b/mpq/sound/cm/p/potentate/hlp-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/hlp-04.wav b/mpq/sound/cm/p/potentate/hlp-04.wav
new file mode 100644
index 0000000..70b97ce
Binary files /dev/null and b/mpq/sound/cm/p/potentate/hlp-04.wav differ
diff --git a/mpq/sound/cm/p/potentate/rdy-01.wav b/mpq/sound/cm/p/potentate/rdy-01.wav
new file mode 100644
index 0000000..4266084
Binary files /dev/null and b/mpq/sound/cm/p/potentate/rdy-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/rdy-02.wav b/mpq/sound/cm/p/potentate/rdy-02.wav
new file mode 100644
index 0000000..67d36f0
Binary files /dev/null and b/mpq/sound/cm/p/potentate/rdy-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/rdy-03.wav b/mpq/sound/cm/p/potentate/rdy-03.wav
new file mode 100644
index 0000000..09c711f
Binary files /dev/null and b/mpq/sound/cm/p/potentate/rdy-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/wht-01.wav b/mpq/sound/cm/p/potentate/wht-01.wav
new file mode 100644
index 0000000..7620be1
Binary files /dev/null and b/mpq/sound/cm/p/potentate/wht-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/wht-02.wav b/mpq/sound/cm/p/potentate/wht-02.wav
new file mode 100644
index 0000000..ceb301a
Binary files /dev/null and b/mpq/sound/cm/p/potentate/wht-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/wht-03.wav b/mpq/sound/cm/p/potentate/wht-03.wav
new file mode 100644
index 0000000..1a6e0a9
Binary files /dev/null and b/mpq/sound/cm/p/potentate/wht-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/wht-04.wav b/mpq/sound/cm/p/potentate/wht-04.wav
new file mode 100644
index 0000000..e2b9779
Binary files /dev/null and b/mpq/sound/cm/p/potentate/wht-04.wav differ
diff --git a/mpq/sound/cm/p/potentate/yes-01.wav b/mpq/sound/cm/p/potentate/yes-01.wav
new file mode 100644
index 0000000..fedadb1
Binary files /dev/null and b/mpq/sound/cm/p/potentate/yes-01.wav differ
diff --git a/mpq/sound/cm/p/potentate/yes-02.wav b/mpq/sound/cm/p/potentate/yes-02.wav
new file mode 100644
index 0000000..70e1a37
Binary files /dev/null and b/mpq/sound/cm/p/potentate/yes-02.wav differ
diff --git a/mpq/sound/cm/p/potentate/yes-03.wav b/mpq/sound/cm/p/potentate/yes-03.wav
new file mode 100644
index 0000000..bcf5c63
Binary files /dev/null and b/mpq/sound/cm/p/potentate/yes-03.wav differ
diff --git a/mpq/sound/cm/p/potentate/yes-04.wav b/mpq/sound/cm/p/potentate/yes-04.wav
new file mode 100644
index 0000000..59b6711
Binary files /dev/null and b/mpq/sound/cm/p/potentate/yes-04.wav differ
diff --git a/mpq/sound/cm/p/vagrant-shade/wht-01.pk b/mpq/sound/cm/p/vagrant-shade/wht-01.pk
new file mode 100644
index 0000000..02d437b
Binary files /dev/null and b/mpq/sound/cm/p/vagrant-shade/wht-01.pk differ
diff --git a/mpq/sound/cm/p/vagrant/wht-01.pk b/mpq/sound/cm/p/vagrant/wht-01.pk
new file mode 100644
index 0000000..7e40c16
Binary files /dev/null and b/mpq/sound/cm/p/vagrant/wht-01.pk differ
diff --git a/mpq/unit/cm/faction-p/cicatus-shadow.grp b/mpq/unit/cm/faction-p/cicatus-shadow.grp
new file mode 100644
index 0000000..ee7b112
Binary files /dev/null and b/mpq/unit/cm/faction-p/cicatus-shadow.grp differ
diff --git a/mpq/unit/cm/faction-p/cicatus.grp b/mpq/unit/cm/faction-p/cicatus.grp
new file mode 100644
index 0000000..e535e7e
Binary files /dev/null and b/mpq/unit/cm/faction-p/cicatus.grp differ
diff --git a/mpq/unit/cm/faction-t/harakan-golden-shadow.grp b/mpq/unit/cm/faction-t/harakan-golden-shadow.grp
new file mode 100644
index 0000000..11b9976
Binary files /dev/null and b/mpq/unit/cm/faction-t/harakan-golden-shadow.grp differ
diff --git a/mpq/unit/cm/faction-t/harakan-golden.grp b/mpq/unit/cm/faction-t/harakan-golden.grp
new file mode 100644
index 0000000..09829b3
Binary files /dev/null and b/mpq/unit/cm/faction-t/harakan-golden.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk-birth.grp b/mpq/unit/cm/faction-z/iziralisk-birth.grp
new file mode 100644
index 0000000..ba6c82f
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk-birth.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk-mutate.grp b/mpq/unit/cm/faction-z/iziralisk-mutate.grp
new file mode 100644
index 0000000..94248f9
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk-mutate.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk-projectile.grp b/mpq/unit/cm/faction-z/iziralisk-projectile.grp
new file mode 100644
index 0000000..c1ca07f
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk-projectile.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk-remains.grp b/mpq/unit/cm/faction-z/iziralisk-remains.grp
new file mode 100644
index 0000000..6bd41c3
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk-remains.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk-shadow.grp b/mpq/unit/cm/faction-z/iziralisk-shadow.grp
new file mode 100644
index 0000000..4cfb6af
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk-shadow.grp differ
diff --git a/mpq/unit/cm/faction-z/iziralisk.grp b/mpq/unit/cm/faction-z/iziralisk.grp
new file mode 100644
index 0000000..5ce1664
Binary files /dev/null and b/mpq/unit/cm/faction-z/iziralisk.grp differ
diff --git a/mpq/unit/cm/protoss/atreus-projectile.grp b/mpq/unit/cm/protoss/atreus-projectile.grp
new file mode 100644
index 0000000..7b94584
Binary files /dev/null and b/mpq/unit/cm/protoss/atreus-projectile.grp differ
diff --git a/mpq/unit/cm/terran/biotic-bastion-damage.lof b/mpq/unit/cm/terran/biotic-bastion-damage.lof
index b85e5a0..6127f0d 100644
Binary files a/mpq/unit/cm/terran/biotic-bastion-damage.lof and b/mpq/unit/cm/terran/biotic-bastion-damage.lof differ
diff --git a/mpq/unit/cm/terran/phalanx-siege-death.grp b/mpq/unit/cm/terran/phalanx-siege-death.grp
index 2aae748..9c2b549 100644
Binary files a/mpq/unit/cm/terran/phalanx-siege-death.grp and b/mpq/unit/cm/terran/phalanx-siege-death.grp differ
diff --git a/mpq/unit/cm/terran/phalanx-tank-death.grp b/mpq/unit/cm/terran/phalanx-tank-death.grp
index 0a7c460..e95ce88 100644
Binary files a/mpq/unit/cm/terran/phalanx-tank-death.grp and b/mpq/unit/cm/terran/phalanx-tank-death.grp differ
diff --git a/mpq/unit/cm/zerg/gorgrokor-death.grp b/mpq/unit/cm/zerg/gorgrokor-death.grp
new file mode 100644
index 0000000..62c6ca8
Binary files /dev/null and b/mpq/unit/cm/zerg/gorgrokor-death.grp differ
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index bd6ac02..7ed53d3 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 78c0eed..ad00345 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 d970a34..adcff1f 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 912e659..8c91cb1 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index db87dbb..d90e580 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -1,6 +1,5 @@
-# 28 December 2024
-## Year 2, month 12, patch 1
-## Acropolis #2 - End of Tournament
+# 11 January 2024
+## Year 3, month 1, patch 1
 
 This patch will include new features, balance adjustments, bugfixes, and audiovisual improvements.
 
@@ -8,184 +7,127 @@ Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zi
 
 We are still hunting for desyncs! Please submit your `Critical` and `Sync Randoms` text files from the `logs` folder to the **cm-issues** "[Desync error megathread](https://discord.com/channels/139276012058968064/1251318131671175198)" on [our Discord server](https://discord.com/invite/s5SKBmY).
 
-## Patch summary
-
-A video going over all changes is forthcoming. This section will be edited with a link and more text at that time.
-
-## Core Mechanics
-- **Height advantage:**
-	- Range bonus +2 per level » +1 per level
-
-## Mapmaking
-- **NEW: Collision brushes** (c. Veeq7)
-	- Neutral (P12) **Spider Mine**s:
-		- Makes pathfinder regions unpathable and disconnects it from walkable space
-		- You can preview pathfinder regions in SCMDraft 2, where each region is denoted by a bold yellow outline
-	- Neutral (P12) **Supply Depot**s:
-		- Sets the tile they are placed on to full collision (unwalkable)
-		- This is not as reliable as **Spider Mine**s
+## Mechanics
+- Energy regeneration is now interrupted while the specialist is stunned
 
 ## Game Modes
-- **Massacre:**
-	- Now gives 2x units per training / morphing
-- **NEW: Dark Ages** (c. Veeq7)
-	- -20% to base sight range and base weapon range
-	- Cliff advantage gives 0.5 weapon range, from 1
-	- Attacking flyers are forbidden
-		- **Caveat:** AI still train them currently
-- **Massacre:**
-	- Gas reward on kill/train 3 » 5
+- **Uprising:**
+	- Fixed ground spawners appearing on islands (c. Veeq7)
+	- Reduced training time of **Broodspawn**
+	- Tweaked the composition of some existing spawners
+	- Added many new spawner types in tiers 1 & 2
+
+## Console
+- **NEW:** `race` command, gets the player of the selected unit's race
+	- Note that this may not be the same race as the selected unit, e.g. in cases of mind control
+	- 0 is Zerg, 1 is Terran, 2 is Protoss
+
+## Editor
+- **Kill Units at Location** vanilla trigger action functionality has been restored (r. 3crow/Kenoli, c. DF)
+- **set_race** custom trigger action no longer fails to set Protoss or Terran races correctly
+- **NEW:** `player_is_race` custom trigger condition (may see changes later)
+- **NEW:** Volatile Egg unit (id 416)
+	- blocks construction, but not worker movement when harvesting, allowing for SC1-style barriers
+	- when placed for P1-P8 and cloaked, any preplaced units for that player will be created, allowing players to select their race without spawning melee units
+
+## AI
+- **Star Sovereign**s now activate Grief of All Gods more liberally
+- Fixed Terran AI having impossible requirements for training *Silvertongue**s and **Magnetar**s
 
 ## Bugfixes
-- **The Turning:**
-	- Fixed cancelled units being added to the dead unit pool (c. Veeq7)
-	- Improved performance during all stages of the game (c. Veeq7)
+- **Stability:**
+	- Slightly reduced selection limit (252 » 246) to prevent action buffer instability
+	- Fixed rare crashes at game end (r. TopRamen, c. DF)
 - **Gameplay:**
-	- Significantly improve melee air unit target tracking (c. DF)
-	- Lardfix: Resolve rare ownership jank with Morningstars (c. DF)
+	- Unloading structures is now more generous (still needs work; b. Londier, c. Veeq7)
+	- Units with **Interception** (e.g. **Siren** and **Cataphract**) no longer fail to damage **Larva**e and **Rilirokor**s (r. TheNightFox)
+	- Didact Shroud of Adun is no longer disabled after Recalling (r. GreenEggs'NSpam & Londier)
+	- Melee splash units (and the **Vilgorokor**) no longer deal damage out of sync with their animation (r. Kenoli & Krankendau, a. DF)
+	- When **Axitrilisk**s are reclaimed with no weapon, they now restart the **Perpetual Wind** timer (r. GreenEggs'NSpam & TheNightFox)
+	- Auras from **Azazel**, **Seraph**, **Crucible**, **Barghest**, **Sycophant**, **Manifold**, **Matraleth**, and **Sasyrvoleth** are now deactivated while the unit is stunned (r. Londier)
+	- **Hypnagogue** corpses can now be interacted with (r. GreenEggs'NSpam)
+	- Fixed bad interactions between Tyranny of the Sun and **Aurora** Last Orders
+	- Fixed being able to enter non-mutual ally transports (r. Londier & billy)
+	- Fixed being able to load neutral units into transports
+	- Fixed edge case turn rate issues with **Diadem**s (r. GreenEggs'NSpam)
+	- **Ultrokor**s no longer consume corpses while burrowed (r. Londier)
+	- **Qilin**s no longer fail to continue healing after a single unload (r. Londier)
 - **Audiovisual:**
-	- Fixed improper mineral chunk being used for non-depleted Mineral Field harvests (r. jakulangski)
-	- `celebrations-enabled` config option functionality restored (c. Veeq7)
-	- Added aura displays for **Barghest Repentent Chorus** and **Manifold Concurring Chorus** (r. shopkeeper dog)
-	- **Hypnagogue Through the Looking Glass** tooltip corrected (displayed incorrect range; r. GreenEggs'NSpam)
-	- **Cleric Nanorepair** tooltip corrected (displayed incorrect heal amount)
+	- **Broodspawn** spawning SFX no longer plays globally
+	- **Blackjack**s no longer change facing angle when their sprite changes
+	- Reviving **Centaur**s no longer create permanent explosion graphics (r. beriso)
+	- Preferred player colors now override racial player color bans (r. Wolfmaw)
+	- Resolved 'invalid shield overlay' error for **Tetcaerokor** (r. beriso)
+	- **Fore Castle** shield overlays no longer proc when hit by **Psionic Storm** (r. Londier)
+	- Corrected poor fire placements for the **Biotic Bastion**'s damage overlay
+	- Witness and replay UI is no longer drawn over ingame menus (c. DF)
+
+## Audiovisuals
+- **New unit responses:**
+	- **Ecclesiast**
+	- **Potentate** (script a. BladehollowRWL)
+- **Corpse updates:**
+	- **Phalanx**, tank & siege (a. ArbuzBudesh)
+	- **Gorgrokor** (c. ArbuzBudesh)
+- **Projectile updates:**
+	- **Atreus** (bigger projectile)
 
 ## Terran
-- [Maverick](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick):
-	- HP 50 » 60
-- [Cleric](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cleric):
-	- HP 75 » 80
-	- **Nanorepair:**
-		- Now adds non-stacking +1 armor to affected units; expires after 1 second
-		- *Visual read not yet implemented*
-- [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman):
-	- **Nanite Field** ability range 4/8 » 4/6
-- [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant):
-	- HP 95 » 110
-	- Armor penetration 2 » 3
-- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap):
-	- Resource costs 125/0 » 100/0
-	- *While Madcaps seem very powerful statistically, it may be safe to make them more spammable. We shall see...*
-- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles):
-	- HP 150 » 180
-- [Striga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/striga):
-	- HP 120 » 160
-- [Olympian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/olympian):
-	- HP 180 » 220
-- [Dilettante](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/dilettante):
-	- HP 90 » 110
-- [Vulture](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture):
-	- HP 90 » 100
-	- Movement speed 7.71 » 8.33
-- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath):
-	- HP 200 » 220
-- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack):
-	- Armor 2 » 1
-	- **Monogun:**
-		- Weapon cooldown 0.49 » 0.54
-- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
-	- HP 140 » 150
-- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
-	- HP 200 » 240
-- [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal):
-	- HP 225 » 260
-- [Tarasque](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tarasque):
-	- Build time 32 » 30
-	- Vision range 9 » 8
+- **Reclamation:**
+	- Initial heal for reclaimed units is now granted over 10 seconds, from 3 seconds
+	- Reclaimed specialists begin with 0 energy, from full
+- [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle):
+	- **Charon Rifle:**
+		- Weapon damage 1x10 » 1x15
+		- Weapon cooldown 1 » 1.5
+		- Weapon range 5 » 6
+- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat):
+	- **Eminence Rifle:**
+		- Weapon cooldown 1.33 » 1.5
+		- Weapon range 6 » 5
+- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie):
+	- **Halo Rockets:**
+		- Weapon cooldown 1.5 » 1.08
+		- No longer deal splash damage to units owned by an allied player
+- **NEW:** [Harakan (Golden)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan-golden)
+	- Fast-moving frontliner with plasma shields; trained from the Stockade
+	- Available for the **Golden Republic**
+- [Aspirant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aspirant):
+	- Mineral cost 175 » 150 
+	- Armor 2 » 3
+	- **Criticality:**
+		- No longer procs on Aspirant death
+		- No longer heals enemies of the Aspirant
+		- Now applies a 2-second debuff to victims, and procs on their death if they die during this debuff
+- [Cohort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cohort):
+	- **New: Servile Vigor:**
+		- Revives once after death, with a 10-second timed life; consumes a corpse to become permanent again
 
 ## Protoss
-- [Witness](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/witness):
-	- Shields 20 » 40
-	- Movement speed 4.58 » 5.41
-- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
-	- HP 120 » 150
-- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth):
-	- Shields 40 » 60
-- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald):
-	- HP 120 » 160
-- [Atreus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/atreus):
-	- HP 150 » 160
-- [Cabalist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cabalist):
-	- **Silent Strides**:
-		- After decloaking, the first strike deals 150% damage
-- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan):
-	- **Fervent Blaster:**
-		- Weapon range 5 » 6
-		- Splash radii 8/16/24 » 12/24/32
-		- Projectile speed 60 » 90
-		- Projectile acceleration ~300% faster
-- [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah):
-	- HP 300 » 400
-- [Sycophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/sycophant):
-	- HP 100 » 200
-- [Archon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/archon):
-	- Build time 45 » 30
-- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
-	- **Sunsplit Beam:**
-		- Weapon damage 10x10 » 12x12
-		- Weapon range 10 » 12
-- [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold):
-	- **Concurring Chorus:**
-		- Effect range 2 » 3
-- [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem):
-	- Shields 60 » 120
-- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol):
-	- **Prismatic Blaster:**
-		- Weapon damage 1x10 » 2x6
+- [Artisan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/artisan):
+	- **Neutron Saber:**
 		- Armor penetration 2 » 0
-		- Weapon cooldown 0.92 » 0.71
-- [Servitor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/servitor):
-	- HP 80 » 100
-	- Build time 18 » 15
-- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron):
-	- Movement speed 4.16 » 5.83
-- [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact):
-	- HP 150 » 200
-- [Steward](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/steward):
-	- HP 70 » 80
-- [Star Sovereign](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/star-sovereign):
-	- Shields 150 » 200
-- [Embassy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/embassy):
-	- Resource costs 125/75 » 125/50
-- [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery):
-	- Resource costs 150/100 » 150/75
-	- Build time 50 » 55
-- [Lattice](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lattice):
-	- Resource costs 150/50 » 150/25
+		- Weapon range 3 » 1
+		- Weapon cooldown 0.92 » 1.08
+- [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem):
+	- **Tranquility Array** now has a third-of-a-second internal cooldown
+- [Lanifect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lanifect):
+	- **Neutron Flare:**
+		- No longer deals splash damage to units owned by an allied player
+- [Gladius](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gladius):
+	- Movement speed 5 » 4.38
+- **NEW:** [Cicatus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cicatus):
+	- Nihilistic frontline vandal; warped from the Gateway
+	- Available for the **Starbound**
 
 ## Zerg
-- **Broodspawn**
-	- Incubation procs now complete on unit death (c. Veeq7)
-- [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor):
-	- **Vestigial Strike:**
-		- Weapon damage 1x8 » 1x4
-		- Weapon cooldown 0.83 » 0.75
-	- **Nathrok Claws:**
-		- Weapon damage 2x4 » 2x6
-- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk):
-	- Weapon range 6 » 5
-- [Mortothrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mortothrokor):
-	- HP 180 » 250
-- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk):
-	- Movement speed 6.16 » 6.52
-	- Attack windup 4 frames » 2 frames
-- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor):
-	- HP 130 » 160
-- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor):
-	- Armor 1 » 2
-	- **Skittering Spores:**
-		- Projectile speed 60 » 30
-		- Projectile acceleration now ~50% slower
-- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
-	- HP 180 » 240
-- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
-	- HP 180 » 200
-- [Rilirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rilirokor) and [Rililisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rililisk):
-	- **Death Cycle:**
-		- On death and expiry, now applies Ensnare to hostiles within 2 range; lasts 1 second.
-- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor):
-	- HP 220 » 250
-- [Vilgorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vilgorokor):
-	- HP 200 » 280
-- [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor):
-	- HP 440 » 500
\ No newline at end of file
+- [Gosvileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gosvileth):
+	- **Gosvil Spines:**
+		- Armor penetration 2 » 0
+		- Weapon cooldown 0.92 » 1.08
+- [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk):
+	- **Corrosive Acid:**
+		- Weapon cooldown 1.08 » 1.17
+- **NEW:** [Iziralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/iziralisk)
+	- Short-range rending assault strain; requires the Hydrith Den
+	- Available for the **Zorthos Tendril**
\ No newline at end of file
diff --git a/plugins/aize_debug.qdp b/plugins/aize_debug.qdp
index be8b117..5d0af79 100644
Binary files a/plugins/aize_debug.qdp and b/plugins/aize_debug.qdp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 56c04ef..7481a11 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ