diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 215dff86..b9e3a57e 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 b540e59a..48577ecf 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 bbb65a2c..a61b2498 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -110,28 +110,28 @@ Zerg Building Spawn (Medium)
 Zerg Building Spawn (Large)
 Zerg Building Rubble (Small)
 Zerg Building Rubble (Large)
-Carrier
-Carrier Shadow
-Carrier Engines
-Carrier Warp Flash
-Interceptor
-Interceptor Shadow
-Shuttle
-Shuttle Shadow
-Shuttle Engines
-Shuttle Warp Flash
-Dragoon
-Dragoon Shadow
-Dragoon Remnants
-Dragoon Warp Flash
-High Templar
-High Templar Shadow
-High Templar Warp Flash
-Dark Templar (Hero)
-Arbiter
-Arbiter Shadow
-Arbiter Engines
-Arbiter Warp Flash
+Solarion
+Solarion Shadow
+Solarion Engines
+Solarion Warp Flash
+Steward
+Steward Shadow
+Envoy
+Envoy Shadow
+Envoy Engines
+Envoy Warp Flash
+Dracadin
+Dracadin Shadow
+Dracadin Remnants
+Dracadin Warp Flash
+Cantavis
+Cantavis Shadow
+Cantavis Warp Flash
+Cabalist (Hero)
+Didact
+Didact Shadow
+Didact Engines
+Didact Warp Flash
 Archon Energy
 Archon Being
 Archon Swirl
@@ -145,54 +145,54 @@ Panoptus Warp Flash
 Accantor
 Accantor Shadow
 Accantor Warp Flash
-Scarab
-Observer
-Observer Shadow
-Observer Warp Flash
+Plasma Shell
+Witness
+Witness Shadow
+Witness Warp Flash
 Zealot
 Zealot Shadow
 Zealot Death
 Zealot Warp Flash
-Templar Archives
-Templar Archives Warp Flash
-Templar Archives Shadow
-Assimilator
-Assimilator Warp Flash
-Assimilator Shadow
-Observatory
-Observatory Warp Flash
-Observatory Shadow
+Ancestral Archives
+Ancestral Archives Warp Flash
+Ancestral Archives Shadow
+Aquifer
+Aquifer Warp Flash
+Aquifer Shadow
+Machinist Hall
+Machinist Hall Warp Flash
+Machinist Hall Shadow
 Citadel of Adun
 Citadel of Adun Warp Flash
 Citadel of Adun Shadow
-Forge
-Forge Overlay
-Forge Warp Flash
-Forge Shadow
+Embassy
+Embassy Overlay
+Embassy Warp Flash
+Embassy Shadow
 Gateway
 Gateway Warp Flash
 Gateway Shadow
-Cybernetics Core
-Cybernetics Core Warp Flash
-Cybernetics Core Overlay
-Cybernetics Core Shadow
+Cenotaph
+Cenotaph Warp Flash
+Cenotaph Overlay
+Cenotaph Shadow
 Khaydarin Formation
 Nexus
 Nexus Warp Flash
 Nexus Overlay
 Nexus Shadow
-Photon Cannon
-Photon Cannon Shadow
-Photon Cannon Warp Flash
-Arbiter Tribunal
-Arbiter Tribunal Warp Flash
-Arbiter Tribunal Shadow
+Warden
+Warden Shadow
+Warden Warp Flash
+Celestial Tribune
+Celestial Tribune Warp Flash
+Celestial Tribune Shadow
 Pylon
 Pylon Warp Flash
 Pylon Shadow
-Robotics Facility
-Robotics Facility Warp Flash
-Robotics Facility Shadow
+Lattice
+Lattice Warp Flash
+Lattice Shadow
 Shield Battery
 Shield Battery Overlay
 Shileld Battery Warp Flash
@@ -224,12 +224,12 @@ Civilian Shadow
 Trojan
 Trojan Shadow
 Trojan Engines
-Firebat
-Firebat Shadow
-Ghost
-Ghost Shadow
-Ghost Remnants
-Ghost Death
+Harakan
+Harakan Shadow
+Eidolon
+Eidolon Shadow
+Eidolon Remnants
+Eidolon Death
 Nuke Beam
 Nuke Target Dot
 Goliath Base
@@ -237,10 +237,10 @@ Goliath Turret
 Goliath Shadow
 Sarah Kerrigan
 Sarah Kerrigan Shadow
-Marine
-Marine Shadow
-Marine Remnants
-Marine Death
+Maverick
+Maverick Shadow
+Maverick Remnants
+Maverick Death
 Wraith
 Wraith Shadow
 Wraith Engines
@@ -258,9 +258,9 @@ Vulture
 Vulture Shadow
 Spider Mine
 Spider Mine Shadow
-Science Vessel (Base)
-Science Vessel (Turret)
-Science Vessel Shadow
+Seraph (Base)
+Seraph (Turret)
+Seraph Shadow
 Fountainhead
 Fountainhead Overlay
 Fountainhead Shadow
@@ -1732,7 +1732,7 @@ Wyvern Turret Shadow
 Analogue
 Analogue Shadow
 Zerg Spore Explosion Large
-Extended Image #732
+Pythean Engines
 Extended Image #733
 Extended Image #734
 Extended Image #735
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 48c48588..b8955d1e 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 94452742..7d69b1c0 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt
index d7fd628f..d28d8e46 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -97,7 +97,7 @@ Sowing Spores (Konvilisk)
 Charybdal Rifle (Siren)
 Astral Blaster (Ecclesiast)
 Dauntless Disruption Cannon (Atreus)
-Psi Cleaver (Amaranth)
+Phase Cleaver (Amaranth)
 Neutron Flare (Lanifect)
 Sequencing Spore (Charlatan)
 Acrid Barbs (Quazilisk)
@@ -111,7 +111,7 @@ Subterranean Spines (Lakizilisk)
 Piercing Spines (Almaksalisk)
 Warp Blades (Cabalist)
 Prismatic Blasters (Idol)
-Psi Lances (Golem)
+Phase Lances (Golem)
 Ray of Agony (Barghest)
 Iconoclast's Flurry (Pariah)
 Eminence Rifle (Autocrat)
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 15581bf5..a4e8d12f 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 242dde9b..b71779b9 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -26498,7 +26498,7 @@ PytheanDeath:
 
 PytheanWalking:
 	setvertpos        	0
-#	imgol             	225 0 0 # Trojan Engines (thingy\tdrGlow.grp)
+	imgol             	1734 0 0 # Pythean Engines (cm\terran\pythean-engine.grp)
 	goto              	InfestedTerranLocal00
 	
 # ----------------------------------------------------------------------------- #
@@ -52089,7 +52089,7 @@ WyvernTurretGndAttkInit:
 	playfram			0x00
 	wait				1
 	nobrkcodestart
-	playfram			0x20
+#	playfram			0x20
 	attackwith        	1
 	nobrkcodeend
 	gotorepeatattk
diff --git a/mpq/templates/Free For All(1).got b/mpq/templates/Free For All(1).got
index d62f3216..455f94af 100644
Binary files a/mpq/templates/Free For All(1).got and b/mpq/templates/Free For All(1).got differ
diff --git a/mpq/templates/Melee(1).got b/mpq/templates/Melee(1).got
index 8006c6d3..14c9b8a2 100644
Binary files a/mpq/templates/Melee(1).got and b/mpq/templates/Melee(1).got differ
diff --git a/mpq/unit/cm/terran/madrigal.grp b/mpq/unit/cm/terran/madrigal.grp
index 90f04b3d..e922a7a9 100644
Binary files a/mpq/unit/cm/terran/madrigal.grp and b/mpq/unit/cm/terran/madrigal.grp differ
diff --git a/mpq/unit/cm/terran/pythean-engine.grp b/mpq/unit/cm/terran/pythean-engine.grp
index cb7a23de..f7ec293c 100644
Binary files a/mpq/unit/cm/terran/pythean-engine.grp and b/mpq/unit/cm/terran/pythean-engine.grp differ
diff --git a/mpq/unit/cm/terran/pythean.grp b/mpq/unit/cm/terran/pythean.grp
index a57e271c..e9f02097 100644
Binary files a/mpq/unit/cm/terran/pythean.grp and b/mpq/unit/cm/terran/pythean.grp differ
diff --git a/mpq/unit/cm/terran/wyvern-engine.grp b/mpq/unit/cm/terran/wyvern-engine.grp
index d999f913..a2e44e3a 100644
Binary files a/mpq/unit/cm/terran/wyvern-engine.grp and b/mpq/unit/cm/terran/wyvern-engine.grp differ
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index ee38a32c..7c2479a1 100644
Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ
diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp
index a576bd35..e4cf3947 100644
Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index de94c93b..b595cd7b 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -56,6 +56,7 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 - Terran lifted buildings now play the "base is under attack" notification
 - Replays are now auto-saved (with a config option to disable this feature) (c. Veeq7)
 - Team UI now has a config option for showing your own stats in the same style, defaulting to off (c. Veeq7)
+- Non-UMS modes no longer show in singleplayer (c. DarkenedFantasies)
 - A new emoji has been added to the font (c. DarkenedFantasies)
 
 ## Terran
@@ -186,6 +187,9 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Armor penetration now 0, from 1
 	- Weapon cooldown now 1.5, from 1.25
 	- Weapon range now 5, from 6
+	- Ability rework:
+		- Spider Mines removed
+		- Now lays [Lobotomy Mines](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/lobotomy-mine), which stun and slow affected targets
 - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops):
 	- Weapon damage now 6, from 5
 	- Armor penetration now 1, from 2
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 9a4c8ef3..78dbdcbb 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ