diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index 572dd4b3..a0c7ba2e 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index 3447529b..ffb03016 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -502,7 +502,7 @@ Nathrok Lake
 Skithrok Scab
 Qilin
 Auriel
-Extended Flingy #296
+Spoke Shell
 Extended Flingy #297
 Extended Flingy #298
 Extended Flingy #299
diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index f2e94852..03d5ad92 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 a97cd4a0..dbf0443b 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 0ec3e58b..72783fb5 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1789,7 +1789,7 @@ Qilin Engines
 Rotary Connector
 Auriel
 Auriel Shadow
-Extended Image #789
+Spoke Shell
 Extended Image #790
 Extended Image #791
 Extended Image #792
diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex
index f88636b9..af7569f2 100644
Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index 662ad43f..b02dc32e 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -891,8 +891,8 @@ Nathrok Lake
 Skithrok Scab
 Qilin
 Auriel
-Extended Sprite #1
-Extended Sprite #1
+Legionnaire Teleport Effect
+Spoke Shell
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1
diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index 3cbacca5..8cd40052 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -151,7 +151,7 @@ Zerg Excisant
 Terran Luminary
 Terran Siren
 Zerg Othstol Oviform
-Zerg Gorgral Swamp
+Zerg Tethvith Swamp
 Protoss Nexus
 Protoss Lattice
 Protoss Pylon
@@ -202,7 +202,7 @@ Terran Scrapyard
 Protoss Crucible
 Dark Swarm
 Terran Nanite Assembly
-Zerg Liivral Pond
+Zerg Kalkiir Lake
 Left Upper Level Door
 Right Upper Level Door
 Left Pit Door
@@ -394,8 +394,8 @@ Select Faction 4
 Select Faction 5
 Select Faction 6
 Terran Hotshot
-Zerg Nathrok Lake
-Zerg Skithrok Scab
+Zerg Vornath Pond
+Zerg Skibact Scab
 Terran Qilin
 Terran Auriel
 Extended Unit #173
diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft
index d0aedafd..765dc065 100644
Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 598785ed..bc5b080b 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl
index 09f2ee46..be6d2e96 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini
index 99bf393f..af68b7b6 100644
--- a/mpq/samase/config.ini
+++ b/mpq/samase/config.ini
@@ -68,12 +68,12 @@ equivalent_ids = Add(surkith_cesiant, skortrith_cesiant)
 equivalent_ids = Add(larvosk_cesiant, ocsal_cesiant)
 equivalent_ids = Add(irol_iris, othstol_oviform)
 equivalent_ids = Add(othstol_oviform, orboth_omlia)
-equivalent_ids = Add(quazeth_pool, nathrok_lake)
-equivalent_ids = Add(quazeth_pool, kalkiir_pond)
-equivalent_ids = Add(nathrok_lake, kalkiir_pond)
-equivalent_ids = Add(hydrith_den, skithrok_scab)
-equivalent_ids = Add(hydrith_den, bactith_swamp)
-equivalent_ids = Add(skithrok_scab, bactith_swamp)
+equivalent_ids = Add(quazeth_pool, vornath_pond)
+equivalent_ids = Add(quazeth_pool, kalkiir_lake)
+equivalent_ids = Add(vornath_pond, kalkiir_lake)
+equivalent_ids = Add(hydrith_den, skibact_scab)
+equivalent_ids = Add(hydrith_den, tethvith_swamp)
+equivalent_ids = Add(skibact_scab, tethvith_swamp)
 equivalent_ids = Add(mutath_spire, tosvrol_haunt)
 equivalent_ids = Add(matravil_nest, almakis_antre)
 equivalent_ids = Add(zorkiz_shroud, ultrav_cavern)
diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt
index 821025e6..5e11f536 100644
--- a/mpq/samase/unitdef.txt
+++ b/mpq/samase/unitdef.txt
@@ -18,11 +18,23 @@ building right_upper_door = 206
 # Special
 building special_control_node = 192
 
-# Factional NGS units
+# Terran factional units
 military cohort = 50
 military luminary = 150
 military aspirant = 194
 military tarasque = 210
+military philoc = 328
+military hotshot = 395
+military qilin = 398
+military auriel = 399
+
+# Protoss factional units
+military adherent = 400
+military extatus = 401
+
+# Zerg factional units
+military nathrelisk = 402
+military iziralisk = 403
 
 # Terran military units
 military maverick = 0
@@ -335,12 +347,12 @@ building gosvileth = 47
 building axtoth_axis = 130
 building almakis_antre = 139
 building othstol_oviform = 152
-building bactith_swamp = 153
+building tethvith_swamp = 153
 building alkag_iteth = 170
 building irulent_ivoa = 181
 building zorkiz_shroud = 193
 building tosvrol_haunt = 197
-building kalkiir_pond = 204
+building kalkiir_lake = 204
 building alkaj_chasm = 212
 building larvosk_cesiant = 216
 building geszkath_grotto = 219
@@ -354,8 +366,8 @@ building chokralgant_chazsal = 330
 building nephrilosk = 350
 building ocsal_cesiant = 354
 building ezigrisant = 364
-building nathrok_lake = 396
-building skithrok_scab = 397
+building vornath_pond = 396
+building skibact_scab = 397
 
 # Misc units
 military goliath_turret = 4
diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin
index 6a94cd80..fe3c9cda 100644
Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 3c747e34..96c3934e 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -49916,7 +49916,6 @@ ZarcavrokorBoneDeath:
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 1718 Cyprian Rail (cm\terran\cyprian-rail.grp)
-# 1719 Sentinel Rail (cm\terran\sentinel-rail.grp)
 .headerstart
 IsId          	733
 Type          	2
@@ -51911,5 +51910,50 @@ AurielGndAttkRpt:
 	gotorepeatattk
 	ignorerest
 	goto				SavantGndAttkToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1725 Spoke Shell (cm\terran\spoke-shell.grp)
+.headerstart
+IsId          	767
+Type          	13
+Init          	SpokeShellInit
+Death         	SpokeShellDeath
+GndAttkInit   	SpokeShellGndAttkInit
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+SpokeShellInit:
+	playfram          	0x00
+	wait              	1
+	sigorder          	1
+SpokeShellGndAttkInit:
+	playfram			0x20
+	wait				1
+	playfram			0x40
+	wait				1
+	playfram			0x60
+	wait				1
+	playfram			0x00
+	wait				1
+	goto              	SpokeShellGndAttkInit
+
+SpokeShellDeath:
+	#playsndbtwn		0 0 # X Weaponhit 01
+	imgol             	530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp)
+	domissiledmg
+	wait              	1
+	end
 	
-## Next free IsId: 767
\ No newline at end of file
+## Next free IsId: 768
\ No newline at end of file
diff --git a/mpq/unit/cm/terran/spoke-shell.grp b/mpq/unit/cm/terran/spoke-shell.grp
new file mode 100644
index 00000000..54056b32
Binary files /dev/null and b/mpq/unit/cm/terran/spoke-shell.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index f1357016..6e192586 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -31,7 +31,10 @@ Patch goals include:
 - Gameplay:
 	- Prospectively fixed a rare case where Apostles could continue reclaiming after death (r. TheBeaver99
 	- Fixed Lobotomy Mines not targeting units that had previously burrowed (c. DF)
+	- Fixed logic for Stewards returning to Solarions upon taking any damage, instead of the intended 50% HP threshold
 	- Improved decollision behaviors for iscript units (c. DF)
+- AI:
+	- Fixed request handling for Vornath Pond and Skibact Scab
 - Audiovisuals:
 	- Added missing Adrenal Frenzy (Nathrokor) armor tooltip
 	- Lobotomy Mine tooltip no longer displays the Spider Mines tooltip (r. 3crow)
@@ -41,6 +44,7 @@ Patch goals include:
 	- Fixed Anchor shadow alignment (c. DF)
 
 ## Audiovisuals
+- Custom trigger recolors have been improved (c. Veeq7)
 - New sprite for:
 	- Quarry, Rotary (c. Solstice)
 - Adjusted Mortothrokor selection circle, death animation timing
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index d529d6f1..6fd77e5b 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ