diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index bfdecfac..3847506c 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 e01801e4..b48e6251 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 765bd546..0e50f603 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1118,7 +1118,7 @@ Star Sovereign Shadow
 Apostle
 Apostle Shadow
 Apostle Remains
-Exemplar Weapon
+Exemplar Torpedo
 Future Station Shadow
 Argosy
 Argosy Shadow
@@ -1832,7 +1832,7 @@ Protathalor Birth
 Cikralisk Birth
 Cherbrathalor Birth
 Okrimnilisk Birth
-Extended Image #832
+Axitrilisk Birth
 Extended Image #833
 Extended Image #834
 Extended Image #835
diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index b53903a0..f256f63d 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 f2a89ec1..5cca3ebf 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3048,16 +3048,16 @@ Furen Advisor No Warp 01
 Furen Advisor Tech Up 01
 Furen Advisor No Vespene 01
 Furen Advisor Warp Complete 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
+Empyrean Death 01
+Empyrean Death 02
+Empyrean Death 03
+Idol Death 01
+Idol Death 02
+Idol Death 03
+Idol Death 04
+Exemplar Weaponhit 01
+Exemplar Weaponhit 02
+Exemplar Weaponhit 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index 1ef7d342..e096dd94 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -3047,4 +3047,14 @@ cm\advisors\furen\furenad_noland-01.wav
 cm\advisors\furen\furenad_nowarp-01.wav
 cm\advisors\furen\furenad_tech-01.wav
 cm\advisors\furen\furenad_vespene-01.wav
-cm\advisors\furen\furenad_warp-01.wav
\ No newline at end of file
+cm\advisors\furen\furenad_warp-01.wav
+cm\p\empyrean\dth-01.wav
+cm\p\empyrean\dth-02.wav
+cm\p\empyrean\dth-03.wav
+cm\p\idol\dth-01.wav
+cm\p\idol\dth-02.wav
+cm\p\idol\dth-03.wav
+cm\p\idol\dth-04.wav
+cm\p\exemplar\wh-01.wav
+cm\p\exemplar\wh-02.wav
+cm\p\exemplar\wh-03.wav
\ No newline at end of file
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index be4af0d0..66f954a9 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 095b7b0b..99563678 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index c15e94d0..04784997 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -25923,7 +25923,7 @@ EmpyreanGndAttkToIdle:
 	goto              	MinotaurGndAttkToIdle
 
 EmpyreanDeath:
-	playsnd           	533
+	playsndbtwn			3050 3052 # Empyrean death 01, 02, 03
 	imgol             	214 0 0	# Explosion1 (Medium) (thingy\tBangL.grp)
 	wait              	3
 	lowsprul			223 0 42 # Protoss Building Rubble Small
@@ -27067,6 +27067,7 @@ ExemplarTorpedoLocal01:
 	
 ExemplarTorpedoDeath:
 	imgol             	1105 0 0 # Exemplar weapon impact
+	playsndbtwn			3057 3059 # Exemplar weaponhit 01, 02, 03
 	domissiledmg
 	wait              	1 
 	end
@@ -29606,8 +29607,8 @@ IdolLocal00:
 	goto				IdolLocal00
 
 IdolDeath:
-	playsnd           	638	# Protoss\TRILOBYTE\PTrDth00.WAV
-	imgol             	214 0 0	# Explosion1 (Medium) (thingy\tBangL.grp)
+	playsndbtwn			3053 3056 # Idol death 01, 02, 03, 04
+	imgol             	213 0 0	# Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			847 0 0 # Protoss Unit Rubble Small
 	wait              	1
@@ -29701,8 +29702,8 @@ GolemLocal00:
 	goto              	GolemLocal00
 
 GolemDeath:
-	playsnd           	638	# Protoss\TRILOBYTE\PTrDth00.WAV
-	imgol             	214 0 0	# Explosion1 (Medium) (thingy\tBangL.grp)
+	playsnd           	533	# Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0	# Explosion1 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			847 0 0 # Protoss Unit Rubble Small
 	wait              	1
diff --git a/mpq/sound/cm/p/empyrean/dth-01.wav b/mpq/sound/cm/p/empyrean/dth-01.wav
new file mode 100644
index 00000000..956df50c
Binary files /dev/null and b/mpq/sound/cm/p/empyrean/dth-01.wav differ
diff --git a/mpq/sound/cm/p/empyrean/dth-02.wav b/mpq/sound/cm/p/empyrean/dth-02.wav
new file mode 100644
index 00000000..0b3ae5f1
Binary files /dev/null and b/mpq/sound/cm/p/empyrean/dth-02.wav differ
diff --git a/mpq/sound/cm/p/empyrean/dth-03.wav b/mpq/sound/cm/p/empyrean/dth-03.wav
new file mode 100644
index 00000000..b9171c74
Binary files /dev/null and b/mpq/sound/cm/p/empyrean/dth-03.wav differ
diff --git a/mpq/sound/cm/p/exemplar/wh-01.wav b/mpq/sound/cm/p/exemplar/wh-01.wav
new file mode 100644
index 00000000..a485dda6
Binary files /dev/null and b/mpq/sound/cm/p/exemplar/wh-01.wav differ
diff --git a/mpq/sound/cm/p/exemplar/wh-02.wav b/mpq/sound/cm/p/exemplar/wh-02.wav
new file mode 100644
index 00000000..05c42b61
Binary files /dev/null and b/mpq/sound/cm/p/exemplar/wh-02.wav differ
diff --git a/mpq/sound/cm/p/exemplar/wh-03.wav b/mpq/sound/cm/p/exemplar/wh-03.wav
new file mode 100644
index 00000000..c7bfc083
Binary files /dev/null and b/mpq/sound/cm/p/exemplar/wh-03.wav differ
diff --git a/mpq/sound/cm/p/idol/dth-01.wav b/mpq/sound/cm/p/idol/dth-01.wav
new file mode 100644
index 00000000..627166f3
Binary files /dev/null and b/mpq/sound/cm/p/idol/dth-01.wav differ
diff --git a/mpq/sound/cm/p/idol/dth-02.wav b/mpq/sound/cm/p/idol/dth-02.wav
new file mode 100644
index 00000000..cf0c7cdd
Binary files /dev/null and b/mpq/sound/cm/p/idol/dth-02.wav differ
diff --git a/mpq/sound/cm/p/idol/dth-03.wav b/mpq/sound/cm/p/idol/dth-03.wav
new file mode 100644
index 00000000..a4a51fe0
Binary files /dev/null and b/mpq/sound/cm/p/idol/dth-03.wav differ
diff --git a/mpq/sound/cm/p/idol/dth-04.wav b/mpq/sound/cm/p/idol/dth-04.wav
new file mode 100644
index 00000000..77e460cd
Binary files /dev/null and b/mpq/sound/cm/p/idol/dth-04.wav differ
diff --git a/mpq/sound/cm/t/_building/_construct-01.wav b/mpq/sound/cm/t/_building/_construct-01.wav
index 93ba67a1..735dd2d4 100644
Binary files a/mpq/sound/cm/t/_building/_construct-01.wav and b/mpq/sound/cm/t/_building/_construct-01.wav differ
diff --git a/mpq/sound/cm/t/_building/_construct-02.wav b/mpq/sound/cm/t/_building/_construct-02.wav
index 1fb3e677..085d6e53 100644
Binary files a/mpq/sound/cm/t/_building/_construct-02.wav and b/mpq/sound/cm/t/_building/_construct-02.wav differ
diff --git a/mpq/sound/cm/t/_building/_construct-03.wav b/mpq/sound/cm/t/_building/_construct-03.wav
index f2cba198..de79fd74 100644
Binary files a/mpq/sound/cm/t/_building/_construct-03.wav and b/mpq/sound/cm/t/_building/_construct-03.wav differ
diff --git a/mpq/sound/cm/t/_building/_construct-04.wav b/mpq/sound/cm/t/_building/_construct-04.wav
index b566817b..267b9fc9 100644
Binary files a/mpq/sound/cm/t/_building/_construct-04.wav and b/mpq/sound/cm/t/_building/_construct-04.wav differ
diff --git a/mpq/unit/cm/zerg/axitrilisk-birth.grp b/mpq/unit/cm/zerg/axitrilisk-birth.grp
new file mode 100644
index 00000000..592936db
Binary files /dev/null and b/mpq/unit/cm/zerg/axitrilisk-birth.grp differ
diff --git a/mpq/unit/cm/zerg/ghitorokor-birth.grp b/mpq/unit/cm/zerg/ghitorokor-birth.grp
index 555ee92e..2935bd87 100644
Binary files a/mpq/unit/cm/zerg/ghitorokor-birth.grp and b/mpq/unit/cm/zerg/ghitorokor-birth.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index 66e41030..f1c8baef 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -13,6 +13,9 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Cases where a unit's sprite is unexpectedly nonexistant will now print debug info to the screen -- **please screenshot this** and [submit it to us on discord!](https://discord.com/invite/s5SKBmY)
 	- Added "Prudence", a clone of the Artisan that can warp in structures, for use in UMS
 - **Config:**
+	- Renamed 'config.yml' to 'cosmonarchy.yml' and migrated it to the user's Starcraft folder, centralizing configs for both prerelease and release (c. Veeq7)
+	- Added 'ingame' and 'witness' options for selection and minimap UI (c. Veeq7)
+	- Autosaved replays are now stored in a unique folder per date played (c. Veeq7)
 	- Added Furen advisor
 
 ## Bugfixes:
@@ -21,14 +24,38 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 		- **Caveat:** At least one other desync case still exists; please keep the reports coming!
 	- Protected against another nullsprite crash (r. Faktheking)
 - **Gameplay:**
+	- Fixed an issue where unit turrets would be stunned even after certain stun effects wore off (r. TheBeaver99)
 	- Fixed tile walkability for Iceworld -> Higher Outpost
+- **Audiovisuals:**
+	- Fixed repair animations not playing when repairing a unit suffering from HP drains (r. neblime)
+	- Discord activity now updates on first launch (c. Veeq7)
 
 ## Audiovisuals
+- Added reads for:
+	- Vilgoleth (corpse consumption proc)
 - Added birth animations for:
-	- Cherbrathalor, Okrimnilisk
+	- Ghitorokor, Axitrilisk (WIP), Cherbrathalor, Okrimnilisk
+- Updated death animations for:
+	- Golem, Idol
+- Updated SFX for:
+	- Terran addon construction
+	- Golem death
+- Added new SFX for:
+	- Idol, Empyrean death
+	- Exemplar weaponhit
 
 ## Protoss
 - [Ecclesiast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ecclesiast):
 	- Astral Blessing proc range now 3, from 2
+- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect):
+	- No longer attacks air targets
 - [Matrix](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/matrix):
-	- Astral Tether proc range now 3, from 2
\ No newline at end of file
+	- Astral Tether proc range now 3, from 2
+
+## Zerg
+- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk):
+	- Armor penetration now 2, from 3
+- [Surkith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant):
+	- Armor now 2, from 3
+- [Spraith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/spraith-cesiant):
+	- Armor now 3, from 2
\ No newline at end of file
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index d10fe6d5..3659f498 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ