diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index bad234a0..63c99b7c 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 3558cdad..72dd97bd 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 36d13787..d31e7c50 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1827,8 +1827,8 @@ Swarming Omen Overlay (Large)
 Swarming Omen Overlay (XLarge)
 Kalkalisk Birth (Egg)
 Tethzorokor Birth
-Extended Image #827
-Extended Image #828
+Vilgorokor Birth
+Protathalor Birth
 Extended Image #829
 Extended Image #830
 Extended Image #831
diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index fc781ae5..dc25ce08 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 155ba220..555dce27 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -3021,10 +3021,10 @@ Empress Under Attack 04
 Madcap Passive Charge 01
 Madcap Passive Charge 02
 Madcap Passive Charge 03
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Addon Construction 01
+Addon Construction 02
+Addon Construction 03
+Addon Construction 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index df65d1f7..72e30d11 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -2466,8 +2466,8 @@ cm\f-t\wendigo\yes-01.wav
 cm\f-t\wendigo\yes-02.wav
 cm\f-t\wendigo\yes-03.wav
 cm\f-t\wendigo\yes-04.wav
-cm\p\_building\cancel-protoss-01.wav
-cm\t\_building\cancel-terran-01.wav
+cm\p\_building\_cancel-protoss-01.wav
+cm\t\_building\_cancel-terran-01.wav
 cm\t\apostle\toggle-01.wav
 cm\t\apostle\toggle-02.wav
 cm\t\apostle\toggle-03.wav
@@ -3020,4 +3020,8 @@ cm\p\empress\hlp-03.wav
 cm\p\empress\hlp-04.wav
 cm\t\madcap\pas-01.wav
 cm\t\madcap\pas-02.wav
-cm\t\madcap\pas-03.wav
\ No newline at end of file
+cm\t\madcap\pas-03.wav
+cm\t\_building\_construct-01.wav
+cm\t\_building\_construct-02.wav
+cm\t\_building\_construct-03.wav
+cm\t\_building\_construct-04.wav
\ No newline at end of file
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index db571ee2..dff4c7f1 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 9a9674f9..516898aa 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -30772,9 +30772,11 @@ KalkaliskGndAttkToIdle:
 	playfram          	0x40
 	wait				2
 	playfram          	0x60
-	wait              	2 
+	wait              	2
 	playfram          	0x80
 	wait				2
+	playfram          	0xA0
+	wait				2
 	playfram			0x00
 	wait				2
 	goto              	KalkaliskGndAttkToIdle
@@ -30788,10 +30790,10 @@ KalkaliskDeath:
 	end
 
 KalkaliskGndAttkInit:
-	playfram			0xA0
+	playfram			0xC0
 	wait				1
 	nobrkcodestart
-	playfram			0xC0
+	playfram			0xE0
 	wait				1
 	playfram			0x100
 	playsndbtwn			1316 1318 # Kalkalisk attack 01, 02, 03
@@ -30799,11 +30801,9 @@ KalkaliskGndAttkInit:
 	wait              	1
 	playfram			0x120
 	wait				1
-	playfram			0x100
+	playfram			0x140
 	wait				1
-	playfram			0xC0
-	wait				1
-	playfram			0xA0
+	playfram			0x160
 	nobrkcodeend
 	gotorepeatattk
 	goto              	KalkaliskGndAttkToIdle
@@ -30814,9 +30814,11 @@ KalkaliskWalking:
 	playfram          	0x40
 	wait				1
 	playfram          	0x60
-	wait              	1 
+	wait              	1
 	playfram          	0x80
 	wait				1
+	playfram          	0xA0
+	wait				1
 	playfram			0x00
 	wait				1
 	goto              	KalkaliskWalking
@@ -42574,6 +42576,8 @@ AirAttkInit   	[NONE]
 FusionCutterHitDamagelessInit:
 	playfram          	0x00
 	playsndbtwn       	35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav
+	goto				FusionCutterHitDamagelessCont
+FusionCutterHitDamagelessCont:
 	wait              	1
 	playfram          	1
 	wait              	1
@@ -52363,5 +52367,22 @@ KalkaliskBirthTempSpecialState1:
 	sigorder          	4
 	nobrkcodeend
 	goto              	InfestedTerranLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1807 Addon Weld Overlay (bullet\scvspark.grp)
+.headerstart
+IsId          	775
+Type          	2
+Init          	FusionCutterHitDamagelessSilentInit
+Death         	FusionCutterHitDamagelessDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+FusionCutterHitDamagelessSilentInit:
+	playfram          	0x00
+	goto				FusionCutterHitDamagelessCont
 	
-## Next free IsId: 775
\ No newline at end of file
+## Next free IsId: 776
\ No newline at end of file
diff --git a/mpq/sound/cm/p/_building/cancel-protoss-01.wav b/mpq/sound/cm/p/_building/_cancel-protoss-01.wav
similarity index 100%
rename from mpq/sound/cm/p/_building/cancel-protoss-01.wav
rename to mpq/sound/cm/p/_building/_cancel-protoss-01.wav
diff --git a/mpq/sound/cm/t/_building/cancel-terran-01.wav b/mpq/sound/cm/t/_building/_cancel-terran-01.wav
similarity index 100%
rename from mpq/sound/cm/t/_building/cancel-terran-01.wav
rename to mpq/sound/cm/t/_building/_cancel-terran-01.wav
diff --git a/mpq/sound/cm/t/_building/_construct-01.wav b/mpq/sound/cm/t/_building/_construct-01.wav
new file mode 100644
index 00000000..93ba67a1
Binary files /dev/null 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
new file mode 100644
index 00000000..1fb3e677
Binary files /dev/null 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
new file mode 100644
index 00000000..f2cba198
Binary files /dev/null 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
new file mode 100644
index 00000000..b566817b
Binary files /dev/null and b/mpq/sound/cm/t/_building/_construct-04.wav differ
diff --git a/mpq/unit/cm/zerg/protathalor-birth.grp b/mpq/unit/cm/zerg/protathalor-birth.grp
new file mode 100644
index 00000000..0338c5b9
Binary files /dev/null and b/mpq/unit/cm/zerg/protathalor-birth.grp differ
diff --git a/mpq/unit/cm/zerg/vilgorokor-birth.grp b/mpq/unit/cm/zerg/vilgorokor-birth.grp
new file mode 100644
index 00000000..a59c5ee5
Binary files /dev/null and b/mpq/unit/cm/zerg/vilgorokor-birth.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index cfa7f936..e3ee7c84 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -15,14 +15,25 @@ This patch will include audiovisual improvements and mild balance adjustments.
 - **The Turning:**
 	- Fixed order limit being reached by zombies
 
+## Bugfixes
+- Stability:
+	- Prospectively fixed a rare nullsprite crash (r. The Shambler)
+- Gameplay:
+	- Removed detector flag from Axtoth Axis (r. TheBeaver99)
+- Audiovisual:
+	- Losing a structure with an addon still attached no longer plays the "abandon addon" advisor event (r. TheBeaver99)
+	- Fixed advisor events not playing for structure warp completion if your race was not Protoss, and addon completion if your race was not Terran (r. TheBeaver99)
+	- Corrected Vagrant Shade portrait (r. TheBeaver99)
+
 ## Audiovisuals
 - Revised graphics for:
 	- Kalkalisk (c. Solstice; cocoon birth animation not yet implemented)
 - Added unit responses for:
 	- Empress (c. [M](https://twitter.com/TheUnluckyM) & Chumbeque)
 - Added birth animations for:
-	- Gorgrokor, Tethzorokor
+	- Protathalor, Tethzorokor, Gorgrokor, Vilgorokor
 - Added SFX for:
+	- Terran addon self-construction
 	- Madcaps reaching full stacks of Cabeirus Feeders
 
 ## Protoss
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index c09c65fc..fdc93a48 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ