diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index f9e6af2d..925d6e21 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3611,19 +3611,19 @@ Bulwark Ambient Proc 02
 Bulwark Ambient Proc 03
 Crucible Ambient 01
 Stockade Ambient 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
+Fulcrum Ambient 01
+Starpad Ambient 01
+Ministry Ambient 01
+Nexus Ambient 01
+Gateway Ambient 01
+Lattice Ambient 01
+Embassy Ambient 01
+Stargate Ambient 01
+Egg Ambient 01
+Egg Ambient 02
+Egg Ambient 03
+Egg Ambient 04
+Treasury Ambient 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index d67318e8..65f64487 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -2476,7 +2476,7 @@ cm\t\shaman\switch-02.wav
 cm\t\shaman\switch-03.wav
 protoss\advisor\paderr03.wav
 protoss\advisor\padupd03.wav
-cm\t\_building\treasury.wav
+cm\t\_building\treasury\wht-01.wav
 cm\t\silvertongue\wf-01.wav
 cm\t\silvertongue\wf-02.wav
 cm\t\silvertongue\wf-03.wav
@@ -2794,7 +2794,7 @@ cm\t\savant\siphon-05.wav
 protoss\fenixd\rdy-01.wav
 protoss\fenixz\rdy-01.wav
 protoss\tassadar\rdy-01.wav
-cm\p\_building\stargate.wav
+cm\p\_building\stargate\wht-01.wav
 cm\p\hierophant\wht-01.wav
 cm\p\hierophant\wht-02.wav
 cm\p\hierophant\wht-03.wav
@@ -2856,7 +2856,7 @@ cm\z\bactalisk\wh-02.wav
 cm\z\bactalisk\wh-03.wav
 cm\p\hierophant\wf-01.wav
 cm\p\hierophant\wf-02.wav
-cm\t\_building\ministry.wav
+cm\t\_building\ministry\wht-01.wav
 cm\t\phalanx\wh2-01.wav
 cm\p\exemplar\dth-01.wav
 cm\advisors\iskatumesk\meskad_allyattack-p-01.wav
@@ -3612,4 +3612,15 @@ cm\p\_building\bulwark\proc-03.wav
 cm\p\_building\crucible\amb-01.wav
 cm\t\_building\stockade\amb-01.wav
 cm\t\_building\fulcrum\amb-01.wav
-cm\t\_building\starpad\amb-01.wav
\ No newline at end of file
+cm\t\_building\starpad\amb-01.wav
+cm\t\_building\ministry\amb-01.wav
+cm\p\_building\nexus\amb-01.wav
+cm\p\_building\gateway\amb-01.wav
+cm\p\_building\lattice\amb-01.wav
+cm\p\_building\embassy\amb-01.wav
+cm\p\_building\stargate\amb-01.wav
+cm\z\egg\amb-01.wav
+cm\z\egg\amb-02.wav
+cm\z\egg\amb-03.wav
+cm\z\egg\amb-04.wav
+cm\t\_building\treasury\amb-01.wav
\ No newline at end of file
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index ddba763c..70735043 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin
index 6d46732c..e4363fdc 100644
Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ
diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt
index 3836d594..949174d2 100644
--- a/mpq/scripts/iscript_zerg.txt
+++ b/mpq/scripts/iscript_zerg.txt
@@ -9153,8 +9153,23 @@ ZoryusthalethLocal06:
 
 ZoryusthalethDeath:
 	playsnd           	1917 # Zoryusthaleth death 01
-	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
-	wait              	5
+	setfldirect       	0
+	playfram          	408
+	wait              	2
+	playfram          	409
+	wait              	2
+	playfram          	410
+	wait              	2
+	playfram          	411
+	wait              	2
+	playfram          	412
+	wait              	2
+	playfram          	413
+	wait              	2
+	playfram          	414
+	wait              	2
+	playfram          	415
+	wait              	2
 	lowsprul			823 0 0 # Zoryusthaleth Remains
 	wait              	1
 	end
@@ -15850,7 +15865,14 @@ LakiziliskDeath:
 	playfram          	0x1ed
 	wait              	2
 	lowsprul          	484 0 0	# Lakizilisk Remnants (zerg\zLakizilisk.grp)
-	wait              	9 # Extra time to prevent nullsprite crash
+	tmprmgraphicstart
+LakiziliskDeathLoop:
+	wait				128 # prevents nullsprite crash
+	sigorder			64
+	goto LakiziliskDeathLoop
+	
+LakiziliskDeathEnd:
+	wait				1
 	end
 	
 LakiziliskUnused1:
diff --git a/mpq/sound/cm/p/_building/embassy/amb-01.wav b/mpq/sound/cm/p/_building/embassy/amb-01.wav
new file mode 100644
index 00000000..515c4e1d
Binary files /dev/null and b/mpq/sound/cm/p/_building/embassy/amb-01.wav differ
diff --git a/mpq/sound/cm/p/_building/gateway/amb-01.wav b/mpq/sound/cm/p/_building/gateway/amb-01.wav
new file mode 100644
index 00000000..81b6fa1c
Binary files /dev/null and b/mpq/sound/cm/p/_building/gateway/amb-01.wav differ
diff --git a/mpq/sound/cm/p/_building/lattice/amb-01.wav b/mpq/sound/cm/p/_building/lattice/amb-01.wav
new file mode 100644
index 00000000..be34ed8f
Binary files /dev/null and b/mpq/sound/cm/p/_building/lattice/amb-01.wav differ
diff --git a/mpq/sound/cm/p/_building/nexus/amb-01.wav b/mpq/sound/cm/p/_building/nexus/amb-01.wav
new file mode 100644
index 00000000..fe38cff6
Binary files /dev/null and b/mpq/sound/cm/p/_building/nexus/amb-01.wav differ
diff --git a/mpq/sound/cm/p/_building/stargate/amb-01.wav b/mpq/sound/cm/p/_building/stargate/amb-01.wav
new file mode 100644
index 00000000..2f6cdb90
Binary files /dev/null and b/mpq/sound/cm/p/_building/stargate/amb-01.wav differ
diff --git a/mpq/sound/cm/p/_building/stargate.wav b/mpq/sound/cm/p/_building/stargate/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/p/_building/stargate.wav
rename to mpq/sound/cm/p/_building/stargate/wht-01.wav
diff --git a/mpq/sound/cm/t/_building/fulcrum/amb-01.wav b/mpq/sound/cm/t/_building/fulcrum/amb-01.wav
index 6bfafeca..2efc08d4 100644
Binary files a/mpq/sound/cm/t/_building/fulcrum/amb-01.wav and b/mpq/sound/cm/t/_building/fulcrum/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/ministry/amb-01.wav b/mpq/sound/cm/t/_building/ministry/amb-01.wav
new file mode 100644
index 00000000..804be821
Binary files /dev/null and b/mpq/sound/cm/t/_building/ministry/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/ministry.wav b/mpq/sound/cm/t/_building/ministry/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/ministry.wav
rename to mpq/sound/cm/t/_building/ministry/wht-01.wav
diff --git a/mpq/sound/cm/t/_building/starpad/amb-01.wav b/mpq/sound/cm/t/_building/starpad/amb-01.wav
index 820575c8..fef8c1c1 100644
Binary files a/mpq/sound/cm/t/_building/starpad/amb-01.wav and b/mpq/sound/cm/t/_building/starpad/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/stockade/amb-01.wav b/mpq/sound/cm/t/_building/stockade/amb-01.wav
index ba123fe0..9e6aa5d3 100644
Binary files a/mpq/sound/cm/t/_building/stockade/amb-01.wav and b/mpq/sound/cm/t/_building/stockade/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/treasury/amb-01.wav b/mpq/sound/cm/t/_building/treasury/amb-01.wav
new file mode 100644
index 00000000..faba3067
Binary files /dev/null and b/mpq/sound/cm/t/_building/treasury/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/treasury.wav b/mpq/sound/cm/t/_building/treasury/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/treasury.wav
rename to mpq/sound/cm/t/_building/treasury/wht-01.wav
diff --git a/mpq/sound/cm/z/egg/amb-01.wav b/mpq/sound/cm/z/egg/amb-01.wav
new file mode 100644
index 00000000..a0261c88
Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-01.wav differ
diff --git a/mpq/sound/cm/z/egg/amb-02.wav b/mpq/sound/cm/z/egg/amb-02.wav
new file mode 100644
index 00000000..445ef45b
Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-02.wav differ
diff --git a/mpq/sound/cm/z/egg/amb-03.wav b/mpq/sound/cm/z/egg/amb-03.wav
new file mode 100644
index 00000000..428befe3
Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-03.wav differ
diff --git a/mpq/sound/cm/z/egg/amb-04.wav b/mpq/sound/cm/z/egg/amb-04.wav
new file mode 100644
index 00000000..520164c4
Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-04.wav differ
diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4
index 78727b0b..3adf1ad9 100644
Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ
diff --git a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp
index d6493855..a067c4ea 100644
Binary files a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp and b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp differ
diff --git a/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp
index bb7e1d55..41eb35bb 100644
Binary files a/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp and b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp differ
diff --git a/mpq/unit/cm/zerg/zoryusthaleth-remains.grp b/mpq/unit/cm/zerg/zoryusthaleth-remains.grp
index 84ca9406..22f87466 100644
Binary files a/mpq/unit/cm/zerg/zoryusthaleth-remains.grp and b/mpq/unit/cm/zerg/zoryusthaleth-remains.grp differ
diff --git a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp
index 629515c2..693928c4 100644
Binary files a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp and b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp differ
diff --git a/mpq/unit/cm/zerg/zoryusthaleth.grp b/mpq/unit/cm/zerg/zoryusthaleth.grp
index 493642a4..4f546b23 100644
Binary files a/mpq/unit/cm/zerg/zoryusthaleth.grp and b/mpq/unit/cm/zerg/zoryusthaleth.grp differ
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index d9f2fee4..a50529f4 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 15d1dc44..3d3f5639 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 d00d39dd..947899d9 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -14,8 +14,9 @@
 ## Bugfixes
 - **Stability:**
 	- Improved floating point safety to further reduce desyncs (c. Veeq7)
-	- Resolved a crash when certain types of graphics were drawn after the Monument of Sin was warped in (r. Sosij & OyA, c. DF)
+	- Resolved a crash when certain types of graphics were drawn after a **Monument of Sin** was warped in (r. Sosij & OyA, c. DF)
 	- Score screen freezes should be resolved, though those replays will freeze during playback -- send them to us with info!
+	- Resolved a rare crash related to dying AI-controlled **Lakizilisk**s (r. SgzzZ, c. DF)
 	- Resolve a Zerg AI freeze (r. Solstice & others)
 	- Fixed rare crash when **Cohort**s self-revive at the unit limit (r. sharktemplar)
 	- Fixed rare crash when **Matraleth**-spawned **Vilgoleth**s were attempted to be made at the unit limit
@@ -23,10 +24,11 @@
 	- Resolved issues with **Swarming Omen** not correctly applying to flingy units, and incorrectly applying to FFA hostiles (r. GreenEggs'NSpam)
 	- Fix pneumonic hotkey mismatch for **Lobotomy Mine** detonation (r. Kenoli)
 - **Audiovisual:**
-	- Fixed wonky birth and mutation animations for the Izirokor (c. Solstice)
-	- Fixed bad requirement strings for Tarasque and Luminary
-	- Corrected Matrix selection circle
-	- Fixed bad death animation for Konvilisk
+	- Fixed wonky birth and mutation animations for the **Izirokor** (c. Solstice)
+	- Fixed bad requirement strings for **Tarasque** and **Luminary**
+	- Corrected **Matrix** selection circle
+	- Fixed bad death animation for **Konvilisk**
+	- Corrected overlay size for **Madrigal**
 	- Added **Miasma** passive icons & tooltips to **Kagralisk** and **Cherbrathalor** (r. Raenarill)
 	- Fixed **Swarming Omen** speed boost not always appearing on the armor tooltip (r. GreenEggs'NSpam)
 	- Fixed **Golden Republic Blackjack** build icon missing before Scrapyard completion (r. SgzzZ)
@@ -52,7 +54,7 @@
 	- **Burst Lasers** (Wraith)
 	- **Perpetual Wind** (Axitrilisk), **Reconstitution** (Vilgorokor), Screaming Venom (Keskathalor)
 - New SFX for:
-	- **Stockade** (training ambience)
+	- **Ministry**, **Treasury**, **Stockade**, **Fulcrum**, **Starpad**, **Nexus**, **Embassy**, **Gateway**, **Lattice**, **Stargate**, **Egg**, **Cocoon** (training ambience)
 	- **Bulwark** (passive proc)
 	- **Crucible** (ambience)
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index a0a6116f..372c9555 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ