diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 960f31df..fd997380 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 be892dde..1dad3062 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 f407269b..985d8c96 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1854,18 +1854,18 @@ Grand Library Shadow
 Grand Library Warp Flash
 Gladius Charge
 Optecton Muzzle Flash
-Extended Image #854
-Extended Image #855
-Extended Image #856
-Extended Image #857
-Extended Image #858
-Extended Image #859
-Extended Image #860
-Extended Image #861
-Extended Image #862
-Extended Image #863
-Extended Image #864
-Extended Image #865
+Avenge - Small
+Avenge - Medium
+Avenge - Large
+Avenge - XLarge
+Ascension - Small
+Ascension - Medium
+Ascension - Large
+Ascension - XLarge
+Astral Rule - Small
+Astral Rule - Medium
+Astral Rule - Large
+Astral Rule - XLarge
 Extended Image #866
 Extended Image #867
 Extended Image #868
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 99a46759..a86ce0e7 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 26b95caf..42329136 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -51053,4 +51053,131 @@ MuzzleFlashSingleInit:
 	wait              	1
 	end
 	
-## Next free IsId: 781
\ No newline at end of file
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1856 Avenge Small  (cm\protoss\avenge-small.grp)
+# 1857 Avenge Medium (cm\protoss\avenge-medium.grp)
+# 1858 Avenge Large  (cm\protoss\avenge-large.grp)
+# 1859 Avenge XLarge (cm\protoss\avenge-xlarge.grp)
+# 1860 Ascension Small  (cm\protoss\ascension-small.grp)
+# 1861 Ascension Medium (cm\protoss\ascension-medium.grp)
+# 1862 Ascension Large  (cm\protoss\ascension-large.grp)
+# 1863 Ascension XLarge (cm\protoss\ascension-xlarge.grp)
+.headerstart
+IsId          	781
+Type          	1
+Init          	AscensionProcInit
+Death         	Generic_Wait1End
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AscensionProcInit:
+	playfram          	0x00
+	wait				1
+	playfram          	1
+	wait				1
+	playfram          	2
+	wait				1
+	playfram          	3
+	wait				1
+	playfram          	4
+	wait				1
+	playfram          	5
+	wait				1
+	playfram          	6
+	wait				1
+	playfram          	7
+	wait				1
+	playfram          	8
+	wait				1
+	playfram          	9
+	wait				1
+	playfram          	10
+	wait				1
+	playfram          	11
+	wait				1
+	playfram          	12
+	wait				1
+	playfram          	13
+	goto				Generic_Wait1End
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1864 Astral Rule Small  (cm\protoss\astral-rule-small.grp)
+# 1865 Astral Rule Medium (cm\protoss\astral-rule-medium.grp)
+# 1866 Astral Rule Large  (cm\protoss\astral-rule-large.grp)
+# 1867 Astral Rule XLarge (cm\protoss\astral-rule-xlarge.grp)
+.headerstart
+IsId          	782
+Type          	1
+Init          	AstralRuleInit
+Death         	AstralRuleDeath
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AstralRuleInit:
+	playfram          	0x00
+	wait				1
+	playfram          	1
+	wait				1
+	playfram          	2
+	wait				1
+	playfram          	3
+	wait				1
+	playfram          	4
+	wait				1
+	playfram          	5
+	wait				1
+	playfram          	6
+	wait				1
+	playfram          	7
+	wait				1
+	playfram          	8
+	wait				1
+	playfram          	9
+AstralRuleLocal00:
+	wait				1
+	playfram          	10
+	wait				1
+	playfram          	11
+	wait				1
+	playfram          	12
+	wait				1
+	playfram          	13
+	wait				1
+	playfram          	14
+	wait				1
+	playfram          	15
+	wait				1
+	playfram          	16
+	wait				1
+	playfram          	17
+	wait				1
+	playfram          	18
+	wait				1
+	playfram          	19
+	goto				AstralRuleLocal00
+	
+AstralRuleDeath:
+	playfram			20
+	wait				1
+	playfram			21
+	wait				1
+	playfram			22
+	wait				1
+	playfram			23
+	wait				1
+	playfram			24
+	wait				1
+	playfram			25
+	wait				1
+	playfram			26
+	wait				1
+	playfram			27
+	wait				1
+	playfram			28
+	wait				1
+	playfram			29
+	goto				Generic_Wait1End
+	
+## Next free IsId: 783
\ No newline at end of file
diff --git a/mpq/unit/cm/protoss/ascension-large.grp b/mpq/unit/cm/protoss/ascension-large.grp
new file mode 100644
index 00000000..97db1534
Binary files /dev/null and b/mpq/unit/cm/protoss/ascension-large.grp differ
diff --git a/mpq/unit/cm/protoss/ascension-medium.grp b/mpq/unit/cm/protoss/ascension-medium.grp
new file mode 100644
index 00000000..92f57010
Binary files /dev/null and b/mpq/unit/cm/protoss/ascension-medium.grp differ
diff --git a/mpq/unit/cm/protoss/ascension-small.grp b/mpq/unit/cm/protoss/ascension-small.grp
new file mode 100644
index 00000000..11253584
Binary files /dev/null and b/mpq/unit/cm/protoss/ascension-small.grp differ
diff --git a/mpq/unit/cm/protoss/ascension-xlarge.grp b/mpq/unit/cm/protoss/ascension-xlarge.grp
new file mode 100644
index 00000000..7448c4bd
Binary files /dev/null and b/mpq/unit/cm/protoss/ascension-xlarge.grp differ
diff --git a/mpq/unit/cm/protoss/astral-rule-large.grp b/mpq/unit/cm/protoss/astral-rule-large.grp
new file mode 100644
index 00000000..323453b0
Binary files /dev/null and b/mpq/unit/cm/protoss/astral-rule-large.grp differ
diff --git a/mpq/unit/cm/protoss/astral-rule-medium.grp b/mpq/unit/cm/protoss/astral-rule-medium.grp
new file mode 100644
index 00000000..a62a0700
Binary files /dev/null and b/mpq/unit/cm/protoss/astral-rule-medium.grp differ
diff --git a/mpq/unit/cm/protoss/astral-rule-small.grp b/mpq/unit/cm/protoss/astral-rule-small.grp
new file mode 100644
index 00000000..d88e9199
Binary files /dev/null and b/mpq/unit/cm/protoss/astral-rule-small.grp differ
diff --git a/mpq/unit/cm/protoss/astral-rule-xlarge.grp b/mpq/unit/cm/protoss/astral-rule-xlarge.grp
new file mode 100644
index 00000000..f9dae708
Binary files /dev/null and b/mpq/unit/cm/protoss/astral-rule-xlarge.grp differ
diff --git a/mpq/unit/cm/protoss/avenge-large.grp b/mpq/unit/cm/protoss/avenge-large.grp
new file mode 100644
index 00000000..e1072feb
Binary files /dev/null and b/mpq/unit/cm/protoss/avenge-large.grp differ
diff --git a/mpq/unit/cm/protoss/avenge-medium.grp b/mpq/unit/cm/protoss/avenge-medium.grp
new file mode 100644
index 00000000..93489ba3
Binary files /dev/null and b/mpq/unit/cm/protoss/avenge-medium.grp differ
diff --git a/mpq/unit/cm/protoss/avenge-small.grp b/mpq/unit/cm/protoss/avenge-small.grp
new file mode 100644
index 00000000..1faf615d
Binary files /dev/null and b/mpq/unit/cm/protoss/avenge-small.grp differ
diff --git a/mpq/unit/cm/protoss/avenge-xlarge.grp b/mpq/unit/cm/protoss/avenge-xlarge.grp
new file mode 100644
index 00000000..4304bf7a
Binary files /dev/null and b/mpq/unit/cm/protoss/avenge-xlarge.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index bebb6c48..9df8ca40 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -14,7 +14,10 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Minimap camera now updates much more swiftly (c. DF)
 - Config:
 	- **New:** preferred colors! (c. Veeq7)
-		- Specify a list of preferred player colors, with the first color being the highest priority
+		- Specify a list of preferred player colors, common or per race
+		- Set 'shuffle' to 'true' to randomly receive a color
+		- Colors are only selected if available on a given tileset
+		- In the event of preference conflicts between players, the lower player ID gets the color
 
 ## Computer AI
 - Priorities:
@@ -34,10 +37,12 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Konvilisk and Cherbrathalor attacks can no longer bounce more than once (r. lolrsk8s)
 	- Crushing Tide attacks are now properly capped at 3 targets, from 4 (r. lolrsk8s)
 	- Successive Sevenstep attacks no longer reset Mind Matter handling (r. lolrsk8s)
-	- Treasuries now leave behind corpses
+	- Zerg Larvae can no longer die by wandering over cagra-free terrain, as long as their parent structure remains alive (r. Krankendau, c. DF)
+	- Treasuries now leave behind rubble
 	- Ezigrisant regression can no longer break gas node harvestability (r. TheBeaver99)
 	- Ocsal Gosvileths no longer pass on Ocsal debuff to structures (r. TheBeaver99)
 - Audiovisuals:
+	- Irradiate overlay is now properly inherited by regressing Zerg (r. TheBeaver99)
 	- Olympian Mythical Might SFX no longer plays more often than intended (r. lolrsk8s)
 - Triggers:
 	- Restored 'Set Next Scenario' trigger action functionality
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 9a02b87d..fd582c64 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ