diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index c4ab4ebb..f9e6af2d 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3610,7 +3610,7 @@ Bulwark Ambient Proc 01
 Bulwark Ambient Proc 02
 Bulwark Ambient Proc 03
 Crucible Ambient 01
-Extended Sound #1
+Stockade Ambient 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index 6ccb7fbf..d67318e8 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -1753,8 +1753,8 @@ cm\t\pazuzu\yes-01.wav
 cm\t\pazuzu\yes-02.wav
 cm\t\pazuzu\yes-03.wav
 cm\t\pazuzu\yes-04.wav
-cm\t\_building\biotic-base.wav
-cm\t\_building\fulcrum.wav
+cm\t\_building\biotic-bastion.wav
+cm\t\_building\fulcrum\wht-01.wav
 cm\t\_building\future-station.wav
 cm\t\_building\iron-foundry.wav
 cm\t\_building\nanite-assembly.wav
@@ -2110,17 +2110,17 @@ cm\z\_building\almakis-antre.wav
 cm\z\_building\liivral-pond.wav
 cm\z\_building\sibraelosk.wav
 cm\z\_building\izkag-iteth.wav
-cm\t\_building\barracks.wav
+cm\t\_building\stockade\wht-01.wav
 cm\t\_building\medbay.wav
 cm\t\_building\scrapyard.wav
-cm\t\_building\starpad.wav
+cm\t\_building\starpad\wht-01.wav
 cm\t\_building\starport.wav
-cm\t\_building\munitions-bay.wav
+cm\t\_building\rotary.wav
 cm\t\apostle\cast-02.wav
 cm\t\apostle\cast-03.wav
 cm\e\energy-start.wav
 cm\e\energy-end.wav
-cm\t\_building\bunker.wav
+cm\t\_building\anchor.wav
 cm\t\_building\sentinel.wav
 cm\t\_building\future-station.wav
 cm\p\_building\matrix.wav
@@ -3483,9 +3483,9 @@ cm\f-t\tiangou\wf-02.wav
 cm\f-t\tiangou\wf-03.wav
 cm\f-t\tiangou\wf-04.wav
 cm\f-t\tiangou\wf-05.wav
-cm\t\_building\facade-cast-01.wav
-cm\t\_building\facade-off-01.wav
-cm\t\_building\facade.wav
+cm\t\_building\facade\cast-01.wav
+cm\t\_building\facade\off-01.wav
+cm\t\_building\facade\wht-01.wav
 cm\t\_building\cestus.wav
 cm\z\cikralisk\rdy-01.wav
 cm\z\cikralisk\rdy-01.wav
@@ -3609,4 +3609,7 @@ cm\t\eidolon\wf-03.wav
 cm\p\_building\bulwark\proc-01.wav
 cm\p\_building\bulwark\proc-02.wav
 cm\p\_building\bulwark\proc-03.wav
-cm\p\_building\crucible\amb-01.wav
\ No newline at end of file
+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
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 4a4e127e..ddba763c 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin
index 1f02d9a7..300f715e 100644
Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ
diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt
index e06bf01a..5116818a 100644
--- a/mpq/scripts/iscript_protoss.txt
+++ b/mpq/scripts/iscript_protoss.txt
@@ -11240,6 +11240,26 @@ ArtisanLocal00:
 	wait				2
 	playfram			0x80
 	wait				2
+	playfram			0xA0
+	wait				2
+	playfram			0xC0
+	wait				2
+	playfram			0xE0
+	wait				2
+	playfram			0x100
+	wait				2
+	playfram			0x120
+	wait				2
+	playfram			0x140
+	wait				2
+	playfram			0x160
+	wait				2
+	playfram			0x180
+	wait				2
+	playfram			0x1A0
+	wait				2
+	playfram			0x1C0
+	wait				2
 	playfram			0x00
 	goto				ArtisanLocal00
 
@@ -11289,6 +11309,26 @@ ArtisanWalking:
 	wait				1
 	playfram			0x80
 	wait				1
+	playfram			0xA0
+	wait				1
+	playfram			0xC0
+	wait				1
+	playfram			0xE0
+	wait				1
+	playfram			0x100
+	wait				1
+	playfram			0x120
+	wait				1
+	playfram			0x140
+	wait				1
+	playfram			0x160
+	wait				1
+	playfram			0x180
+	wait				1
+	playfram			0x1A0
+	wait				1
+	playfram			0x1C0
+	wait				1
 	playfram			0x00
 	goto              	ArtisanWalking
 
@@ -11301,13 +11341,32 @@ ArtisanAlmostBuilt:
 	playfram			0x20
 	wait				1
 	playfram			0x40
-	wait				2
+	wait				1
 	playfram			0x60
-	wait				2
+	wait				1
 	playfram			0x80
-	wait				2
+	wait				1
+	playfram			0xA0
+	wait				1
+	playfram			0xC0
+	wait				1
+	playfram			0xE0
+	wait				1
+	playfram			0x100
+	wait				1
+	playfram			0x120
+	wait				1
+	playfram			0x140
+	wait				1
+	playfram			0x160
+	wait				1
+	playfram			0x180
+	wait				1
+	playfram			0x1A0
+	wait				1
+	playfram			0x1C0
+	wait				1
 	playfram			0x00
-	wait              	1
 	goto              	ArtisanAlmostBuilt
 
 ArtisanWarpIn:
diff --git a/mpq/sound/cm/t/_building/bunker.wav b/mpq/sound/cm/t/_building/anchor.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/bunker.wav
rename to mpq/sound/cm/t/_building/anchor.wav
diff --git a/mpq/sound/cm/t/_building/biotic-base.wav b/mpq/sound/cm/t/_building/biotic-bastion.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/biotic-base.wav
rename to mpq/sound/cm/t/_building/biotic-bastion.wav
diff --git a/mpq/sound/cm/t/_building/facade-cast-01.wav b/mpq/sound/cm/t/_building/facade/cast-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/facade-cast-01.wav
rename to mpq/sound/cm/t/_building/facade/cast-01.wav
diff --git a/mpq/sound/cm/t/_building/facade-off-01.wav b/mpq/sound/cm/t/_building/facade/off-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/facade-off-01.wav
rename to mpq/sound/cm/t/_building/facade/off-01.wav
diff --git a/mpq/sound/cm/t/_building/facade.WAV b/mpq/sound/cm/t/_building/facade/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/facade.WAV
rename to mpq/sound/cm/t/_building/facade/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
new file mode 100644
index 00000000..6bfafeca
Binary files /dev/null and b/mpq/sound/cm/t/_building/fulcrum/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/fulcrum.wav b/mpq/sound/cm/t/_building/fulcrum/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/fulcrum.wav
rename to mpq/sound/cm/t/_building/fulcrum/wht-01.wav
diff --git a/mpq/sound/cm/t/_building/munitions-bay.wav b/mpq/sound/cm/t/_building/rotary.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/munitions-bay.wav
rename to mpq/sound/cm/t/_building/rotary.wav
diff --git a/mpq/sound/cm/t/_building/starpad/amb-01.wav b/mpq/sound/cm/t/_building/starpad/amb-01.wav
new file mode 100644
index 00000000..820575c8
Binary files /dev/null and b/mpq/sound/cm/t/_building/starpad/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/starpad.wav b/mpq/sound/cm/t/_building/starpad/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/starpad.wav
rename to mpq/sound/cm/t/_building/starpad/wht-01.wav
diff --git a/mpq/sound/cm/t/_building/stockade/amb-01.wav b/mpq/sound/cm/t/_building/stockade/amb-01.wav
new file mode 100644
index 00000000..ba123fe0
Binary files /dev/null and b/mpq/sound/cm/t/_building/stockade/amb-01.wav differ
diff --git a/mpq/sound/cm/t/_building/barracks.wav b/mpq/sound/cm/t/_building/stockade/wht-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/barracks.wav
rename to mpq/sound/cm/t/_building/stockade/wht-01.wav
diff --git a/mpq/unit/cm/protoss/architect-engine.grp b/mpq/unit/cm/protoss/architect-engine.grp
index 086057fa..aa711f59 100644
Binary files a/mpq/unit/cm/protoss/architect-engine.grp and b/mpq/unit/cm/protoss/architect-engine.grp differ
diff --git a/mpq/unit/cm/protoss/architect.grp b/mpq/unit/cm/protoss/architect.grp
index a8edc587..725b63d7 100644
Binary files a/mpq/unit/cm/protoss/architect.grp and b/mpq/unit/cm/protoss/architect.grp differ
diff --git a/mpq/unit/cm/protoss/artisan.grp b/mpq/unit/cm/protoss/artisan.grp
index 7b2a9a52..df1f9182 100644
Binary files a/mpq/unit/cm/protoss/artisan.grp and b/mpq/unit/cm/protoss/artisan.grp differ
diff --git a/mpq/unit/cm/protoss/artisan.loo b/mpq/unit/cm/protoss/artisan.loo
index 4177029b..5506fe1f 100644
Binary files a/mpq/unit/cm/protoss/artisan.loo and b/mpq/unit/cm/protoss/artisan.loo differ
diff --git a/patchnotes.md b/patchnotes.md
index ad008949..f0fc7aac 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -14,6 +14,7 @@
 ## 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)
 	- Score screen freezes should be resolved, though those replays will freeze during playback -- send them to us with info!
 	- Resolve a Zerg AI freeze (r. Solstice & others)
 	- Fixed rare crash when **Cohort**s self-revive at the unit limit (r. sharktemplar)
@@ -37,17 +38,20 @@
 - Smoothed camera follow for units (not pixel-perfect, yet...) (c. DF)
 - New models for:
 	- **Matador** (c. Solstice)
+	- **Artisan** (c. DeltaCadimus)
 - Modified models for:
 	- **Madrigal** (material updates)
 	- **Legionnaire** and **Izirokor** (slight size increases, c. Solstice)
+	- **Architect** (fixed engine, improved player color + muzzleflash)
 - New portrait for:
 	- **Izirokor** (c. Solstice)
 - New wireframe for:
 	- **Izirokor** (c. jun3hong)
 - New icons for: (c. Raenarill)
 	- **Burst Lasers** (Wraith)
-	- **Perpetual Wind** (Axitrilisk), **Reconstitution** (Vilgorokor),  Screaming Venom (Keskathalor)
+	- **Perpetual Wind** (Axitrilisk), **Reconstitution** (Vilgorokor), Screaming Venom (Keskathalor)
 - New SFX for:
+	- **Stockade** (training ambience)
 	- **Bulwark** (passive proc)
 	- **Crucible** (ambience)
 
@@ -69,11 +73,16 @@
 	- Factional variant that **Incinerate**s ground and air units while in **Imperioso Mode**
 
 ## Protoss
+- [Dracadin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/dracadin) and [Hierophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/hierophant):
+	- Transport space 4 » 3
 - [Bulwark](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/bulwark):
 	- Vision range 9 » 11
 	- Now benefits from **Crucible Khaydarin Charge**
 
 ## Zerg
+- [Ovileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ovileth):
+	- Resource costs 75/50 » 100/25
+	- Build time 22 » 20
 - [Cagrant Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cagrant-cesiant), [Surkith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant), and [Skortrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skortrith-cesiant:
 	- Vision range 10 » 9
 - [Kazitrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 48c17ac1..b6eecf16 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ