diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index b6695e98..0478e398 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 c4973ce0..2bf8c917 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 285da071..f284d511 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1749,7 +1749,7 @@ Philoc Engines
 Engram Warp Flash
 Radial Explosion (Orange)
 Radial Explosion (Green)
-Extended Image #749
+Quazilisk Mutate
 Extended Image #750
 Extended Image #751
 Extended Image #752
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index cf4cb530..0b51e752 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -6924,6 +6924,8 @@ Phalanx_Tank_BaseDeath:
 	playsnd           	317	# Terran\TANK\TTaDth00.WAV
 	imgol             	333 0 0	# Explosion2 (Medium) (thingy\tBangL.grp)
 	wait              	3
+	lowsprul			273 0 0 # Terran Building Rubble Small
+	wait				1
 	end
 
 Phalanx_Tank_BaseWalking:
@@ -20464,20 +20466,7 @@ ZergEggAllMutationsSpecialState2:
 	goto              	ZergEggAllMutationsLocal01
 
 ZergEggAllMutationsGndAttkToIdle:
-	playfram          	48
-	wait              	2
-	playfram          	49
-	wait              	2
-	playfram          	50
-	wait              	2
-	playfram          	51
-	wait              	2
-	playfram          	52
-	wait              	2
-	playfram          	53
-	wait              	2
-	playfram          	54
-	waitrand          	1 3 
+	wait				1
 	goto              	ZergEggAllMutationsLocal00
 
 ZergEggAllMutationsAirAttkToIdle:
@@ -34379,47 +34368,48 @@ QuaziliskUnused1:
 	goto				QuaziliskGndAttkToIdle
 
 QuaziliskGndAttkInit:
-	playfram          	0x00	# Frame set 0
-	wait              	1 
+	playfram          	0x110
+	wait              	1
 	nobrkcodestart
-	playfram			0x110
+	playfram			0x121
+	wait				1
 	playsndbtwn			1329 1331 # Quazilisk attack 01, 02, 03
 	attack
 	wait				1
-	playfram			0x00
-	wait              	1 
 	playfram			0x110
-	wait              	1 
-	playfram			0x00
-	wait              	1 
+	wait              	1
+	playfram			0x121
+	wait              	1
+	playfram			0x110
+	wait              	1
 	nobrkcodeend
 	gotorepeatattk
 	goto              	QuaziliskGndAttkToIdle
 
 QuaziliskWalking:
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x11
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x22
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x33
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x44
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x55
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x66
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x77
 	move              	5
-	wait              	1 
+	wait              	1
 	playfram          	0x88
 	goto              	QuaziliskWalking
 
@@ -34444,7 +34434,7 @@ QuaziliskBurrow:
 	playfram			0xee
 	wait				1
 	playfram			0xff
-	sigorder          	4 
+	sigorder          	4
 	goto              	QuaziliskLocal07
 
 QuaziliskUnBurrow:
@@ -34452,16 +34442,16 @@ QuaziliskUnBurrow:
 	waitrand          	1 4
 	imgul             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
 	playfram          	0xee
-	wait              	1 
+	wait              	1
 	playfram          	0xdd
-	wait              	1 
+	wait              	1
 	playfram          	0xbb
-	wait              	1 
+	wait              	1
 	playfram          	0xaa
-	wait              	1 
+	wait              	1
 	playfram          	0x99
-	wait              	1 
-	sigorder          	4 
+	wait              	1
+	sigorder          	4
 	goto              	QuaziliskGndAttkToIdle
 	
 # ----------------------------------------------------------------------------- #
@@ -51739,5 +51729,76 @@ TerranHeavyMissileExplosionInit:
 TerranHeavyMissileExplosionDeath:
 	wait              	1
 	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1751 Quazilisk Mutate (cm\zerg\quazilisk-mutate.grp)
+.headerstart
+IsId          	754
+Type          	13
+Init          	ZergMutateInit
+Death         	EggDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	ZergMutateUnused
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	ZergMutateSpecialState1
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ZergMutateInit:
+	playfram          	0x00
+	goto              	InfestedTerranLocal00
+
+ZergMutateDeath:
+	wait              	1
+	end
+
+ZergMutateUnused:
+	wait				1
+	nobrkcodestart
+	playfram          	6
+	wait              	2
+	playfram          	5
+	wait              	2
+	playfram          	4
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	1
+	wait              	2
+	playfram          	0
+	wait				2
+	sigorder			4
+	wait				2
+	nobrkcodeend
+	goto              	InfestedTerranLocal00
+
+ZergMutateSpecialState1:
+	playfram          	0
+	wait              	2
+	playfram          	1
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	4
+	wait              	2
+	playfram          	5
+	wait              	2
+	playfram          	6
+	waitrand          	1 3
+	sigorder			8
+	goto              	InfestedTerranLocal00
 	
-# Next free isid: 754
\ No newline at end of file
+# Next free isid: 755
\ No newline at end of file
diff --git a/mpq/unit/cm/faction/aspirant-shad.grp b/mpq/unit/cm/faction/aspirant-shadow.grp
similarity index 100%
rename from mpq/unit/cm/faction/aspirant-shad.grp
rename to mpq/unit/cm/faction/aspirant-shadow.grp
diff --git a/mpq/unit/cm/faction/cohort-shad.grp b/mpq/unit/cm/faction/cohort-shadow.grp
similarity index 100%
rename from mpq/unit/cm/faction/cohort-shad.grp
rename to mpq/unit/cm/faction/cohort-shadow.grp
diff --git a/mpq/unit/cm/faction/tarasque-shad.grp b/mpq/unit/cm/faction/tarasque-shadow.grp
similarity index 100%
rename from mpq/unit/cm/faction/tarasque-shad.grp
rename to mpq/unit/cm/faction/tarasque-shadow.grp
diff --git a/mpq/unit/cm/protoss/argosy-shad.grp b/mpq/unit/cm/protoss/argosy-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/argosy-shad.grp
rename to mpq/unit/cm/protoss/argosy-shadow.grp
diff --git a/mpq/unit/cm/protoss/astralomen-shad.grp b/mpq/unit/cm/protoss/astralomen-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/astralomen-shad.grp
rename to mpq/unit/cm/protoss/astralomen-shadow.grp
diff --git a/mpq/unit/cm/protoss/aurora-engine.grp b/mpq/unit/cm/protoss/aurora-engine.grp
index b96d771c..d58f1e06 100644
Binary files a/mpq/unit/cm/protoss/aurora-engine.grp and b/mpq/unit/cm/protoss/aurora-engine.grp differ
diff --git a/mpq/unit/cm/protoss/aurora.grp b/mpq/unit/cm/protoss/aurora.grp
index 1d0fce14..27c8b75c 100644
Binary files a/mpq/unit/cm/protoss/aurora.grp and b/mpq/unit/cm/protoss/aurora.grp differ
diff --git a/mpq/unit/cm/protoss/automatonregister-shad.grp b/mpq/unit/cm/protoss/automatonregister-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/automatonregister-shad.grp
rename to mpq/unit/cm/protoss/automatonregister-shadow.grp
diff --git a/mpq/unit/cm/protoss/charlatan-shad.grp b/mpq/unit/cm/protoss/charlatan-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/charlatan-shad.grp
rename to mpq/unit/cm/protoss/charlatan-shadow.grp
diff --git a/mpq/unit/cm/protoss/crucible-shad.grp b/mpq/unit/cm/protoss/crucible-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/crucible-shad.grp
rename to mpq/unit/cm/protoss/crucible-shadow.grp
diff --git a/mpq/unit/cm/protoss/demiurge-shad.grp b/mpq/unit/cm/protoss/demiurge-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/demiurge-shad.grp
rename to mpq/unit/cm/protoss/demiurge-shadow.grp
diff --git a/mpq/unit/cm/protoss/golem-shad.grp b/mpq/unit/cm/protoss/golem-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/golem-shad.grp
rename to mpq/unit/cm/protoss/golem-shadow.grp
diff --git a/mpq/unit/cm/protoss/grandlibrary-shad.grp b/mpq/unit/cm/protoss/grandlibrary-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/grandlibrary-shad.grp
rename to mpq/unit/cm/protoss/grandlibrary-shadow.grp
diff --git a/mpq/unit/cm/protoss/hierophant-shad.grp b/mpq/unit/cm/protoss/hierophant-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/hierophant-shad.grp
rename to mpq/unit/cm/protoss/hierophant-shadow.grp
diff --git a/mpq/unit/cm/protoss/idol-shad.grp b/mpq/unit/cm/protoss/idol-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/idol-shad.grp
rename to mpq/unit/cm/protoss/idol-shadow.grp
diff --git a/mpq/unit/cm/protoss/legionnaire-shad.grp b/mpq/unit/cm/protoss/legionnaire-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/legionnaire-shad.grp
rename to mpq/unit/cm/protoss/legionnaire-shadow.grp
diff --git a/mpq/unit/cm/protoss/manifold-shad.grp b/mpq/unit/cm/protoss/manifold-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/manifold-shad.grp
rename to mpq/unit/cm/protoss/manifold-shadow.grp
diff --git a/mpq/unit/cm/protoss/monumentofsin-shad.grp b/mpq/unit/cm/protoss/monumentofsin-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/monumentofsin-shad.grp
rename to mpq/unit/cm/protoss/monumentofsin-shadow.grp
diff --git a/mpq/unit/cm/protoss/panoptus.grp b/mpq/unit/cm/protoss/panoptus.grp
index 0a45ea0e..a1d0be41 100644
Binary files a/mpq/unit/cm/protoss/panoptus.grp and b/mpq/unit/cm/protoss/panoptus.grp differ
diff --git a/mpq/unit/cm/protoss/pariah-shad.grp b/mpq/unit/cm/protoss/pariah-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/pariah-shad.grp
rename to mpq/unit/cm/protoss/pariah-shadow.grp
diff --git a/mpq/unit/cm/protoss/pennant-shad.grp b/mpq/unit/cm/protoss/pennant-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/pennant-shad.grp
rename to mpq/unit/cm/protoss/pennant-shadow.grp
diff --git a/mpq/unit/cm/protoss/prostrationstage-shad.grp b/mpq/unit/cm/protoss/prostrationstage-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/prostrationstage-shad.grp
rename to mpq/unit/cm/protoss/prostrationstage-shadow.grp
diff --git a/mpq/unit/cm/protoss/roguegallery-shad.grp b/mpq/unit/cm/protoss/roguegallery-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/roguegallery-shad.grp
rename to mpq/unit/cm/protoss/roguegallery-shadow.grp
diff --git a/mpq/unit/cm/protoss/sanctumofsorrow-shad.grp b/mpq/unit/cm/protoss/sanctumofsorrow-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/sanctumofsorrow-shad.grp
rename to mpq/unit/cm/protoss/sanctumofsorrow-shadow.grp
diff --git a/mpq/unit/cm/protoss/simulacrum-shad.grp b/mpq/unit/cm/protoss/simulacrum-shadow.grp
similarity index 100%
rename from mpq/unit/cm/protoss/simulacrum-shad.grp
rename to mpq/unit/cm/protoss/simulacrum-shadow.grp
diff --git a/mpq/unit/cm/terran/anticthon-shad.grp b/mpq/unit/cm/terran/anticthon-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/anticthon-shad.grp
rename to mpq/unit/cm/terran/anticthon-shadow.grp
diff --git a/mpq/unit/cm/terran/autocrat-shad.grp b/mpq/unit/cm/terran/autocrat-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/autocrat-shad.grp
rename to mpq/unit/cm/terran/autocrat-shadow.grp
diff --git a/mpq/unit/cm/terran/bioticbase-damage.lof b/mpq/unit/cm/terran/biotic-bastion-damage.lof
similarity index 100%
rename from mpq/unit/cm/terran/bioticbase-damage.lof
rename to mpq/unit/cm/terran/biotic-bastion-damage.lof
diff --git a/mpq/unit/cm/terran/bioticbase-shad.grp b/mpq/unit/cm/terran/biotic-bastion-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/bioticbase-shad.grp
rename to mpq/unit/cm/terran/biotic-bastion-shadow.grp
diff --git a/mpq/unit/cm/terran/bioticbase.grp b/mpq/unit/cm/terran/biotic-bastion.grp
similarity index 100%
rename from mpq/unit/cm/terran/bioticbase.grp
rename to mpq/unit/cm/terran/biotic-bastion.grp
diff --git a/mpq/unit/cm/terran/captaincy-shad.grp b/mpq/unit/cm/terran/captaincy-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/captaincy-shad.grp
rename to mpq/unit/cm/terran/captaincy-shadow.grp
diff --git a/mpq/unit/cm/terran/cohort-shad.grp b/mpq/unit/cm/terran/cohort-shad.grp
deleted file mode 100644
index 25b86655..00000000
Binary files a/mpq/unit/cm/terran/cohort-shad.grp and /dev/null differ
diff --git a/mpq/unit/cm/terran/cohort.grp b/mpq/unit/cm/terran/cohort.grp
deleted file mode 100644
index cc6150a8..00000000
Binary files a/mpq/unit/cm/terran/cohort.grp and /dev/null differ
diff --git a/mpq/unit/cm/terran/cuirass-shad.grp b/mpq/unit/cm/terran/cuirass-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/cuirass-shad.grp
rename to mpq/unit/cm/terran/cuirass-shadow.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attack.grp b/mpq/unit/cm/terran/diadem-attack.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attack.grp
rename to mpq/unit/cm/terran/diadem-attack.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attack.lol b/mpq/unit/cm/terran/diadem-attack.lol
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attack.lol
rename to mpq/unit/cm/terran/diadem-attack.lol
diff --git a/mpq/unit/cm/terran/ioncannon-attackA1.grp b/mpq/unit/cm/terran/diadem-attackA1.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attackA1.grp
rename to mpq/unit/cm/terran/diadem-attackA1.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attackA2.grp b/mpq/unit/cm/terran/diadem-attackA2.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attackA2.grp
rename to mpq/unit/cm/terran/diadem-attackA2.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attackA3.grp b/mpq/unit/cm/terran/diadem-attackA3.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attackA3.grp
rename to mpq/unit/cm/terran/diadem-attackA3.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attackA4.grp b/mpq/unit/cm/terran/diadem-attackA4.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attackA4.grp
rename to mpq/unit/cm/terran/diadem-attackA4.grp
diff --git a/mpq/unit/cm/terran/ioncannon-attackB.grp b/mpq/unit/cm/terran/diadem-attackB.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-attackB.grp
rename to mpq/unit/cm/terran/diadem-attackB.grp
diff --git a/mpq/unit/cm/terran/ioncannon-base.grp b/mpq/unit/cm/terran/diadem-base.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-base.grp
rename to mpq/unit/cm/terran/diadem-base.grp
diff --git a/mpq/unit/cm/terran/ion-cannon-beacon.grp b/mpq/unit/cm/terran/diadem-beacon.grp
similarity index 100%
rename from mpq/unit/cm/terran/ion-cannon-beacon.grp
rename to mpq/unit/cm/terran/diadem-beacon.grp
diff --git a/mpq/unit/cm/terran/ioncannon-damage.lof b/mpq/unit/cm/terran/diadem-damage.lof
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-damage.lof
rename to mpq/unit/cm/terran/diadem-damage.lof
diff --git a/mpq/unit/cm/terran/ioncannon-dustoff.lod b/mpq/unit/cm/terran/diadem-dustoff.lod
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-dustoff.lod
rename to mpq/unit/cm/terran/diadem-dustoff.lod
diff --git a/mpq/unit/cm/terran/ioncannon-duston.lou b/mpq/unit/cm/terran/diadem-duston.lou
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-duston.lou
rename to mpq/unit/cm/terran/diadem-duston.lou
diff --git a/mpq/unit/cm/effect/ioncannon-ionfield.grp b/mpq/unit/cm/terran/diadem-ion-field.grp
similarity index 100%
rename from mpq/unit/cm/effect/ioncannon-ionfield.grp
rename to mpq/unit/cm/terran/diadem-ion-field.grp
diff --git a/mpq/unit/cm/terran/ioncannon-mouseresponse.grp b/mpq/unit/cm/terran/diadem-mouseresponse.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-mouseresponse.grp
rename to mpq/unit/cm/terran/diadem-mouseresponse.grp
diff --git a/mpq/unit/cm/terran/ioncannon-overlay.grp b/mpq/unit/cm/terran/diadem-overlay.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-overlay.grp
rename to mpq/unit/cm/terran/diadem-overlay.grp
diff --git a/mpq/unit/cm/terran/ioncannon-overlay.lol b/mpq/unit/cm/terran/diadem-overlay.lol
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-overlay.lol
rename to mpq/unit/cm/terran/diadem-overlay.lol
diff --git a/mpq/unit/cm/effect/ioncannon-projectile.grp b/mpq/unit/cm/terran/diadem-projectile.grp
similarity index 100%
rename from mpq/unit/cm/effect/ioncannon-projectile.grp
rename to mpq/unit/cm/terran/diadem-projectile.grp
diff --git a/mpq/unit/cm/terran/ioncannon-shad.grp b/mpq/unit/cm/terran/diadem-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-shad.grp
rename to mpq/unit/cm/terran/diadem-shadow.grp
diff --git a/mpq/unit/cm/terran/ioncannon-turret.grp b/mpq/unit/cm/terran/diadem-turret.grp
similarity index 100%
rename from mpq/unit/cm/terran/ioncannon-turret.grp
rename to mpq/unit/cm/terran/diadem-turret.grp
diff --git a/mpq/unit/cm/terran/guildhall-shad.grp b/mpq/unit/cm/terran/guildhall-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/guildhall-shad.grp
rename to mpq/unit/cm/terran/guildhall-shadow.grp
diff --git a/mpq/unit/cm/terran/particle-accelerator-damage.lof b/mpq/unit/cm/terran/hadron-damage.lof
similarity index 100%
rename from mpq/unit/cm/terran/particle-accelerator-damage.lof
rename to mpq/unit/cm/terran/hadron-damage.lof
diff --git a/mpq/unit/cm/terran/particle-accelerator-shadow.grp b/mpq/unit/cm/terran/hadron-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/particle-accelerator-shadow.grp
rename to mpq/unit/cm/terran/hadron-shadow.grp
diff --git a/mpq/unit/cm/terran/particle-accelerator.grp b/mpq/unit/cm/terran/hadron.grp
similarity index 100%
rename from mpq/unit/cm/terran/particle-accelerator.grp
rename to mpq/unit/cm/terran/hadron.grp
diff --git a/mpq/unit/cm/terran/heracles-shad.grp b/mpq/unit/cm/terran/heracles-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/heracles-shad.grp
rename to mpq/unit/cm/terran/heracles-shadow.grp
diff --git a/mpq/unit/cm/terran/ironfoundry-shad.grp b/mpq/unit/cm/terran/ironfoundry-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/ironfoundry-shad.grp
rename to mpq/unit/cm/terran/ironfoundry-shadow.grp
diff --git a/mpq/unit/cm/terran/madcap-shad.grp b/mpq/unit/cm/terran/madcap-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/madcap-shad.grp
rename to mpq/unit/cm/terran/madcap-shadow.grp
diff --git a/mpq/unit/cm/terran/naniteassembly-shad.grp b/mpq/unit/cm/terran/naniteassembly-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/naniteassembly-shad.grp
rename to mpq/unit/cm/terran/naniteassembly-shadow.grp
diff --git a/mpq/unit/cm/terran/olympian-shad.grp b/mpq/unit/cm/terran/olympian-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/olympian-shad.grp
rename to mpq/unit/cm/terran/olympian-shadow.grp
diff --git a/mpq/unit/cm/terran/paladin-shad.grp b/mpq/unit/cm/terran/paladin-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/paladin-shad.grp
rename to mpq/unit/cm/terran/paladin-shadow.grp
diff --git a/mpq/unit/cm/terran/penumbra-shad.grp b/mpq/unit/cm/terran/penumbra-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/penumbra-shad.grp
rename to mpq/unit/cm/terran/penumbra-shadow.grp
diff --git a/mpq/unit/cm/terran/quarry-shad.grp b/mpq/unit/cm/terran/quarry-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/quarry-shad.grp
rename to mpq/unit/cm/terran/quarry-shadow.grp
diff --git a/mpq/unit/cm/terran/munitionsbay-damage.lof b/mpq/unit/cm/terran/rotary-damage.lof
similarity index 100%
rename from mpq/unit/cm/terran/munitionsbay-damage.lof
rename to mpq/unit/cm/terran/rotary-damage.lof
diff --git a/mpq/unit/cm/terran/munitionsbay-shad.grp b/mpq/unit/cm/terran/rotary-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/munitionsbay-shad.grp
rename to mpq/unit/cm/terran/rotary-shadow.grp
diff --git a/mpq/unit/cm/terran/munitionsbay.grp b/mpq/unit/cm/terran/rotary.grp
similarity index 100%
rename from mpq/unit/cm/terran/munitionsbay.grp
rename to mpq/unit/cm/terran/rotary.grp
diff --git a/mpq/unit/cm/terran/savant-shad.grp b/mpq/unit/cm/terran/savant-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/savant-shad.grp
rename to mpq/unit/cm/terran/savant-shadow.grp
diff --git a/mpq/unit/cm/terran/scrapyard-shad.grp b/mpq/unit/cm/terran/scrapyard-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/scrapyard-shad.grp
rename to mpq/unit/cm/terran/scrapyard-shadow.grp
diff --git a/mpq/unit/cm/terran/siren-shad.grp b/mpq/unit/cm/terran/siren-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/siren-shad.grp
rename to mpq/unit/cm/terran/siren-shadow.grp
diff --git a/mpq/unit/cm/terran/striga-shad.grp b/mpq/unit/cm/terran/striga-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/striga-shad.grp
rename to mpq/unit/cm/terran/striga-shadow.grp
diff --git a/mpq/unit/cm/terran/tinkererstower-shad.grp b/mpq/unit/cm/terran/tinkererstower-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/tinkererstower-shad.grp
rename to mpq/unit/cm/terran/tinkererstower-shadow.grp
diff --git a/mpq/unit/cm/terran/treasury-shad.grp b/mpq/unit/cm/terran/treasury-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/treasury-shad.grp
rename to mpq/unit/cm/terran/treasury-shadow.grp
diff --git a/mpq/unit/cm/terran/medbay-connector.grp b/mpq/unit/cm/terran/vestry-connector.grp
similarity index 100%
rename from mpq/unit/cm/terran/medbay-connector.grp
rename to mpq/unit/cm/terran/vestry-connector.grp
diff --git a/mpq/unit/cm/terran/medbay-damage.lof b/mpq/unit/cm/terran/vestry-damage.lof
similarity index 100%
rename from mpq/unit/cm/terran/medbay-damage.lof
rename to mpq/unit/cm/terran/vestry-damage.lof
diff --git a/mpq/unit/cm/terran/medbay-shad.grp b/mpq/unit/cm/terran/vestry-shadow.grp
similarity index 100%
rename from mpq/unit/cm/terran/medbay-shad.grp
rename to mpq/unit/cm/terran/vestry-shadow.grp
diff --git a/mpq/unit/cm/terran/medbay.grp b/mpq/unit/cm/terran/vestry.grp
similarity index 100%
rename from mpq/unit/cm/terran/medbay.grp
rename to mpq/unit/cm/terran/vestry.grp
diff --git a/mpq/unit/cm/zerg/bactalisk-shad.grp b/mpq/unit/cm/zerg/bactalisk-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/bactalisk-shad.grp
rename to mpq/unit/cm/zerg/bactalisk-shadow.grp
diff --git a/mpq/unit/cm/zerg/gorgral-swamp-shad.grp b/mpq/unit/cm/zerg/gorgral-swamp-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/gorgral-swamp-shad.grp
rename to mpq/unit/cm/zerg/gorgral-swamp-shadow.grp
diff --git a/mpq/unit/cm/zerg/infestedtemplar-shad.grp b/mpq/unit/cm/zerg/infestedtemplar-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/infestedtemplar-shad.grp
rename to mpq/unit/cm/zerg/infestedtemplar-shadow.grp
diff --git a/mpq/unit/cm/zerg/izirokor-shad.grp b/mpq/unit/cm/zerg/izirokor-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/izirokor-shad.grp
rename to mpq/unit/cm/zerg/izirokor-shadow.grp
diff --git a/mpq/unit/cm/zerg/keskathalor-shad.grp b/mpq/unit/cm/zerg/keskathalor-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/keskathalor-shad.grp
rename to mpq/unit/cm/zerg/keskathalor-shadow.grp
diff --git a/mpq/unit/cm/zerg/konvilisk-shad.grp b/mpq/unit/cm/zerg/konvilisk-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/konvilisk-shad.grp
rename to mpq/unit/cm/zerg/konvilisk-shadow.grp
diff --git a/mpq/unit/cm/zerg/larvalcolony-shad.grp b/mpq/unit/cm/zerg/larvalcolony-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/larvalcolony-shad.grp
rename to mpq/unit/cm/zerg/larvalcolony-shadow.grp
diff --git a/mpq/unit/cm/zerg/quazilisk-mutate.grp b/mpq/unit/cm/zerg/quazilisk-mutate.grp
new file mode 100644
index 00000000..20d5e74d
Binary files /dev/null and b/mpq/unit/cm/zerg/quazilisk-mutate.grp differ
diff --git a/mpq/unit/cm/zerg/quazilisk-shad.grp b/mpq/unit/cm/zerg/quazilisk-shad.grp
deleted file mode 100644
index f6c8d979..00000000
Binary files a/mpq/unit/cm/zerg/quazilisk-shad.grp and /dev/null differ
diff --git a/mpq/unit/cm/zerg/quazilisk-shadow.grp b/mpq/unit/cm/zerg/quazilisk-shadow.grp
new file mode 100644
index 00000000..66324cda
Binary files /dev/null and b/mpq/unit/cm/zerg/quazilisk-shadow.grp differ
diff --git a/mpq/unit/cm/zerg/quazilisk.grp b/mpq/unit/cm/zerg/quazilisk.grp
index 04a329bd..d09317eb 100644
Binary files a/mpq/unit/cm/zerg/quazilisk.grp and b/mpq/unit/cm/zerg/quazilisk.grp differ
diff --git a/mpq/unit/cm/zerg/sire-shad.grp b/mpq/unit/cm/zerg/sire-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/sire-shad.grp
rename to mpq/unit/cm/zerg/sire-shadow.grp
diff --git a/mpq/unit/cm/zerg/zoryusthaleth-shad.grp b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp
similarity index 100%
rename from mpq/unit/cm/zerg/zoryusthaleth-shad.grp
rename to mpq/unit/cm/zerg/zoryusthaleth-shadow.grp
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index e04f9463..5fafbbfe 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 d102a51c..a7910b5a 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 6722620d..abac0ec2 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ