diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt
index 34078af7..12f193a7 100644
--- a/CMBW-editor/grafting/Buttons.txt
+++ b/CMBW-editor/grafting/Buttons.txt
@@ -59,19 +59,20 @@
 19:	# [19] Basic Zerg Buildings
   1, 131, 4, 33, 131, 131, 613, 0  # Hachirosk, Can Create Unit\Building ([131] Hachirosk), Create Building - Zerg ([131] Hachirosk)
   2, 143, 4, 33, 143, 143, 614, 0  # Cagrant Colony, Can Create Unit\Building ([143] Cagrant Colony), Create Building - Zerg ([143] Cagrant Colony)
-  3, 149, 4, 33, 149, 149, 615, 0  # Excisant, Can Create Unit\Building ([149] Excisant), Create Building - Zerg ([149] Excisant)
+  3, 149, 4, 33, 149, 149, 615, 1467  # Excisant, Can Create Unit\Building ([149] Excisant), Create Building - Zerg ([149] Excisant)
   4, 142, 4, 33, 142, 142, 616, 0  # Quazrok Pool, Can Create Unit\Building ([142] Quazrok Pool), Create Building - Zerg ([142] Quazrok Pool)
   5, 135, 4, 33, 135, 135, 618, 0  # Hydrok Den, Can Create Unit\Building ([135] Hydrok Den), Create Building - Zerg ([135] Hydrok Den)
   6, 193, 4, 33, 193, 193, 387, 389  # Zoryus Shroud, Can Create Unit\Building ([193] Zoryus Shroud), Create Building - Zerg ([193] Zoryus Shroud)
   7, 224, 4, 33, 224, 224, 1366, 1365  # Irol Iris, Can Create Unit\Building ([224] Irol Iris), Create Building - Zerg ([224] Irol Iris)
 
 20:	# [20] Advanced Zerg Buildings
-  1, 141, 4, 33, 141, 141, 620, 1098  # Muthrok Spire, Can Create Unit\Building ([141] Muthrok Spire), Create Building - Zerg ([141] Muthrok Spire)
-  2, 170, 4, 33, 170, 170, 1386, 1103  # Izkag Iteth, Can Create Unit\Building ([170] Izkag Iteth), Create Building - Zerg ([170] Izkag Iteth)
-  3, 138, 4, 33, 138, 138, 621, 752  # Matravil Nest, Can Create Unit\Building ([138] Matravil Nest), Create Building - Zerg ([138] Matravil Nest)
-  4, 134, 4, 33, 134, 134, 619, 748  # Nydus Cesiant, Can Create Unit\Building ([134] Nydus Cesiant), Create Building - Zerg ([134] Nydus Cesiant)
-  5, 219, 4, 33, 219, 219, 1399, 1398  # Geszkath Grotto, Can Create Unit\Building ([219] Geszkath Grotto), Create Building - Zerg ([219] Geszkath Grotto)
-  6, 136, 4, 33, 136, 136, 623, 755  # Sovthrath Mound, Can Create Unit\Building ([136] Sovthrath Mound), Create Building - Zerg ([136] Sovthrath Mound)
+  1, 134, 4, 33, 134, 134, 619, 748  # Nydus Cesiant, Can Create Unit\Building ([134] Nydus Cesiant), Create Building - Zerg ([134] Nydus Cesiant)
+  4, 141, 4, 33, 141, 141, 620, 1098  # Muthrok Spire, Can Create Unit\Building ([141] Muthrok Spire), Create Building - Zerg ([141] Muthrok Spire)
+  5, 170, 4, 33, 170, 170, 1386, 1103  # Izkag Iteth, Can Create Unit\Building ([170] Izkag Iteth), Create Building - Zerg ([170] Izkag Iteth)
+  6, 138, 4, 33, 138, 138, 621, 752  # Matravil Nest, Can Create Unit\Building ([138] Matravil Nest), Create Building - Zerg ([138] Matravil Nest)
+  7, 130, 4, 33, 130, 130, 447, 429  # Axtoth Axis, Can Create Unit\Building ([130] Axtoth Axis), Create Building - Zerg ([130] Axtoth Axis)
+  8, 219, 4, 33, 219, 219, 1399, 1398  # Geszkath Grotto, Can Create Unit\Building ([219] Geszkath Grotto), Create Building - Zerg ([219] Geszkath Grotto)
+  9, 136, 4, 33, 136, 136, 623, 755  # Sovthrath Mound, Can Create Unit\Building ([136] Sovthrath Mound), Create Building - Zerg ([136] Sovthrath Mound)
 # 9, 236, 3, 59, 0, 228, 688, 0  # Cancel, Always (0), Change Displayed Buttons ([228] Blank)
 
 22:	# [22] Hydralisk
@@ -235,7 +236,6 @@
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
   7, 277, 23, 24, 20, 20, 401, 406  # Hallucination, Spell Researched ([20] Hallucinate - Cantavis), Use Technology ([20] Hallucinate - Cantavis)
   8, 275, 23, 24, 19, 19, 400, 405  # Psionic Storm, Spell Researched ([19] Psionic Storm - Cantavis), Use Technology ([19] Psionic Storm - Cantavis)
-  9, 274, 23, 57, 34, 0, 1625, 1625  # Mind Control (SC Beta), Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 48:	# [48] Cabalist
   1, 228, 3, 9, 0, 0, 664, 0  # Move, Always (0), Move (0)
@@ -350,7 +350,7 @@
 71:	# [71] Basic Terran Buildings
   1, 106, 4, 29, 106, 106, 646, 0  # Command Center, Can Create Unit\Building ([106] Command Center), Create Building - Terran ([106] Command Center)
   2, 124, 4, 29, 124, 124, 651, 0  # Watchdog, Can Create Unit\Building ([124] Watchdog), Create Building - Terran ([124] Watchdog)
-  3, 110, 4, 29, 110, 110, 648, 0  # Reservoir, Can Create Unit\Building ([110] Reservoir), Create Building - Terran ([110] Reservoir)
+  3, 110, 4, 29, 110, 110, 648, 1378  # Reservoir, Can Create Unit\Building ([110] Reservoir), Create Building - Terran ([110] Reservoir)
   4, 111, 4, 29, 111, 111, 649, 710  # Barracks, Can Create Unit\Building ([111] Barracks), Create Building - Terran ([111] Barracks)
   5, 113, 4, 29, 113, 113, 654, 712  # Fulcrum, Can Create Unit\Building ([113] Fulcrum), Create Building - Terran ([113] Fulcrum)
   6, 404, 4, 29, 254, 254, 533, 0  # Starpad, Can Create Unit\Building ([254] Starpad), Create Building - Terran ([254] Starpad)
@@ -371,6 +371,7 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
+  7, 252, 23, 57, 34, 0, 716, 716  # Permanent Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0)
   9, 311, 33, 51, 0, 0, 685, 761  # Nuclear Strike, Nuke Available (0), Nuclear Strike (0)
 
 76:	# [76] Phalanx
@@ -889,7 +890,6 @@
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
   7, 408, 4, 38, 258, 258, 1549, 1550  # Zarcavrokor, Can Create Unit\Building ([258] Zarcavrokor), Unit Morph ([258] Zarcavrokor)
-  8, 269, 23, 57, 34, 0, 1504, 1504  # Roar (Unused Zerg Upgrade), Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 142:	# Aurora
   1, 228, 41, 9, 0, 0, 664, 0  # Move, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Move (0)
@@ -1175,7 +1175,7 @@
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
   7, 354, 23, 57, 34, 0, 555, 555  # Projection, Spell Researched ([34] Healing - Cleric), Cancel (0)
-  8, 354, 23, 57, 34, 0, 329, 329  # Heretical Bedlam, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  8, 274, 23, 57, 34, 0, 329, 329  # Heretical Bedlam, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 179:	# Salamander
   1, 228, 3, 9, 0, 0, 664, 0  # Move, Always (0), Move (0)
@@ -1418,7 +1418,7 @@
   9, 283, 36, 36, 0, 199, 670, 0  # Land, Building Has Lifted Off (0), Land ([199] Captaincy)
   9, 282, 37, 45, 0, 0, 671, 0  # Lift off, Building Has Landed (0), Lift Off (0)
 
-207:	# Basic commands with permanent cloak
+207:	# Basic commands + permacloak
   1, 228, 3, 9, 0, 0, 664, 0  # Move, Always (0), Move (0)
   2, 229, 3, 10, 0, 0, 665, 0  # Stop, Always (0), Stop (0)
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
@@ -1508,7 +1508,7 @@
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
 # 7, 476, 4, 38, 326, 326, 1348, 1349  # Kethrostalor, Can Create Unit\Building ([326] Kethrostalor), Unit Morph ([326] Kethrostalor)
-  8, 346, 23, 57, 34, 0, 472, 472  # Venom (Unused Zerg Weapon), Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 346, 23, 57, 34, 0, 472, 472  # Venom (Unused Zerg Weapon), Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 218:	# Ion Cannon
   1, 228, 35, 9, 0, 0, 664, 0  # Move, Building Can Move And Has Lifted Off (0), Move (0)
@@ -1572,6 +1572,8 @@
   4, 420, 4, 38, 270, 270, 749, 640  # Cikralisk, Can Create Unit\Building ([270] Cikralisk), Unit Morph ([270] Cikralisk)
   5, 418, 4, 38, 268, 268, 355, 584  # Protathalor, Can Create Unit\Building ([268] Protathalor), Unit Morph ([268] Protathalor)
   6, 43, 4, 38, 43, 43, 580, 741  # Mutalisk, Can Create Unit\Building ([43] Mutalisk), Unit Morph ([43] Mutalisk)
+  7, 191, 4, 38, 191, 191, 432, 433  # Axitrilisk, Can Create Unit\Building ([191] Axitrilisk), Unit Morph ([191] Axitrilisk)
+  8, 469, 4, 38, 319, 319, 450, 1468  # Mortothrokor, Can Create Unit\Building ([319] Mortothrokor), Unit Morph ([319] Mortothrokor)
 
 226:	# Larva - Assault
   1, 38, 4, 38, 38, 38, 576, 739  # Hydralisk, Can Create Unit\Building ([38] Hydralisk), Unit Morph ([38] Hydralisk)
@@ -1651,7 +1653,7 @@
   3, 230, 42, 11, 0, 0, 666, 0  # Attack, Not Burrowed (Attack) (0), Attack (0)
   4, 254, 41, 20, 0, 0, 667, 0  # Patrol, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Patrol (0)
   5, 255, 41, 21, 0, 0, 668, 0  # Hold Position, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Hold Position (0)
-  7, 269, 23, 57, 34, 0, 434, 434  # Roar (Unused Zerg Upgrade), Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 269, 23, 57, 34, 0, 434, 434  # Perpetual Wind, Spell Researched ([34] Healing - Cleric), Cancel (0)
 # 9, 259, 38, 41, 11, 11, 372, 382  # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
 # 9, 260, 39, 42, 11, 0, 373, 0  # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
 
@@ -1921,7 +1923,7 @@
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
 # 7, 427, 4, 38, 277, 277, 577, 740  # Selkerilisk, Can Create Unit\Building ([277] Selkerilisk), Unit Morph ([277] Selkerilisk)
-  8, 296, 23, 57, 34, 0, 328, 328  # Pneumatized Carapace, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 296, 23, 57, 34, 0, 328, 328  # Pneumatized Carapace, Spell Researched ([34] Healing - Cleric), Cancel (0)
   9, 260, 39, 42, 11, 0, 373, 0  # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
   9, 259, 38, 41, 11, 11, 372, 382  # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
 
@@ -1948,7 +1950,7 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-  7, 340, 23, 57, 34, 0, 1802, 1802  # Kaiser Blades, Spell Researched ([34] Healing - Cleric), Cancel (0)
+# 7, 340, 23, 57, 34, 0, 1803, 1803  # Kaiser Blades, Spell Researched ([34] Healing - Cleric), Cancel (0)
   9, 260, 39, 42, 11, 0, 373, 0  # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
   9, 259, 38, 41, 11, 11, 372, 382  # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
 
@@ -1958,7 +1960,7 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-  7, 269, 23, 57, 34, 0, 1803, 1803  # Kaiser Blades, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 269, 23, 57, 34, 0, 1804, 1804  # Kaiser Blades, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 271:	# Ocsal Larva - Swarm
   1, 128, 4, 38, 128, 128, 1554, 1539  # Vorvrokor, Can Create Unit\Building ([128] Vorvrokor), Unit Morph ([128] Vorvrokor)
@@ -1999,7 +2001,7 @@
 275:	# [275] Ardent Authority
   1, 456, 4, 3, 306, 306, 1369, 0  # Servitor, Can Create Unit\Building ([306] Servitor), Create Unit ([306] Servitor)
   2, 457, 4, 3, 307, 307, 1370, 0  # Positron, Can Create Unit\Building ([307] Positron), Create Unit ([307] Positron)
-# 3, 458, 4, 3, 308, 308, 1371, 706  # Analogue, Can Create Unit\Building ([308] Analogue), Create Unit ([308] Analogue)
+  3, 458, 4, 3, 308, 308, 1371, 706  # Analogue, Can Create Unit\Building ([308] Analogue), Create Unit ([308] Analogue)
   6, 286, 13, 1, 0, 0, 672, 0  # Set Rally Point, Rally Point (0), Rally Point (0)
   9, 236, 10, 4, 0, 254, 693, 0  # Cancel, Cancel Last (0), Cancel Last (254)
 
@@ -2056,7 +2058,7 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-  7, 308, 23, 57, 34, 0, 1804, 1804 # Reclamation Fields, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 308, 23, 57, 34, 0, 1802, 1802 # Reclamation Fields, Spell Researched ([34] Healing - Cleric), Cancel (0)
   8, 361, 23, 57, 34, 0, 543, 543  # Offset: Linear, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 283:	# [283] Basic Commands + Kinetic Penetration - Hippogriff
@@ -2073,8 +2075,8 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-  7, 305, 23, 57, 34, 0, 1799, 1799  # Astral Rule, Spell Researched ([34] Healing - Cleric), Cancel (0)
-  8, 391, 23, 57, 34, 0, 1391, 1391  # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 359, 23, 57, 34, 0, 1382, 1382  # Interception, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  8, 305, 23, 57, 34, 0, 1799, 1799  # Astral Rule, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 285:	# Optecton
   1, 228, 3, 9, 0, 0, 664, 0  # Move, Always (0), Move (0)
@@ -2082,8 +2084,8 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-# 7, 391, 23, 57, 34, 0, 1391, 1391  # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0)
-  7, 290, 23, 57, 34, 0, 535, 535 # Forward March, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 359, 23, 57, 34, 0, 1382, 1382  # Interception, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  8, 290, 23, 57, 34, 0, 535, 535 # Forward March, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
 286:	# Irulent Ivoa
   7, 152, 4, 35, 152, 152, 1358, 0		# Othstol Oviform, Can Create Unit\Building ([152] Othstol Oviform), Building Morph ([152] Othstol Oviform)
@@ -2173,7 +2175,28 @@
   3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
   4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
   5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
-  7, 350, 23, 57, 34, 0, 1382, 1382  # Relentless Aggression, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 350, 23, 57, 34, 0, 1778, 1778  # Relentless Aggression, Spell Researched ([34] Healing - Cleric), Cancel (0)
+
+301:	# Analogue
+  1, 228, 3, 9, 0, 0, 664, 0  # Move, Always (0), Move (0)
+  2, 229, 3, 10, 0, 0, 665, 0  # Stop, Always (0), Stop (0)
+  3, 230, 8, 11, 0, 0, 666, 0  # Attack, Unit Has A Weapon (0), Attack (0)
+  4, 254, 3, 20, 0, 0, 667, 0  # Patrol, Always (0), Patrol (0)
+  5, 255, 3, 21, 0, 0, 668, 0  # Hold Position, Always (0), Hold Position (0)
+  7, 360, 23, 57, 34, 0, 545, 545  # Empathy Core, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  
+302:	# Lobotomy Mine
+  7, 243, 23, 57, 34, 0, 476, 476  # Dazing Detonation, Spell Researched ([34] Healing - Cleric), Cancel (0)
+
+303:	# Axitrilisk (Weaponless)
+  1, 228, 41, 9, 0, 0, 664, 0  # Move, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Move (0)
+  2, 229, 41, 10, 0, 0, 665, 0  # Stop, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Stop (0)
+  3, 230, 42, 11, 0, 0, 666, 0  # Attack, Not Burrowed (Attack) (0), Attack (0)
+  4, 254, 41, 20, 0, 0, 667, 0  # Patrol, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Patrol (0)
+  5, 255, 41, 21, 0, 0, 668, 0  # Hold Position, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Hold Position (0)
+  7, 269, 23, 57, 34, 0, 1469, 1469  # Perpetual Wind, Spell Researched ([34] Healing - Cleric), Cancel (0)
+# 9, 259, 38, 41, 11, 11, 372, 382  # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
+# 9, 260, 39, 42, 11, 0, 373, 0  # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
 
 #### Buttonsets END ####
 #### Unit Settings START ####
@@ -2195,7 +2218,7 @@ Unit 7: # [7] Terran Mason
                    # Stat Preset: Normal Unit
 
 Unit 8: # [8] Wraith
-  207, 65535, 1, 0  # Button Set: Basic Commands w/ Permacloak
+  207, 65535, 1, 0  # Button Set: Basic Commands + Permacloak
                    # Stat Preset: Normal Unit
 
 Unit 9: # [9] Seraph
@@ -2519,7 +2542,7 @@ Unit 99: # [99] Idol
                    # Stat Preset: Normal Unit
 
 Unit 100: # [100] Golem
-  186, 65535, 1, 0  # Button Set: Golem
+  12, 65535, 1, 0  # Button Set: [12] Basic Commands
                    # Stat Preset: Normal Unit
 
 Unit 101: # [101] Map Revealer
@@ -3011,7 +3034,7 @@ Unit 252: # [252] Protoss Matrix
                    # Stat Preset: Building
 
 Unit 253: # [253] Terran Sundog
-  207, 65535, 1, 0  # Button Set: Basic Commands w/ Permacloak
+  207, 65535, 1, 0  # Button Set: Basic Commands + Permacloak
                    # Stat Preset: Normal Unit
 
 Unit 254: # [254] Terran Starpad
@@ -3087,7 +3110,7 @@ Unit 271: # [271] Zerg Tosgrilisk
                    # Stat Preset: Normal Unit
 				   
 Unit 272: # [272] Zerg Ghitorokor
-  12, 65535, 1, 0  # Button Set: [12] Basic Commands
+  300, 65535, 1, 0  # Button Set: [300] Ghitorokor
                    # Stat Preset: Normal Unit
 				   
 Unit 273: # [273] Zerg Zobriolisk
@@ -3206,6 +3229,10 @@ Unit 307: # [307] Protoss Positron
   276, 65535, 1, 0  # Button Set: [276] Positron
                    # Stat Preset: Normal Unit
 
+Unit 308: # [308] Protoss Positron
+  301, 65535, 1, 0  # Button Set: [301] Analogue
+                   # Stat Preset: Normal Unit
+
 Unit 315: # [315] Protoss Sycophant
   277, 65535, 1, 0  # Button Set: [277] Sycophant
                    # Stat Preset: Normal Unit
@@ -3308,4 +3335,12 @@ Unit 371: # [371] Matador Cinder Mode
 
 Unit 372: # [372] WAT Trooper
   12, 65535, 1, 0  # Button Set: [12] Basic Commands
+                   # Stat Preset: Normal Unit
+
+Unit 375: # [375] Lobotomy Mine
+  302, 65535, 5, 0  # Button Set: [302] Lobotomy Mine
+                   # Stat Preset: Powerup
+
+Unit 377: # [377] Axitrilisk (Weaponless)
+  303, 65535, 1, 0  # Button Set: [303] Basic Commands
                    # Stat Preset: Normal Unit
\ No newline at end of file
diff --git a/CMBW-editor/grafting/Units.txt b/CMBW-editor/grafting/Units.txt
index ca1aeb28..8e30eced 100644
--- a/CMBW-editor/grafting/Units.txt
+++ b/CMBW-editor/grafting/Units.txt
@@ -682,6 +682,7 @@
   0xFF02            # Current unit is...
   20                # [20] Talos
   0xFF0B            # Is not constructing
+  122               # Has Unit: [122] Atlas
   0xFFFF            # ==End of List==
 
 111:                # [111] Barracks
@@ -1022,6 +1023,11 @@
   0xFF01            # Or
   0xFF02            # Current unit is...
   47                # [47] Gosvileth
+  0xFF11            # Is not burrowed
+  224               # Has Unit: [224] Irol Iris
+  0xFF01            # Or
+  0xFF03            # Must have...
+  152               # [152] Othstol Oviform
   0xFFFF            # ==End of List==
 
 150:                # [150] Luminary
diff --git a/CMBW-maps/melee/1v1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/(2)Boskevine.scx
index 65f9dec7..3b88ac75 100644
Binary files a/CMBW-maps/melee/1v1/(2)Boskevine.scx and b/CMBW-maps/melee/1v1/(2)Boskevine.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Brimstone Disco.scx b/CMBW-maps/melee/1v1/(2)Brimstone Disco.scx
index f4656869..c75da0a5 100644
Binary files a/CMBW-maps/melee/1v1/(2)Brimstone Disco.scx and b/CMBW-maps/melee/1v1/(2)Brimstone Disco.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Crossguard.scx b/CMBW-maps/melee/1v1/(2)Crossguard.scx
index 18592012..9a90dcd7 100644
Binary files a/CMBW-maps/melee/1v1/(2)Crossguard.scx and b/CMBW-maps/melee/1v1/(2)Crossguard.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Desert Duality.scx b/CMBW-maps/melee/1v1/(2)Desert Duality.scx
index 8ef95ca0..031299f4 100644
Binary files a/CMBW-maps/melee/1v1/(2)Desert Duality.scx and b/CMBW-maps/melee/1v1/(2)Desert Duality.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/(2)Equilibrium.scx
index e84a4a94..b1f32b68 100644
Binary files a/CMBW-maps/melee/1v1/(2)Equilibrium.scx and b/CMBW-maps/melee/1v1/(2)Equilibrium.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Iceberg.scx b/CMBW-maps/melee/1v1/(2)Iceberg.scx
index 3a441287..61efd387 100644
Binary files a/CMBW-maps/melee/1v1/(2)Iceberg.scx and b/CMBW-maps/melee/1v1/(2)Iceberg.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx
index 772a489d..7db32d45 100644
Binary files a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Maim Street.scx b/CMBW-maps/melee/1v1/(2)Maim Street.scx
index 3304c269..a0b8eef9 100644
Binary files a/CMBW-maps/melee/1v1/(2)Maim Street.scx and b/CMBW-maps/melee/1v1/(2)Maim Street.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx
index 27339d37..6c2a8331 100644
Binary files a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx and b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Mouth of Hel.scx b/CMBW-maps/melee/1v1/(2)Mouth of Hel.scx
index facfa7ed..c80b848c 100644
Binary files a/CMBW-maps/melee/1v1/(2)Mouth of Hel.scx and b/CMBW-maps/melee/1v1/(2)Mouth of Hel.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx b/CMBW-maps/melee/1v1/(2)Nemesis Station.scx
index b3c9e123..323d4dea 100644
Binary files a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx and b/CMBW-maps/melee/1v1/(2)Nemesis Station.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Proxima.scx b/CMBW-maps/melee/1v1/(2)Proxima.scx
index af935947..09b86f6e 100644
Binary files a/CMBW-maps/melee/1v1/(2)Proxima.scx and b/CMBW-maps/melee/1v1/(2)Proxima.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Repulsion.scx b/CMBW-maps/melee/1v1/(2)Repulsion.scx
index 4d9ac8fd..e901ec07 100644
Binary files a/CMBW-maps/melee/1v1/(2)Repulsion.scx and b/CMBW-maps/melee/1v1/(2)Repulsion.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx
index aa772750..218f0131 100644
Binary files a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx and b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Stardust.scx b/CMBW-maps/melee/1v1/(2)Stardust.scx
index e8745999..c38ddb7b 100644
Binary files a/CMBW-maps/melee/1v1/(2)Stardust.scx and b/CMBW-maps/melee/1v1/(2)Stardust.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Terminus.scx b/CMBW-maps/melee/1v1/(2)Terminus.scx
index 9aef5dd5..f72ee203 100644
Binary files a/CMBW-maps/melee/1v1/(2)Terminus.scx and b/CMBW-maps/melee/1v1/(2)Terminus.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Tropical Crossing.scx b/CMBW-maps/melee/1v1/(2)Tropical Crossing.scx
index 2baff64a..63eed31b 100644
Binary files a/CMBW-maps/melee/1v1/(2)Tropical Crossing.scx and b/CMBW-maps/melee/1v1/(2)Tropical Crossing.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Wellington.scx b/CMBW-maps/melee/1v1/(2)Wellington.scx
index d7b577cc..46358e22 100644
Binary files a/CMBW-maps/melee/1v1/(2)Wellington.scx and b/CMBW-maps/melee/1v1/(2)Wellington.scx differ
diff --git a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx
index 63ad921a..bfc5acdd 100644
Binary files a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx and b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Enigma.scx b/CMBW-maps/melee/1v1/(4)Enigma.scx
index 9c440a0a..21bbd4a2 100644
Binary files a/CMBW-maps/melee/1v1/(4)Enigma.scx and b/CMBW-maps/melee/1v1/(4)Enigma.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx
index f9aa1570..0b900a63 100644
Binary files a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx and b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/(4)Nitro Valley.scx
index 190c0ca6..312181a5 100644
Binary files a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/(4)Nitro Valley.scx differ
diff --git a/CMBW-maps/melee/1v1/(4)Perpetua.scx b/CMBW-maps/melee/1v1/(4)Perpetua.scx
index 86912905..89d289fa 100644
Binary files a/CMBW-maps/melee/1v1/(4)Perpetua.scx and b/CMBW-maps/melee/1v1/(4)Perpetua.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Infinite Loop.scx b/CMBW-maps/melee/2v2/(4)Infinite Loop.scx
index dd710538..a581dde2 100644
Binary files a/CMBW-maps/melee/2v2/(4)Infinite Loop.scx and b/CMBW-maps/melee/2v2/(4)Infinite Loop.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx b/CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx
index 3965869b..cbff422e 100644
Binary files a/CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx and b/CMBW-maps/melee/2v2/(4)Midnight Outskirts.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Parabola.scx b/CMBW-maps/melee/2v2/(4)Parabola.scx
index 2b59a243..5088437f 100644
Binary files a/CMBW-maps/melee/2v2/(4)Parabola.scx and b/CMBW-maps/melee/2v2/(4)Parabola.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Sinusoid.scx b/CMBW-maps/melee/2v2/(4)Sinusoid.scx
index 1fdaeca6..1036504c 100644
Binary files a/CMBW-maps/melee/2v2/(4)Sinusoid.scx and b/CMBW-maps/melee/2v2/(4)Sinusoid.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Spacer.scx b/CMBW-maps/melee/2v2/(4)Spacer.scx
index 9100f4b7..e7fe2a91 100644
Binary files a/CMBW-maps/melee/2v2/(4)Spacer.scx and b/CMBW-maps/melee/2v2/(4)Spacer.scx differ
diff --git a/CMBW-maps/melee/2v2/(4)Yin Yang.scx b/CMBW-maps/melee/2v2/(4)Yin Yang.scx
index 127c5f90..ca80e75e 100644
Binary files a/CMBW-maps/melee/2v2/(4)Yin Yang.scx and b/CMBW-maps/melee/2v2/(4)Yin Yang.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Mother Entropy.scx b/CMBW-maps/melee/3v3/(6)Mother Entropy.scx
index aaa21263..254bc485 100644
Binary files a/CMBW-maps/melee/3v3/(6)Mother Entropy.scx and b/CMBW-maps/melee/3v3/(6)Mother Entropy.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx b/CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx
index 103c0379..3ea95ecd 100644
Binary files a/CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx and b/CMBW-maps/melee/3v3/(6)Mouth of Bathala.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Ozone.scx b/CMBW-maps/melee/3v3/(6)Ozone.scx
index 5768cc61..0b4bef2c 100644
Binary files a/CMBW-maps/melee/3v3/(6)Ozone.scx and b/CMBW-maps/melee/3v3/(6)Ozone.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx b/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx
index e2cde7d8..b75084a9 100644
Binary files a/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx and b/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx differ
diff --git a/CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx b/CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx
index 18e95d5d..2e1b3288 100644
Binary files a/CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx and b/CMBW-maps/melee/3v3/(6)Umbral Sanctum.scx differ
diff --git a/CMBW-maps/melee/FFA Solo/(4)Vestal Shrine.scx b/CMBW-maps/melee/FFA Solo/(4)Vestal Shrine.scx
index 64dec70e..8eb4afd1 100644
Binary files a/CMBW-maps/melee/FFA Solo/(4)Vestal Shrine.scx and b/CMBW-maps/melee/FFA Solo/(4)Vestal Shrine.scx differ
diff --git a/CMBW-maps/melee/FFA Solo/(8)Midas Complex.scx b/CMBW-maps/melee/FFA Solo/(8)Midas Complex.scx
index a0c81392..b2aa17ee 100644
Binary files a/CMBW-maps/melee/FFA Solo/(8)Midas Complex.scx and b/CMBW-maps/melee/FFA Solo/(8)Midas Complex.scx differ
diff --git a/CMBW-maps/melee/FFA Solo/(8)Unholy Grail.scx b/CMBW-maps/melee/FFA Solo/(8)Unholy Grail.scx
index 923ac4d1..b26a78cc 100644
Binary files a/CMBW-maps/melee/FFA Solo/(8)Unholy Grail.scx and b/CMBW-maps/melee/FFA Solo/(8)Unholy Grail.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(2)Everessence.scx b/CMBW-maps/melee/Nonstandard/(2)Everessence.scx
index 61b56a95..868f68d9 100644
Binary files a/CMBW-maps/melee/Nonstandard/(2)Everessence.scx and b/CMBW-maps/melee/Nonstandard/(2)Everessence.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scm b/CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scm
index cbc33bc9..82f8c3ac 100644
Binary files a/CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scm and b/CMBW-maps/melee/Nonstandard/(2)Jungle Jammed.scm differ
diff --git a/CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx b/CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx
index be1f24d6..8d796bfe 100644
Binary files a/CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx and b/CMBW-maps/melee/Nonstandard/(2)Sun-Starved.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(2)The Underwood.scx b/CMBW-maps/melee/Nonstandard/(2)The Underwood.scx
index f40ebe24..1a4ec6b6 100644
Binary files a/CMBW-maps/melee/Nonstandard/(2)The Underwood.scx and b/CMBW-maps/melee/Nonstandard/(2)The Underwood.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(3)Excelsior.scx b/CMBW-maps/melee/Nonstandard/(3)Excelsior.scx
index 89026558..b0a65106 100644
Binary files a/CMBW-maps/melee/Nonstandard/(3)Excelsior.scx and b/CMBW-maps/melee/Nonstandard/(3)Excelsior.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx b/CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx
index be1df7c6..b4c9ae50 100644
Binary files a/CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx and b/CMBW-maps/melee/Nonstandard/(4)Dead Ringer.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Double Desert Trouble.scx b/CMBW-maps/melee/Nonstandard/(4)Double Desert Trouble.scx
index 5b076983..699e4647 100644
Binary files a/CMBW-maps/melee/Nonstandard/(4)Double Desert Trouble.scx and b/CMBW-maps/melee/Nonstandard/(4)Double Desert Trouble.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Godhead.scx b/CMBW-maps/melee/Nonstandard/(4)Godhead.scx
index 530f5f85..a321adde 100644
Binary files a/CMBW-maps/melee/Nonstandard/(4)Godhead.scx and b/CMBW-maps/melee/Nonstandard/(4)Godhead.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Platform of Peace 80.scm b/CMBW-maps/melee/Nonstandard/(4)Platform of Peace 80.scm
index 49435a43..ed9068bd 100644
Binary files a/CMBW-maps/melee/Nonstandard/(4)Platform of Peace 80.scm and b/CMBW-maps/melee/Nonstandard/(4)Platform of Peace 80.scm differ
diff --git a/CMBW-maps/melee/Nonstandard/(4)Vanishing Valley.scx b/CMBW-maps/melee/Nonstandard/(4)Vanishing Valley.scx
index dbd52f27..666d5a0f 100644
Binary files a/CMBW-maps/melee/Nonstandard/(4)Vanishing Valley.scx and b/CMBW-maps/melee/Nonstandard/(4)Vanishing Valley.scx differ
diff --git a/CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scm b/CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scm
index 97fd5b52..0a9b2935 100644
Binary files a/CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scm and b/CMBW-maps/melee/Nonstandard/(6)Platform of Peace 96.scm differ
diff --git a/CMBW-maps/scenario/Pr0nogo/(2)The Benefactor.scx b/CMBW-maps/scenario/Pr0nogo/(2)The Benefactor.scx
index 098f6184..ba83896e 100644
Binary files a/CMBW-maps/scenario/Pr0nogo/(2)The Benefactor.scx and b/CMBW-maps/scenario/Pr0nogo/(2)The Benefactor.scx differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index d8feb78c..c58ae9b2 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -15,7 +15,7 @@ Matraleth
 Ultrokor
 Zethrokor
 Cerebrate
-Infested Command Center
+Infested Ministry
 Quazrok Pool
 Mature Chrysalis
 Almakis Antre
@@ -92,7 +92,7 @@ Fountainhead
 Barracks
 Atelier
 Comsat Station
-Command Center
+Ministry
 Supply Depot
 Commandment
 Fulcrum
@@ -102,7 +102,7 @@ Machine Shop
 Watchdog (Base)
 Crashed Minotaur
 Physics Lab
-Bunker
+Anchor
 Reservoir
 Immobile Barracks
 Daedala
@@ -217,7 +217,7 @@ Paladin
 Madrigal
 Savant
 Scrapyard
-Munitions Bay
+Rotary
 Sundog
 Azazel
 Matador
@@ -310,8 +310,8 @@ Architect Missile
 Burst Lasers Impact
 Burst Lasers Blue Impact
 Burst Lasers Red Impact
-Ion Cannon
-Ion Cannon Projectile
+Diadem
+Diadem Projectile
 Keskathalor Spore
 Burst Lasers Explosive
 Herald
@@ -326,7 +326,7 @@ Almaksalisk
 Aion
 Rililisk
 Fusion Cutter Impact Small
-Command Center Christmas
+Ministry Christmas
 Protathalor
 Nexus Christmas
 Hachirosk Christmas
@@ -359,7 +359,7 @@ Claymore
 Gorgral Swamp
 Keskathalor Weaponhit
 Alaszileth
-Ion Cannon Weaponhit
+Diadem Weaponhit
 Irradiate Small
 Irradiate Medium
 Irradiate Large
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index a1a3f60f..56994194 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -61,7 +61,7 @@ Zerg Air Death Explosion (Small)
 Zerg Building Explosion
 Cerebrate
 Cerebrate Shadow
-Infested Command Center
+Infested Ministry
 Spawning Pool
 Spawning Pool Shadow
 Evolution Chamber
@@ -99,7 +99,7 @@ Muthrok Spire
 Muthrok Spire Shadow
 Spraith Colony
 Spraith Colony Shadow
-Infested Command Center Overlay
+Infested Ministry Overlay
 Zerg Construction (Large)
 Zerg Building Morph
 Zerg Construction (Medium)
@@ -273,9 +273,9 @@ Comsat Station
 Comsat Station Connector
 Comsat Station Overlay
 Comsat Station Shadow
-Command Center
-Command Center Overlay
-Command Center Shadow
+Ministry
+Ministry Overlay
+Ministry Shadow
 Supply Depot
 Supply Depot Overlay
 Supply Depot Shadow
@@ -290,7 +290,7 @@ Covert Ops
 Covert Ops Connector
 Covert Ops Overlay
 Covert Ops Shadow
-Ion Cannon
+Ion Cannon (old, unused)
 Machine Shop
 Machine Shop Connector
 Machine Shop Shadow
@@ -302,9 +302,9 @@ Crashed Minotaur Shadow
 Physics Lab
 Physics Lab Connector
 Physics Lab Shadow
-Bunker
-Bunker Shadow
-Bunker Attack Overlay (Orange)
+Anchor
+Anchor Shadow
+Anchor Attack Overlay (Orange)
 Reservoir
 Reservoir Shadow
 Daedala
@@ -1007,7 +1007,7 @@ Paladin
 Madrigal
 Savant
 Scrapyard
-Munitions Bay
+Rotary
 Matrix Shadow
 Future Station
 Matrix Warpin
@@ -1068,7 +1068,7 @@ Malice Overlay Large
 Malediction Overlay Small
 Malediction Overlay Medium
 Malediction Overlay Large
-Munitions Bay Shadow
+Rotary Shadow
 Simulacrum
 Simulacrum Shadow
 Automaton Register
@@ -1253,12 +1253,12 @@ Grief of All Gods Channel
 Khaydarin Formation Shadow
 Grief of All Gods Blast Loop
 Grief of All Gods Blast
-Ion Cannon Base
-Ion Cannon Turret
+Diadem Base
+Diadem Turret
 Zerg Overmind (With Shell) Shadow
-Ion Cannon Shadow
-Ion Cannon Weapon
-Ion Cannon Weaponhit
+Diadem Shadow
+Diadem Weapon
+Diadem Weaponhit
 Keskathalor Spores
 Keskathalor Weaponhit
 Burst Lasers Explosive
@@ -1276,7 +1276,7 @@ Protoss Accelerant Medium
 Protoss Accelerant Small
 Vagrant
 Vagrant Shadow
-Ion Cannon Attack A2
+Diadem Attack A2
 Seeker Spores Silent
 Ion Field
 Ensnaring Brood Overlay
@@ -1298,7 +1298,7 @@ Rililisk Shadow
 Almaksalisk Birth
 Zoryusthaleth Birth
 Mason Spark Small
-Command Center Christmas
+Ministry Christmas
 Epigraph Engines
 Nexus Christmas
 Hachirosk Christmas
@@ -1450,9 +1450,9 @@ Axtoth Axis Shadow
 Ovileth Death Reversed
 Zerg Air Explosion Large Reversed
 Zerg Air Explosion Small Reversed
-Ion Cannon Mouse Response
-Ion Cannon Attack A1
-Ion Cannon Attack B
+Diadem Mouse Response
+Diadem Attack A1
+Diadem Attack B
 Anthelion Teleport Depart
 Anthelion Teleport Arrive
 Skithrokor Birth
@@ -1699,12 +1699,12 @@ Cuirass (Trench Mode) Shadow
 Madrigal Dirge Proc
 Spirtith Colony
 Spirtith Colony Shadow
-Ion Cannon Attack A3
-Ion Cannon Attack A4
+Diadem Attack A3
+Diadem Attack A4
 Skortrith Colony
 Skortrith Colony Shadow
-Bunker Attack Overlay (Green)
-Bunker Attack Overlay (Blue)
+Anchor Attack Overlay (Green)
+Anchor Attack Overlay (Blue)
 Terran Unit Rubble (Medium)
 Terran Unit Rubble (Small)
 Protoss Unit Rubble (Medium)
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index 6c0a201a..455d173c 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -160,7 +160,7 @@ Ultrokor Remnants
 Zethrokor
 Zethrokor Remnants
 Cerebrate
-Infested Command Center
+Infested Ministry
 Quazrok Pool
 Mature Chrysalis
 Almakis Antre
@@ -250,17 +250,17 @@ Fountainhead
 Barracks
 Atelier
 Comsat Station
-Command Center
+Ministry
 Supply Depot
 Commandment
 Fulcrum
 Covert Ops
-Ion Cannon
+Ion Cannon (old, unused)
 Machine Shop
 Watchdog (Base)
 Crashed Minotaur
 Physics Lab
-Bunker
+Anchor
 Reservoir
 Daedala
 Nuclear Silo
@@ -375,7 +375,7 @@ Scarab/Anti-Matter Missile Overlay
 Hallucination Death1
 Hallucination Death2
 Hallucination Death3
-Bunker Attack Overlay (Orange)
+Anchor Attack Overlay (Orange)
 Flamethrower
 Recall Field
 Scanner Sweep Hit
@@ -524,7 +524,7 @@ Paladin
 Madrigal
 Savant
 Scrapyard
-Munitions Bay
+Rotary
 Wyvern
 Oberon
 Zarcavrokor
@@ -635,15 +635,15 @@ Exemplar Torpedo Impact
 Planet Cracker Beam
 Planet Cracker Blast (Loop)
 Planet Cracker Blast
-Ion Cannon
-Ion Cannon Projectile
-Ion Cannon Projectile Impact
+Diadem
+Diadem Projectile
+Diadem Projectile Impact
 Keskathalor Weapon
 Keskathalor Weapon Impact
 Augur Death Explosion
 Burst Lasers (Explosive)
 Burst Lasers Impact (Damageless)
-Ion Cannon Turret
+Diadem Turret
 Herald
 Clarion
 Lobotomy Mine
@@ -657,8 +657,8 @@ Aion
 Rililisk
 Mason Death Explosion
 Mason Spark (Small)
-Command Center (Christmas)
-Infested Command Center (Christmas)
+Ministry (Christmas)
+Infested Ministry (Christmas)
 Nexus (Christmas)
 Hatchery (Christmas)
 Caphrolosk (Christmas)
@@ -753,7 +753,7 @@ Axtoth Axis
 Ovileth Death (Reversed)
 Zerg Air Explosion Large Reversed
 Zerg Air Explosion Small Reversed
-Ion Cannon Attack Glow
+Diadem Attack Glow
 Warp Anchor New
 Anthelion Teleport Depart
 Anthelion Teleport Arrive
@@ -840,8 +840,8 @@ Cuirass (Trench Mode)
 Cuirass Stonewall Protocol Overlay
 Spirtith Colony
 Skortrith Colony
-Bunker Attack Overlay (Green)
-Bunker Attack Overlay (Blue)
+Anchor Attack Overlay (Green)
+Anchor Attack Overlay (Blue)
 Terran Unit Rubble (Medium)
 Terran Unit Rubble (Small)
 Protoss Unit Rubble (Medium)
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index daab9f23..acd571db 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index 56b101b2..271fb2ad 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -104,7 +104,7 @@ Protoss Augur
 Zerg Lakizilisk
 Protoss Barghest
 Disruption Field
-Terran Command Center
+Terran Ministry
 Terran Comsat Station
 Terran Missile Silo
 Terran Supply Depot
@@ -119,13 +119,13 @@ Terran Covert Ops
 Terran Magnetar
 Terran Medbay
 Terran Machine Shop
-Terran Munitions Bay
+Terran Rotary
 Terran Atlas
 Zerg Sovroleth
 Terran Watchdog
-Terran Bunker
+Terran Anchor
 Zerg Kagralisk
-Terran Ion Cannon
+Terran Diadem
 Zerg Vorvrokor
 Zerg Bactalisk
 Zerg Axtoth Axis
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 25d2178a..a0150c6e 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 d28d8e46..96a74698 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -127,7 +127,7 @@ Jackson Cannon (Wyvern)
 Skyfall (Paladin ability)
 Enthralling Assault (Akistrokor ability)
 Final Hour (Augur behavior)
-Hammerfall Beacon (Ion Cannon)
+Hammerfall Beacon (Diadem)
 None
 Icarus Missiles (Luminary)
 Litany Cannons (Epigraph)
@@ -196,7 +196,7 @@ Antimatter Missile (Positron)
 Sparring Saber (Sycophant)
 Kissing Emoji (Smoochie Boy)
 Khaydarin Plasma Laser (Engram)
-Ion Cannon (Ion Cannon)
+Ion Cannon (Diadem)
 Discoid Railgun (Savant, Piercing)
 Geometric Rifle (Sevenstep, Piercing)
 Twinstrike Cannons (Matador)
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index fd85e4e4..cc361bfe 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 21eaab9e..95116515 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/patchnotes.md b/patchnotes.md
index 44f0f76d..0e03e8cf 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -365,10 +365,12 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Energy now 100, from 200
 	- Yamato Cannon:
 		- Removed
-- [Command Center](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/command-center):
+- [Ministry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ministry):
+	- *Formerly known as the Command Center*
 	- Time cost now 80, from 75
 	- HP now 1650, from 1500
-- [Bunker](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/bunker):
+- [Anchor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anchor):
+	- *Formerly known as the Bunker*
 	- Armor now 1, from 2
 - [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury):
 	- Time cost now 55, from 50
@@ -386,8 +388,16 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Mineral, gas, and time costs now 1400/1400/150, from 1200/1200/120
 - [Wellbore](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wellbore):
 	- Mineral cost now 600, from 800
-- [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon):
+- [Diadem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/diadem):
+	- *Formerly known as the Ion Cannon*
 	- Armor now 6, from 8
+- [Fulcrum](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/fulcrum):
+	- Time cost now 50, from 40
+- [Starpad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/starpad):
+	- Time cost now 45, from 35
+- [Rotary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/rotary):
+	- *Formerly known as the Munitions Bay*
+	- Gas cost now 75, from 50
 
 ## Protoss
 - [Scribe](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/scribe):
@@ -643,12 +653,16 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Time cost now 80, from 75
 	- HP now 850, from 750
 	- Shields now 550, from 500
-- [Aquifer](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aquifer):
-	- Mineral, gas, and time costs now 300/125/50, from 150/0/35
-	- Sight range now 9, from 10
 - [Warden](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/warden):
 	- HP now 200, from 175
 	- Armor penetration now 0, from 2
+- [Aquifer](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aquifer):
+	- Mineral, gas, and time costs now 300/125/50, from 150/0/35
+	- Sight range now 9, from 10
+- [Cenotaph](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cenotaph):
+	- Mineral and time costs now 125/40, from 100/35
+- [Stargate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/stargate):
+	- Time cost now 50, from 45
 
 ## Zerg
 - [Larva](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/larva):
@@ -841,8 +855,12 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Time cost now 120, from 100
 - [Gathtelosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gathtelosk):
 	- HP now 800, from 750
+- [Hydrok Den](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydrok-den):
+	- Time cost now 50, from 40
 - [Izkag Iteth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izkag-iteth):
 	- Now requires Irol Iris
+- [Zorkiz Shroud](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zorkiz-shroud):
+	- Time cost now 45, from 40
 - [Matravil Nest](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/matravil-nest):
 	- Now requires Irol Iris
 - [Geszkath Grotto](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/geszkath-grotto):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 99dd47c6..199fa020 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ