diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind00.wav b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind00.wav
new file mode 100644
index 0000000000..3899dd58ac
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind00.wav differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind01.wav b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind01.wav
new file mode 100644
index 0000000000..03e4e884db
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind01.wav differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind02.wav b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind02.wav
new file mode 100644
index 0000000000..6153cb1400
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind02.wav differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind03.wav b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind03.wav
new file mode 100644
index 0000000000..5c255b74a3
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Artanis_AstralWind03.wav differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack00.ogg
new file mode 100644
index 0000000000..1fb0a53d33
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack01.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack01.ogg
new file mode 100644
index 0000000000..c1fde992ad
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack01.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack02.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack02.ogg
new file mode 100644
index 0000000000..f20e2a01ed
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack02.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack03.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack03.ogg
new file mode 100644
index 0000000000..9bedf6d8fd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack03.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack04.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack04.ogg
new file mode 100644
index 0000000000..90703bb78c
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Attack04.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Death00.wav b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Death00.wav
new file mode 100644
index 0000000000..1910eb8bb3
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Death00.wav differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Help00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Help00.ogg
new file mode 100644
index 0000000000..0a5cd765bf
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Help00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed00.ogg
new file mode 100644
index 0000000000..3f79a9b53d
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed01.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed01.ogg
new file mode 100644
index 0000000000..03d62c5def
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed01.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed02.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed02.ogg
new file mode 100644
index 0000000000..4db3983e82
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed02.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed03.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed03.ogg
new file mode 100644
index 0000000000..136cff7840
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Pissed03.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Ready00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Ready00.ogg
new file mode 100644
index 0000000000..651b5a6ddd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Ready00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What00.ogg
new file mode 100644
index 0000000000..9147c38675
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What01.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What01.ogg
new file mode 100644
index 0000000000..3f5fd1546a
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What01.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What02.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What02.ogg
new file mode 100644
index 0000000000..255c0cd930
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What02.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What03.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What03.ogg
new file mode 100644
index 0000000000..66c5ebb93f
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_What03.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes00.ogg
new file mode 100644
index 0000000000..ba96cda1cb
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes00.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes01.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes01.ogg
new file mode 100644
index 0000000000..f9c72a3f8c
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes01.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes02.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes02.ogg
new file mode 100644
index 0000000000..2d00e88620
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes02.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes03.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes03.ogg
new file mode 100644
index 0000000000..7a8f1fd9b4
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes03.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes04.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes04.ogg
new file mode 100644
index 0000000000..7125efd855
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/Selendis/Selendis_Yes04.ogg differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/alarakdeath_ingame_heroportrait.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/alarakdeath_ingame_heroportrait.dds
new file mode 100644
index 0000000000..7d2173ad92
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/alarakdeath_ingame_heroportrait.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-arcshield-taldarim.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-arcshield-taldarim.dds
new file mode 100644
index 0000000000..880f0ef32d
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-arcshield-taldarim.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-blackhole-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-blackhole-orange.dds
new file mode 100644
index 0000000000..ada940e41b
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-blackhole-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-carrierrepairdrones-purifier.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-carrierrepairdrones-purifier.dds
new file mode 100644
index 0000000000..61b44f8ecf
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-carrierrepairdrones-purifier.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-chargedshield-blue.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-chargedshield-blue.dds
new file mode 100644
index 0000000000..3a06b25ea0
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-chargedshield-blue.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-emergencywarp-aiur.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-emergencywarp-aiur.dds
new file mode 100644
index 0000000000..166a8e97bd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-emergencywarp-aiur.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-orbitalthermallance-taldarim.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-orbitalthermallance-taldarim.dds
new file mode 100644
index 0000000000..dbffbf8540
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-orbitalthermallance-taldarim.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-phasecannon-purifier.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-phasecannon-purifier.dds
new file mode 100644
index 0000000000..9592c18df5
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-phasecannon-purifier.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-orange.dds
new file mode 100644
index 0000000000..70f0090bd4
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-warpray.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-warpray.dds
new file mode 100644
index 0000000000..ee8f6286ab
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-prismaticrange-warpray.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-planetcracker.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-planetcracker.dds
new file mode 100644
index 0000000000..9a503949fd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-planetcracker.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-shield-ex2.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-shield-ex2.dds
new file mode 100644
index 0000000000..ff9eeacf67
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifier-shield-ex2.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifierauxiliary.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifierauxiliary.dds
new file mode 100644
index 0000000000..fa58b55b83
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-purifierauxiliary.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-blue.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-blue.dds
new file mode 100644
index 0000000000..001df6d8b5
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-blue.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-orange.dds
new file mode 100644
index 0000000000..5c79208c90
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-timewarp-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-warpharmonization-taldarim.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-warpharmonization-taldarim.dds
new file mode 100644
index 0000000000..2643bfa1f0
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-ability-protoss-warpharmonization-taldarim.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothership-purifier-collection-ex2.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothership-purifier-collection-ex2.dds
new file mode 100644
index 0000000000..84cbdf4080
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothership-purifier-collection-ex2.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothershipcore-purifier-ex2.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothershipcore-purifier-ex2.dds
new file mode 100644
index 0000000000..b6ac1be8b4
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-protoss-mothershipcore-purifier-ex2.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-aiur-dragoonweapon.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-aiur-dragoonweapon.dds
new file mode 100644
index 0000000000..bb88586d66
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-aiur-dragoonweapon.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-destroyer-bloodshardoverload.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-destroyer-bloodshardoverload.dds
new file mode 100644
index 0000000000..28622d4e88
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-destroyer-bloodshardoverload.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dischargestrike-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dischargestrike-orange.dds
new file mode 100644
index 0000000000..daa5bd7874
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dischargestrike-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dragoonweapon-taldarim.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dragoonweapon-taldarim.dds
new file mode 100644
index 0000000000..afc9df1f82
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-dragoonweapon-taldarim.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemitters-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemitters-orange.dds
new file mode 100644
index 0000000000..eab5aabb67
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemitters-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds
new file mode 100644
index 0000000000..c3e4822e1b
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-structureovercharge-purifier.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-structureovercharge-purifier.dds
new file mode 100644
index 0000000000..3fa429d1d5
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-structureovercharge-purifier.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-symbolofunity.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-symbolofunity.dds
new file mode 100644
index 0000000000..af9e2a97bd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-protoss-symbolofunity.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-purifier-pylonpower.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-purifier-pylonpower.dds
new file mode 100644
index 0000000000..4c3725535d
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-upgrade-purifier-pylonpower.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothership_purifier_collection_newpart_emis.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothership_purifier_collection_newpart_emis.dds
new file mode 100644
index 0000000000..0e97424d99
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothership_purifier_collection_newpart_emis.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_diff.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_diff.dds
new file mode 100644
index 0000000000..84dea9115f
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_diff.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_spec.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_spec.dds
new file mode 100644
index 0000000000..11b88f4f7a
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collection_spec.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_diff.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_diff.dds
new file mode 100644
index 0000000000..5495cc89d7
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_diff.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_spec.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_spec.dds
new file mode 100644
index 0000000000..b00ae78bf2
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/mothershipcore1purifier_collectioncomposite_spec.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1diffuse.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1diffuse.dds
new file mode 100644
index 0000000000..6d7f406c39
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1diffuse.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1emissive.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1emissive.dds
new file mode 100644
index 0000000000..b8735fea60
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1emissive.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1specular.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1specular.dds
new file mode 100644
index 0000000000..bd7988603e
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/purifiermatrixcomposite1specular.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/techlines1_orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/techlines1_orange.dds
new file mode 100644
index 0000000000..1d7cba1452
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/techlines1_orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/vortexwarp2_orange.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/vortexwarp2_orange.dds
new file mode 100644
index 0000000000..e793b9977e
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/vortexwarp2_orange.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Effects/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Effects/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3
new file mode 100644
index 0000000000..5100a7eeec
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Effects/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MotherShipCore_Purifier_Ex2_Morph_Addition_final.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MotherShipCore_Purifier_Ex2_Morph_Addition_final.m3
new file mode 100644
index 0000000000..0781dc036c
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MotherShipCore_Purifier_Ex2_Morph_Addition_final.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MothershipCore_Purifier_Ex2_final.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MothershipCore_Purifier_Ex2_final.m3
new file mode 100644
index 0000000000..0d1347f30e
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/MothershipCore_Purifier_Ex2_final.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2.m3
new file mode 100644
index 0000000000..d2a8a79bcd
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3
new file mode 100644
index 0000000000..5100a7eeec
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_Shield_final.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_Shield_final.m3
new file mode 100644
index 0000000000..e9f0bc6cd8
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/Mothership_Purifier_Ex2_Shield_final.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierCollectionMothershipOrange.jpg.original-zps b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierCollectionMothershipOrange.jpg.original-zps
new file mode 100644
index 0000000000..44b880efc6
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierCollectionMothershipOrange.jpg.original-zps differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierMotherShipCore.jpg.original-zps b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierMotherShipCore.jpg.original-zps
new file mode 100644
index 0000000000..3d88989123
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Protoss/Mothership_Purifier/PurifierMotherShipCore.jpg.original-zps differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index d0391beff9..91a2cb5511 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -7138,10 +7138,14 @@
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Structures"/>
         <Activity value="UI/Warping"/>
         <Offset value="0,0"/>
-        <!--        <InfoArray index="Train1" Time="30">-->
-        <!--            <Button DefaultButtonFace="MothershipCore" State="Restricted" Requirements="MothershipCoreRequirements"/>-->
-        <!--            <Unit value="MothershipCore"/>-->
-        <!--        </InfoArray>-->
+        <InfoArray index="Train1" Time="25">
+            <Button DefaultButtonFace="AP_MothershipCoreAiur" State="Restricted" Requirements="AP_AiurMothershipCoreRequirements"/>
+            <Unit value="AP_MothershipCoreAiur"/>
+        </InfoArray>
+        <InfoArray index="Train2" Time="30">
+            <Button DefaultButtonFace="AP_MothershipCorePurifier" State="Restricted" Requirements="AP_PurifierMothershipCoreRequirements"/>
+            <Unit value="AP_MothershipCorePurifier"/>
+        </InfoArray>
     </CAbilTrain>
     <CAbilRally id="AP_RallyNexus">
         <OrderArray index="0">
@@ -7311,13 +7315,20 @@
         <Effect index="0" value="AP_SOAMothershipBlinkCP"/>
         <Flags index="AllowMovement" value="1"/>
         <Cost>
-            <Cooldown TimeUse="8"/>
+            <Cooldown Link="Abil/AP_SOAMothershipBlink" Location="Unit" TimeUse="8"/>
         </Cost>
         <Range value="10"/>
         <Arc value="360"/>
         <UninterruptibleArray index="Channel" value="1"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_SOAMothershipBlink"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_SOAMothershipBlinkGlobal" parent="AP_SOAMothershipBlink">
+        <Cost index="0">
+            <Vital index="Energy" value="50"/>
+            <Cooldown Link="Abil/AP_SOAMothershipBlink" TimeUse="120"/>
+        </Cost>
+        <Range index="0" value="500"/>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_SOAMothershipLineAttack">
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <Effect index="0" value="AP_SOAMothershipLineAttackInitialCP"/>
@@ -7327,7 +7338,7 @@
         </Cost>
         <Range value="500"/>
         <Arc value="360"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_SOAMothershipLineAttack"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_SOAMothershipLineAttack" Requirements="AP_HaveThermalLanceInstalled"/>
     </CAbilEffectTarget>
     <CAbilMorph id="AP_AutoMorphToMothershipTaldarim">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
@@ -7351,6 +7362,43 @@
         <Flags index="IgnoreFood" value="1"/>
         <InfoArray Unit="AP_SOAMothershipv4" CollideRange="0"/>
     </CAbilMorph>
+    <CAbilMorph id="AP_AutoMorphToMothershipPurifierPowerSource">
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="Raise" Requirements="AP_HaveMothershipPurifierPowerSource"/>
+        <CmdButtonArray index="Cancel" DefaultButtonFace="Cancel"/>
+        <Flags index="Automatic" value="1"/>
+        <Flags index="IgnorePlacement" value="1"/>
+        <Flags index="IgnoreFacing" value="1"/>
+        <Flags index="IgnoreUnitCost" value="1"/>
+        <Flags index="IgnoreFood" value="1"/>
+        <InfoArray Unit="AP_MothershipPurifierPowerSource" CollideRange="0"/>
+    </CAbilMorph>
+    <CAbilEffectInstant id="AP_AstralRestoration">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_AstralRestorationInitialSet"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="BestUnit" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="Transient" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+            <Cooldown Location="Unit" TimeUse="180"/>
+        </Cost>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_AstralRestoration" Requirements="AP_HaveAstralRestorationInstalled"/>
+    </CAbilEffectInstant>
+    <CAbilEffectInstant id="AP_OverloadWeaponSystems">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_OverloadWeaponSystemsABSet"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="BestUnit" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="Transient" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="50"/>
+            <Cooldown TimeUse="12"/>
+        </Cost>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_OverloadWeaponSystems" Requirements="AP_HaveOverloadWeaponSystemsInstalled"/>
+    </CAbilEffectInstant>
     <CAbilEffectTarget id="AP_InduceScopophobia">
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_ScopophobiaTargetAB"/>
@@ -7543,6 +7591,7 @@
     </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_ShieldBatteryRechargeChanneled">
         <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_ShieldBatteryRechargeChanneledSet"/>
         <Flags index="AutoCast" value="1"/>
         <Flags index="AutoCastOn" value="1"/>
         <Flags index="BestUnit" value="0"/>
@@ -7561,6 +7610,505 @@
         <DefaultError value="RequiresHealTarget"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ShieldBatteryRecharge"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_PowerRedirection">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_PowerRedirectionSet"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+            <Cooldown TimeUse="30"/>
+        </Cost>
+        <TargetFilters value="Visible;Self,Neutral,Enemy,Heroic,Missile,Item,Uncommandable,Stasis,Dead,Hidden"/>
+        <Range value="8"/>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryChronoBeam"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_PowerRedirectionUpgrade">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_PowerRedirectionBuildingSet"/>
+        <Cost>
+            <Vital index="Energy" value="75"/>
+            <Cooldown TimeUse="25"/>
+        </Cost>
+        <TargetFilters value="Visible;Self,Neutral,Enemy,Heroic,Missile,Item,Uncommandable,Stasis,Dead,Hidden"/>
+        <Range value="8"/>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryChronoBeam" Requirements="AP_HavePowerRedirectionInstalled"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_RevitalizeShields">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_RevitalizeShieldsSet"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="50"/>
+        </Cost>
+        <Range value="9"/>
+        <CursorEffect value="AP_RevitalizeShieldsSearchArea"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_RevitalizeShields" Requirements="AP_HaveRevitalizeShieldsInstalled"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_BatteryOvercharge">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_BatteryOverchargeAB"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="75"/>
+            <Cooldown TimeUse="15"/>
+        </Cost>
+        <Range value="8"/>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BatteryOvercharge"/>
+        <TargetFilters value="-;Neutral,Enemy,Stasis,UnderConstruction,Dead"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_BatteryOverchargeUpgrade">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_BatteryOverchargeAB"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="50"/>
+            <Cooldown TimeUse="15"/>
+        </Cost>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_BatteryOvercharge" Requirements="AP_HaveBatteryOverchargeInstalled"/>
+        <TargetFilters value="-;Neutral,Enemy,Stasis,UnderConstruction,Dead"/>
+    </CAbilEffectTarget>
+    <CAbilEffectInstant id="AP_SummonDeathFleet">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_SummonDeathFleetSet"/>
+        <Flags index="BestUnit" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+            <Cooldown TimeUse="240"/>
+        </Cost>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidRayTaldarim" Requirements="AP_HaveSummonDeathFleetInstalled"/>
+    </CAbilEffectInstant>
+    <CAbilBehavior id="AP_MothershipTaldarimBaseAttackSwap">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <CmdButtonArray index="On" DefaultButtonFace="AP_MothershipTaldarimBaseAttackEnable" Requirements="AP_HaveTaldarimMothershipFastAttack">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+        <CmdButtonArray index="Off" DefaultButtonFace="AP_MothershipTaldarimBaseAttackDisable" Requirements="AP_HaveTaldarimMothershipFastAttack">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+        <Flags index="Toggle" value="1"/>
+        <Flags index="Transient" value="1"/>
+        <BehaviorArray value="AP_EnableMothershipTaldarimAttackSwap"/>
+    </CAbilBehavior>
+    <CAbilResearch id="AP_MothershipAiurAuxiliaryOneTimeInstall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Research1" Time="0" Upgrade="AP_AiurMothershipFeedback">
+            <Resource index="Minerals" value="25"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_AiurMothershipFeedback" State="Restricted" Requirements="AP_CanInstallAiurMothershipFeedback"/>
+        </InfoArray>    
+        <InfoArray index="Research2" Time="0" Upgrade="AP_AiurMothershipShieldRestore">
+            <Resource index="Minerals" value="75"/>
+            <Resource index="Vespene" value="0"/>
+            <Button DefaultButtonFace="AP_AiurMothershipShieldRestore" State="Restricted" Requirements="AP_CanInstallAiurMothershipShieldRestore"/>
+        </InfoArray>     
+        <InfoArray index="Research3" Time="0" Upgrade="AP_AiurMothershipEnergyRegenAura">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_AiurMothershipEnergyRegenAura" State="Restricted" Requirements="AP_CanInstallAiurMothershipEnergyRegenAura"/>
+        </InfoArray>     
+        <InfoArray index="Research4" Time="0" Upgrade="AP_MothershipAiurHangar">
+            <Resource index="Minerals" value="75"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_InterceptorMothershipAiur" State="Restricted" Requirements="AP_HaveMothershipHangarUpgrade"/>
+        </InfoArray>
+    </CAbilResearch>
+    <CAbilResearch id="AP_MothershipPurifierAuxiliaryOneTimeInstall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Research1" Time="0" Upgrade="AP_PurifierMothershipDebuff">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="75"/>
+            <Button DefaultButtonFace="AP_PurifierMothershipDebuff" State="Restricted" Requirements="AP_CanInstallPurifierMothershipDebuff"/>
+        </InfoArray>
+        <InfoArray index="Research2" Time="0" Upgrade="AP_PurifierMothershipShielding">
+            <Resource index="Minerals" value="125"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_PurifierMothershipShielding" State="Restricted" Requirements="AP_CanInstallPurifierMothershipShielding"/>
+        </InfoArray>        
+        <InfoArray index="Research3" Time="0" Upgrade="AP_PurifierMothershipAttackSpeedBoost">
+            <Resource index="Minerals" value="100"/>
+            <Resource index="Vespene" value="100"/>
+            <Button DefaultButtonFace="AP_PurifierMothershipAttackSpeedBoost" State="Restricted" Requirements="AP_CanInstallPurifierMothershipAttackSpeedBoost"/>
+        </InfoArray>
+        <InfoArray index="Research4" Time="0" Upgrade="AP_MothershipPurifierHangar">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_InterceptorMothershipPurifier" State="Restricted" Requirements="AP_HaveMothershipHangarUpgrade"/>
+        </InfoArray>        
+    </CAbilResearch>
+    <CAbilResearch id="AP_MothershipTaldarimAuxiliaryOneTimeInstall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Research1" Time="0" Upgrade="AP_TaldarimMothershipGroundSlow">
+            <Resource index="Minerals" value="100"/>
+            <Resource index="Vespene" value="75"/>
+            <Button DefaultButtonFace="AP_TaldarimMothershipGroundSlow" State="Restricted" Requirements="AP_CanInstallTaldarimMothershipGroundSlow"/>
+        </InfoArray>
+        <InfoArray index="Research2" Time="0" Upgrade="AP_TaldarimMothershipFastAttack">
+            <Resource index="Minerals" value="125"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_TaldarimMothershipFastAttack" State="Restricted" Requirements="AP_CanInstallTaldarimMothershipFastAttack"/>
+        </InfoArray>        
+        <InfoArray index="Research3" Time="0" Upgrade="AP_TaldarimMothershipDeathHeal">
+            <Resource index="Minerals" value="175"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_TaldarimMothershipDeathHeal" State="Restricted" Requirements="AP_CanInstallTaldarimMothershipDeathHeal"/>
+        </InfoArray>
+        <InfoArray index="Research4" Time="0" Upgrade="AP_MothershipTaldarimHangar">
+            <Resource index="Minerals" value="100"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_InterceptorInstall" State="Restricted" Requirements="AP_HaveMothershipHangarUpgrade"/>
+        </InfoArray>
+    </CAbilResearch>
+    <CAbilSpecialize id="AP_PurifierMothershipInstalls">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Specialize1" Time="0" Effect="AP_OverloadWeaponSystemsInstallSet">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_OverloadWeaponSystems" Requirements="AP_CanInstallOverloadWeaponSystems"/>
+        </InfoArray>
+        <InfoArray index="Specialize2" Time="0" Effect="AP_PowerRedirectionInstallSet">
+            <Button DefaultButtonFace="AP_PowerRedirection" Requirements="AP_CanInstallPowerRedirection"/>
+        </InfoArray>
+        <InfoArray index="Specialize3" Time="0" Effect="AP_PlanetCrackerInstallSet">
+            <Resource index="Minerals" value="100"/>
+            <Resource index="Vespene" value="100"/>
+            <Button DefaultButtonFace="AP_PlanetCracker" Requirements="AP_CanInstallPlanetCracker"/>
+        </InfoArray>
+        <InfoArray index="Specialize4" Time="0" Effect="AP_BlackHoleInstallSet">
+            <Button DefaultButtonFace="AP_MothershipBlackHole" Requirements="AP_CanInstallBlackHole"/>
+        </InfoArray>
+        <InfoArray index="Specialize5" Time="0" Effect="AP_TimeFieldInstallSet">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_TimeField" Requirements="AP_CanInstallTimeField"/>
+        </InfoArray>
+        <InfoArray index="Specialize6" Time="0" Effect="AP_WormholeModuleInstallSet">
+            <Resource index="Minerals" value="25"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_MassRecall" Requirements="AP_CanInstallWormholeModule"/>
+        </InfoArray>
+    </CAbilSpecialize>
+    <CAbilSpecialize id="AP_AiurMothershipInstalls">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Specialize1" Time="0" Effect="AP_RevitalizeShieldsInstallSet">
+            <Resource index="Minerals" value="25"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_RevitalizeShields" Requirements="AP_CanInstallRevitalizeShields"/>
+        </InfoArray>
+        <InfoArray index="Specialize2" Time="0" Effect="AP_BatteryOverchargeInstallSet">
+            <Button DefaultButtonFace="AP_BatteryOvercharge" Requirements="AP_CanInstallBatteryOvercharge"/>
+        </InfoArray>
+        <InfoArray index="Specialize3" Time="0" Effect="AP_AstralRestorationInstallSet">
+            <Resource index="Minerals" value="75"/>
+            <Resource index="Vespene" value="75"/>
+            <Button DefaultButtonFace="AP_AstralRestoration" Requirements="AP_CanInstallAstralRestoration"/>
+        </InfoArray>
+        <InfoArray index="Specialize4" Time="0" Effect="AP_BlackHoleInstallSet">
+            <Button DefaultButtonFace="AP_MothershipBlackHole" Requirements="AP_CanInstallBlackHole"/>
+        </InfoArray>
+        <InfoArray index="Specialize5" Time="0" Effect="AP_TimeFieldInstallSet">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_TimeField" Requirements="AP_CanInstallTimeField"/>
+        </InfoArray>
+        <InfoArray index="Specialize6" Time="0" Effect="AP_WormholeModuleInstallSet">
+            <Resource index="Minerals" value="25"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_NexusRecall" Requirements="AP_CanInstallWormholeModule"/>
+        </InfoArray>
+    </CAbilSpecialize>
+    <CAbilSpecialize id="AP_TaldarimMothershipInstalls">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoArray index="Specialize1" Time="0" Effect="AP_ThermalLanceInstallSet">
+            <Button DefaultButtonFace="AP_SOAMothershipLineAttackInstall" Requirements="AP_CanInstallThermalLance"/>
+        </InfoArray>
+        <InfoArray index="Specialize2" Time="0" Effect="AP_SummonDeathFleetInstallSet">
+            <Resource index="Minerals" value="125"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_SummonDeathFleet" Requirements="AP_CanInstallSummonDeathFleet"/>
+        </InfoArray>
+        <InfoArray index="Specialize3" Time="0" Effect="AP_BlackHoleInstallSet">
+            <Button DefaultButtonFace="AP_MothershipBlackHole" Requirements="AP_CanInstallBlackHole"/>
+        </InfoArray>
+        <InfoArray index="Specialize4" Time="0" Effect="AP_TimeFieldInstallSet">
+            <Resource index="Minerals" value="50"/>
+            <Resource index="Vespene" value="50"/>
+            <Button DefaultButtonFace="AP_TimeField" Requirements="AP_CanInstallTimeField"/>
+        </InfoArray>
+        <InfoArray index="Specialize5" Time="0" Effect="AP_WormholeModuleInstallSet">
+            <Resource index="Minerals" value="75"/>
+            <Resource index="Vespene" value="25"/>
+            <Button DefaultButtonFace="AP_WormholeTransit" Requirements="AP_CanInstallWormholeModule"/>
+        </InfoArray>
+    </CAbilSpecialize>
+    <CAbilEffectTarget id="AP_PlanetCracker">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_PlanetCrackerSet"/>
+        <Range value="11"/>
+        <Arc value="360"/>
+        <Cost>
+            <Vital index="Energy" value="125"/>
+            <Cooldown TimeUse="300"/>
+        </Cost>
+        <UninterruptibleArray index="Approach" value="1"/>
+        <UninterruptibleArray index="Prep" value="1"/>
+        <UninterruptibleArray index="Cast" value="1"/>
+        <UninterruptibleArray index="Channel" value="1"/>
+        <UninterruptibleArray index="Finish" value="1"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_PlanetCracker" Requirements="AP_HavePlanetCrackerInstalled"/>
+        <PrepTime value="0.5"/>
+        <CastIntroTime value="0.5"/>
+        <FinishTime value="0.5"/>
+    </CAbilEffectTarget>           
+    <CAbilArmMagazine id="AP_MothershipTaldarimHangar">
+        <AbilSetId value="MothershipHangar"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Flags index="Retarget" value="1"/>
+        <Leash value="12"/>
+        <InfoArray index="Ammo1" Time="8" CountStart="8" Manage="Recall" Unit="AP_InterceptorTaldarim">
+            <Charge Link="CarrierInterceptor" Location="Unit"/>
+            <Cooldown Link="CarrierTrainInterceptor" TimeUse="0.01"/>
+            <Button DefaultButtonFace="Interceptor" Requirements="AP_HaveMothershipHangarTaldarimInstalled">
+                <Flags index="ToSelection" value="1"/>
+            </Button>
+            <Flags index="AutoBuild" value="1"/>
+            <Flags index="AutoBuildOn" value="1"/>
+            <Flags index="LeashRetarget" value="1"/>
+        </InfoArray>
+        <Alert value="TrainComplete"/>
+        <EffectArray index="Death" value="InterceptorFate"/>
+        <MaxCount value="0"/>
+    </CAbilArmMagazine> 
+    <CAbilArmMagazine id="AP_MothershipDummyHangar">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <ExternalAngle value="-135"/>
+        <ExternalAngle value="135"/>
+        <MaxCount value="0"/>
+    </CAbilArmMagazine>    
+    <CAbilArmMagazine id="AP_MothershipPurifierHangar">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Launch value="ReleaseAtSource"/>
+        <Flags index="AutoCreate" value="1"/>
+        <Flags index="Retarget" value="1"/>
+        <Leash value="4"/>
+        <InfoArray index="Ammo1" Time="0" CountStart="0" Manage="Recall" Unit="AP_ChronoDrone">
+            <Charge HideCount="1" Link="ChronoDrone" Location="Unit"/>
+            <Cooldown Link="Abil/##id##"/>
+            <Button DefaultButtonFace="AP_RepairDrones" Requirements="AP_HaveMothershipHangarPurifierInstalled">
+                <Flags index="ToSelection" value="1"/>
+            </Button>
+            <Flags index="AutoBuild" value="1"/>
+            <Flags index="AutoBuildOn" value="1"/>
+            <Flags index="External" value="1"/>
+        </InfoArray>
+        <EffectArray index="Create" value="AP_CarrierRepairDroneRecall"/>
+        <ExternalAngle value="-135"/>
+        <ExternalAngle value="135"/>
+        <MaxCount value="1"/>
+    </CAbilArmMagazine>   
+    <CAbilArmMagazine id="AP_MothershipAiurHangar">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Launch value="ReleaseAtSource"/>
+        <Flags index="AutoCreate" value="1"/>
+        <Flags index="Retarget" value="1"/>
+        <Leash value="4"/>
+        <InfoArray index="Ammo1" Time="0" CountStart="0" Manage="Recall" Unit="AP_MothershipRepairDrone">
+            <Charge HideCount="1" Link="RepairDrone" Location="Unit"/>
+            <Cooldown Link="Abil/##id##"/>
+            <Button DefaultButtonFace="AP_RepairDrones" Requirements="AP_HaveMothershipHangarAiurInstalled">
+                <Flags index="ToSelection" value="1"/>
+            </Button>
+            <Flags index="AutoBuild" value="1"/>
+            <Flags index="AutoBuildOn" value="1"/>
+            <Flags index="External" value="1"/>
+        </InfoArray>
+        <EffectArray index="Create" value="AP_CarrierRepairDroneRecall"/>
+        <ExternalAngle value="180"/>
+        <ExternalAngle value="90"/>
+        <ExternalAngle value="270"/>
+        <MaxCount value="2"/>
+    </CAbilArmMagazine>                                             
+    <CAbilEffectTarget id="AP_TimeFieldAiur">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_TimeFieldAiurCreatePersistent"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Vital index="Energy" value="75"/>
+        </Cost>
+        <CursorEffect value="AP_TimeFieldAiurSearchArea"/>
+        <AINotifyEffect value="AP_TimeFieldAiurCreatePersistent"/>
+        <Range value="9"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_TimeField" Requirements="AP_HaveTimeFieldInstalled"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_TimeFieldPurifier">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_TimeFieldPurifierCreatePersistent"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Vital index="Energy" value="75"/>
+        </Cost>
+        <CursorEffect value="AP_TimeFieldPurifierSearchArea"/>
+        <Range value="9"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_TimeField" Requirements="AP_HaveTimeFieldInstalled"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_TimeFieldAiurCore">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_TimeFieldAiurCoreCreatePersistent"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+        </Cost>
+        <CursorEffect value="AP_TimeFieldAiurCoreSearchArea"/>
+        <AINotifyEffect value="AP_TimeFieldAiurCoreCreatePersistent"/>
+        <Range value="9"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_TimeField"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_TimeFieldPurifierCore">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_TimeFieldPurifierCoreCreatePersistent"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+        </Cost>
+        <CursorEffect value="AP_TimeFieldPurifierCoreSearchArea"/>
+        <Range value="9"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_TimeField"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_TimeFieldTaldarim">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_TimeFieldTaldarimCreatePersistent"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Flags index="NoDeceleration" value="1"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Vital index="Energy" value="75"/>
+        </Cost>
+        <CursorEffect value="AP_TimeFieldTaldarimSearchArea"/>
+        <AINotifyEffect value="AP_TimeFieldTaldarimCreatePersistent"/>
+        <Range value="9"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_TimeField" Requirements="AP_HaveTimeFieldInstalled"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_MothershipCoreMassRecall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_MothershipMassRecallSearch"/>
+        <Cost>
+            <Vital index="Energy" value="125"/>
+            <Cooldown TimeUse="30"/>
+        </Cost>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <CursorEffect value="AP_MothershipMassRecallSearch"/>
+        <AINotifyEffect value=""/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterMPRecall"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_MothershipCoreNexusRecall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_MothershipCoreNexusRecallPrepare"/>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <AINotifyEffect value="MassRecall"/>
+        <Cost>
+            <Vital index="Energy" value="100"/>
+            <Cooldown TimeUse="30"/>
+        </Cost>
+        <CursorEffect value="AP_MothershipCoreNexusRecallSearch"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MothershipCoreNexusRecall"/>
+        <TargetFilters value="-;Ally,Neutral,Enemy"/>
+        <Flags index="AllowMovement" value="1"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_MothershipNexusRecall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_MothershipNexusRecallPrepare"/>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <AINotifyEffect value="MassRecall"/>
+        <Cost>
+            <Vital index="Energy" value="50"/>
+            <Cooldown TimeUse="15"/>
+        </Cost>
+        <CursorEffect value="AP_MothershipNexusRecallSearch"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MothershipNexusRecall" Requirements="AP_HaveWormholeModuleInstalled"/>
+        <TargetFilters value="-;Ally,Neutral,Enemy"/>
+        <Flags index="AllowMovement" value="1"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_MothershipMassRecall">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_MothershipMassRecallSearch"/>
+        <Cost>
+            <Vital index="Energy" value="50"/>
+            <Cooldown TimeUse="15"/>
+        </Cost>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <CursorEffect value="AP_MothershipMassRecallSearch"/>
+        <AINotifyEffect value=""/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterMPRecall" Requirements="AP_HaveWormholeModuleInstalled"/>
+    </CAbilEffectTarget>
+    <CAbilMorph id="AP_MorphToMothershipAiur">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MorphToMothershipAiur" Requirements="AP_HaveFleetBeacon"/>
+        <CmdButtonArray index="Cancel" DefaultButtonFace="AP_CancelMothershipMorph"/>
+        <Flags index="DisableAbils" value="1"/>
+        <Flags index="FastBuild" value="1"/>
+        <Flags index="Interruptible" value="1"/>
+        <Flags index="IgnoreFacing" value="1"/>
+        <Flags index="IgnorePlacement" value="0"/>
+        <Flags index="Produce" value="1"/>
+        <Flags index="ShowProgress" value="1"/>
+        <Flags index="SuppressMovement" value="1"/>
+        <InfoArray Score="1" Unit="AP_MothershipAiur">
+            <SectionArray index="Abils">
+                <DurationArray index="Delay" value="100"/>
+            </SectionArray>
+            <SectionArray index="Actor">
+                <DurationArray index="Delay" value="100"/>
+            </SectionArray>
+            <SectionArray index="Mover">
+                <DurationArray index="Delay" value="100"/>
+            </SectionArray>
+            <SectionArray index="Stats">
+                <DurationArray index="Delay" value="100"/>
+            </SectionArray>
+        </InfoArray>
+        <ProgressButton value="AP_MorphToMothership"/>
+        <Alert value="AP_MothershipComplete"/>
+    </CAbilMorph>
+    <CAbilMorph id="AP_MorphToMothershipPurifier" parent="AP_MorphToMothershipAiur">
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MorphToMothershipPurifier" Requirements="AP_HaveFleetBeacon"/>
+        <InfoArray index="0" Score="1" Unit="AP_MothershipPurifier">
+            <SectionArray index="Abils">
+                <DurationArray index="Delay" value="110"/>
+            </SectionArray>
+            <SectionArray index="Actor">
+                <DurationArray index="Delay" value="110"/>
+            </SectionArray>
+            <SectionArray index="Mover">
+                <DurationArray index="Delay" value="110"/>
+            </SectionArray>
+            <SectionArray index="Stats">
+                <DurationArray index="Delay" value="110"/>
+            </SectionArray>
+        </InfoArray>
+    </CAbilMorph>
     <CAbilResearch id="AP_SpireResearch">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
         <InfoArray index="Research1" Time="160" Upgrade="AP_ZergFlyerWeaponsLevel1">
@@ -10204,7 +10752,15 @@
         <Range value="10"/>
         <Arc value="360"/>
         <CursorEffect value="AP_VoidSentryBlackHoleSearch"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryBlackHole"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryBlackHole" Requirements="AP_HaveBlackHoleInstalled"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_AiurMothershipBlackHole" parent="AP_VoidSentryBlackHole">
+        <Effect index="0" value="AP_AiurMothershipBlackHolePersistent"/>
+        <CursorEffect index="0" value="AP_AiurMothershipBlackHoleSearch"/>
+    </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_PurifierMothershipBlackHole" parent="AP_VoidSentryBlackHole">
+        <Effect index="0" value="AP_PurifierMothershipBlackHolePersistent"/>
+        <CursorEffect index="0" value="AP_PurifierMothershipBlackHoleSearch"/>
     </CAbilEffectTarget>
     <CAbilMorph id="AP_TransportMode">
         <EditorCategories value="Race:Protoss,AbilityorEffectType:MorphsandBurrows"/>
@@ -10294,6 +10850,16 @@
     <CAbilEffectTarget id="AP_VoidSentryChronoBeamMobile" parent="AP_VoidSentryChronoBeam">
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryChronoBeam" Requirements="AP_UseEnergizerMobileChronoBeam"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_ChronoDroneChronoBeam" parent="AP_VoidSentryChronoBeam">
+        <Range value="11"/>
+        <AutoCastRange value="11"/>
+        <Effect index="0" value="AP_ChronoDroneChronoBeamCP"/>
+        <AutoCastValidatorArray value="AP_TargetIsNotPurifierMothershipBase"/>
+        <AutoCastValidatorArray value="AP_TargetIsNotPurifierMothershipUpgraded"/>
+        <Cost index="0">
+            <Vital index="Energy" value="0"/>
+        </Cost>
+    </CAbilEffectTarget>
     <CAbilMorph id="AP_VoidSentryPhasingMode">
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_VoidSentryPhasingMode"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 00adb26b1a..1bd7616f46 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -6,6 +6,7 @@
         <DeathCustomPriorityList value="Purifier"/>
         <DeathCustomPriorityList value="Nerazim"/>
         <DeathCustomPriorityList value="Aiur"/>
+        <DeathCustomPriorityList value="Unity"/>
     </CActorGlobalConfig>
     <const id="$AP_LurkerSpineSiteOps" value="{AP_LurkerSOpAoEVariancer SOpShadow SOpForwardCasterPoint SOp2DRotation AP_LurkerSOpShadowSpine SOpRotVariancerUp15}"/>
     <CActorUnit default="1" id="GenericUnitStandard">
@@ -1795,7 +1796,6 @@
         <On Terms="Behavior.AP_SalvageNydus.Off" Send="Destroy"/> 
         <Sound value="Nydus_Unburrow"/>
     </CActorSound>
-
     <CActorModel default="1" id="AP_SITerranBuildingBuild" parent="TerranModelConstruction">
         <CreepHeightClass value="Default"/>
         <Aliases value="_TerranBuildModel"/>
@@ -2138,6 +2138,10 @@
         <AttachQuery Methods="Target"/>
         <ForceSoftAttach value="1"/>
     </CActorSiteOpAttach>
+    <CActorSiteOpLocalOffset id="AP_SOpLowerBy375">
+        <EditorCategories value=""/>
+        <LocalOffset value="0.000000,0.000000,-3.750000"/>
+    </CActorSiteOpLocalOffset>
     <CActorSound id="AP_StukovInfestedSiegeTankCrawlerDeathSound" parent="UnitDeathSound">
         <Sound value="Zerg_ExplosionLarge"/>
     </CActorSound>
@@ -2640,6 +2644,7 @@
         <Inherits index="CloakEffect" value="1"/>
         <Inherits index="Visibility" value="1"/>
         <On Terms="Effect.AP_MedicSCBWRestoration@Set.Start; At Target" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipShieldRestore.Start; At Target" Send="Create"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachOverhead" HoldRotation="1"/>
         <Model value="AP_MedicSCBWRestoration@Impact"/>
@@ -6866,6 +6871,38 @@
             <Image value="Assets\Textures\Wireframe-Protoss-Observer-Shield03.dds"/>
         </WireframeShield>
     </CActorUnit>
+    <CActorUnit id="AP_MothershipRepairDrone" parent="GenericUnitStandard" unitName="AP_MothershipRepairDrone">
+        <On Terms="Behavior.WarpInEffect15.On" Send="ModelSwap ObserverWarpIn"/>
+        <On Terms="Behavior.WarpInEffect15.On" Send="$Birth"/>
+        <On Terms="Behavior.WarpInEffect15.Off" Send="ModelSwap Observer"/>
+        <On Terms="Behavior.WarpInEffect15.Off" Send="AnimBaselineStart"/>
+        <On Terms="UnitHeightUpdate.*.Land" Send="Create Observer_Land"/>
+        <AnimBlendTime value="1.200000"/>
+        <BuildModel value="AP_ProtossGenericWarpInOut"/>
+        <DeathArray index="Normal" ModelLink="AP_CarrierRepairDroneDeath" SoundLink="Observer_Explode"/>
+        <Model value="AP_CarrierRepairDrone"/>
+        <PortraitModel value="ObserverPortrait"/>
+        <BarOffset value="40"/>
+        <BarWidth value="42"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer.dds"/>
+        </GroupIcon>
+        <HeroIcon value="Assets\Textures\btn-unit-protoss-observer.dds"/>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <SoundArray index="Ready" value="Observer_Ready"/>
+        <SoundArray index="What" value="Observer_What"/>
+        <SoundArray index="Yes" value="Observer_Yes"/>
+        <SoundArray index="Pissed" value="Observer_Pissed"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-observer.dds"/>
+        <Wireframe>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer.dds"/>
+        </Wireframe>
+        <WireframeShield>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer-Shield01.dds"/>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer-Shield02.dds"/>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer-Shield03.dds"/>
+        </WireframeShield>
+    </CActorUnit>
     <CActorBeamSimple id="AP_CarrierRepairDroneHealBeam" parent="BeamSimpleAnimationStyleContinuous">
         <On Terms="Effect.AP_CarrierRepairDroneHealTargetAB.Start; At Target" Send="Create"/>
         <On Terms="Behavior.AP_CarrierRepairDroneHealTarget.Off" Send="AnimBracketStop BSD"/>
@@ -7912,9 +7949,12 @@
     </CActorRange>
     <CActorSimple id="AP_ArbiterMPRecallOpacity">
         <On Terms="Behavior.AP_ArbiterMPRecalling.On" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalling.On" Send="Create"/>
+        <On Terms="Behavior.AP_SummonDeathFleetWarpOut.On" Send="Create"/>
         <On Terms="ActorCreation" Target="_Unit" Send="SetOpacity 0.400000 0.250000 MassRecallOpacity"/>
         <On Terms="ActorCreation" Target="_Unit" Send="SetTintColor 100,100,255 0.250000 OneShot MassRecallTint"/>
         <On Terms="Behavior.AP_ArbiterMPRecalled.Off" Send="TimerSet 0.150000 ClearRecallOpacity"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalled.Off" Send="TimerSet 0.150000 ClearRecallOpacity"/>
         <On Terms="Behavior.AP_Yoink.On" Target="_Unit" Send="ClearOpacity 0.250000 MassRecallOpacity"/>
         <On Terms="Behavior.AP_Yoink.On" Target="_Unit" Send="ClearTintColor 0.250000 MassRecallTint"/>
         <On Terms="Behavior.AP_Yoink.On" Send="Destroy"/>
@@ -7925,6 +7965,7 @@
     <CActorModel id="AP_ArbiterMPRecalledImpact" parent="ModelAnimationStyleOneShot">
         <Terms value="Cap 1"/>
         <On Terms="Behavior.AP_ArbiterMPRecalled.On" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalled.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpShadow"/>
         <AutoScaleFactor value="0.450000"/>
@@ -7932,12 +7973,14 @@
     <CActorSound id="AP_ArbiterMPRecalledImpactSound" parent="SoundOneShot">
         <Terms value="Cap 1"/>
         <On Terms="Behavior.AP_ArbiterMPRecalled.On" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalled.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_RecallEnd"/>
     </CActorSound>
     <CActorModel id="AP_ArbiterMPRecallingImpact" parent="ModelAnimationStyleOneShot">
         <Terms value="Cap 1"/>
         <On Terms="Behavior.AP_ArbiterMPRecalling.On" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalling.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpShadow"/>
         <AutoScaleFactor value="0.450000"/>
@@ -7945,6 +7988,8 @@
     <CActorSound id="AP_ArbiterMPRecallingImpactSound" parent="SoundOneShot">
         <Terms value="Cap 1"/>
         <On Terms="Behavior.AP_ArbiterMPRecalling.On" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipCoreRecalling.On" Send="Create"/>
+        <On Terms="Behavior.AP_SummonDeathFleetWarpOut.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_RecallStart"/>
     </CActorSound>
@@ -17273,6 +17318,27 @@
     <CActorSound id="AP_Archon_Land" parent="SoundOneShot">
         <Sound value="Archon_Land"/>
     </CActorSound>
+    <CActorUnit id="AP_ChronoDrone" parent="GenericUnitStandard" unitName="AP_ChronoDrone">
+        <On Terms="Behavior.WarpInEffect15.On" Send="ModelSwap ObserverWarpIn"/>
+        <On Terms="Behavior.WarpInEffect15.On" Send="$Birth"/>
+        <On Terms="Behavior.WarpInEffect15.Off" Send="ModelSwap Observer"/>
+        <On Terms="Behavior.WarpInEffect15.Off" Send="AnimBaselineStart"/>
+        <On Terms="UnitHeightUpdate.*.Land" Send="Create Observer_Land"/>
+        <AnimBlendTime value="1.200000"/>
+        <BuildModel value="AP_ProtossGenericWarpInOut"/>
+        <DeathArray index="Normal" ModelLink="AP_ChronoDroneDeath" SoundLink="Observer_Explode"/>
+        <PortraitModel value="ObserverPortrait"/>
+        <BarOffset value="40"/>
+        <BarWidth value="42"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-Protoss-Observer.dds"/>
+        </GroupIcon>
+        <HeroIcon value="Assets\Textures\btn-unit-protoss-observer.dds"/>
+        <HighlightTooltip value="Unit/Name/AP_ChronoDrone"/>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-observer.dds"/>
+        <Model value="AP_ChronoDrone"/>
+    </CActorUnit>
     <CActorModel id="AP_CreepFrenzy13CreepTumor" parent="ModelAddition">
         <On Terms="Behavior.AP_CreepFrenzy13CreepTumor.On" Send="Create"/>
         <On Terms="Behavior.AP_CreepFrenzy13CreepTumor.Off" Send="AnimBracketStop BSD"/>
@@ -17408,6 +17474,8 @@
     <CActorModel id="AP_DarkArchonConfusionModel" parent="ModelAnimationStyleContinuous">
         <On Terms="Behavior.AP_DarkArchonConfusion.On" Send="Create"/>
         <On Terms="Behavior.AP_DarkArchonConfusion.Off" Send="Destroy"/>
+        <On Terms="Behavior.AP_TimeFieldTaldarimConfusion.On" Send="Create"/>
+        <On Terms="Behavior.AP_TimeFieldTaldarimConfusion.Off" Send="Destroy"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachOverhead"/>
@@ -21195,7 +21263,9 @@
         <HostSiteOps Ops="SOpAttachCenter"/>
         <AutoScaleFactor value="0.800000"/>
     </CActorModel>
-    <CActorSound id="AP_SOAShieldRegenerationImpactSound" parent="SoundOneShot"/>
+    <CActorSound id="AP_SOAShieldRegenerationImpactSound" parent="SoundOneShot">
+        <On Terms="Abil.AP_SummonDeathFleet.SourceCastStart" Send="Create"/>
+    </CActorSound>
     <CActorSound id="AP_SOAShieldRegenerationFadeSound" parent="SoundOneShot"/>
     <CActorSimple id="AP_SOASuperChronoAnimationSpeed">
         <On Terms="Behavior.AP_SOASuperChrono.On" Send="Create"/>
@@ -22003,6 +22073,400 @@
     <CActorSound id="AP_Herc_GrappleRetract" parent="SoundOneShot">
         <Sound value="AP_Herc_Grapple_Move"/>
     </CActorSound>
+    <CActorModel id="AP_RevitalizeShieldsModel">
+        <On Terms="Effect.AP_RevitalizeShieldsSearchArea.Start" Send="Create"/>
+        <On Terms="Effect.AP_RevitalizeShieldsSearchArea.Start" Send="$Stand"/>
+        <On Terms="Effect.AP_RevitalizeShieldsSearchArea.Start" Send="AnimSetTime Stand 0.490000"/>
+    </CActorModel>
+    <CActorSplat id="AP_RevitalizeShieldsCursorSplat" parent="ProtossCursorSplat" abil="AP_RevitalizeShields"/>
+    <CActorRange id="AP_RevitalizeShieldsRange" parent="RangeAbil" abil="AP_RevitalizeShields">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
+    <CActorSound id="AP_RevitalizeShieldsLaunch" parent="SoundOneShot">
+        <On Terms="Abil.AP_RevitalizeShields.SourceCastStart" Send="Create"/>
+    </CActorSound>
+    <CActorModel id="AP_BatteryOverchargeModel" parent="ModelAnimationStyleContinuous">
+        <On Terms="Behavior.AP_BatteryOvercharge.On" Send="Create"/>
+        <On Terms="Behavior.AP_BatteryOvercharge.Off" Send="Destroy"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart Work Stand,Work,Start Stand,Work Stand,Work,End"/>
+        <On Terms="ActorCreation" Send="SetTintColor 0,255,108"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachOverhead"/>
+        <Inherits index="CloakEffect" value="1"/>
+        <Inherits index="TeamColor" value="1"/>
+    </CActorModel>
+    <CActorSound id="AP_BatteryOverchargeCastSound" parent="SoundOneShot">
+        <On Terms="Behavior.AP_BatteryOvercharge.On" Send="Create"/>
+        <Sound value="Mothership_PhotonOverchargeActivate"/>
+    </CActorSound>
+    <CActorRange id="AP_BatteryOverchargeRange" parent="RangeAbil" abil="AP_BatteryOvercharge">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
+    <CActorRange id="AP_BatteryOverchargeUpgradeRange" parent="RangeAbil" abil="AP_BatteryOverchargeUpgrade">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
+    <CActorSplat id="AP_MothershipMassRecallCursorSplat" parent="ProtossCursorSplat" abil="AP_MothershipMassRecall"/>
+    <CActorSplat id="AP_MothershipCoreMassRecallCursorSplat" parent="ProtossCursorSplat" abil="AP_MothershipCoreMassRecall"/>
+    <CActorRange id="AP_MothershipMassRecallRange" parent="RangeAbil" abil="AP_MothershipMassRecall">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
+    <CActorBeamSimple id="AP_PlanetCrackerBeam" parent="BeamSimpleAnimationStyleContinuous">
+        <HostLaunch Subject="_Selectable" Actor="Find"/>
+        <HostLaunchSiteOps Ops="SOpAttachOrigin"/>
+        <HostImpact Subject="_Selectable" Actor="Find"/>
+        <HostImpactSiteOps Ops="SOpAttachOrigin SOpShadow"/>
+        <On Terms="Behavior.AP_PlanetCracker.On" Send="Create"/>
+        <On Terms="Behavior.AP_PlanetCracker.Off" Send="AnimBracketStop BSD"/>
+        <On Terms="Behavior.AP_PlanetCracker.On" Send="SetScale 1.150000"/>
+        <On Terms="ActorCreation" Send="SetOpacity 0.75"/>
+    </CActorBeamSimple>
+    <CActorModel id="AP_PlanetCrackerImpact" parent="ModelAnimationStyleOneShotUNIT">
+        <On Terms="Effect.AP_PlanetCrackerDamage.Start; At Target" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipDebuffDOT.Start; At Target" Send="Create"/>
+        <HostSiteOps Ops="SOpAttachRandomDamage"/>
+    </CActorModel>
+    <CActorSound id="AP_PlanetCrackerSound" parent="SoundOneShot">
+        <On Terms="Behavior.AP_PlanetCracker.On" Send="Create"/>
+        <On Terms="Behavior.AP_PlanetCracker.Off" Send="Destroy"/>
+    </CActorSound>
+    <CActorAction id="AP_PlanetCrackerShieldHitter" parent="AoEAttackShieldHitter" effectHit="AP_PlanetCrackerDamage"/>
+    <CActorSplat id="AP_TimeFieldAiurCursorSplat" parent="ProtossCursorSplat" abil="AP_TimeFieldAiur"/>
+    <CActorSplat id="AP_TimeFieldAiurCoreCursorSplat" parent="ProtossCursorSplat" abil="AP_TimeFieldAiurCore"/>
+    <CActorSplat id="AP_TimeFieldPurifierCursorSplat" parent="ProtossCursorSplat" abil="AP_TimeFieldPurifier"/>
+    <CActorSplat id="AP_TimeFieldPurifierCoreCursorSplat" parent="ProtossCursorSplat" abil="AP_TimeFieldPurifierCore"/>
+    <CActorModel id="AP_PlanetCrackerChargeUp" parent="ModelAddition">
+        <Model value="AP_PurifierPowerUp"/>
+        <On Terms="Behavior.AP_PlanetCrackerChargeUp.On" Send="Create"/>
+        <On Terms="Behavior.AP_PlanetCrackerChargeUp.On" Send="SetScale 20.000000 2.500000"/>
+        <On Terms="Behavior.AP_PlanetCrackerChargeUp.Off" Send="AnimBracketStop BSD"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachHardPoint"/>
+    </CActorModel>
+    <CActorSound id="AP_PlanetCrackerChargeUpSound" parent="SoundOneShot">
+        <On Terms="Behavior.AP_PlanetCrackerChargeUp.On" Send="Create"/>
+        <On Terms="Behavior.AP_PlanetCrackerChargeUp.Off" Send="Destroy"/>
+        <HostSiteOps Ops="SOpShadow"/>
+        <Sound value="AP_SOA_PurifierBeam_Birth_A"/>
+    </CActorSound>
+    <CActorRange id="AP_PlanetCrackerRange" parent="RangeAbil" abil="AP_PlanetCracker">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
+    <CActorSplat id="AP_PlanetCrackerCursorInner" parent="ProtossCursorSplat" abil="AP_PlanetCracker">
+        <Model value="LiberatorAGTargetCursorSplat"/>
+        <On Terms="ActorCreation" Send="SetTintColor {255,165,0 10.000000}"/>
+        <On Terms="ActorCreation" Send="Create AP_PlanetCrackerCursorOuter"/>
+        <On Terms="ActorDestruction" Target="AP_PlanetCrackerCursorOuter" Send="Destroy"/>
+        <Scale value="1.225"/>
+    </CActorSplat>
+    <CActorSplat id="AP_PlanetCrackerCursorOuter" parent="ProtossCursorSplat">
+        <Model value="LiberatorAGTargetCursorSplat"/>
+        <Scale value="1.225"/>
+        <On index="0" Terms="Abil.Cursor" Send="Create"/>
+        <On Terms="ActorCreation" Send="SetTintColor {255,165,0 10.000000}"/>
+        <On Terms="ActorCreation" Send="SetOpacity 0.600000"/>
+        <On Terms="ActorCreation" Send="TimerSet 0.250000 Scaling"/>
+        <On Terms="TimerExpired; TimerName Scaling" Send="SetScale 1.225"/>
+        <On Terms="TimerExpired; TimerName Scaling" Send="SetScale 2.11 2.00000"/>
+        <On Terms="TimerExpired; TimerName Scaling" Send="TimerSet 2.00000 Scaling"/>
+    </CActorSplat>
+    <CActorSplat id="AP_TimeFieldTaldarimCursorSplat" parent="ProtossCursorSplat" abil="AP_TimeFieldTaldarim">
+        <Model value="AP_VoidSentryBlackHoleCursorSplat"/>
+    </CActorSplat>
+    <CActorSiteOpLocalOffset id="AP_PlanetCrackerOffset">
+        <LocalOffset value="0.000000,0.000000,-2.000000"/>
+    </CActorSiteOpLocalOffset>
+    <CActorModel id="AP_MothershipTeleportIn" parent="ModelAnimationStyleOneShot">
+        <On Terms="Abil.AP_PlanetCracker.SourcePrepStart" Send="Create"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachOriginStationary"/>
+        <Model value="MothershipTeleportIn"/>
+    </CActorModel>
+    <CActorModel id="AP_MothershipTeleportOut" parent="ModelAnimationStyleOneShot">
+        <On Terms="Abil.AP_PlanetCracker.SourceCastStop" Send="Create"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+        <Model value="MothershipTeleportOut"/>
+    </CActorModel>
+    <CActorSound id="AP_PlanetCrackerTeleportSound" parent="SoundOneShot">
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachOriginStationary"/>
+        <On Terms="Abil.AP_PlanetCracker.SourcePrepStart" Send="Create"/>
+        <Sound value="Mothership_WormholeTransitStart"/>
+    </CActorSound>
+    <CActorPower id="AP_MothershipPurifierPower">
+        <On Terms="Behavior.AP_MothershipPurifierPowerSource.Create; !Option Model Low" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipPurifierPowerSource.Destroy; !Option Model Low" Send="Destroy"/>
+        <PowerSource value="AP_MothershipPurifierPowerSource"/>
+        <VisualArray value="UnpoweredVisual"/>
+        <VisualArray value="AP_SentryPowerVisual"/>
+    </CActorPower>
+    <CActorPower id="AP_MothershipPurifierPowerLow">
+        <On Terms="Behavior.AP_MothershipPurifierPowerSource.Create; Option Model Low" Send="Create"/>
+        <On Terms="Behavior.AP_MothershipPurifierPowerSource.Destroy; Option Model Low" Send="Destroy"/>
+        <PowerSource value="AP_MothershipPurifierPowerSource"/>
+        <VisualArray value="AP_UnpoweredVisualLow"/>
+        <VisualArray value="AP_SentryPowerVisualLow"/>
+    </CActorPower>
+    <CActorRange id="AP_TaldarimMothershipGroundSlowAuraRange">
+        <On Terms="SelectionLocalUpdate.*.Start" Send="SetVisibility 1"/>
+        <On Terms="SelectionLocalUpdate.*.Stop" Send="SetVisibility"/>
+        <On Terms="Behavior.AP_TaldarimMothershipGroundSlowAura.On" Send="Create"/>
+        <On Terms="Behavior.AP_TaldarimMothershipGroundSlowAura.Off" Send="Destroy"/>
+        <Range value="7.750000"/>
+    </CActorRange>
+    <CActorRange id="AP_PurifierMothershipAttackSpeedBoostAuraRange">
+        <On Terms="SelectionLocalUpdate.*.Start" Send="SetVisibility 1"/>
+        <On Terms="SelectionLocalUpdate.*.Stop" Send="SetVisibility"/>
+        <On Terms="Behavior.AP_PurifierMothershipAttackSpeedBoostAura.On" Send="Create"/>
+        <On Terms="Behavior.AP_PurifierMothershipAttackSpeedBoostAura.Off" Send="Destroy"/>
+        <Range value="6.350000"/>
+    </CActorRange>
+    <CActorRange id="AP_MothershipAiurCloakingFieldRange">
+        <On Terms="SelectionLocalUpdate.AP_MothershipAiur.Start" Send="Create"/>
+        <On Terms="SelectionLocalUpdate.AP_MothershipAiur.Stop" Send="Destroy"/>
+        <On Terms="SelectionLocalUpdate.*.Start" Send="SetVisibility 1"/>
+        <On Terms="SelectionLocalUpdate.*.Stop" Send="SetVisibility"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="Destroy"/>`
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="Create"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="SetVisibility 1"/>`
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="SetVisibility"/>
+        <Range value="6.350000"/>
+    </CActorRange>
+    <CActorRange id="AP_MothershipAstralRestorationRange">
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="Create"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="Destroy"/>`
+        <Range value="9.100000"/>
+    </CActorRange>
+    <CActorModel id="AP_AstralRestoration">
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="Create"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="Destroy"/>
+        <On Terms="ActorCreation" Send="$Birth PlayForever,ForceLooping"/>
+        <On Terms="ActorCreation" Send="SetOpacity 0.450000"/>    
+        <On Terms="ActorOrphan" Send="Destroy"/>
+        <Model value="AP_AstralRestoration"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachCenter"/>
+    </CActorModel>
+    <CActorSound id="AP_AstralRestorationSound" parent="SoundContinuous">
+        <Sound value="AP_AstralRestorationLaunch"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="Create"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="Destroy"/>
+    </CActorSound>
+    <CActorModel id="AP_PurifierMothershipAttackSpeedBoost" parent="ModelAnimationStyleContinuous">
+        <Inherits index="Visibility" value="1"/>
+        <On Terms="Behavior.AP_PurifierMothershipAttackSpeedBoostAura.On" Send="Create"/>
+        <On Terms="Behavior.AP_PurifierMothershipAttackSpeedBoostAura.On" Send="SetScale 1.40000"/>
+        <On Terms="ActorCreation" Send="$Stand PlayForever,ForceLooping"/>
+        <On Terms="Behavior.AP_PurifierMothershipAttackSpeedBoostAura.Off" Send="Destroy"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachCenter"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorModel>
+    <CActorModel id="AP_TaldarimMothershipGroundSlowAura" parent="ModelAnimationStyleContinuous">
+        <Inherits index="Visibility" value="1"/>
+        <On Terms="Behavior.AP_TaldarimMothershipGroundSlowAura.On" Send="Create"/>
+        <On Terms="Behavior.AP_TaldarimMothershipGroundSlowAura.On" Send="SetScale 1.40000"/>
+        <On Terms="ActorCreation" Send="$Stand PlayForever,ForceLooping"/>
+        <On Terms="Behavior.AP_TaldarimMothershipGroundSlowAura.Off" Send="Destroy"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachCenter"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorModel>
+    <CActorModel id="AP_PurifierMothershipShielding" parent="ModelAnimationStyleContinuous">
+        <Inherits index="Visibility" value="1"/>
+        <On Terms="Behavior.AP_PurifierMothershipShielding.On" Send="Create"/>
+        <On Terms="Behavior.AP_PurifierMothershipShielding.Off" Send="Destroy"/>
+        <On Terms="ActorCreation; ValidateUnit AP_IsAPPhotonCannon" Send="SetScale 0.36"/>
+        <On Terms="ActorCreation; ValidateUnit AP_IsKhaydarinMonolith" Send="SetScale 0.54"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachCenter AP_PurifierMothershipShieldingOffset"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorModel>
+    <CActorModel id="AP_OverloadWeaponSystems" parent="ModelAnimationStyleContinuous">
+        <On Terms="Behavior.AP_OverloadWeaponSystems.On" Send="Create"/>
+        <On Terms="Behavior.AP_OverloadWeaponSystems.Off" Send="Destroy"/>
+        <On Terms="Behavior.AP_OverloadWeaponSystems.On" Send="SetTintColor {255,165,0 10.000000}"/>
+        <On Terms="Behavior.AP_OverloadWeaponSystems.On" Send="SetScale 0.700000"/>
+        <On Terms="ActorOrphan" Send="Destroy"/>
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachCenter AP_OverloadWeaponSystemsOffset"/>
+    </CActorModel>
+    <CActorSiteOpLocalOffset id="AP_OverloadWeaponSystemsOffset">
+        <LocalOffset value="0.000000,0.000000,0.500000"/>
+    </CActorSiteOpLocalOffset>
+    <CActorSiteOpLocalOffset id="AP_PurifierMothershipShieldingOffset">
+        <LocalOffset value="0.000000,0.000000,-0.950000"/>
+    </CActorSiteOpLocalOffset>
+    <CActorModel id="AP_TimeFieldAiurModel" parent="ModelAnimationStyleContinuous">
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Start" Send="SetScale 1.5000"/>
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="ActorCreation" Send="SetTintColor {30,70,255 2.000000}"/>
+        <HostSiteOps Ops="SOpShadow"/>
+        <Macros value="GlobalLoopMacro"/>
+        <Inherits index="TeamColor" value="1"/>
+        <HostForProps Subject="_Unit" Scope="Caster" Actor="Find"/>
+    </CActorModel>
+    <CActorModel id="AP_TimeFieldPurifierModel">
+        <On Terms="ActorCreation" Send="AnimBracketStart SSD Spell Stand Death"/>
+        <On Terms="ActorOrphan" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Start" Send="SetScale 1.2200"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Stop" Send="AnimBracketStop SSD"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Start" Send="SetScale 0.84800"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Stop" Send="AnimBracketStop SSD"/>
+        <On Terms="ActorCreation" Send="SetTintColor {110,255,10 2.000000}"/>
+        <On Terms="AnimBracketState.*.AfterClosing; !AnimBracketExitReason ModelSwap; AnimName SSD" Send="Destroy"/>
+        <HostSiteOps Ops="SOpShadow"/>
+        <Macros value="GlobalLoopMacro"/>
+        <Inherits index="TeamColor" value="1"/>
+        <HostForProps Subject="_Unit" Scope="Caster" Actor="Find"/>
+    </CActorModel>
+    <CActorModel id="AP_TimeFieldTaldarimModel">
+        <On Terms="ActorCreation" Send="AnimBracketStart SSD Spell Stand Death"/>
+        <On Terms="ActorOrphan" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Start" Send="SetScale 1.31100"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Stop" Send="AnimBracketStop SSD"/>
+        <On Terms="AnimBracketState.*.AfterClosing; !AnimBracketExitReason ModelSwap; AnimName SSD" Send="Destroy"/>
+        <HostSiteOps Ops="SOpShadow"/>
+        <Macros value="GlobalLoopMacro"/>
+        <Inherits index="TeamColor" value="1"/>
+        <HostForProps Subject="_Unit" Scope="Caster" Actor="Find"/>
+    </CActorModel>
+    <CActorRange id="AP_TimeFieldAiurRange">
+        <EditorCategories value=""/>
+        <On Terms="Abil.AP_TimeFieldAiur.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_TimeFieldAiur.TargetOff" Send="Destroy"/>
+        <Abil Link="AP_TimeFieldAiur"/>
+        <IconArcLength value="3.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorRange id="AP_TimeFieldPurifierRange">
+        <EditorCategories value=""/>
+        <On Terms="Abil.AP_TimeFieldPurifier.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_TimeFieldPurifier.TargetOff" Send="Destroy"/>
+        <Abil Link="AP_TimeFieldPurifier"/>
+        <IconArcLength value="3.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorRange id="AP_TimeFieldAiurCoreRange">
+        <EditorCategories value=""/>
+        <On Terms="Abil.AP_TimeFieldAiurCore.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_TimeFieldAiurCore.TargetOff" Send="Destroy"/>
+        <Abil Link="AP_TimeFieldAiurCore"/>
+        <IconArcLength value="3.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorRange id="AP_TimeFieldPurifierCoreRange">
+        <EditorCategories value=""/>
+        <On Terms="Abil.AP_TimeFieldPurifierCore.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_TimeFieldPurifierCore.TargetOff" Send="Destroy"/>
+        <Abil Link="AP_TimeFieldPurifierCore"/>
+        <IconArcLength value="3.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorRange id="AP_TimeFieldTaldarimRange">
+        <EditorCategories value=""/>
+        <On Terms="Abil.AP_TimeFieldTaldarim.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_TimeFieldTaldarim.TargetOff" Send="Destroy"/>
+        <Abil Link="AP_TimeFieldTaldarim"/>
+        <IconArcLength value="3.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorSound id="AP_TimeFieldLoop" parent="SoundContinuous">
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Stop" Send="Destroy"/>
+        <Sound value="Mothership_TimeWarpLoop"/>
+    </CActorSound>
+    <CActorSound id="AP_TimeFieldLaunch" parent="SoundOneShot">
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Start" Send="Create"/>
+        <Sound value="Mothership_TimeWarpLaunch"/>
+    </CActorSound>
+    <CActorSound id="AP_TimeFieldEnd" parent="SoundOneShot">
+        <On Terms="Effect.AP_TimeFieldAiurCreatePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldAiurCoreCreatePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCreatePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldPurifierCoreCreatePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_TimeFieldTaldarimCreatePersistent.Stop" Send="Create"/>
+        <Sound value="Mothership_TimeWarpEnd"/>
+    </CActorSound>
+    <CActorModel id="AP_TimeFieldAiurImpactModel" parent="ModelAnimationStyleOneShot">
+        <Terms value="Cap 1"/>
+        <Inherits index="CloakEffect" value="1"/>
+        <On Terms="Behavior.AP_TimeFieldAiur.On" Send="Create"/>
+        <On Terms="Behavior.AP_TimeFieldAiurCore.On" Send="Create"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+        <AutoScaleFactor value="1.000000"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+    </CActorModel>
+    <CActorModel id="AP_TimeFieldTaldarimImpactModel" parent="ModelAnimationStyleOneShot">
+        <Terms value="Cap 1"/>
+        <Inherits index="CloakEffect" value="1"/>
+        <On Terms="Behavior.AP_TimeFieldTaldarim.On" Send="Create"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+        <AutoScaleFactor value="1.000000"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+    </CActorModel>
+    <CActorRange id="AP_MothershipCoreNexusRecallRange">
+        <On Terms="Abil.AP_MothershipCoreNexusRecall.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_MothershipCoreNexusRecall.TargetOff" Send="Destroy"/>
+        <Range value="7.500000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorRange id="AP_MothershipNexusRecallRange">
+        <On Terms="Abil.AP_MothershipNexusRecall.TargetOn" Send="Create"/>
+        <On Terms="Abil.AP_MothershipNexusRecall.TargetOff" Send="Destroy"/>
+        <Range value="7.250000"/>
+        <Icon value="Assets\Textures\radaricon2.dds"/>
+    </CActorRange>
+    <CActorSplat id="AP_MothershipCoreNexusRecallCursorSplat">
+        <Remove Terms="Abil.AP_MothershipCoreNexusRecall.Cursor" Send="Create"/>
+    </CActorSplat>
+    <CActorAction id="AP_MothershipCoreAttack" parent="GenericAttack" effectImpact="AP_MothershipCoreRepulsorCannonDamage" effectLaunch="AP_MothershipCorePlasmaDisruptorLaunchMissile">
+        <LaunchAssets Sound="PhotonCannon_AttackLaunch"/>
+        <ImpactMap index="None" Sound="PhotonCannon_AttackImpact"/>
+        <ImpactMap index="Flesh" ModelReaction="BloodTargetImpact"/>
+    </CActorAction>
+    <CEffectLaunchMissile id="AP_MothershipCorePlasmaDisruptorLaunchMissile">
+        <ValidatorArray index="0" value="PhotonCannonTargetFilters"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactEffect value="AP_MothershipCoreRepulsorCannonDamage"/>
+        <AmmoUnit value="AP_RepulsorCannonWeapon"/>
+    </CEffectLaunchMissile>
+    <CActorMissile id="AP_MothershipCoreAttackMissile" parent="GenericAttackMissile" unitName="AP_RepulsorCannonWeapon">
+        <On Terms="UnitBirth" Send="AnimSetTimeScaleAbsolute Lifetime 1.000000"/>
+        <Model value="AP_MothershipCoreWeapon"/>
+    </CActorMissile>
+    <CActorSound id="AP_MothershipPhotonOverchargeCastSound" parent="SoundOneShot">
+        <On Terms="Behavior.AP_PhotonOvercharge.On" Send="Create"/>
+        <Sound value="AP_MothershipCorePhotonOverchargeActivate"/>
+    </CActorSound>
     <CActorForceSphere id="AP_WarhoundMissileAttackForce">
         <Host Subject="_ImpactGuide"/>
         <HostSiteOps Ops="SOpMoveDownByDot25 SOpRandomPointInSphereDot25"/>
@@ -23341,6 +23805,12 @@
     <CActorSplat id="AP_TemplarArchivesSplat" parent="GenericUnitSplat" unitName="AP_TemplarArchive">
         <Model value="TemplarArchiveSplat"/>
     </CActorSplat>
+    <CActorModel id="AP_MothershipCoreBeaconLight" parent="ModelAnimationStyleContinuous">
+        <On Terms="Abil.AP_NexusTrainMothershipCore.Start" Send="Create"/>
+        <On Terms="Abil.AP_NexusTrainMothershipCore.Stop" Send="Destroy"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+    </CActorModel>
     <CActorRange id="AP_SOARadarNexusRange">
         <FogVisibility value="Visible"/>
         <On Terms="Behavior.AP_SOARadar.On" Send="Create"/>
@@ -23369,7 +23839,7 @@
     </CActorSound>
     <CActorMissile id="AP_MothershipCoreWeaponAttackMissile" parent="GenericAttackMissile" unitName="AP_MothershipCoreWeaponWeapon">
         <On Terms="UnitBirth" Send="AnimSetTimeScaleAbsolute Lifetime 1.000000"/>
-        <Model value="MothershipCoreWeaponWeapon"/>
+        <Model value="AP_MothershipCoreWeaponWeapon"/>
     </CActorMissile>
     <CActorAction id="AP_MothershipCoreWeaponAttack" parent="GenericAttack" effectImpact="AP_MothershipCoreWeaponDamage" effectLaunch="AP_MothershipCoreWeaponLM">
         <ImpactMap index="None" Sound=""/>
@@ -23380,7 +23850,7 @@
         <ImpactPhysics Name="PurifyImpact" MatchKeys="Basic" Physics="AP_MothershipCoreAttackForce"/>
     </CActorAction>
     <CActorSiteOpLocalOffset id="AP_MothershipCoreWeaponAttackOffset">
-        <LocalOffset value="-0.700000,0.000000,3.700000"/>
+        <LocalOffset value="-0.300000,0.000000,3.500000"/>
     </CActorSiteOpLocalOffset>
     <CActorForceSphere id="AP_MothershipCoreAttackSecondaryForce">
         <HostSiteOps Ops="SOpIncomingMissile SOpRandomPointInSphereDot25"/>
@@ -23693,7 +24163,9 @@
         <HostOffset Subject="AP_SpineCrawler" Scope="Caster"/>
         <HostOffsetSiteOps Ops="SOpAttachWeaponSoft"/>
     </CActorSiteOpHostedOffset>
-    <CActorRange id="AP_SOAMothershipBlinkRange" parent="RangeAbil" abil="AP_SOAMothershipBlink"/>
+    <CActorRange id="AP_SOAMothershipBlinkRange" parent="RangeAbil" abil="AP_SOAMothershipBlink">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+    </CActorRange>
     <CActorModel id="AP_ProtossGuideVisualQuadRedLaunch" parent="GuideVisualQuadModel">
         <Model value="ProtossGuideVisualQuadRedLaunch"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
@@ -23833,21 +24305,8 @@
         <!--        <On Terms="Abil.Vortex.SourceCastStart" Send="$Spell"/>-->
         <On Terms="Effect.AP_SOAMothershipBlinkCP.Start" Send="SetOpacity 0.050000 0.375000"/>
         <On Terms="Effect.AP_SOAMothershipBlinkTeleport.Stop" Send="SetOpacity 1.000000 0.625000"/>
-        <!--        <On Terms="Abil.MassRecall.SourceCastStart" Send="$Spell"/>-->
-        <!--        <On Terms="Effect.MothershipMassRecallTeleport.Start" Send="CombatRevealClearTimers"/>-->
         <On Terms="UnitHeightUpdate.*.Land" Send="Create AP_Mothership_Land"/>
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="SetScale 0.010000"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="SetScale 1.000000 0.500000"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create MothershipCoreTeleportIn"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create MothershipCore_UpgradeToMothershipEnd"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create MothershipCore_UpgradeToMothershipEnd2"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create MothershipCore_UpgradeToMothershipEnd3"/>-->
-        <!--        <On Terms="AbilMorph.*.Finish; MorphFrom MothershipCore" Send="Create MothershipCore_UpgradeToMothershipEndHit"/>-->
-        <!--        <On Terms="Abil.MothershipCoreTeleport.SourceCastStart" Send="SetScale 0.010000 0.500000"/>-->
-        <!--        <On Terms="Abil.MothershipCoreTeleport.SourceCastStart" Send="Create MothershipCoreTeleportOut"/>-->
-        <!--        <On Terms="Abil.MothershipCoreTeleport.SourceFinishStart" Send="Create MothershipCoreTeleportIn"/>-->
-        <!--        <On Terms="Abil.MothershipCoreTeleport.SourceCastStart" Send="TimerSet 0.500000 ShrinkDelay"/>-->
+        <On Terms="Abil.AP_SummonDeathFleet.SourceCastStart" Send="$Spell"/>
         <On Terms="TimerExpired; TimerName ShrinkDelay" Target="::Main" Send="SetScale 1.000000 0.500000"/>
         <On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_MothershipTaldarimWarpInStargateBig"/>
         <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
@@ -23893,7 +24352,7 @@
         <BarWidth value="216"/>
         <GlossaryAnim value="GLstand"/>
         <GroupIcon>
-            <Image value="Assets\Textures\Wireframe-Protoss-Mothership.dds"/>
+            <Image value="Assets\Textures\wireframe-protoss-mothership-taldarim.dds"/>
         </GroupIcon>
         <GroupSoundArray index="What" value="Mothership_GroupWhat"/>
         <GroupSoundArray index="Yes" value="Mothership_GroupYes"/>
@@ -23924,6 +24383,469 @@
             <Image value="Assets\Textures\Wireframe-Protoss-Mothership-taldarim-Shield03.dds"/>
         </WireframeShield>
     </CActorUnit>
+    <CActorUnit id="AP_MothershipPurifier" parent="GenericUnitBase" unitName="AP_MothershipPurifier">
+        <Aliases value="_UnitHuge"/>
+        <Macros value="TerrainSquibAnimations"/>
+        <Macros value="PhysicsDeathsSwarmAir"/>
+        <Macros value="PhysicsDeathsVoidAir"/>
+        <On Terms="Effect.AP_SOAMothershipBlinkCP.Start" Send="SetOpacity 0.050000 0.375000"/>
+        <On Terms="Effect.AP_SOAMothershipBlinkTeleport.Stop" Send="SetOpacity 1.000000 0.625000"/>
+        <On Terms="UnitBirth.AP_MothershipPurifierPowerSource" Send="Create"/>
+        <On Terms="UnitHeightUpdate.*.Land" Send="Create AP_Mothership_Land"/>
+        <On Terms="Behavior.AP_PlanetCracker.On" Send="AnimBracketStart AR Stand,Work,Start Stand,Work Stand,Work,End"/>
+        <On Terms="Behavior.AP_PlanetCracker.Off" Send="AnimBracketStop AR"/>        
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="SetScale 0.010000"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="SetScale 1.000000 0.500000"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create AP_MothershipCoreTeleportIn"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create AP_MothershipCoreUpgradeToMothershipEnd"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create AP_MothershipCoreUpgradeToMothershipEnd2"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create AP_MothershipCoreUpgradeToMothershipEnd3"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Create AP_MothershipCoreUpgradeToMothershipEndHit"/>
+        <On Terms="Abil.AP_PowerRedirectionUpgrade.SourceCastStart" Send="$Spell"/>
+        <On Terms="Abil.AP_PlanetCracker.SourcePrepStart" Send="$Spell"/>
+        <On Terms="Abil.AP_PlanetCracker.SourceCastStart" Send="SetScale 0.100000 0.400000"/>
+        <On Terms="Abil.AP_PlanetCracker.SourceCastStop" Send="SetScale 1.000000 0.400000"/>
+        <On Terms="TimerExpired; TimerName ShrinkDelay" Target="::Main" Send="SetScale 1.000000 0.500000"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_MothershipTaldarimWarpInStargateBig"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
+        <On Terms="AnimDone; AnimName Spell" Send="ModelSwap AP_PurifierMothership"/>
+        <On Terms="AnimDone; AnimName Spell" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
+        <On Terms="AnimDone; AnimName Spell" Send="AnimClear Spell"/>
+        <Model value="AP_PurifierMothership"/>
+        <Baselines index="Walk" AnimProps="Walk,01"/>
+        <BuildModel value="AP_MotherShipTaldarimWarpIn"/>
+        <DeathArray index="Normal" ModelLink="AP_PurifierMothershipDeath" SoundLink="AP_Mothership_Explode" VoiceLink=""/>
+        <DeathCustoms>
+            <ActorModel value="AP_MothershipDeathRagdoll"/>
+            <ModelLink value="AP_MothershipDeathRagdoll"/>
+            <Name value="RagdollBasic"/>
+            <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+            <BodySquibs Name="BasicHeavy" Model="ProtossLargeRobotSquibDeathRagdoll"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollNuke" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="FireHeavy"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollFire" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="FireHeavy"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollAcid" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Acid"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
+        <DeathActorModel value="AP_PurifierMothershipDeathModel"/>
+        <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+        <PlacementModel value="AP_MothershipTaldarimPlacement"/>
+        <PortraitModel value="AP_MothershipPurifierPortrait"/>
+        <TerrainSquibs>
+            <MovementDistance value="0.150000,0.150000"/>
+            <IdlePeriod value="0.250000,0.500000"/>
+            <RangeDown value="5.000000"/>
+            <RangeDownFade value="1.000000"/>
+            <AttachQuery Methods="AMFilterCenter"/>
+            <Visuals TerrainPhysicsMaterial="Water" ActorModel="TerrainSquibHarnessContinuous" ModelLink="WaterRippleMassive3"/>
+        </TerrainSquibs>
+        <BarOffset value="180"/>
+        <BarWidth value="216"/>
+        <GlossaryAnim value="GLstand"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\wireframe-collection-purifier-mothership.dds"/>
+        </GroupIcon>
+        <GroupSoundArray index="What" value="Mothership_GroupWhat"/>
+        <GroupSoundArray index="Yes" value="Mothership_GroupYes"/>
+        <GroupSoundArray index="Attack" value="Mothership_GroupAttack"/>
+        <GroupSoundArray index="Board" value="Mothership_GroupBoard"/>
+        <HeroIcon value="Assets\Textures\btn-unit-collection-purifier-mothership.dds"/>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <NameOffset value="130"/>
+        <SoundArray index="Ready" value="AP_SelendisReady"/>
+        <SoundArray index="Help" value="AP_SelendisHelp"/>
+        <SoundArray index="What" value="AP_SelendisWhat"/>
+        <SoundArray index="Yes" value="AP_SelendisYes"/>
+        <SoundArray index="Attack" value="AP_SelendisAttack"/>
+        <SoundArray index="Pissed" value="AP_SelendisPissed"/>
+        <SoundArray index="Movement" value="AP_SelendisMoveStart"/>
+        <SoundArray index="Turning" value="AP_SelendisTurning"/>
+        <SoundArray index="Board" value="AP_SelendisBoard"/>
+        <SoundArray index="Click" value="AP_SelendisClick"/>
+        <SoundArray index="ClickError" value="AP_SelendisClickError"/>
+        <SoundArray index="Highlight" value="AP_SelendisHighlight"/>
+        <AbilSoundArray AbilCmd="AP_PlanetCracker,Execute" Sound="AP_SelendisAttack"/>
+        <UnitIcon value="Assets\Textures\btn-unit-collection-purifier-mothership.dds"/>
+        <Wireframe>
+            <Image value="Assets\Textures\wireframe-collection-purifier-mothership.dds"/>
+        </Wireframe>
+        <WireframeShield>
+            <Image value="Assets\Textures\wireframe-collection-purifier-mothership-shield01.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-purifier-mothership-shield02.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-purifier-mothership-shield03.dds"/>
+        </WireframeShield>
+    </CActorUnit>
+    <CActorUnit id="AP_MothershipAiur" parent="GenericUnitBase" unitName="AP_MothershipAiur">
+        <Aliases value="_UnitHuge"/>
+        <Macros value="TerrainSquibAnimations"/>
+        <Macros value="PhysicsDeathsSwarmAir"/>
+        <Macros value="PhysicsDeathsVoidAir"/>
+        <On Terms="Effect.AP_SOAMothershipBlinkCP.Start" Send="SetOpacity 0.050000 0.375000"/>
+        <On Terms="Effect.AP_SOAMothershipBlinkTeleport.Stop" Send="SetOpacity 1.000000 0.625000"/>
+        <On Terms="UnitHeightUpdate.*.Land" Send="Create AP_Mothership_Land"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.On" Send="AnimBracketStart AR Stand,Work,Start Stand,Work Stand,Work,End"/>
+        <On Terms="Behavior.AP_AstralRestorationCaster.Off" Send="AnimBracketStop AR"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="SetScale 0.010000"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="SetScale 1.000000 0.500000"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create AP_MothershipCoreTeleportIn"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create AP_MothershipCoreUpgradeToMothershipEnd"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create AP_MothershipCoreUpgradeToMothershipEnd2"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create AP_MothershipCoreUpgradeToMothershipEnd3"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Create AP_MothershipCoreUpgradeToMothershipEndHit"/>
+        <On Terms="Abil.AP_BatteryOverchargeUpgrade.SourceCastStart" Send="$Spell"/>
+        <On Terms="TimerExpired; TimerName ShrinkDelay" Target="::Main" Send="SetScale 1.000000 0.500000"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur; ValidatePlayer AP_HaveAiurMothershipEnergyRegenAura" Send="ModelSwap AP_AiurMothershipUpgrade"/>
+        <On Terms="UnitBirth; ValidatePlayer AP_HaveAiurMothershipEnergyRegenAura" Send="ModelSwap AP_AiurMothershipUpgrade"/>
+        <On Terms="Upgrade.AP_AiurMothershipEnergyRegenAura.Add" Send="ModelSwap AP_AiurMothershipUpgrade"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_MothershipTaldarimWarpInStargateBig"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
+        <On Terms="AnimDone; AnimName Spell" Send="ModelSwap AP_AiurMothership"/>
+        <On Terms="AnimDone; AnimName Spell" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
+        <On Terms="AnimDone; AnimName Spell" Send="AnimClear Spell"/>
+        <On Terms="UnitDeathCustomize; ValidatePlayer AP_HaveAiurMothershipEnergyRegenAura" Send="DeathCustomize Unity"/>
+        <Model value="AP_AiurMothership"/>
+        <Baselines index="Walk" AnimProps="Walk,01"/>
+        <BuildModel value="AP_MotherShipTaldarimWarpIn"/>
+        <DeathArray index="Normal" ModelLink="AP_AiurMothershipDeath" SoundLink="AP_Mothership_Explode" VoiceLink=""/>
+        <DeathCustoms>
+            <ActorModel value="AP_MothershipDeathRagdoll"/>
+            <ModelLink value="AP_MothershipDeathRagdoll"/>
+            <Name value="RagdollBasic"/>
+            <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+            <BodySquibs Name="BasicHeavy" Model="ProtossLargeRobotSquibDeathRagdoll"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollNuke" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="FireHeavy"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollFire" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="FireHeavy"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollAcid" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Acid"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms ModelLink="AP_AiurMothershipUpgradeDeath" SoundLink="AP_Mothership_Explode" Name="Unity"/>
+        <DeathActorModel value="AP_AiurMothershipDeathModel"/>
+        <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+        <PlacementModel value="AP_MothershipTaldarimPlacement"/>
+        <PortraitModel value="AP_MothershipAiurPortrait"/>
+        <TerrainSquibs>
+            <MovementDistance value="0.150000,0.150000"/>
+            <IdlePeriod value="0.250000,0.500000"/>
+            <RangeDown value="5.000000"/>
+            <RangeDownFade value="1.000000"/>
+            <AttachQuery Methods="AMFilterCenter"/>
+            <Visuals TerrainPhysicsMaterial="Water" ActorModel="TerrainSquibHarnessContinuous" ModelLink="WaterRippleMassive3"/>
+        </TerrainSquibs>
+        <BarOffset value="180"/>
+        <BarWidth value="216"/>
+        <GlossaryAnim value="GLstand"/>
+        <GroupIcon>
+            <Image value="Assets\Textures\wireframe-protoss-mothership.dds"/>
+        </GroupIcon>
+        <GroupSoundArray index="What" value="Mothership_GroupWhat"/>
+        <GroupSoundArray index="Yes" value="Mothership_GroupYes"/>
+        <GroupSoundArray index="Attack" value="Mothership_GroupAttack"/>
+        <GroupSoundArray index="Board" value="Mothership_GroupBoard"/>
+        <HeroIcon value="Assets\Textures\btn-unit-collection-purifier-mothership.dds"/>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <NameOffset value="130"/>
+        <SoundArray index="Birth" value="Mothership_Birth"/>
+        <SoundArray index="Ready" value="Mothership_Ready"/>
+        <SoundArray index="Help" value="Mothership_Help"/>
+        <SoundArray index="What" value="Mothership_What"/>
+        <SoundArray index="Yes" value="Mothership_Yes"/>
+        <SoundArray index="Attack" value="Mothership_Attack"/>
+        <SoundArray index="Pissed" value="Mothership_Pissed"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-mothership.dds"/>
+        <Wireframe>
+            <Image value="Assets\Textures\wireframe-protoss-mothership.dds"/>
+        </Wireframe>
+        <WireframeShield>
+            <Image value="Assets\Textures\wireframe-protoss-mothership-shield01.dds"/>
+            <Image value="Assets\Textures\wireframe-protoss-mothership-shield02.dds"/>
+            <Image value="Assets\Textures\wireframe-protoss-mothership-shield03.dds"/>
+        </WireframeShield>
+    </CActorUnit>
+    <CActorUnit id="AP_MothershipCoreAiur" parent="GenericUnitStandard" unitName="AP_MothershipCoreAiur">
+        <Macros value="PhysicsDeathsVoidAir"/>
+        <DeathArray index="Normal" AnimProps="Death,A" ModelLink="" SoundLink="Mothership_Explode"/>
+        <DeathActorModel value="UnitDeathModelWithDeathMotionFlier"/>
+        <Model value="AP_MothershipCoreAiur"/>
+        <BuildModel value="AP_MothershipCoreTeleportIn"/>
+        <PortraitModel value="AP_MothershipAiurPortrait"/>
+        <On Terms="Behavior.AP_MothershipCoreWeapon.On" Send="AnimGroupApply Work Stand,Work,Start Stand,Work,End"/>
+        <On Terms="Behavior.AP_MothershipCoreWeapon.Off" Send="AnimGroupRemove Work"/>
+        <On Terms="Abil.AP_MothershipCoreNexusRecall.SourceCastStart" Send="$Spell"/>
+        <On Terms="Abil.AP_TimeField.SourceCastStart" Send="$Spell"/>
+        <On Terms="UnitBirth.AP_MothershipCoreAiur.Normal" Send="AnimPlay MorphStart Morph,End,A"/>
+        <On Terms="AbilMorph.*.Delay; MorphFrom AP_MothershipCoreAiur" Send="TimerSet 99.000000 DelayWarpOut"/>
+        <On Terms="TimerExpired; TimerName DelayWarpOut" Send="AnimPlay Morph Stand,Morph,Start PlayForever,NonLooping"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCoreAiur" Send="AnimClear Morph"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCoreAiur" Send="TimerKill DelayWarpOut"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCoreAiur" Target="AP_MothershipCoreMorphAddition" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Target="AP_MothershipCoreMorphAddition" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCoreAiur" Send="Destroy"/>
+        <On Terms="Abil.AP_MorphToMothershipAiur.Start" Send="Create AP_MothershipCoreMorphAddition"/>
+        <On Terms="Abil.AP_MorphToMothershipAiur.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart"/>
+        <On Terms="Abil.AP_MorphToMothershipAiur.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart2"/>
+        <On Terms="Abil.AP_MorphToMothershipAiur.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart3"/>
+        <On Terms="Abil.AP_MorphToMothershipAiur.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart4"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
+        <On Terms="UnitDeathCustomize; Option Model Low" Send="DeathCustomize Low"/>
+        <On Terms="Effect.AP_MothershipCoreNexusRecallTeleport.Start" Send="CombatRevealClearTimers"/>
+        <On Terms="UnitDeathCustomize; ValidateUnit AP_HasMothershipCoreRecalling" Send="ClearTintColor 0.600000"/>
+        <On Terms="UnitDeathCustomize; ValidateUnit AP_HasMothershipCoreRecalling" Send="ClearOpacity"/>
+        <DeathCustoms AnimProps="Death,B" SoundLink="Mothership_Explode" Name="Variation0"/>
+        <DeathCustoms ModelLink="ProtossMediumUnitDeathLow" Name="Low"/>
+        <DeathCustoms ActorModel="AP_MothershipCoreDeathRagdollFlier" Name="RagdollBasic" PhysicsMatchKeysOrdered="BasicAir,Basic">
+            <BodySquibs Name="Basic" Model="ProtossTinyRobotSquibDeathRagdoll"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollNuke" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Fire"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollFire" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Fire"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollAcid" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Acid"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
+        <ModelFlags index="AutomateGlobalLoops" value="0"/>
+        <BarWidth value="90"/>
+        <NameOffset value="130"/>
+        <BarOffset value="125"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-mothershipcore.dds"/>
+        <HeroIcon value="Assets\Textures\btn-unit-protoss-mothershipcore.dds"/>
+        <WireframeShield>
+            <Image value="Assets\Textures\Wireframe-Protoss-mothershipcore-Shield01.dds"/>
+            <Image value="Assets\Textures\Wireframe-Protoss-mothershipcore-Shield02.dds"/>
+            <Image value="Assets\Textures\Wireframe-Protoss-mothershipcore-Shield03.dds"/>
+        </WireframeShield>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-Protoss-mothershipcore.dds"/>
+        </GroupIcon>
+        <Wireframe>
+            <Image value="Assets\Textures\Wireframe-Protoss-mothershipcore.dds"/>
+        </Wireframe>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <SoundArray index="Birth" value="Mothership_Birth"/>
+        <SoundArray index="Ready" value="Mothership_Ready"/>
+        <SoundArray index="Help" value="Mothership_Help"/>
+        <SoundArray index="What" value="Mothership_What"/>
+        <SoundArray index="Yes" value="Mothership_Yes"/>
+        <SoundArray index="Attack" value="Mothership_Attack"/>
+        <SoundArray index="Pissed" value="Mothership_Pissed"/>
+        <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+        <Macros value="PhysicsDeathsSwarmAir"/>
+        <ModelFlags index="OutlineEmitter" value="1"/>
+    </CActorUnit>
+    <CActorUnit id="AP_MothershipCorePurifier" parent="GenericUnitStandard" unitName="AP_MothershipCorePurifier">
+        <Macros value="PhysicsDeathsVoidAir"/>
+        <DeathArray index="Normal" AnimProps="Death,A" ModelLink="" SoundLink="Mothership_Explode"/>
+        <DeathActorModel value="UnitDeathModelWithDeathMotionFlier"/>
+        <Model value="AP_MothershipCorePurifier"/>
+        <BuildModel value="AP_MothershipCoreTeleportIn"/>
+        <PortraitModel value="AP_MothershipPurifierPortrait"/>
+        <On Terms="Behavior.AP_MothershipCoreWeapon.On" Send="AnimGroupApply Work Stand,Work,Start Stand,Work,End"/>
+        <On Terms="Behavior.AP_MothershipCoreWeapon.Off" Send="AnimGroupRemove Work"/>
+        <On Terms="Abil.AP_TimeField.SourceCastStart" Send="$Spell"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Start" Send="AnimBracketStart PR Stand,Work,Start Stand,Work Stand,Work,End"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Stop" Send="AnimBracketStop PR"/>
+        <On Terms="UnitBirth.AP_MothershipCorePurifier.Normal" Send="AnimPlay MorphStart Morph,End,A"/>
+        <On Terms="AbilMorph.*.Delay; MorphFrom AP_MothershipCorePurifier" Send="TimerSet 109.000000 DelayWarpOut"/>
+        <On Terms="TimerExpired; TimerName DelayWarpOut" Send="AnimPlay Morph Stand,Morph,Start PlayForever,NonLooping"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCorePurifier" Send="AnimClear Morph"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCorePurifier" Send="TimerKill DelayWarpOut"/>
+        <On Terms="AbilMorph.*.Cancel; MorphFrom AP_MothershipCorePurifier" Target="AP_MothershipCorePurifierMorphAddition" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Target="AP_MothershipCorePurifierMorphAddition" Send="Destroy"/>
+        <On Terms="AbilMorph.*.Finish; MorphFrom AP_MothershipCorePurifier" Send="Destroy"/>
+        <On Terms="Abil.AP_MorphToMothershipPurifier.Start" Send="Create AP_MothershipCorePurifierMorphAddition"/>
+        <On Terms="Abil.AP_MorphToMothershipPurifier.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart"/>
+        <On Terms="Abil.AP_MorphToMothershipPurifier.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart2"/>
+        <On Terms="Abil.AP_MorphToMothershipPurifier.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart3"/>
+        <On Terms="Abil.AP_MorphToMothershipPurifier.Start" Send="Create AP_MothershipCoreUpgradeToMothershipStart4"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
+        <On Terms="UnitDeathCustomize; Option Model Low" Send="DeathCustomize Low"/>
+        <On Terms="Effect.AP_MothershipCoreNexusRecallTeleport.Start" Send="CombatRevealClearTimers"/>
+        <On Terms="UnitDeathCustomize; ValidateUnit AP_HasMothershipCoreRecalling" Send="ClearTintColor 0.600000"/>
+        <On Terms="UnitDeathCustomize; ValidateUnit AP_HasMothershipCoreRecalling" Send="ClearOpacity"/>
+        <DeathCustoms AnimProps="Death,B" SoundLink="Mothership_Explode" Name="Variation0"/>
+        <DeathCustoms ModelLink="ProtossMediumUnitDeathLow" Name="Low"/>
+        <DeathCustoms ActorModel="AP_MothershipCoreDeathRagdollFlier" Name="RagdollBasic" PhysicsMatchKeysOrdered="BasicAir,Basic">
+            <BodySquibs Name="Basic" Model="ProtossTinyRobotSquibDeathRagdoll"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollNuke" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Fire"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollFire" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Fire"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollAcid" InheritsFrom="RagdollBasic">
+            <BodySquibs Name="Acid"/>
+        </DeathCustoms>
+        <DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
+        <DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
+        <ModelFlags index="AutomateGlobalLoops" value="0"/>
+        <BarWidth value="90"/>
+        <NameOffset value="130"/>
+        <BarOffset value="125"/>
+        <UnitIcon value="Assets\Textures\btn-unit-collection-purifier-mothershipcore.dds"/>
+        <HeroIcon value="Assets\Textures\btn-unit-collection-purifier-mothershipcore.dds"/>
+        <WireframeShield>
+            <Image value="Assets\Textures\Wireframe-collection-purifier-mothershipcore-Shield01.dds"/>
+            <Image value="Assets\Textures\Wireframe-collection-purifier-mothershipcore-Shield02.dds"/>
+            <Image value="Assets\Textures\Wireframe-collection-purifier-mothershipcore-Shield03.dds"/>
+        </WireframeShield>
+        <GroupIcon>
+            <Image value="Assets\Textures\Wireframe-collection-purifier-mothershipcore.dds"/>
+        </GroupIcon>
+        <Wireframe>
+            <Image value="Assets\Textures\Wireframe-collection-purifier-mothershipcore.dds"/>
+        </Wireframe>
+        <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
+        <SoundArray index="Ready" value="AP_SelendisReady"/>
+        <SoundArray index="Help" value="AP_SelendisHelp"/>
+        <SoundArray index="What" value="AP_SelendisWhat"/>
+        <SoundArray index="Yes" value="AP_SelendisYes"/>
+        <SoundArray index="Attack" value="AP_SelendisAttack"/>
+        <SoundArray index="Pissed" value="AP_SelendisPissed"/>
+        <SoundArray index="Movement" value="AP_SelendisMoveStart"/>
+        <SoundArray index="Turning" value="AP_SelendisTurning"/>
+        <SoundArray index="Board" value="AP_SelendisBoard"/>
+        <SoundArray index="Click" value="AP_SelendisClick"/>
+        <SoundArray index="ClickError" value="AP_SelendisClickError"/>
+        <SoundArray index="Highlight" value="AP_SelendisHighlight"/>
+        <PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
+        <Macros value="PhysicsDeathsSwarmAir"/>
+        <ModelFlags index="OutlineEmitter" value="1"/>
+    </CActorUnit>
+    <CActorBeamSimple id="AP_MothershipCorePurifierAttackBeam">
+        <Terms value="Cap 1"/>
+        <On Terms="ActorCreation" Send="Create AP_MothershipCorePurifierAttackBeamImpact"/>
+        <On Terms="ActorCreation" Send="Create AP_MothershipCorePurifierAttackLaunchSound"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart BSD Birth Stand Death"/>
+        <On Terms="Signal.*.Arrival" Send="AnimBracketStop BSD"/>
+        <On Terms="AnimBracketState.*.AfterOpening; AnimName BSD" Target="AP_MothershipCorePurifierAttackImpactSite" Send="MoverMove"/>
+        <On Terms="AnimBracketState.*.AfterClosing; AnimName BSD" Send="Destroy"/>
+        <On Terms="Effect.AP_MothershipCorePurifierWeaponSearch.Impact" Send="Create"/>
+        <HostLaunch Subject="AP_MothershipCorePurifierAttackLaunchSite" Scope="Caster" Actor="Create"/>
+        <HostImpact Subject="AP_MothershipCorePurifierAttackImpactSite"/>
+    </CActorBeamSimple>
+    <CActorModel id="AP_MothershipCorePurifierAttackBeamImpact">
+        <Supporter Subject="::Creator"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart BSD Birth Stand Death"/>
+        <On Terms="ActorCreation" Send="Create AP_MothershipCorePurifierAttackImpactSound"/>
+        <On Terms="SupporterDestruction" Send="AnimBracketStop BSD"/>
+        <On Terms="AnimBracketState.*.AfterClosing; AnimName BSD" Send="Destroy"/>
+        <Host Subject="AP_MothershipCorePurifierAttackImpactSite"/>
+        <Model value="ColossusAttackBeamImpact"/>
+    </CActorModel>
+    <CActorSiteMover id="AP_MothershipCorePurifierAttackImpactSite">
+        <Terms value="Cap 1"/>
+        <Sharing value="PerEffectTree"/>
+        <On Terms="Effect.AP_MothershipCorePurifierWeaponSearch.Impact" Send="Create"/>
+        <On Terms="Effect.AP_MothershipCorePurifierWeaponSearch.Impact; At Effect" Send="MoverSetDestination2D"/>
+        <On Terms="MoverArrived" Target="AP_MothershipCorePurifierAttackBeam" Send="Signal Arrival"/>
+        <HostSiteOps Ops="SOpShadow"/>
+        <Acceleration value="40.000000"/>
+        <Deceleration value="40.000000"/>
+        <Speed value="2.000000"/>
+        <SpeedMax value="4.100000"/>
+    </CActorSiteMover>
+    <CActorSite id="AP_MothershipCorePurifierAttackLaunchSite" parent="SiteUNIT">
+        <Aliases value="_LaunchGuide"/>
+        <HostSiteOps Ops="SOpAttachWeapon"/>
+    </CActorSite>
+    <CActorSound id="AP_MothershipCorePurifierAttackImpactSound" parent="SoundOneShot">
+        <Host Subject="::Creator"/>
+        <Sound value="Colossus_AttackImpact"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCorePurifierAttackLaunchSound" parent="SoundOneShot">
+        <Host Subject="AP_MothershipCorePurifier"/>
+        <Sound value="Colossus_AttackLaunch"/>
+    </CActorSound>
+    <CActorModel id="AP_MothershipCoreTeleportIn" parent="ModelAnimationStyleOneShot">
+        <Host Subject="_Selectable"/>
+        <HostSiteOps Ops="SOpAttachOriginStationary"/>
+    </CActorModel>
+    <CActorModel id="AP_MothershipCoreDeathRagdollFlier" parent="UnitDeathModel">
+        <HostSiteOps Ops="SOpAttachOrigin SOpDeathMotionFlier"/>
+    </CActorModel>
+    <CActorTurret id="AP_MothershipCoreTurret">
+        <On Terms="TurretEnable.AP_MothershipCoreTurret" Send="Create"/>
+        <On Terms="AbilMorph.*.Finish" Send="Destroy"/>
+    </CActorTurret>
+    <CActorModel id="AP_MothershipCoreMorphAddition" parent="ModelAnimationStyleContinuous">
+        <On Terms="ActorCreation" Send="AnimBracketStart Work Stand,Work,Start Stand,Work Stand,Work,End"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachCenter"/>
+        <ModelFlags index="AllowHitTest" value="0"/>
+    </CActorModel>
+    <CActorModel id="AP_MothershipCorePurifierMorphAddition" parent="AP_MothershipCoreMorphAddition">
+        <Model value="AP_MothershipCorePurifierMorphAddition"/>
+    </CActorModel>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipStart" parent="SoundOneShot">
+        <Sound value="AP_CoreTransform"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipStart2" parent="SoundOneShot">
+        <Sound value="AP_CoreTransform2"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipStart3" parent="SoundOneShot">
+        <Sound value="AP_CoreTransform3"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipStart4" parent="SoundOneShot">
+        <Sound value="AP_CoreTransform4"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipEnd" parent="SoundOneShot">
+        <Sound value="AP_CoreTransformEnd"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipEnd2" parent="SoundOneShot">
+        <Sound value="AP_CoreTransformEnd2"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipEnd3" parent="SoundOneShot">
+        <Sound value="AP_CoreTransformEnd3"/>
+    </CActorSound>
+    <CActorSound id="AP_MothershipCoreUpgradeToMothershipEndHit" parent="SoundOneShot">
+        <Sound value="AP_CoreTransformEndHit"/>
+    </CActorSound>
+    <CActorSplat id="AP_AiurMothershipBlackHoleCursorSplat" parent="ProtossCursorSplat" abil="AP_AiurMothershipBlackHole"/>
+    <CActorRange id="AP_AiurMothershipBlackHoleRange" parent="RangeAbil" abil="AP_AiurMothershipBlackHole">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+    </CActorRange>
+    <CActorModel id="AP_AiurMothershipBlackHole" parent="ModelAnimationStyleContinuous">
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="ActorCreation" Send="SetOpacity 0.500000"/>
+        <Model value="VortexModel"/>
+    </CActorModel>
+    <CActorModel id="AP_PurifierMothershipBlackHole" parent="ModelAnimationStyleContinuous">
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="ActorCreation" Send="SetTintColor {255,110,10 3.000000}"/>
+        <On Terms="ActorCreation" Send="SetOpacity 0.500000"/>
+        <On Terms="ActorCreation" Send="SetScale 1.16667"/>
+        <Model value="VortexModel"/>
+    </CActorModel>
+    <CActorSplat id="AP_PurifierMothershipBlackHoleCursorSplat" parent="ProtossCursorSplat" abil="AP_PurifierMothershipBlackHole"/>
+    <CActorRange id="AP_PurifierMothershipBlackHoleRange" parent="RangeAbil" abil="AP_PurifierMothershipBlackHole">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+    </CActorRange>
     <CActorModel id="AP_MothershipDeathRagdoll" parent="UnitDeathRagdollFlier">
         <Model value="MothershipDeathRagdoll"/>
         <On Terms="ActorCreation" Send="Create AP_MothershipDeathRagdollDetonationForce"/>
@@ -23941,10 +24863,18 @@
     <CActorSound id="AP_Mothership_Land" parent="SoundOneShot">
         <Sound value="Mothership_Land"/>
     </CActorSound>
+    <CActorModel id="AP_PurifierMothershipDeathModel" parent="UnitDeathModel">
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+    </CActorModel>
+    <CActorModel id="AP_AiurMothershipDeathModel" parent="UnitDeathModel">
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+    </CActorModel>
     <CActorAction id="AP_SOAMothershipv4Attack" parent="GenericAttackBase">
         <On Terms="Effect.AP_SOAMothershipv4BeamPersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_SOAMothershipv4FastBeamPersistent.Start" Send="Create"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <On Terms="Effect.AP_SOAMothershipv4FastBeamPersistent.Stop" Send="Destroy WhenReady"/>
         <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
         <LaunchAssets Sound="AP_MothershipVoid_AttackLaunch"/>
         <ImpactMap index="None" Sound="AP_MothershipVoid_AttackImpact"/>
@@ -23955,16 +24885,20 @@
     <CActorBeamSimple id="AP_SOAMothershipv4AttackBeam" parent="BeamSimpleAnimationStyleContinuous">
         <Macros value="ActionTargetTeleportDestroy"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="Effect.AP_SOAMothershipv4FastBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
     </CActorBeamSimple>
     <CActorSound id="AP_SOAMothershipv4AttackImpact" parent="SoundContinuous">
         <On Terms="Effect.AP_SOAMothershipv4BeamDamage.Start; EffectExecuteIndex 1" Send="Create"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamPersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_SOAMothershipv4FastBeamPersistent.Stop" Send="Destroy"/>
         <Sound value="AP_MothershipVoid_AttackImpactLoop"/>
     </CActorSound>
     <CActorAction id="AP_SOAMothershipv4SecondaryAttack" parent="GenericAttackBase">
         <On Terms="Effect.AP_SOAMothershipv4SecondaryBeamPersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_SOAMothershipv4SecondaryFastBeamPersistent.Start" Send="Create"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
         <On Terms="Effect.AP_SOAMothershipv4BeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <On Terms="Effect.AP_SOAMothershipv4FastBeamPersistent.Stop" Send="Destroy WhenReady"/>
         <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
         <ImpactMap index="None" Model="AP_SOAMothershipv4AttackImpact"/>
         <ActionFlags index="AlignedImpactsAndDamages" value="1"/>
@@ -23974,8 +24908,88 @@
     <CActorBeamSimple id="AP_SOAMothershipv4SecondaryAttackBeam" parent="BeamSimpleAnimationStyleContinuous">
         <Macros value="ActionTargetTeleportDestroy"/>
         <On Terms="Effect.AP_SOAMothershipv4SecondaryBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="Effect.AP_SOAMothershipv4SecondaryFastBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
         <Model value="AP_SOAMothershipv4AttackBeam"/>
     </CActorBeamSimple>
+    <CActorAction id="AP_PurifierMothershipAttack" parent="GenericAttackBase">
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Start" Send="SetScale 2.0"/>
+        <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
+        <LaunchAssets Sound="Mothership_AttackLaunch"/>
+        <ImpactMap index="None" Sound="Colossus_AttackImpact"/>
+        <ActionFlags index="AlignedImpactsAndDamages" value="1"/>
+        <ActionFlags index="ImpactMonitorsTeleports" value="1"/>
+        <Lifetime value="-1.000000"/>
+    </CActorAction>
+    <CActorBeamSimple id="AP_PurifierMothershipAttackBeam" parent="BeamSimpleAnimationStyleContinuous"> 
+        <Macros value="ActionTargetTeleportDestroy"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+    </CActorBeamSimple>
+    <CActorSound id="AP_PurifierMothershipAttackImpact" parent="SoundContinuous">
+        <On Terms="Effect.AP_PurifierMothershipBeamDamage.Start; EffectExecuteIndex 1" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Stop" Send="Destroy"/>
+        <Sound value="AP_MothershipVoid_AttackImpactLoop"/>
+    </CActorSound>
+    <CActorAction id="AP_PurifierMothershipSecondaryAttack" parent="GenericAttackBase">
+        <On Terms="Effect.AP_PurifierMothershipSecondaryBeamPersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipSecondaryBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
+        <On Terms="Effect.AP_PurifierMothershipBeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
+        <ImpactMap index="None" Model="AP_PurifierMothershipAttackImpact"/>
+        <ActionFlags index="AlignedImpactsAndDamages" value="1"/>
+        <ActionFlags index="ImpactMonitorsTeleports" value="1"/>
+        <Lifetime value="-1.000000"/>
+    </CActorAction>
+    <CActorBeamSimple id="AP_PurifierMothershipSecondaryAttackBeam" parent="BeamSimpleAnimationStyleContinuous">
+        <Macros value="ActionTargetTeleportDestroy"/>
+        <On Terms="Effect.AP_PurifierMothershipSecondaryBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_PurifierMothershipSecondaryBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+        <Model value="AP_PurifierMothershipAttackBeam"/>
+    </CActorBeamSimple>
+    <CActorAction id="AP_AiurMothershipAttack" parent="GenericAttackBase">
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <!-- <On Terms="Effect.AP_AiurMothershipBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/> -->
+        <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
+        <LaunchAssets Sound="Mothership_AttackLaunch"/>
+        <ImpactMap index="None" Sound="Colossus_AttackImpact"/>
+        <ActionFlags index="AlignedImpactsAndDamages" value="1"/>
+        <ActionFlags index="ImpactMonitorsTeleports" value="1"/>
+        <Lifetime value="-1.000000"/>
+    </CActorAction>
+    <CActorBeamSimple id="AP_AiurMothershipAttackBeam" parent="BeamSimpleAnimationStyleContinuous"> 
+        <Macros value="ActionTargetTeleportDestroy"/>
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+    </CActorBeamSimple>
+    <CActorSound id="AP_AiurMothershipAttackImpact" parent="SoundContinuous">
+        <On Terms="Effect.AP_AiurMothershipBeamDamage.Start; EffectExecuteIndex 1" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Stop" Send="Destroy"/>
+        <Sound value="AP_MothershipVoid_AttackImpactLoop"/>
+    </CActorSound>
+    <CActorAction id="AP_AiurMothershipSecondaryAttack" parent="GenericAttackBase">
+        <On Terms="Effect.AP_AiurMothershipSecondaryBeamPersistent.Start" Send="Create"/>
+     <!--     <On Terms="Effect.AP_AiurMothershipSecondaryBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>  -->
+        <On Terms="Effect.AP_AiurMothershipBeamDamage.Start; FromEffectTreeDescendant" Send="ActionDamage"/>
+        <On Terms="Effect.AP_AiurMothershipBeamPersistent.Stop" Send="Destroy WhenReady"/>
+        <LaunchAttachQuery Methods="AMFilterWeaponSetA0 AMClosest2ToTarget AP_AMPatternSOAMothershipv4Beam"/>
+        <ImpactMap index="None" Model="AP_AiurMothershipAttackImpact"/>
+        <ActionFlags index="AlignedImpactsAndDamages" value="1"/>
+        <ActionFlags index="ImpactMonitorsTeleports" value="1"/>
+        <Lifetime value="-1.000000"/>
+    </CActorAction>
+    <CActorBeamSimple id="AP_AiurMothershipSecondaryAttackBeam" parent="BeamSimpleAnimationStyleContinuous">
+        <Macros value="ActionTargetTeleportDestroy"/>
+        <On Terms="Effect.AP_AiurMothershipSecondaryBeamPersistent.Start" Send="SetTintColor {255,197,60 3.000000}"/>
+        <On Terms="Effect.AP_AiurMothershipSecondaryBeamPersistent.Stop" Send="AnimBracketStop BSD"/>
+        <Model value="AP_AiurMothershipAttackBeam"/>
+    </CActorBeamSimple>
     <CActorModel id="AP_SOAMothershipv4WarpAway" parent="ModelAnimationStyleOneShot">
         <On Terms="Behavior.AP_SOAMothershipWarpAway.On" Send="Create"/>
         <On Terms="ActorCreation" Target="_Selectable" Send="SetOpacity 0.000000 0.750000"/>
@@ -24179,6 +25193,8 @@
     </CActorModel>
     <CActorSound id="AP_VoidSentryBlackHoleBirthSound" parent="SoundOneShot">
         <On Terms="Effect.AP_VoidSentryBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Start" Send="Create"/>
         <Sound value="AP_BlackHole_Start1"/>
         <Layers>
             <Sound value="BlackHole_Start2"/>
@@ -24203,6 +25219,8 @@
     </CActorSound>
     <CActorSound id="AP_VoidSentryBlackHoleDeathSound" parent="SoundOneShot">
         <On Terms="Effect.AP_VoidSentryBlackHolePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Stop" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Stop" Send="Create"/>
         <Sound value="AP_BlackHole_End"/>
     </CActorSound>
     <CActorSimple id="AP_VoidSentryBlackHoleFlail">
@@ -24215,6 +25233,10 @@
     <CActorSound id="AP_VoidSentryBlackHoleLoopSound" parent="SoundContinuous">
         <On Terms="Effect.AP_VoidSentryBlackHolePersistent.Start" Send="Create"/>
         <On Terms="Effect.AP_VoidSentryBlackHolePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_AiurMothershipBlackHolePersistent.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_PurifierMothershipBlackHolePersistent.Stop" Send="Destroy"/>
         <Sound value="AP_BlackHole_Loop1"/>
         <Layers>
             <Sound value="BlackHole_Loop2"/>
@@ -24720,6 +25742,8 @@
     <CActorSound id="AP_SentryAttackLoop" parent="SoundContinuous">
         <On Terms="Effect.AP_DisruptionBeam.Start" Send="Create"/>
         <On Terms="Effect.AP_DisruptionBeam.Stop" Send="Destroy"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Start" Send="Create"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Stop" Send="Destroy"/>
         <Sound value="Sentry_WeaponLoop"/>
     </CActorSound>
     <CActorSound id="AP_SentryAttackStart" parent="SoundOneShot">
@@ -24734,6 +25758,19 @@
         <Inherits index="Visibility" value="1"/>
         <On Terms="Effect.AP_VoidSentryChronoBeamCP.Start" Send="Create"/>
         <On Terms="Effect.AP_VoidSentryChronoBeamCP.Stop" Send="AnimBracketStop BSD"/>
+        <On Terms="Effect.AP_ChronoDroneChronoBeamCP.Start" Send="Create"/>
+        <On Terms="Effect.AP_ChronoDroneChronoBeamCP.Stop" Send="AnimBracketStop BSD"/>
+        <HostForProps Subject="_Unit" Scope="Caster" Actor="Find"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+        <HostLaunch Subject="_Unit" Scope="Caster" Actor="Find"/>
+        <HostLaunchSiteOps Ops="SOpAttachCenter"/>
+        <HostImpact Subject="_Unit" Scope="Target" Actor="Find"/>
+        <HostImpactSiteOps Ops="SOpAttachCenter"/>
+    </CActorBeamSimple>
+    <CActorBeamSimple id="AP_PowerRedirectionBeam" parent="BeamSimpleAnimationStyleContinuous">
+        <Inherits index="Visibility" value="1"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Start" Send="Create"/>
+        <On Terms="Effect.AP_PowerRedirectionCP.Stop" Send="Destroy"/>
         <HostForProps Subject="_Unit" Scope="Caster" Actor="Find"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
         <HostLaunch Subject="_Unit" Scope="Caster" Actor="Find"/>
@@ -24741,12 +25778,17 @@
         <HostImpact Subject="_Unit" Scope="Target" Actor="Find"/>
         <HostImpactSiteOps Ops="SOpAttachCenter"/>
     </CActorBeamSimple>
+    <CActorUnit id="AP_MothershipPylonPowerUnit" parent="GenericUnitStandardNoAutoSoundLinks" unitName="AP_MothershipPylonPowerUnit">
+        <Model value="Invisible"/>
+    </CActorUnit>
     <CActorModel id="AP_SentryChronoBeamImpact" parent="ModelAnimationStyleContinuous">
         <AutoScaleFactor value="0.600000"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachOrigin"/>
         <On Terms="Behavior.AP_VoidSentryChronoBeam.On" Send="Create"/>
         <On Terms="Behavior.AP_VoidSentryChronoBeam.Off" Send="AnimBracketStop BSD"/>
+        <On Terms="Behavior.AP_PowerRedirectionCP.On" Send="Create"/>
+        <On Terms="Behavior.AP_PowerRedirectionCP.Off" Send="AnimBracketStop BSD"/>
         <ModelFlags index="AllowHitTest" value="0"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
     </CActorModel>
@@ -24759,6 +25801,7 @@
     </CActorSound>
     <CActorSound id="AP_SentryChronoBeamSoundStart" parent="SoundOneShot">
         <On Terms="Effect.AP_VoidSentryChronoBeamCP.Start; At Target" Send="Create"/>
+        <On Terms="Effect.AP_ChronoDroneChronoBeamCP.Start; At Target" Send="Create"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachOverhead"/>
@@ -25225,6 +26268,8 @@
         <Inherits index="Visibility" value="1"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStart" Send="Create"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStop" Send="Destroy"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStart" Send="Create"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStop" Send="Destroy"/>
         <HostForProps Subject="_Unit" Scope="Target" Actor="Find"/>
         <Model value="ShieldBatteryRechargeChanneledBeam"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
@@ -25237,6 +26282,8 @@
         <On Terms="ActorCreation" Send="$Birth PlayForever"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStart; At Target" Send="Create"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStop; At Target" Send="Destroy"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStart; At Target" Send="Create"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStop; At Target" Send="Destroy"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachCenter"/>
@@ -25245,6 +26292,8 @@
     <CActorSound id="AP_ShieldBatteryRechargeChanneledSoundLoop" parent="SoundContinuous">
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStart; At Target" Send="Create"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStop; At Target" Send="Destroy"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStart; At Target" Send="Create"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStop; At Target" Send="Destroy"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <On Terms="ActorCreation" Send="Create AP_SentryShieldRepairSoundStart"/>
         <On Terms="ActorDestruction" Send="Create AP_SentryShieldRepairSoundStop"/>
@@ -25255,6 +26304,8 @@
     <CActorSound id="AP_ShieldBatteryStructureRechargeSoundLoop" parent="SoundContinuous">
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStart; At Caster" Send="Create"/>
         <On Terms="Effect.AP_ShieldBatteryRechargeChanneled.TargetStop; At Caster" Send="Destroy"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStart; At Caster" Send="Create"/>
+        <On Terms="Effect.AP_ShieldBatteryRechargeChanneledOvercharged.TargetStop; At Caster" Send="Destroy"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <Sound value="AP_ShieldBattery_Recharge_Loop2"/>
     </CActorSound>
@@ -32116,6 +33167,13 @@
         <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
         <On Terms="AnimDone; AnimName Spell" Send="ModelSwap AP_VoidRayTaldarim"/>
         <On Terms="AnimDone; AnimName Spell" Send="AnimClear Spell"/>
+        <On Terms="Behavior.AP_SummonDeathFleetInitial.On" Send="ModelSwap AP_VoidRayTaldarimWarpIn"/>
+        <On Terms="Behavior.AP_SummonDeathFleetInitial.On" Send="$Birth"/>
+        <On Terms="Behavior.AP_SummonDeathFleetInitial.On" Send="AnimSetTime Birth 3.000000"/>
+        <On Terms="AnimDone; AnimName Birth" Send="ModelSwap AP_VoidRayTaldarim"/>
+        <On Terms="AnimDone; AnimName Birth" Send="AnimClear Birth"/>
+        <On Terms="Behavior.AP_SummonDeathFleetWarpOut.On" Send="SetScale 0.050000,0.050000,5.000000 0.250000 RecallScale"/>
+        <On Terms="Behavior.AP_SummonDeathFleetWarpOut.Off" Send="SetVisibility"/>
         <On Terms="Signal.*.UnitRemoved" Target="VoidRayChargeBeamBounce1AttackBeam" Send="Destroy Immediate"/>
         <On Terms="Signal.*.CampaignBeamCreated" Send="RefSetFromMsg ::actor.MyAttackBeam ::Sender"/>
         <On Terms="Signal.*.UnitRemoved" Target="::actor.MyAttackBeam" Send="Destroy Immediate"/>
@@ -33029,9 +34087,24 @@
     </CActorAction>
     <CActorModelMaterial id="AP_GhostSCBWLockdown@Glaze" parent="GlazeParent">
         <On Terms="Behavior.AP_GhostSCBWLockdown.On" Send="Create"/>
+        <On Terms="Behavior.AP_PowerRedirectionPhoton.On" Send="Create"/>
+        <On Terms="Behavior.AP_PowerRedirectionKhaydarin.On" Send="Create"/>
         <On Terms="ActorCreation" Send="ModelMaterialApplyTo ::Main"/>
         <On Terms="Behavior.AP_GhostSCBWLockdown.Off" Send="ModelMaterialRemoveFrom ::Main"/>
         <On Terms="Behavior.AP_GhostSCBWLockdown.Off" Send="Destroy"/>
+        <On Terms="Behavior.AP_PowerRedirectionPhoton.Off" Send="ModelMaterialRemoveFrom ::Main"/>
+        <On Terms="Behavior.AP_PowerRedirectionPhoton.Off" Send="Destroy"/>
+        <On Terms="Behavior.AP_PowerRedirectionKhaydarin.Off" Send="ModelMaterialRemoveFrom ::Main"/>
+        <On Terms="Behavior.AP_PowerRedirectionKhaydarin.Off" Send="Destroy"/>
+    </CActorModelMaterial>
+    <CActorModelMaterial id="AP_SacrificialConduitsGlaze" parent="GlazeParent">
+        <On Terms="Effect.AP_SOAMothershipv4BeamSwitch.Start; ValidatePlayer AP_HaveHHVikingPiercingAttackUpgrade; At Caster" Send="Create"/>
+    </CActorModelMaterial>
+    <CActorModelMaterial id="AP_PurifierStunGlaze" parent="GlazeParent">
+        <On Terms="Behavior.AP_OverloadWeaponSystemsStun.On" Send="Create"/>
+        <On Terms="ActorCreation" Send="ModelMaterialApplyTo ::Main"/>
+        <On Terms="Behavior.AP_OverloadWeaponSystemsStun.Off" Send="ModelMaterialRemoveFrom ::Main"/>
+        <On Terms="Behavior.AP_OverloadWeaponSystemsStun.Off" Send="Destroy"/>
     </CActorModelMaterial>
     <CActorUnit id="AP_Drone" parent="GenericBurrowerStandard" unitName="AP_Drone">
         <Model value="Drone"/>
@@ -43475,6 +44548,29 @@
         <Model value="ArchonDeath"/>
     </CActorModel>
     <CActorRange id="AP_ArchonSiphonRange" parent="RangeAbil" abil="Ap_ArchonSiphon"/>
+    <CActorMissile id="AP_TaldarimMothershipDeathHealDummyAttackMissile" parent="GenericAttackMissile" unitName="AP_TaldarimMothershipDeathHealDummyAttackMissile"/>
+    <CActorMissile id="AP_TaldarimMothershipDeathHealMissile" parent="GenericAttackMissile" unitName="AP_TaldarimMothershipDeathHealMissle">
+        <On Terms="ActorCreation" Send="SetTintColor 185,2,38"/>
+        <Model value="AP_TaldarimMothershipDeathHealDummyAttackMissile"/>
+    </CActorMissile>
+    <CActorAction id="AP_TaldarimMothershipDeathHealDummyAttack" parent="GenericAttack" effectImpact="AP_TaldarimMothershipDeathHealModifyImpactDummy" effectLaunch="AP_TaldarimMothershipDeathHealModifyLM">
+        <LaunchAssets Sound=""/>
+        <ImpactMap index="None" Model="" Sound="Raven_PointDefenseDroneReleaseImpact"/>
+        <ShieldFlashType value="None"/>
+    </CActorAction>
+    <CActorSound id="AP_TaldarimMothershipDeathHealActorSound" parent="SoundOneShot">
+        <Sound value="AP_TaldarimMothershipDeathHeal"/>
+        <On Terms="Effect.AP_TaldarimMothershipDeathHealMU.Start; At Source" Send="Create"/>
+        <On Terms="Effect.AP_TaldarimMothershipDeathHealTaldarimMU.Start; At Source" Send="Create"/>
+    </CActorSound>
+    <CActorModelMaterial id="AP_TaldarimMothershipDeathHealGlaze" parent="GlazeParent">
+        <On Terms="Effect.AP_TaldarimMothershipDeathHealMU.Start; At Target" Send="Create"/>
+        <On Terms="Effect.AP_TaldarimMothershipDeathHealTaldarimMU.Start; At Target" Send="Create"/>
+        <On Terms="ActorCreation" Send="ModelMaterialApplyTo ::Main"/>
+        <On Terms="ActorCreation" Send="AnimBracketStart Birth Birth"/>
+        <On Terms="AnimDone; AnimName Birth" Send="Destroy"/>
+        <ModelFlags index="AutomateGlobalLoops" value="1"/>
+    </CActorModelMaterial>
     <CActorModel id="AP_FenixWarbringerColossusSlowModel" parent="ModelAnimationStyleContinuous">
         <!-- TODO -->
         <!-- <On Terms="Behavior.FenixWarbringerColossusIceFlatAmount.On" Send="Create"/> -->
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AlertData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AlertData.xml
index b5c51b9867..7a56ebbc72 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AlertData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AlertData.xml
@@ -26,4 +26,10 @@
         <Voice value="Ready"/>
         <Peripheral value="MorphComplete"/>
     </CAlert>
+    <CAlert id="AP_MothershipComplete">
+        <Icon value="Assets\Textures\btn-unit-protoss-mothership.dds"/>
+        <Sound value="Ping"/>
+        <Voice value="Ready"/>
+        <Peripheral value="MorphComplete"/>
+    </CAlert>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 00ca946d4d..69d7d4cbbb 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -3538,15 +3538,6 @@
             <VitalRegenArray index="Energy" value="-0.1015"/>
         </Modification>
     </CBehaviorBuff>
-    <CBehaviorBuff id="AP_Purify">
-        <InfoIcon value="Assets\Textures\btn-ability-protoss-purify.dds"/>
-        <EditorCategories value="AbilityorEffectType:Units"/>
-        <Duration value="60"/>
-        <Modification>
-            <WeaponArray Link="AP_MothershipCoreWeapon" Turret="AP_Nexus"/>
-        </Modification>
-        <TimeScaleSource Value="Global"/>
-    </CBehaviorBuff>
     <CBehaviorBuff id="AP_SOAGlobalChronoProd">
         <Alignment value="Positive"/>
         <InfoIcon value="Assets\Textures\btn-ability-protoss-chronoboost.dds"/>
@@ -3718,6 +3709,32 @@
     <CBehaviorBuff id="AP_ArbiterMPEternalStasisField" parent="AP_ArbiterMPStasisField">
         <Duration value="65.5"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_EnableMothershipTaldarimAttack">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <RemoveValidatorArray value="AP_NotHaveTaldarimMothershipFastAttack"/>
+        <Modification>
+            <WeaponArray Link="AP_SOAMothershipv4Weapon"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_EnableMothershipTaldarimAttackSwap">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <Modification>
+            <WeaponArray Link="AP_SOAMothershipv4Weapon"/>
+        </Modification>
+        <InitialEffect value="AP_SetMothershipTaldarimCooldown"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_EnableUpgradedMothershipTaldarimAttack">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_MothershipTaldarimBaseAttackSwap"/>
+        <DisableValidatorArray value="AP_HaveTaldarimMothershipFastAttack"/>
+        <Modification>
+            <WeaponArray Link="AP_TaldarimMothershipFastAttackWeapon"/>
+        </Modification>
+        <InitialEffect value="AP_SetUpgradedMothershipTaldarimCooldown"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_CorsairDisableFakeWeapon">
         <InfoFlags index="Hidden" value="1"/>
         <DisableValidatorArray value="AP_CorsairFakeWeaponBehaviorDisable"/>
@@ -4143,6 +4160,12 @@
             <HeightTime index="Stop" value="0.25"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_AiurMothershipBlackHole" parent="AP_VoidSentryBlackHole">
+        <Modification Height="0.5" MoveSpeedMultiplier="2.25"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurifierMothershipBlackHole" parent="AP_VoidSentryBlackHole">
+        <Modification Height="0.5" MoveSpeedMultiplier="2.625"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_SOAMothershipGravitonPulse">
         <Alignment value="Negative"/>
         <InfoIcon value="Assets\Textures\btn-ability-protoss-gravitonbeam.dds"/>
@@ -5048,6 +5071,223 @@
             <WeaponDisableArray value="AP_HERCWeapon"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_SummonDeathFleetInitial">
+        <InfoFlags index="Hidden" value="1"/>
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-building-protoss-pylon.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="2"/>
+        <Modification>
+            <StateFlags index="SuppressPassenger" value="1"/>
+            <ModifyFlags index="DisableAbils" value="1"/>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <ModifyFlags index="SuppressTurning" value="1"/>
+        </Modification>
+        <ExpireEffect value="AP_SummonDeathFleetTimerAB"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_SummonDeathFleetTimer">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="30"/>
+        <ExpireEffect value="AP_SummonDeathFleetWarpOutAB"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <DisplayDuration index="Self" value="1"/>
+        <Modification>
+            <StateFlags index="SuppressPassenger" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_SummonDeathFleetWarpOut">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="0.25"/>
+        <ExpireEffect value="Kill"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <Modification>
+            <StateFlags index="SuppressPassenger" value="1"/>
+            <ModifyFlags index="DisableAbils" value="1"/>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <ModifyFlags index="SuppressTurning" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TaldarimMothershipDeathHeal">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <Period value="1"/>
+        <PeriodicEffect value="AP_TaldarimMothershipDeathHealSearch"/>
+        <Requirements value="AP_HaveTaldarimMothershipDeathHeal"/>
+        <InfoFlags index="Hidden" value="1"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TaldarimMothershipDeathHealDebuff">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <Duration value="2"/>
+        <DamageResponse Chance="1" Fatal="1" Handled="AP_TaldarimMothershipDeathHealLM"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TaldarimMothershipDeathHealTaldarimDebuff">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <Duration value="2"/>
+        <DamageResponse Chance="1" Fatal="1" Handled="AP_TaldarimMothershipDeathHealTaldarimLM"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TaldarimMothershipGroundSlowAura">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Period value="0.2"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <PeriodicEffect value="AP_TaldarimMothershipGroundSlowSearch"/>
+        <Requirements value="AP_HaveTaldarimMothershipGroundSlow"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TaldarimMothershipGroundSlowDebuff">
+        <InfoIcon value="Assets\Textures\fearex3_coop.dds"/>
+        <Alignment value="Negative"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Duration value="0.4"/>
+        <Modification MoveSpeedMultiplier="0.70"/>
+        <Modification AttackSpeedMultiplier="0.70"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PlanetCrackerChargeUp">
+        <InfoIcon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="2"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Enemy" value="1"/>
+        <ExpireEffect value="AP_PlanetCrackerAB"/>
+        <Modification>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <StateFlags index="SuppressAttack" value="1"/>
+            <AbilLinkDisableArray value="move"/>
+            <AbilLinkDisableArray value="attack"/>
+            <AbilLinkDisableArray value="AP_PurifierMothershipInstalls"/> 
+            <AbilLinkDisableArray value="AP_MothershipCoreMassRecall"/>
+            <AbilLinkDisableArray value="AP_PurifierMothershipBlackHole"/>
+            <AbilLinkDisableArray value="AP_TimeFieldPurifier"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PlanetCracker">
+        <InfoIcon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="10"/>
+        <Period value="0.25"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Enemy" value="1"/>
+        <InitialEffect value="AP_PlanetCrackerSearch"/>
+        <RefreshEffect value="AP_PlanetCrackerSearch"/>
+        <PeriodicEffect value="AP_PlanetCrackerSearch"/>
+        <ExpireEffect value="AP_PurifierMothershipShieldingRB"/>
+        <Modification>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <StateFlags index="SuppressAttack" value="1"/>
+            <AbilLinkDisableArray value="move"/>
+            <AbilLinkDisableArray value="attack"/>
+            <AbilLinkDisableArray value="AP_PurifierMothershipInstalls"/> 
+            <AbilLinkDisableArray value="AP_MothershipCoreMassRecall"/>
+            <AbilLinkDisableArray value="AP_MothershipPurifierBlackHole"/>
+            <AbilLinkDisableArray value="AP_TimeFieldPurifier"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_MothershipAbilityInstalled">
+        <BehaviorFlags index="Permanent" value="1"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PlanetCrackerInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_OverloadWeaponSystemsInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_PowerRedirectionInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_ThermalLanceInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_SummonDeathFleetInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_RevitalizeShieldsInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_BatteryOverchargeInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_AstralRestorationInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_BlackHoleInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_TimeFieldInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_WormholeModuleInstalled" parent="AP_MothershipAbilityInstalled"/>
+    <CBehaviorBuff id="AP_PurifierMothershipDebuff">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-protoss-fenix-dragoonovercharge.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="4.00"/>
+        <Period value="0.20"/>
+        <PeriodicEffect value="AP_PurifierMothershipDebuffDOT"/>
+        <Modification ShieldArmorBonus="-1">
+            <LifeArmorBonus value="-1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorPowerSource id="AP_MothershipPurifierPowerSource">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Structures"/>
+        <Radius value="7.5"/>
+        <PowerLink value="PowerSource"/>
+    </CBehaviorPowerSource>
+    <CBehaviorBuff id="AP_MothershipAiurCloakingField">
+        <Alignment value="Positive"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <InfoIcon value="Assets\Textures\BTN-Ability-Protoss-CloakField.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <BuffFlags index="DisableWhileUnderConstruction" value="1"/>
+        <DisableValidatorArray value="AP_NotStunnedorStasised"/>
+        <DisableValidatorArray value="IsNotHallucination"/>
+        <Period value="0.1"/>
+        <PeriodicEffect value="AP_MothershipAiurCloakingFieldSearch"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldPurifier">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-timewarp.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="0.125"/>
+        <Modification MoveSpeedMultiplier="1.50"/>
+        <Modification AttackSpeedMultiplier="1.50"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldAiur">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-timewarp.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_NotHeroic"/>
+        <DisableValidatorArray value="AP_IsNotFriendly"/>
+        <Duration value="0.125"/>
+        <Modification MoveSpeedMultiplier="0.4"/>
+        <Modification AttackSpeedMultiplier="0.4"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldAiurHeroic">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-timewarp.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_IsHeroic"/>
+        <DisableValidatorArray value="AP_IsNotFriendly"/>
+        <Duration value="0.125"/>
+        <Modification MoveSpeedMultiplier="0.6"/>
+        <Modification AttackSpeedMultiplier="0.6"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldTaldarim">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-timewarp.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_IsNotFriendly"/>
+        <DisableValidatorArray value="AP_NotTimeFieldTaldarimConfusion"/>
+        <Duration value="0.125"/>
+        <Modification AttackSpeedMultiplier="0.30"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldTaldarimConfusion">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-confusion.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="3"/>
+        <Period value="1"/>
+        <DisableValidatorArray value="AP_NotHeroic"/>
+        <InitialEffect value="AP_DarkArchonConfusionStopInitialSet"/>
+        <PeriodicEffect value="AP_DarkArchonConfusionAttackSearch"/>
+        <ExpireEffect value="AP_DarkArchonConfusionEndSet"/>
+        <Modification AttackSpeedMultiplier="1.70"/>
+        <Modification>
+            <StateFlags index="Passive" value="1"/>
+            <StateFlags index="IgnorePlayerAlliedFlags" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TimeFieldDecelerationBuff">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Modification DecelerationBonus="1000"/>
+        <Duration value="1"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_HercBanelingImmunity">
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="AbilityorEffectType:Units,Race:Terran"/>
@@ -5905,6 +6145,167 @@
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_TargetFire">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <MaxStackCount value="2"/>
+        <Duration value="5"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_BatteryOvercharge">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-ability-zeratul-observer-sensorarray.dds"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="14"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <InitialEffect value="AP_AiurMothershipFeedbackSearchPoint"/>
+        <Modification HealDealtMultiplier="2.0"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_MothershipPylonPowerTimer">
+        <Alignment value="Positive"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="10"/>
+        <RemoveValidatorArray value="CasterNotDead"/>
+        <FinalEffect value="Suicide"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PowerRedirectionPhoton">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-karax-reconstructionbeamextratarget.dds"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="10"/>
+        <RemoveValidatorArray value="CasterNotDead"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <InitialEffect value="AP_PowerRedirectionCasterAB"/>
+        <FinalEffect value="AP_PowerRedirectionCasterRemoveSet"/>
+        <Modification>
+            <AdditiveAttackSpeedFactor value="1.25"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PowerRedirectionKhaydarin">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-karax-reconstructionbeamextratarget.dds"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="10"/>
+        <RemoveValidatorArray value="CasterNotDead"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <InitialEffect value="AP_PowerRedirectionCasterAB"/>
+        <FinalEffect value="AP_PowerRedirectionCasterRemoveSet"/>
+        <Modification>
+            <AdditiveAttackSpeedFactor value="1.0"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PowerRedirectionCaster">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-karax-reconstructionbeamextratarget.dds"/>
+        <TimeScaleSource Value="Global"/>
+        <Duration value="10"/>
+        <Period value="0.1"/>
+        <RemoveValidatorArray value="TargetNotDead"/>
+        <DisableValidatorArray value="AP_CasterIsPurifierMothershipCore"/>
+        <ExpireEffect value="AP_KillMothershipPylonPowerSearchArea"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <Modification>
+            <ModifyFlags index="SuppressMoving" value="1"/>
+            <StateFlags index="SuppressAttack" value="1"/>
+            <AbilLinkDisableArray value="move"/>
+            <AbilLinkDisableArray value="attack"/>
+            <AbilLinkDisableArray value="stop"/>
+            <AbilLinkDisableArray value="AP_MorphToMothershipPurifier"/>
+            <AbilLinkDisableArray value="AP_TimeFieldPurifierCore"/>
+            <AbilLinkDisableArray value="AP_MothershipCoreNexusRecall"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorPowerSource id="AP_PowerRedirectionPowerSource">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Structures"/>
+        <Radius value="0.5"/>
+        <PowerLink value="PowerSource"/>
+    </CBehaviorPowerSource>
+    <CBehaviorBuff id="AP_AiurMothershipFeedbackAura">
+        <Alignment value="Positive"/>
+        <TimeScaleSource Value="Global"/>
+        <Requirements value="AP_HaveAiurMothershipFeedback"/>
+        <InitialEffect value="AP_AiurMothershipFeedbackSearchCaster"/>
+        <Duration value="10"/>
+        <Period value="5"/>
+        <PeriodicEffect value="AP_AiurMothershipFeedbackSearchCaster"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_AstralRestorationCaster">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-astralwind.dds"/>
+        <TimeScaleSource Value="Global"/>
+        <DisableValidatorArray value="AP_CasterAstralRestoration"/>
+        <Duration value="10"/>
+        <Period value="0.125"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <PeriodicEffect value="AP_MothershipAstralRestorationSearch"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_AstralRestorationCooldown">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units,Race:Terran"/>
+        <Duration value="180"/>
+        <Cost>
+            <Cooldown TimeStart="180"/>
+        </Cost>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_SummonDeathFleetCooldown">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units,Race:Terran"/>
+        <Duration value="240"/>
+        <Cost>
+            <Cooldown TimeStart="240"/>
+        </Cost>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PlanetCrackerCooldown">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units,Race:Terran"/>
+        <Duration value="300"/>
+        <Cost>
+            <Cooldown TimeStart="300"/>
+        </Cost>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_OverloadWeaponSystems">
+        <Alignment value="Positive"/>
+        <InfoIcon value="Assets\Textures\BTN-Ability-Protoss-FireBeam.dds"/>
+        <TimeScaleSource Value="Global"/>
+        <DisableValidatorArray value="AP_CasterOverloadWeaponSystems"/>
+        <Duration value="10"/>
+        <ExpireEffect value="AP_PurifierMothershipShieldingRB"/>
+        <FinalEffect value="AP_OverloadWeaponSystemsStunAB"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <Modification MoveSpeedBonus="-10">
+            <AbilClassDisableArray index="CAbilMove" value="1"/>
+            <AbilClassDisableArray index="move" value="1"/>
+            <AbilLinkDisableArray value="AP_PurifierMothershipInstalls"/>
+            <AdditiveAttackSpeedFactor value="0.50"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_OverloadWeaponSystemsStun">
+        <Alignment value="Negative"/>
+        <InfoIcon value="Assets\Textures\BTN-Ability-Protoss-FireBeam.dds"/>
+        <BehaviorCategories index="Stun" value="1"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="1.5"/>
+        <DisplayDuration index="Self" value="1"/>
+        <DisplayDuration index="Ally" value="1"/>
+        <DisplayDuration index="Neutral" value="1"/>
+        <InitialEffect value="AP_PurifierMothershipShieldingRB"/>
+        <Modification>
+            <StateFlags index="Stun" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_FenixSOAChargeStun">
         <Alignment value="Negative"/>
         <InfoFlags index="Hidden" value="1"/>
@@ -7140,8 +7541,33 @@
         <RemoveValidatorArray value="OnCreep"/>
         <RemoveValidatorArray value="AP_NotHaveCreepFrenzy13Crawler"/>
     </CBehaviorBuff>
-    <CBehaviorBuff id="MothershipCoreRecalling">
-        <!-- Behavior stub -->
+    <CBehaviorBuff id="AP_MothershipCoreRecalling">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="1"/>
+        <ExpireEffect value="AP_MothershipCoreNexusRecallSet"/>
+        <Modification>
+            <ModifyFlags index="DisableAbils" value="1"/>
+            <StateFlags index="SuppressAttack" value="1"/>
+            <StateFlags index="SuppressPassenger" value="1"/>
+            <StateFlags index="Uncommandable" value="1"/>
+            <AbilClassDisableArray index="CAbilAttack" value="1"/>
+            <AbilClassDisableArray index="CAbilMove" value="1"/>
+        </Modification>
+        <RemoveValidatorArray value="CasterNotDead"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_MothershipCoreRecalled">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="2"/>
+        <Modification>
+            <ModifyFlags index="DisableAbils" value="1"/>
+            <StateFlags index="SuppressAttack" value="1"/>
+            <StateFlags index="SuppressPassenger" value="1"/>
+            <StateFlags index="Uncommandable" value="1"/>
+            <AbilClassDisableArray index="CAbilAttack" value="1"/>
+            <AbilClassDisableArray index="CAbilMove" value="1"/>
+        </Modification>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_SiegeTankSiegedTransportableMorph">
         <InfoFlags index="Hidden" value="1"/>
@@ -8098,6 +8524,34 @@
         <Name value="Button/Name/AP_BattlecruiserRangeAura"/>
         <Tooltip value="Button/Tooltip/AP_BattlecruiserRangeAura"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_MothershipAiurShieldArmor">
+        <Alignment value="Positive"/>       
+        <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
+        <Duration value="0.25"/>
+        <InfoIcon value="AP\Assets\Textures\btn-ability-protoss-emergencywarp-aiur.dds"/>
+        <Requirements value="AP_HaveMothershipAiurShieldArmorAura"/>
+        <Modification>
+            <ShieldArmorBonus value="1"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_AiurMothershipEnergyRegenAuraBuff">
+        <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
+        <Duration value="0.25"/>
+        <InfoIcon value="Assets\Textures\talent-artanis-level01-swiftretribution.dds"/>
+        <Requirements value="AP_HaveAiurMothershipEnergyRegenAura"/>
+        <Modification>
+            <VitalRegenArray index="Energy" value="0.4"/>
+        </Modification>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_AiurMothershipEnergyRegenAuraBuffAiur">
+        <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
+        <Duration value="0.25"/>
+        <InfoIcon value="AP\Assets\Textures\btn-upgrade-protoss-symbolofunity.dds"/>
+        <Requirements value="AP_HaveAiurMothershipEnergyRegenAura"/>
+        <Modification>
+            <VitalRegenArray index="Energy" value="0.6"/>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_FusionCoreFusionReactorAura">
         <EditorCategories value="AbilityorEffectType:Units,Race:Terran"/>
         <BehaviorFlags index="Permanent" value="1"/>
@@ -9527,6 +9981,36 @@
             <WeaponEnableArray value="AP_AcidSporeVentsWeapon"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurifierMothershipShielding">
+        <Alignment value="Positive"/>
+        <InfoIcon value="AP\Assets\Textures\btn-ability-protoss-purifier-shield-ex2.dds"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Requirements value="AP_HavePurifierMothershipShielding"/>
+        <DamageResponse ModifyFraction="0.50">
+            <Chance value="1"/>
+        </DamageResponse>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurifierMothershipAttackSpeedBoostAura">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <Period value="0.07"/>
+        <PeriodicEffect value="AP_PurifierMothershipAttackSpeedBoostSearch"/>
+        <Requirements value="AP_HavePurifierMothershipAttackSpeedBoost"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurifierMothershipAttackSpeedBoostBuff">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="0.14"/>
+        <Modification AttackSpeedMultiplier="1.08"/>
+        <InfoIcon value="AP\Assets\Textures\btn-upgrade-protoss-purifier-sentry-optimizedemitters-orange.dds"/>
+        <Alignment value="Positive"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurifierMothershipAttackSpeedBoostBuffEmpowered">
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Duration value="0.14"/>
+        <Modification AttackSpeedMultiplier="1.12"/>
+        <InfoIcon value="AP\Assets\Textures\btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds"/>
+        <Alignment value="Positive"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_KerriganVoidCoopEconDropCaster">
         <EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
         <Duration value="15"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 952032af7a..954e5c795f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2167,6 +2167,24 @@
         <TooltipAppender Validator="AP_HaveWarCouncilNerfs" Text="Button/Tooltip/AP_AppendWarCouncilUpgrade"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_MothershipRepairDrones">
+        <Icon value="Assets\Textures\btn-ability-protoss-carrierrepairdrones.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-carrierrepairdrones.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary1"/>
+    </CButton>
+    <CButton id="AP_MothershipRepairDronesInstall" parent="AP_MothershipRepairDrones">
+        <Name value="Button/Name/AP_MothershipRepairDronesInstall"/>
+    </CButton>
+    <CButton id="AP_MothershipChronoDrones">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-carrierrepairdrones-purifier.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-carrierrepairdrones-purifier.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary1"/>
+    </CButton>
+    <CButton id="AP_MothershipChronoDronesInstall" parent="AP_MothershipChronoDrones">
+        <Name value="Button/Name/AP_MothershipChronoDronesInstall"/>
+    </CButton>
     <CButton id="AP_GravitonBeam">
         <Icon value="Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds"/>
@@ -2750,6 +2768,305 @@
         <AlertIcon value="Assets\Textures\btn-unit-protoss-mothership.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
+    <CButton id="AP_TimeFieldAiurCore">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-timewarp-blue.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-timewarp-blue.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_TimeFieldPurifierCore">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-timewarp-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-timewarp-orange.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_TimeFieldPurifier">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-timewarp-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-timewarp-orange.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+    <CButton id="AP_TimeFieldAiur">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-timewarp-blue.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-timewarp-blue.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+    <CButton id="AP_TimeFieldTaldarim">
+        <Icon value="Assets\Textures\btn-ability-protoss-timewarp-red.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-timewarp-red.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+    <CButton id="AP_MothershipCoreNexusRecall">
+        <Icon value="Assets\Textures\btn-ability-protoss-massrecall.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-massrecall.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_MothershipCoreMassRecall">
+        <Icon value="Assets\Textures\btn-ability-protoss-wormholetransit-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-wormholetransit-color.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_WormholeTransit">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-warpharmonization-taldarim.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-warpharmonization-taldarim.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_WormholeTransitInstall" parent="AP_WormholeTransit">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility3"/>
+        <Tooltip value="Button/Tooltip/AP_WormholeTransitInstall"/>
+        <Name value="Button/Name/AP_WormholeTransitInstall"/>
+    </CButton>
+    <CButton id="AP_TimeFieldAiurInstall" parent="AP_TimeFieldAiur">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility2"/>
+        <Tooltip value="Button/Tooltip/AP_TimeFieldAiurInstall"/>
+        <Name value="Button/Name/AP_TimeFieldAiurInstall"/>
+    </CButton>
+    <CButton id="AP_TimeFieldPurifierInstall" parent="AP_TimeFieldPurifier">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility2"/>
+        <Tooltip value="Button/Tooltip/AP_TimeFieldPurifierInstall"/>
+        <Name value="Button/Name/AP_TimeFieldPurifierInstall"/>
+    </CButton>
+    <CButton id="AP_TimeFieldTaldarimInstall" parent="AP_TimeFieldTaldarim">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility2"/>
+        <Tooltip value="Button/Tooltip/AP_TimeFieldTaldarimInstall"/>
+        <Name value="Button/Name/AP_TimeFieldTaldarimInstall"/>
+    </CButton>
+    <CButton id="AP_MothershipNexusRecallInstall" parent="AP_MothershipCoreNexusRecall">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility3"/>
+        <Tooltip value="Button/Tooltip/AP_MothershipNexusRecallInstall"/>
+        <Name value="Button/Name/AP_MothershipNexusRecallInstall"/>
+    </CButton>
+    <CButton id="AP_MothershipMassRecallInstall" parent="AP_MothershipCoreMassRecall">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility3"/>
+        <Tooltip value="Button/Tooltip/AP_MothershipNexusRecallInstall"/>
+        <Name value="Button/Name/AP_MothershipMassRecallInstall"/>
+    </CButton>
+    <CButton id="AP_InterceptorMothershipTaldarim">
+        <Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_Interceptor"/>
+    </CButton>
+    <CButton id="AP_MothershipCoreAiur">
+        <Icon value="Assets\Textures\btn-unit-protoss-mothershipcore.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-protoss-mothershipcore.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipCoreAiur"/>
+    </CButton>
+    <CButton id="AP_MothershipCorePurifier">
+        <Icon value="AP\Assets\Textures\btn-unit-protoss-mothershipcore-purifier-ex2.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-unit-protoss-mothershipcore-purifier-ex2.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipCorePurifier"/>
+    </CButton>
+    <CButton id="AP_MothershipAiur">
+        <Icon value="Assets\Textures\btn-unit-protoss-mothership.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-protoss-mothership.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MorphToMothership"/>
+    </CButton>
+    <CButton id="AP_MothershipPurifier">
+        <Icon value="AP\Assets\Textures\btn-unit-protoss-mothership-purifier-collection-ex2.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-unit-protoss-mothership-purifier-collection-ex2.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MorphToMothership"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipGroundSlow">
+        <Icon value="AP\Assets\Textures\alarakdeath_ingame_heroportrait.dds"/>
+        <AlertIcon value="AP\Assets\Textures\alarakdeath_ingame_heroportrait.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary3"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipGroundSlowInstall" parent="AP_TaldarimMothershipGroundSlow">
+        <Name value="Button/Name/AP_TaldarimMothershipGroundSlowInstall"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipFastAttack">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-orbitalthermallance-taldarim.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-orbitalthermallance-taldarim.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary2"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipFastAttackInstall" parent="AP_TaldarimMothershipFastAttack">
+        <Name value="Button/Name/AP_TaldarimMothershipFastAttackInstall"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipDeathHeal">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-supplicantsacrifice.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-supplicantsacrifice.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary4"/>
+    </CButton>
+    <CButton id="AP_TaldarimMothershipDeathHealInstall" parent="AP_TaldarimMothershipDeathHeal">
+        <Name value="Button/Name/AP_TaldarimMothershipDeathHealInstall"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipDebuff">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-dragoonovercharge.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-dragoonovercharge.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary2"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipDebuffInstall" parent="AP_PurifierMothershipDebuff">
+        <Name value="Button/Name/AP_PurifierMothershipDebuffInstall"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipEnergyRegenAura">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-symbolofunity.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-symbolofunity.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary4"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipEnergyRegenAuraInstall" parent="AP_AiurMothershipEnergyRegenAura">
+        <Name value="Button/Name/AP_AiurMothershipEnergyRegenAuraInstall"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipAttackSpeedBoost">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-purifier-sentry-optimizedemittersresearch-orange.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary4"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipAttackSpeedBoostInstall" parent="AP_PurifierMothershipAttackSpeedBoost">
+        <Name value="Button/Name/AP_PurifierMothershipAttackSpeedBoostInstall"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipShielding">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-purifier-shield-ex2.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-purifier-shield-ex2.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary3"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipShieldingInstall" parent="AP_PurifierMothershipShielding">
+        <Name value="Button/Name/AP_PurifierMothershipShieldingInstall"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipFeedback">
+        <Icon value="Assets\Textures\btn-ability-protoss-feedbackaoe-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-feedbackaoe-color.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <TooltipAppender Validator="AP_CanInstallAiurMothershipFeedback" Text="Button/Tooltip/AP_AppendAiurMothershipFeedback"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary3"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipFeedbackInstall" parent="AP_AiurMothershipFeedback">
+        <Name value="Button/Name/AP_AiurMothershipFeedbackInstall"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipShieldRestore">
+        <Icon value="Assets\Textures\talent-vorazun-level07-improvedshieldregeneration.dds"/>
+        <AlertIcon value="Assets\Textures\talent-vorazun-level07-improvedshieldregeneration.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary2"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipShieldRestoreInstall" parent="AP_AiurMothershipShieldRestore">
+        <Name value="Button/Name/AP_AiurMothershipShieldRestoreInstall"/>
+    </CButton>
+    <CButton id="AP_HangarInstallTaldarim">
+        <Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary1"/>
+    </CButton>
+    <CButton id="AP_CloakingFieldMothership">
+        <Icon value="Assets\Textures\btn-ability-protoss-cloakfield-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-cloakfield-color.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_MobilePowerField">
+        <Icon value="AP\Assets\Textures\btn-upgrade-purifier-pylonpower.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-purifier-pylonpower.dds"/>
+        <TooltipAppender Validator="AP_HaveWarCouncilNerfs" Text="Button/Tooltip/AP_AppendWarCouncilUpgrade"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_MothershipAiurShieldArmorAura">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-emergencywarp-aiur.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-emergencywarp-aiur.dds"/>
+        <TooltipAppender Validator="AP_HaveWarCouncilNerfs" Text="Button/Tooltip/AP_AppendWarCouncilUpgrade"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_BatteryOvercharge">
+        <Icon value="Assets\Textures\btn-ability-zeratul-observer-sensorarray.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zeratul-observer-sensorarray.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_BatteryOverchargeInstall" parent="AP_BatteryOvercharge">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage2"/>
+        <Tooltip value="Button/Tooltip/AP_BatteryOverchargeInstall"/>
+        <Name value="Button/Name/AP_BatteryOverchargeInstall"/>
+    </CButton>
+    <CButton id="AP_PowerRedirection">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-phasecannon-purifier.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-phasecannon-purifier.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_PowerRedirectionUpgrade">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-phasecannon-purifier.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-phasecannon-purifier.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_PowerRedirectionInstall" parent="AP_PowerRedirectionUpgrade">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage2"/>
+        <Tooltip value="Button/Tooltip/AP_PowerRedirectionInstall"/>
+        <Name value="Button/Name/AP_PowerRedirectionInstall"/>
+    </CButton>
+    <CButton id="AP_RevitalizeShields">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-chargedshield-blue.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-chargedshield-blue.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_AstralRestoration">
+        <Icon value="Assets\Textures\btn-ability-protoss-astralwind.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-astralwind.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_OverloadWeaponSystems">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-dischargestrike-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-dischargestrike-orange.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_PlanetCracker">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-purifier-planetcracker.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-purifier-planetcracker.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_RevitalizeShieldsInstall" parent="AP_RevitalizeShields">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage1"/>
+        <Tooltip value="Button/Tooltip/AP_RevitalizeShieldsInstall"/>
+        <Name value="Button/Name/AP_RevitalizeShieldsInstall"/>
+    </CButton>
+    <CButton id="AP_AstralRestorationInstall" parent="AP_AstralRestoration">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage3"/>
+        <Tooltip value="Button/Tooltip/AP_AstralRestorationInstall"/>
+        <Name value="Button/Name/AP_AstralRestorationInstall"/>
+    </CButton>
+    <CButton id="AP_OverloadWeaponSystemsInstall" parent="AP_OverloadWeaponSystems">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage1"/>
+        <Tooltip value="Button/Tooltip/AP_OverloadWeaponSystemsInstall"/>
+        <Name value="Button/Name/AP_OverloadWeaponSystemsInstall"/>
+    </CButton>
+    <CButton id="AP_PlanetCrackerInstall" parent="AP_PlanetCracker">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage3"/>
+        <Tooltip value="Button/Tooltip/AP_PlanetCrackerInstall"/>
+        <Name value="Button/Name/AP_PlanetCrackerInstall"/>
+    </CButton>
     <CButton id="AP_Probe">
         <Icon value="Assets\Textures\btn-unit-protoss-probe.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-protoss-probe.dds"/>
@@ -2942,13 +3259,151 @@
         <Icon value="Assets\Textures\btn-ability-protoss-blink-color.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_SOAMothershipBlinkGlobal">
+        <Icon value="AP\Assets\btn-ability-protoss-warpharmonization-taldarim.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
     <CButton id="AP_SOAMothershipLineAttack">
         <Icon value="Assets\Textures\btn-ability-protoss-thermallance.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-thermallance.dds"/>
         <EditorCategories value="Race:Protoss"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
     </CButton>
     <CButton id="AP_VoidSentryBlackHole">
         <Icon value="Assets\Textures\btn-ability-protoss-blackhole-redcolor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-blackhole-redcolor.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+   <CButton id="AP_SummonDeathFleet">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-improveddeathfleet.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-improveddeathfleet.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamagePrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipDamagePrimary"/>
+    </CButton>
+    <CButton id="AP_SOAMothershipLineAttackInstall" parent="AP_SOAMothershipLineAttack">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage1"/>
+        <Tooltip value="Button/Tooltip/AP_SOAMothershipLineAttackInstall"/>
+        <Name value="Button/Name/AP_SOAMothershipLineAttackInstall"/>
+    </CButton>
+    <CButton id="AP_VoidSentryBlackHoleInstall" parent="AP_VoidSentryBlackHole">
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility1"/>
+        <Tooltip value="Button/Tooltip/AP_VoidSentryBlackHoleInstall"/>
+        <Name value="Button/Name/AP_VoidSentryBlackHoleInstall"/>
+    </CButton>
+   <CButton id="AP_SummonDeathFleetInstall" parent="AP_SummonDeathFleet">
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage2"/>
+        <Tooltip value="Button/Tooltip/AP_SummonDeathFleetInstall"/>
+        <Name value="Button/Name/AP_SummonDeathFleetInstall"/>
+    </CButton>
+    <CButton id="AP_MothershipCloakField">
+        <Icon value="Assets\Textures\btn-ability-protoss-cloakfield-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-cloakfield-color.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_MothershipPowerField">
+        <Icon value="Assets\Textures\btn-upgrade-artanis-pylonpower.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-artanis-pylonpower.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_MothershipDamageAiur">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-prismaticrange-warpray.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-prismaticrange-warpray.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Name value="Button/Name/AP_MothershipDamage"/>
+        <Tooltip value="Button/Tooltip/AP_MothershipDamage"/>
+        <AlertTooltip value="Button/Tooltip/AP_MothershipDamage"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipDamage"/>
+        <HotkeyAlias value="AP_MothershipDamage"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_MothershipUtilityAiur">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-aiur-dragoonweapon.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-aiur-dragoonweapon.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Name value="Button/Name/AP_MothershipUtility"/>
+        <Tooltip value="Button/Tooltip/AP_MothershipUtility"/>
+        <AlertTooltip value="Button/Tooltip/AP_MothershipUtility"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility"/>
+        <HotkeyAlias value="AP_MothershipUtility"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_MothershipAuxiliaryAiur">
+        <Icon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Name value="Button/Name/AP_MothershipAuxiliary"/>
+        <Tooltip value="Button/Tooltip/AP_MothershipAuxiliary"/>
+        <AlertTooltip value="Button/Tooltip/AP_MothershipAuxiliary"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipAuxiliary"/>
+        <HotkeyAlias value="AP_MothershipAuxiliary"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_MothershipDamagePurifier" parent="AP_MothershipDamageAiur">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-prismaticrange-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-prismaticrange-orange.dds"/>
+    </CButton>
+    <CButton id="AP_MothershipUtilityPurifier" parent="AP_MothershipUtilityAiur">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-dragoonsuit-weapon.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-dragoonsuit-weapon.dds"/>
+    </CButton>
+    <CButton id="AP_MothershipAuxiliaryPurifier" parent="AP_MothershipAuxiliaryAiur">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-purifierauxiliary.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-purifierauxiliary.dds"/>
+    </CButton>
+    <CButton id="AP_MothershipDamageTaldarim" parent="AP_MothershipDamageAiur">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-destroyer-bloodshardoverload.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-destroyer-bloodshardoverload.dds"/>
+    </CButton>
+    <CButton id="AP_MothershipUtilityTaldarim" parent="AP_MothershipUtilityAiur">
+        <Icon value="AP\Assets\Textures\btn-upgrade-protoss-dragoonweapon-taldarim.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-upgrade-protoss-dragoonweapon-taldarim.dds"/>
+    </CButton>
+    <CButton id="AP_MothershipAuxiliaryTaldarim" parent="AP_MothershipAuxiliaryAiur">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-arcshield-taldarim.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-arcshield-taldarim.dds"/>
+    </CButton>
+    <CButton id="AP_AiurMothershipBlackHole">
+        <Icon value="Assets\Textures\btn-ability-protoss-blackhole-color.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-blackhole-color.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+    <CButton id="AP_PurifierMothershipBlackHole">
+        <Icon value="AP\Assets\Textures\btn-ability-protoss-blackhole-orange.dds"/>
+        <AlertIcon value="AP\Assets\Textures\btn-ability-protoss-blackhole-orange.dds"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtilityPrimary"/>
+        <EditorCategories value="Race:Protoss"/>
+        <HotkeyAlias value="AP_MothershipUtilityPrimary"/>
+    </CButton>
+    <CButton id="AP_MothershipAiurBlackHoleInstall" parent="AP_AiurMothershipBlackHole">
+        <Tooltip value="Button/Tooltip/AP_MothershipAiurBlackHoleInstall"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility1"/>
+        <Name value="Button/Name/AP_MothershipBlackHoleInstall"/>
+    </CButton>
+    <CButton id="AP_MothershipPurifierBlackHoleInstall" parent="AP_PurifierMothershipBlackHole">
+        <Tooltip value="Button/Tooltip/AP_MothershipPurifierBlackHoleInstall"/>
+        <Hotkey value="Button/Hotkey/AP_MothershipUtility1"/>
+        <Name value="Button/Name/AP_MothershipBlackHoleInstall"/>
+    </CButton>
+    <CButton id="AP_CancelMothershipMorph">
+        <Icon value="Assets\Textures\btn-command-cancel.dds"/>
+        <AlertIcon value="Assets\Textures\btn-command-cancel.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+        <TintRacially value="1"/>
+    </CButton>
+    <CButton id="AP_MothershipTaldarimBaseAttackEnable">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-melleeweapon.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_MothershipTaldarimBaseAttackDisable">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-rangeweapon.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
     <CButton id="AP_ReaverScarabs">
@@ -6015,6 +6470,7 @@
     <CButton id="AP_InterceptorTaldarim">
         <Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
         <AlertIcon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <Hotkey value="Button/Hotkey/AP_Interceptor"/>
     </CButton>
     <CButton id="AP_InterceptorPurifier">
         <Icon value="Assets\Textures\btn-unit-collection-purifier-bomber.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 7131d0f4dd..b711f7843e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -8051,6 +8051,28 @@
         <PlacementAround Value="CasterUnit"/>
         <SourceLocation Value="TargetUnit"/>
     </CEffectTeleport>
+    <CEffectCreatePersistent id="AP_MothershipTaldarimInterceptorLP">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetUnit"/>
+        <TimeScaleSource Value="Caster"/>
+        <Flags index="Channeled" value="1"/>
+        <ValidatorArray value="AP_HaveMothershipHangarTaldarimInstalled"/>
+        <PeriodCount value="8"/>
+        <PeriodicValidator value="CasterNotDead"/>
+        <PeriodicEffectArray value="AP_MothershipTaldarimInterceptor"/>
+        <PeriodicPeriodArray value="0.08"/>
+    </CEffectCreatePersistent>
+    <CEffectUseMagazine id="AP_MothershipTaldarimInterceptor">
+        <EditorCategories value="Race:Protoss"/>
+        <AmmoEffect value="AP_CarrierInterceptorLaunchSet"/>
+        <MagazineAbil value="AP_MothershipTaldarimHangar"/>
+    </CEffectUseMagazine>
+    <CEffectDamage id="AP_MothershipCoreRepulsorCannonDamage" parent="DU_WEAP">
+        <EditorCategories value="Race:Protoss"/>
+        <Kind value="Ranged"/>
+        <Amount value="6"/>
+        <Visibility value="Visible"/>
+    </CEffectDamage> 
     <CEffectCreatePersistent id="AP_InterceptorAiurLaunchPersistent">
         <EditorCategories value="Race:Protoss"/>
         <WhichLocation Value="TargetUnit"/>
@@ -10993,7 +11015,8 @@
         <Target Value="CasterUnit"/>
     </CEffectIssueOrder>
     <CEffectApplyBehavior id="AP_ArbiterMPCloakingFieldApply">
-        <ValidatorArray index="0" value="NotMothership"/>
+        <ValidatorArray value="NotMothership"/>
+        <ValidatorArray value="AP_NotMothershipAiur"/>
         <ValidatorArray value="AP_NotMothershipCore"/>
         <ValidatorArray value="AP_NotArbiterMP"/>
         <ValidatorArray value="AP_NotBansheeMengskCloakField"/>
@@ -11045,11 +11068,13 @@
         <ValidatorArray value="NotLarva"/>
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_ArbiterMPRecallTeleport"/>
+        <EffectArray value="AP_MothershipMassRecallTeleport"/>
         <EffectArray value="AP_ArbiterMPRecallApplyPostRecallBehavior"/>
     </CEffectSet>
     <CEffectTeleport id="AP_ArbiterMPRecallTeleport">
         <EditorCategories value="Race:Protoss"/>
         <PlacementArc value="360"/>
+        <ValidatorArray value="AP_CasterIsArbiter"/>
         <PlacementAround Effect="AP_ArbiterMPRecallSearch" Value="SourcePoint"/>
         <PlacementRange value="15"/>
         <SourceLocation Effect="AP_ArbiterMPRecallSearch" Value="TargetPoint"/>
@@ -11610,6 +11635,27 @@
     <CEffectDamage id="AP_OracleDummyWeapon">
         <EditorCategories value="Race:Protoss"/>
     </CEffectDamage>
+    <CEffectEnumArea id="AP_AiurMothershipFeedbackSearchPoint">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="Visible;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <ImpactLocation Value="TargetPoint"/>
+        <ValidatorArray value="AP_HaveAiurMothershipFeedback"/>
+        <ValidatorArray value="AP_CasterIsAiurMothership"/>
+        <TargetSorts>
+            <SortArray value="AP_TSEnergyDescending"/>
+        </TargetSorts>
+        <AreaArray Radius="6" MaxCount="1" Effect="AP_FeedbackSet"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_AiurMothershipFeedbackSearchCaster">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="Visible;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <ValidatorArray value="AP_HaveAiurMothershipFeedback"/>
+        <TargetSorts>
+            <SortArray value="AP_TSEnergyDescending"/>
+        </TargetSorts>
+        <AreaArray Radius="9" MaxCount="1" Effect="AP_FeedbackSet"/>
+    </CEffectEnumArea>
     <CEffectCreatePersistent id="AP_SOAMothershipBlinkCP">
         <EditorCategories value="Race:Protoss"/>
         <Flags index="Channeled" value="1"/>
@@ -11712,79 +11758,940 @@
         <ValidatorArray value="noMarkers"/>
         <EditorCategories value="Race:Protoss"/>
         <Flags index="Notification" value="1"/>
-        <Amount value="200"/>
-        <Death value="Fire"/>
+        <Amount value="200"/>
+        <Death value="Fire"/>
+    </CEffectDamage>
+    <CEffectCreatePersistent id="AP_SOAMothershipLineAttackInitialCP">
+        <WhichLocation Value="CasterPoint"/>
+        <PeriodCount value="1"/>
+        <PeriodicEffectArray value="AP_SOAMothershipLineAttackCasterLM"/>
+        <PeriodicOffsetArray value="0,-10,0"/>
+        <PeriodicPeriodArray value="0"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_SOAMothershipLineAttackScanCP">
+        <EditorCategories value="Race:Protoss"/>
+        <Marker>
+            <MatchFlags index="Id" value="1"/>
+        </Marker>
+        <WhichLocation Value="SourceUnit"/>
+        <TimeScaleSource Value="Caster"/>
+        <PeriodCount value="10"/>
+        <PeriodicEffectArray value="AP_SOAMothershipLineAttackSearch"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectEnumArea id="AP_SOAMothershipLineAttackSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1" Effect="AP_SOAMothershipLineAttackDamage"/>
+        <RevealerParams Duration="1" ShapeExpansion="0.5">
+            <RevealFlags index="Unfog" value="1"/>
+        </RevealerParams>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_SOAMothershipTimedLifeAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SOAMothershipTimedLife"/>
+    </CEffectApplyBehavior>
+    <CEffectDamage id="AP_SOAMothershipv4BeamDamage" parent="DU_WEAP_MISSILE">
+        <ValidatorArray value="AP_MothershipRangeCheck"/>
+        <ValidatorArray value="NotHidden"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Visibility value="Visible"/>
+        <Amount value="38"/>
+        <Death value="Fire"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_SOAMothershipv4FastBeamDamage" parent="AP_SOAMothershipv4BeamDamage">
+        <Amount value="19"/>
+    </CEffectDamage>
+    <CEffectModifyUnit id="AP_SOAMothershipv4BeamDummy">
+        <ValidatorArray value="AP_MothershipRangeCheck"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectModifyUnit>
+    <CEffectCreatePersistent id="AP_SOAMothershipv4BeamPersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetUnit"/>
+        <TimeScaleSource Value="Caster"/>
+        <Flags index="Channeled" value="1"/>
+        <InitialEffect value="AP_SOAMothershipv4BeamDummy"/>
+        <PeriodCount value="3"/>
+        <PeriodicValidator value="CasterNotDead"/>
+        <PeriodicValidator value="NotInvulnerable"/>
+        <PeriodicEffectArray value="AP_SOAMothershipv4BeamDamage"/>
+        <PeriodicPeriodArray value="0.375"/>
+    </CEffectCreatePersistent>
+    <CEffectSet id="AP_SOAMothershipv4BeamSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_MothershipTaldarimInterceptorLP"/>
+        <EffectArray value="AP_SOAMothershipv4BeamPersistent"/>
+        <EffectArray value="AP_SOAMothershipv4SecondaryBeamPersistent"/>
+        <EffectArray value="AP_TimeFieldTaldarimConfusionSearch"/>
+    </CEffectSet>
+    <CEffectSet id="AP_SOAMothershipv4FastBeamSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_MothershipTaldarimInterceptorLP"/>
+        <EffectArray value="AP_SOAMothershipv4FastBeamPersistent"/>
+        <EffectArray value="AP_SOAMothershipv4SecondaryFastBeamPersistent"/>
+        <EffectArray value="AP_TimeFieldTaldarimConfusionSearch"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_SOAMothershipv4SecondaryBeamPersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetUnit"/>
+        <TimeScaleSource Value="Caster"/>
+        <Flags index="Channeled" value="1"/>
+        <InitialDelay value="0.25"/>
+        <InitialEffect value="AP_SOAMothershipv4BeamDummy"/>
+        <PeriodCount value="3"/>
+        <PeriodicValidator value="AP_MothershipRangeCheckCombine"/>
+        <PeriodicValidator value="CasterNotDead"/>
+        <PeriodicValidator value="NotInvulnerable"/>
+        <PeriodicEffectArray value="AP_SOAMothershipv4BeamDamage"/>
+        <PeriodicPeriodArray value="0.375"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_SOAMothershipv4FastBeamPersistent" parent="AP_SOAMothershipv4BeamPersistent">
+        <PeriodicEffectArray index="0" value="AP_SOAMothershipv4FastBeamDamage"/>
+        <PeriodicPeriodArray index="0" value="0.14"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_SOAMothershipv4SecondaryFastBeamPersistent" parent="AP_SOAMothershipv4SecondaryBeamPersistent">
+        <InitialDelay value="0.1"/>
+        <PeriodicEffectArray index="0" value="AP_SOAMothershipv4FastBeamDamage"/>
+        <PeriodicPeriodArray index="0" value="0.14"/>
+    </CEffectCreatePersistent>
+    <CEffectDamage id="AP_AiurMothershipBeamDamage" parent="AP_SOAMothershipv4BeamDamage">
+        <Amount value="6"/>
+    </CEffectDamage>
+    <CEffectApplyBehavior id="AP_AiurMothershipWeaponHeroicAB">
+        <ValidatorArray value="NotFrenzied"/>
+        <ValidatorArray value="AP_HaveMothershipAiurAttackSlow"/>
+        <ValidatorArray value="AP_IsHeroic"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_MothershipAiurSlowHeroic"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_AiurMothershipWeaponSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AiurMothershipWeaponAB"/>
+        <EffectArray value="AP_AiurMothershipWeaponHeroicAB"/>
+        <EffectArray value="AP_AiurMothershipBeamDamage"/>
+        <EffectArray value="AP_AiurMothershipShieldRestoreSearch"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_AiurMothershipShieldRestoreSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <ValidatorArray value="AP_HaveAiurMothershipShieldRestore"/>
+        <SearchFilters value="Visible;Enemy,Missile,Stasis,Dead,Invulnerable"/>
+        <TargetSorts>
+            <SortArray value="TSShieldsFraction"/>
+        </TargetSorts>
+        <AreaArray Radius="7" MaxCount="1" Effect="AP_AiurMothershipShieldRestore"/>
+        <SearchFlags index="CenterAtLaunch" value="1"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+        <SearchFlags index="OffsetAreaByAngle" value="0"/>
+    </CEffectEnumArea>
+    <CEffectModifyUnit id="AP_AiurMothershipShieldRestore">
+        <ValidatorArray value="ShieldsNotFull"/>
+        <EditorCategories value="Race:Protoss"/>
+        <VitalArray index="Shields">
+            <Change value="5"/>
+        </VitalArray>
+    </CEffectModifyUnit>
+    <CEffectModifyUnit id="AP_AiurMothershipBeamDummy">
+        <ValidatorArray value="AP_MothershipRangeCheck"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectModifyUnit>
+    <CEffectCreatePersistent id="AP_AiurMothershipBeamPersistent" parent="AP_SOAMothershipv4BeamPersistent">
+        <PeriodicEffectArray index="0" value="AP_AiurMothershipWeaponSet"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_AiurMothershipSecondaryBeamPersistent" parent="AP_SOAMothershipv4SecondaryBeamPersistent">
+        <PeriodicEffectArray index="0" value="AP_AiurMothershipWeaponSet"/>
+    </CEffectCreatePersistent>
+    <CEffectSet id="AP_AiurMothershipBeamSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_MothershipAiurInterceptorLP"/>
+        <EffectArray value="AP_AiurMothershipBeamPersistent"/>
+        <EffectArray value="AP_AiurMothershipSecondaryBeamPersistent"/>
+    </CEffectSet>
+   <CEffectDamage id="AP_PurifierMothershipBeamDamage" parent="AP_SOAMothershipv4BeamDamage">
+        <Amount value="6"/>
+    </CEffectDamage>
+    <CEffectSet id="AP_PurifierMothershipBeamDamageSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PurifierMothershipBeamDamage"/>
+        <EffectArray value="AP_PurifierMothershipDebuffAB"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_PurifierMothershipBeamPersistent" parent="AP_SOAMothershipv4BeamPersistent">
+        <PeriodicEffectArray index="0" value="AP_PurifierMothershipBeamDamageSet"/>
+        <Flags index="Channeled" value="0"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_PurifierMothershipSecondaryBeamPersistent" parent="AP_SOAMothershipv4SecondaryBeamPersistent">
+        <PeriodicEffectArray index="0" value="AP_PurifierMothershipBeamDamageSet"/>
+        <Flags index="Channeled" value="0"/>
+    </CEffectCreatePersistent>
+    <CEffectSet id="AP_PurifierMothershipBeamSet">
+        <ValidatorArray value="AP_EnemyTargetExcludeSelf"/>
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PurifierMothershipBeamPersistent"/>
+        <EffectArray value="AP_PurifierMothershipSecondaryBeamPersistent"/>
+        <TargetLocationType value="Unit"/>
+    </CEffectSet>
+    <CEffectSet id="AP_PurifierMothershipFriendlyBeamSet">
+        <ValidatorArray value="AP_FriendlyTargetExcludeSelf"/>
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PurifierMothershipBeamPersistent"/>
+        <EffectArray value="AP_PurifierMothershipSecondaryBeamPersistent"/>
+    </CEffectSet>
+    <CEffectSet id="AP_PurifierMothershipWeaponSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PurifierMothershipFriendlyBeamSet"/>
+        <EffectArray value="AP_PurifierMothershipBeamSet"/>
+        <EffectArray value="AP_PurifierMothershipWeaponSearchSwitch"/>
+        <EffectArray value="AP_PurifierMothershipWeaponOverloadSearchSwitch"/>
+        <TargetLocationType value="Unit"/>
+    </CEffectSet>
+    <CEffectSwitch id="AP_PurifierMothershipWeaponSearchSwitch">
+        <CaseArray Validator="AP_Have1BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponSearch1BonusRange"/>
+        <CaseArray Validator="AP_Have2BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponSearch2BonusRange"/>
+        <CaseArray Validator="AP_Have3BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponSearch3BonusRange"/>
+        <CaseDefault value="AP_PurifierMothershipWeaponSearch"/>
+        <ValidatorArray value="AP_NotCasterOverloadWeaponSystems"/>
+    </CEffectSwitch>
+    <CEffectSwitch id="AP_PurifierMothershipWeaponOverloadSearchSwitch">
+        <CaseArray Validator="AP_Have1BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponOverloadSearch1BonusRange"/>
+        <CaseArray Validator="AP_Have2BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponOverloadSearch2BonusRange"/>
+        <CaseArray Validator="AP_Have3BonusRangeBehavior" Effect="AP_PurifierMothershipWeaponOverloadSearch3BonusRange"/>
+        <CaseDefault value="AP_PurifierMothershipWeaponOverloadSearch"/>
+        <ValidatorArray value="AP_CasterOverloadWeaponSystems"/>
+    </CEffectSwitch>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="Visible;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <ExcludeArray Value="Target"/>
+        <TargetSorts>
+            <SortArray value="AP_MothershipTargetFire"/>
+            <SortArray value="AP_TSThreatenBattlecruiser"/>
+            <SortArray value="TSPriority"/>
+        </TargetSorts>
+        <AreaArray>
+            <Arc value="360"/>
+            <MaxCount value="3"/>
+            <Radius value="7.5"/>
+            <Effect value="AP_PurifierMothershipBeamSet"/>
+        </AreaArray>
+        <SearchFlags index="CenterAtLaunch" value="1"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+        <SearchFlags index="OffsetAreaByAngle" value="0"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponSearch1BonusRange" parent="AP_PurifierMothershipWeaponSearch">
+        <AreaArray index="0">
+            <Radius value="8.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponSearch2BonusRange" parent="AP_PurifierMothershipWeaponSearch">
+        <AreaArray index="0">
+            <Radius value="9.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponSearch3BonusRange" parent="AP_PurifierMothershipWeaponSearch">
+        <AreaArray index="0">
+            <Radius value="10.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponOverloadSearch" parent="AP_PurifierMothershipWeaponSearch">
+        <AreaArray index="0">
+            <MaxCount value="7"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponOverloadSearch1BonusRange" parent="AP_PurifierMothershipWeaponOverloadSearch">
+        <AreaArray index="0">
+            <Radius value="8.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponOverloadSearch2BonusRange" parent="AP_PurifierMothershipWeaponOverloadSearch">
+        <AreaArray index="0">
+            <Radius value="9.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurifierMothershipWeaponOverloadSearch3BonusRange" parent="AP_PurifierMothershipWeaponOverloadSearch">
+        <AreaArray index="0">
+            <Radius value="10.5"/>
+        </AreaArray>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_RevitalizeShieldsSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AiurMothershipFeedbackSearchPoint"/>
+        <EffectArray value="AP_RevitalizeShieldsSearchArea"/>
+        <TargetLocationType value="Point"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_RevitalizeShieldsSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="Visible;Neutral,Enemy,Missile,Item,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="2.7" Effect="AP_RevitalizeShieldsModifyUnit"/>
+        <ImpactLocation Value="TargetPoint"/>
+    </CEffectEnumArea>
+    <CEffectModifyUnit id="AP_RevitalizeShieldsModifyUnit">
+        <EditorCategories value="Race:Protoss"/>
+        <VitalArray index="Shields" Change="80"/>
+    </CEffectModifyUnit>
+    <CEffectSet id="AP_SummonDeathFleetSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_SummonDeathFleet"/>
+        <EffectArray value="AP_SummonDeathFleetCooldownAB"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_SummonDeathFleet">
+        <EditorCategories value="Race:Protoss"/>
+        <TimeScaleSource Value="Caster"/>
+        <OffsetVectorStartLocation Value="CasterUnit"/>
+        <PeriodCount value="6"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicEffectArray value="AP_SummonDeathFleetVoidRay"/>
+        <PeriodicOffsetArray value="-4.4,0,0"/>
+        <PeriodicOffsetArray value="4.4,0,0"/>
+        <PeriodicOffsetArray value="2.2,3.7,0"/>
+        <PeriodicOffsetArray value="2.2,-3.7,0"/>
+        <PeriodicOffsetArray value="-2.2,3.7,0"/>
+        <PeriodicOffsetArray value="-2.2,-3.7,0"/>
+        <PeriodicPeriodArray value="0"/>
+    </CEffectCreatePersistent>
+    <CEffectCreateUnit id="AP_SummonDeathFleetVoidRay">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetPoint"/>
+        <CreateFlags index="SetFacing" value="1"/>
+        <CreateFlags index="UseFood" value="0"/>
+        <SpawnUnit value="AP_VoidRayTaldarim"/>
+        <SpawnRange value="10"/>
+        <SpawnEffect value="AP_SummonDeathFleetInitialAB"/>
+    </CEffectCreateUnit>
+    <CEffectApplyBehavior id="AP_SummonDeathFleetInitialAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SummonDeathFleetInitial"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_SummonDeathFleetCooldownAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SummonDeathFleetCooldown"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_SummonDeathFleetTimerAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SummonDeathFleetTimer"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_SummonDeathFleetWarpOutAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SummonDeathFleetWarpOut"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_PlanetCrackerInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PlanetCrackerInstallAB"/>
+        <EffectArray value="AP_OverloadWeaponSystemsInstallRB"/>
+        <EffectArray value="AP_PowerRedirectionInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_OverloadWeaponSystemsInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PlanetCrackerInstallRB"/>
+        <EffectArray value="AP_OverloadWeaponSystemsInstallAB"/>
+        <EffectArray value="AP_PowerRedirectionInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_PowerRedirectionInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PlanetCrackerInstallRB"/>
+        <EffectArray value="AP_OverloadWeaponSystemsInstallRB"/>
+        <EffectArray value="AP_PowerRedirectionInstallAB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_SummonDeathFleetInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_SummonDeathFleetInstallAB"/>
+        <EffectArray value="AP_ThermalLanceInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_ThermalLanceInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_SummonDeathFleetInstallRB"/>
+        <EffectArray value="AP_ThermalLanceInstallAB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_BatteryOverchargeInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_BatteryOverchargeInstallAB"/>
+        <EffectArray value="AP_AstralRestorationInstallRB"/>
+        <EffectArray value="AP_RevitalizeShieldsInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_AstralRestorationInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AstralRestorationInstallAB"/>
+        <EffectArray value="AP_RevitalizeShieldsInstallRB"/>
+        <EffectArray value="AP_BatteryOverchargeInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_RevitalizeShieldsInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AstralRestorationInstallRB"/>
+        <EffectArray value="AP_RevitalizeShieldsInstallAB"/>
+        <EffectArray value="AP_BatteryOverchargeInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_BlackHoleInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_BlackHoleInstallAB"/>
+        <EffectArray value="AP_TimeFieldInstallRB"/>
+        <EffectArray value="AP_WormholeModuleInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_TimeFieldInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_BlackHoleInstallRB"/>
+        <EffectArray value="AP_TimeFieldInstallAB"/>
+        <EffectArray value="AP_WormholeModuleInstallRB"/>
+    </CEffectSet>
+    <CEffectSet id="AP_WormholeModuleInstallSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_BlackHoleInstallRB"/>
+        <EffectArray value="AP_TimeFieldInstallRB"/>
+        <EffectArray value="AP_WormholeModuleInstallAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_PlanetCrackerInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_PlanetCrackerInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_PlanetCrackerInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_PlanetCrackerInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_OverloadWeaponSystemsInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_OverloadWeaponSystemsInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_OverloadWeaponSystemsInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_OverloadWeaponSystemsInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_PowerRedirectionInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_PowerRedirectionInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_PowerRedirectionInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_PowerRedirectionInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_ThermalLanceInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_ThermalLanceInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_ThermalLanceInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_ThermalLanceInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_SummonDeathFleetInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_SummonDeathFleetInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_SummonDeathFleetInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_SummonDeathFleetInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_RevitalizeShieldsInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_RevitalizeShieldsInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_RevitalizeShieldsInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_RevitalizeShieldsInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_AstralRestorationInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_AstralRestorationInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_AstralRestorationInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_AstralRestorationInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_BatteryOverchargeInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_BatteryOverchargeInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_BatteryOverchargeInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_BatteryOverchargeInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_BlackHoleInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_BlackHoleInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_BlackHoleInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_BlackHoleInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_TimeFieldInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TimeFieldInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_TimeFieldInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_TimeFieldInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_WormholeModuleInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_WormholeModuleInstalled"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_WormholeModuleInstallRB">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_WormholeModuleInstalled"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_NexusRecallAB">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_NexusRecall"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_TaldarimMothershipDeathHealABSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_TaldarimMothershipDeathHealAB"/>
+        <EffectArray value="AP_TaldarimMothershipDeathHealTaldarimAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_TaldarimMothershipDeathHealAB">
+        <EditorCategories value=""/>
+        <ValidatorArray value="AP_IsNotTaldarimUnit"/>
+        <ValidatorArray value="AP_NotWorker"/>
+        <Behavior value="AP_TaldarimMothershipDeathHealDebuff"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_TaldarimMothershipDeathHealTaldarimAB">
+        <EditorCategories value=""/>
+        <ValidatorArray value="AP_IsTaldarimUnit"/>
+        <Behavior value="AP_TaldarimMothershipDeathHealTaldarimDebuff"/>
+    </CEffectApplyBehavior>
+    <CEffectLaunchMissile id="AP_TaldarimMothershipDeathHealLM">
+        <EditorCategories value=""/>
+        <ImpactLocation Value="CasterUnit"/>
+        <ImpactEffect value="AP_TaldarimMothershipDeathHealMU"/>
+        <AmmoUnit value="AP_TaldarimMothershipDeathHealMissle"/>
+    </CEffectLaunchMissile>
+    <CEffectModifyUnit id="AP_TaldarimMothershipDeathHealMU">
+        <EditorCategories value=""/>
+        <VitalArray index="Life" Change="10"/>
+        <VitalArray index="Shields" Change="20"/>
+        <ImpactUnit Value="Caster"/>
+    </CEffectModifyUnit>
+    <CEffectLaunchMissile id="AP_TaldarimMothershipDeathHealTaldarimLM">
+        <EditorCategories value=""/>
+        <ImpactLocation Value="CasterUnit"/>
+        <ImpactEffect value="AP_TaldarimMothershipDeathHealTaldarimMU"/>
+        <AmmoUnit value="AP_TaldarimMothershipDeathHealMissle"/>
+    </CEffectLaunchMissile>
+    <CEffectModifyUnit id="AP_TaldarimMothershipDeathHealTaldarimMU">
+        <EditorCategories value=""/>
+        <VitalArray index="Life" Change="20"/>
+        <VitalArray index="Shields" Change="20"/>
+        <VitalArray index="Energy" Change="1"/>
+        <ImpactUnit Value="Caster"/>
+    </CEffectModifyUnit>
+    <CEffectEnumArea id="AP_TaldarimMothershipDeathHealSearch">
+        <EditorCategories value=""/>
+        <ValidatorArray value="AP_NotWorker"/>
+        <AreaArray Radius="9.5" Effect="AP_TaldarimMothershipDeathHealABSet"/>
+        <SearchFilters value="-;Self,Ally,Neutral,Enemy,Structure"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_TaldarimMothershipDeathHealImpactDummy"/>
+    <CEffectSet id="AP_TaldarimMothershipDeathHealLaunchDummy"/>
+    <CEffectEnumArea id="AP_PlanetCrackerSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <AreaArray Radius="6.2" RadiusBonus="0.13" Effect="AP_PlanetCrackerDamage"/>
+        <SearchFilters value="-;Self,Stasis,Dead,Hidden,Missile,Invulnerable"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_PlanetCrackerAB">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PlanetCracker"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PurifierMothershipShieldingAB">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PurifierMothershipShielding"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PurifierMothershipShieldingABTarget">
+        <Behavior value="AP_PurifierMothershipShielding"/>
+        <ValidatorArray value="AP_CasterIsPurifierMothership"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_PurifierMothershipShieldingRB">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <BehaviorLink value="AP_PurifierMothershipShielding"/>
+    </CEffectRemoveBehavior>
+   <CEffectRemoveBehavior id="AP_PurifierMothershipShieldingRBTarget">
+        <EditorCategories value="Race:Protoss"/>
+        <BehaviorLink value="AP_PurifierMothershipShielding"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_PlanetCrackerChargeUpAB">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PlanetCrackerChargeUp"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PlanetCrackerCooldownAB">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PlanetCrackerCooldown"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CEffectApplyBehavior>
+    <CEffectDamage id="AP_PlanetCrackerDamage">
+        <EditorCategories value="Race:Protoss"/>
+        <Visibility value="Visible"/>
+        <Amount value="25"/>
+        <Death value="Fire"/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <Flags index="Notification" value="1"/>
+        <SearchFlags index="CallForHelp" value="1"/>
+    </CEffectDamage>
+    <CEffectSet id="AP_PlanetCrackerSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PlanetCrackerTeleport"/>
+        <EffectArray value="AP_PlanetCrackerCooldownAB"/>
+        <EffectArray value="AP_PlanetCrackerChargeUpAB"/>
+        <EffectArray value="AP_PurifierMothershipShieldingAB"/>
+        <TargetLocationType value="Point"/>
+    </CEffectSet>
+    <CEffectTeleport id="AP_PlanetCrackerTeleport">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <TargetLocation Value="TargetPoint"/>
+    </CEffectTeleport>
+    <CEffectSet id="AP_MothershipAiurCloakingFieldSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPCloakingFieldApply"/>
+        <EffectArray value="AP_MothershipAiurShieldArmorAB"/>
+        <EffectArray value="AP_AiurMothershipEnergyRegenAuraSet"/>
+        <TargetLocationType value="Point"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_MothershipAiurCloakingFieldSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_NoAstralRestoration"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="-;Self,Neutral,Enemy,Missile,Dead,Hidden"/>
+        <AreaArray Radius="6" Effect="AP_MothershipAiurCloakingFieldSet"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_MothershipAiurShieldArmorAB">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_HaveMothershipAiurShieldArmorAura"/>
+        <Behavior value="AP_MothershipAiurShieldArmor"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_AiurMothershipFeedbackAuraAB">
+        <WhichUnit Value="Caster"/>
+        <EditorCategories value=""/>
+        <ValidatorArray value="AP_HaveAiurMothershipFeedback"/>
+        <Behavior value="AP_AiurMothershipFeedbackAura"/>
+    </CEffectApplyBehavior>
+    <CEffectEnumArea id="AP_MothershipAstralRestorationSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_CasterAstralRestoration"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="-;Self,Neutral,Enemy,Missile,Dead,Hidden"/>
+        <AreaArray Radius="9" Effect="AP_AstralRestorationSet"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_AstralRestorationSet">
+        <ValidatorArray value="AP_FriendlyTargetExcludeSelf"/>
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPCloakingFieldApply"/>
+        <EffectArray value="AP_AstralRestorationHeal"/>
+        <EffectArray value="AP_MothershipAiurShieldArmorAB"/>
+        <EffectArray value="AP_AiurMothershipEnergyRegenAuraSet"/>
+    </CEffectSet>
+    <CEffectSet id="AP_AstralRestorationInitialSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AstralRestorationABCaster"/>
+        <EffectArray value="AP_AstralRestorationABCooldown"/>
+        <EffectArray value="AP_AiurMothershipFeedbackAuraAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_AstralRestorationABCaster">
+        <WhichUnit Value="Caster"/>
+        <EditorCategories value=""/>
+        <Behavior value="AP_AstralRestorationCaster"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_AstralRestorationABCooldown">
+        <WhichUnit Value="Caster"/>
+        <EditorCategories value=""/>
+        <Behavior value="AP_AstralRestorationCooldown"/>
+    </CEffectApplyBehavior>
+    <CEffectModifyUnit id="AP_AstralRestorationHeal">
+        <EditorCategories value="Race:Protoss"/>
+        <VitalArray index="Shields" Change="2"/>
+        <VitalArray index="Life" Change="1"/>
+    </CEffectModifyUnit>
+    <CEffectSet id="AP_OverloadWeaponSystemsABSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_OverloadWeaponSystemsABCaster"/>
+        <EffectArray value="AP_PurifierMothershipShieldingAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_OverloadWeaponSystemsABCaster">
+        <WhichUnit Value="Caster"/>
+        <EditorCategories value=""/>
+        <Behavior value="AP_OverloadWeaponSystems"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_OverloadWeaponSystemsStunAB">
+        <Behavior value="AP_OverloadWeaponSystemsStun"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_TargetFirePriority">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TargetFire"/>
+    </CEffectApplyBehavior>
+    <CEffectCreateHealer id="AP_BatteryOverchargeCreateHealer">
+        <EditorCategories value="Race:Protoss"/>
+        <RechargeVital value="Energy"/>
+        <RechargeVitalRate value="3.332"/>
+    </CEffectCreateHealer>
+    <CEffectApplyBehavior id="AP_BatteryOverchargeAB">
+        <ValidatorArray value="AP_IsAPShieldBattery"/>
+        <ValidatorArray value="IsNotConstructing"/>
+        <ValidatorArray value="AP_BuildingHasAtLeastNormalPower"/>
+        <ValidatorArray value="TargetNotHaveBatteryOvercharge"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_BatteryOvercharge"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_AiurMothershipBlackHoleAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_AiurMothershipBlackHole"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyForce id="AP_AiurMothershipBlackHoleForce">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetPoint"/>
+        <WhichUnit Effect="AP_AiurMothershipBlackHoleImpactSet"/>
+        <Amount value="-1"/>
+    </CEffectApplyForce>
+    <CEffectCreatePersistent id="AP_AiurMothershipBlackHoleForceOffset">
+        <EditorCategories value="Race:Protoss"/>
+        <OffsetVectorStartLocation Effect="AP_AiurMothershipBlackHoleSearch" Value="TargetPoint"/>
+        <InitialEffect value="AP_AiurMothershipBlackHoleForce"/>
+        <InitialOffset value="0.375,0.1125,0"/>
+    </CEffectCreatePersistent>
+    <CEffectSet id="AP_AiurMothershipBlackHoleImpactSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AiurMothershipBlackHoleAB"/>
+        <EffectArray value="AP_AiurMothershipBlackHoleForceOffset"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_AiurMothershipBlackHolePersistent">
+        <InitialEffect value="AP_AiurMothershipFeedbackSearchPoint"/>
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="96"/>
+        <PeriodicEffectArray value="AP_AiurMothershipBlackHoleSearch"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectEnumArea id="AP_AiurMothershipBlackHoleSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <LaunchLocation Value="TargetPoint"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="3" Effect="AP_AiurMothershipBlackHoleImpactSet"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_PurifierMothershipBlackHoleAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_PurifierMothershipBlackHole"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyForce id="AP_PurifierMothershipBlackHoleForce">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetPoint"/>
+        <WhichUnit Effect="AP_PurifierMothershipBlackHoleImpactSet"/>
+        <Amount value="-1"/>
+    </CEffectApplyForce>
+    <CEffectCreatePersistent id="AP_PurifierMothershipBlackHoleForceOffset">
+        <EditorCategories value="Race:Protoss"/>
+        <OffsetVectorStartLocation Effect="AP_PurifierMothershipBlackHoleSearch" Value="TargetPoint"/>
+        <InitialEffect value="AP_PurifierMothershipBlackHoleForce"/>
+        <InitialOffset value="0.4375,0.13125,0"/>
+    </CEffectCreatePersistent>
+    <CEffectSet id="AP_PurifierMothershipBlackHoleImpactSet">
+        <EditorCategories value=""/>
+        <EffectArray value="AP_PurifierMothershipBlackHoleAB"/>
+        <EffectArray value="AP_PurifierMothershipBlackHoleForceOffset"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_PurifierMothershipBlackHolePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="112"/>
+        <PeriodicEffectArray value="AP_PurifierMothershipBlackHoleSearch"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectEnumArea id="AP_PurifierMothershipBlackHoleSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <LaunchLocation Value="TargetPoint"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="3.5" Effect="AP_PurifierMothershipBlackHoleImpactSet"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_PurifierMothershipDebuffAB">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_HavePurifierMothershipDebuff"/>
+        <Behavior value="AP_PurifierMothershipDebuff"/>
+    </CEffectApplyBehavior>
+    <CEffectDamage id="AP_PurifierMothershipDebuffDOT">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <Flags index="Notification" value="1"/>
+        <Amount value="1"/>
+    </CEffectDamage>
+    <CEffectApplyBehavior id="AP_MothershipHangarInstallAB">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_MothershipHangar"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PowerRedirectionPhotonAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_PowerRedirectionPhoton"/>
+        <ValidatorArray value="AP_IsAPPhotonCannon"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PowerRedirectionKhaydarinAB">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_PowerRedirectionKhaydarin"/>
+        <ValidatorArray value="AP_IsKhaydarinMonolith"/>
+    </CEffectApplyBehavior>
+    <CEffectCreateUnit id="AP_MothershipPylonPowerCU">
+        <WhichLocation Value="TargetPoint"/>
+        <CreateFlags index="Placement" value="0"/>
+        <CreateFlags index="ProvideFood" value="0"/>
+        <CreateFlags index="SetFacing" value="1"/>
+        <CreateFlags index="UseFood" value="0"/>
+        <SpawnUnit value="AP_MothershipPylonPowerUnit"/>
+    </CEffectCreateUnit>
+    <CEffectEnumArea id="AP_KillMothershipPylonPowerSearchArea">
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="-;Ally,Neutral,Enemy"/>
+        <AreaArray Radius="100" Effect="AP_KillMothershipPylonPowerDamage"/>
+    </CEffectEnumArea>
+    <CEffectDamage id="AP_KillMothershipPylonPowerDamage">
+        <ValidatorArray value="AP_IsMothershipPylonPowerUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <Flags index="Kill" value="1"/>
+    </CEffectDamage>
+    <CEffectSet id="AP_PowerRedirectionSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PowerRedirectionCasterAB"/>
+        <EffectArray value="AP_PowerRedirectionCP"/>
+        <EffectArray value="AP_PurifierMothershipShieldingABTarget"/>
+        <ValidatorArray value="AP_IsPhotonOrKhaydarin"/>
+        <TargetLocationType value="UnitOrPoint"/>
+    </CEffectSet>
+    <CEffectSet id="AP_PowerRedirectionBuildingSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PowerRedirectionPhotonAB"/>
+        <EffectArray value="AP_PowerRedirectionKhaydarinAB"/>
+        <EffectArray value="AP_PurifierMothershipShieldingABTarget"/>
+        <EffectArray value="AP_MothershipPylonPowerCU"/>
+        <ValidatorArray value="AP_IsPhotonOrKhaydarin"/>
+        <TargetLocationType value="UnitOrPoint"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_PowerRedirectionCP">
+        <ValidatorArray value="noMarkers"/>
+        <ValidatorArray value="AP_IsPhotonOrKhaydarin"/>
+        <EditorCategories value=""/>
+        <WhichLocation Value="TargetUnit"/>
+        <Flags index="Channeled" value="1"/>
+        <InitialEffect value="AP_PowerRedirectionBuildingSet"/>
+        <PeriodCount value="50"/>
+        <PeriodicValidator value="CasterNotDead"/>
+        <PeriodicValidator value="TargetNotDead"/>
+        <PeriodicPeriodArray value="0.20"/>
+    </CEffectCreatePersistent>
+    <CEffectApplyBehavior id="AP_PowerRedirectionCasterAB">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PowerRedirectionCaster"/>
+    </CEffectApplyBehavior>
+   <CEffectRemoveBehavior id="AP_PowerRedirectionCasterRB">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <BehaviorLink value="AP_PowerRedirectionCaster"/>
+    </CEffectRemoveBehavior>
+    <CEffectSet id="AP_PowerRedirectionCasterRemoveSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PowerRedirectionCasterRB"/>
+        <EffectArray value="AP_KillMothershipPylonPowerSearchArea"/>
+        <EffectArray value="AP_PurifierMothershipShieldingRBTarget"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_KhaydarinSplashSearch">
+        <EditorCategories value=""/>
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.4" Effect="AP_KhaydarinSplashDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectDamage id="AP_KhaydarinSplashDamage">
+        <EditorCategories value="Race:Protoss"/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <ArmorReduction value="1"/>
+        <Flags index="Notification" value="1"/>
+        <Kind value="Ranged"/>
+        <Amount value="40"/>
+        <SearchFlags index="CallForHelp" value="1"/>
+        <ValidatorArray value="AP_HasPowerRedirectedKhaydarin"/>
     </CEffectDamage>
-    <CEffectCreatePersistent id="AP_SOAMothershipLineAttackInitialCP">
-        <WhichLocation Value="CasterPoint"/>
-        <PeriodCount value="1"/>
-        <PeriodicEffectArray value="AP_SOAMothershipLineAttackCasterLM"/>
-        <PeriodicOffsetArray value="0,-10,0"/>
-        <PeriodicPeriodArray value="0"/>
-    </CEffectCreatePersistent>
-    <CEffectCreatePersistent id="AP_SOAMothershipLineAttackScanCP">
-        <EditorCategories value="Race:Protoss"/>
-        <Marker>
-            <MatchFlags index="Id" value="1"/>
-        </Marker>
-        <WhichLocation Value="SourceUnit"/>
-        <TimeScaleSource Value="Caster"/>
-        <PeriodCount value="10"/>
-        <PeriodicEffectArray value="AP_SOAMothershipLineAttackSearch"/>
-        <PeriodicPeriodArray value="0.0625"/>
-    </CEffectCreatePersistent>
-    <CEffectEnumArea id="AP_SOAMothershipLineAttackSearch">
+    <CEffectEnumArea id="AP_PhotonCannonSearch">
         <EditorCategories value="Race:Protoss"/>
-        <SearchFilters value="-;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <AreaArray Radius="1" Effect="AP_SOAMothershipLineAttackDamage"/>
-        <RevealerParams Duration="1" ShapeExpansion="0.5">
-            <RevealFlags index="Unfog" value="1"/>
-        </RevealerParams>
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="Visible;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray MaxCount="2" Radius="2.25" Effect="AP_PhotonCannonLM"/>
+        <ValidatorArray value="AP_HasPowerRedirectedPhoton"/>
     </CEffectEnumArea>
-    <CEffectApplyBehavior id="AP_SOAMothershipTimedLifeAB">
+    <CEffectSet id="AP_PhotonCannonSet">
         <EditorCategories value="Race:Protoss"/>
-        <Behavior value="AP_SOAMothershipTimedLife"/>
-    </CEffectApplyBehavior>
-    <CEffectDamage id="AP_SOAMothershipv4BeamDamage" parent="DU_WEAP_MISSILE">
-        <ValidatorArray value="AP_MothershipRangeCheck"/>
+        <EffectArray value="AP_PhotonCannonLM"/>
+        <EffectArray value="AP_PhotonCannonSearch"/>
+        <TargetLocationType value="UnitOrPoint"/>
+    </CEffectSet>
+    <CEffectSet id="AP_MothershipCorePurifierWeaponInitialSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_MothershipCorePurifierWeaponCP"/>
+        <EffectArray value="AP_MothershipCorePurifierWeaponFriendlyCP"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_MothershipCorePurifierWeaponFriendlyCP">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichLocation Value="TargetUnit"/>
+        <TimeScaleSource Value="Caster"/>
+        <Flags index="Channeled" value="1"/>
+        <ExpireDelay value="0.2"/>
+        <PeriodCount value="1"/>
+        <PeriodicEffectArray value="AP_MothershipCorePurifierWeaponFriendlyDamage"/>
+        <PeriodicPeriodArray value="0.09"/>
+    </CEffectCreatePersistent>
+    <CEffectDamage id="AP_MothershipCorePurifierWeaponDamage" parent="DU_WEAP">
         <ValidatorArray value="NotHidden"/>
+        <ValidatorArray value="noMarkers"/>
         <EditorCategories value="Race:Protoss"/>
         <Visibility value="Visible"/>
-        <Amount value="38"/>
+        <Kind value="Ranged"/>
+        <KindSplash value="Splash"/>
+        <Amount value="16"/>
         <Death value="Fire"/>
     </CEffectDamage>
-    <CEffectModifyUnit id="AP_SOAMothershipv4BeamDummy">
-        <ValidatorArray value="AP_MothershipRangeCheck"/>
-        <EditorCategories value="Race:Protoss"/>
-    </CEffectModifyUnit>
-    <CEffectCreatePersistent id="AP_SOAMothershipv4BeamPersistent">
+    <CEffectDamage id="AP_MothershipCorePurifierWeaponFriendlyDamage" parent="AP_MothershipCorePurifierWeaponDamage">
+        <ValidatorArray value="FriendlyTarget"/>
+    </CEffectDamage>
+    <CEffectCreatePersistent id="AP_MothershipCorePurifierWeaponDamageDelay">
         <EditorCategories value="Race:Protoss"/>
         <WhichLocation Value="TargetUnit"/>
-        <TimeScaleSource Value="Caster"/>
-        <Flags index="Channeled" value="1"/>
-        <InitialEffect value="AP_SOAMothershipv4BeamDummy"/>
-        <PeriodCount value="3"/>
-        <PeriodicValidator value="CasterNotDead"/>
-        <PeriodicEffectArray value="AP_SOAMothershipv4BeamDamage"/>
-        <PeriodicPeriodArray value="0.375"/>
+        <ExpireDelay value="0.25"/>
+        <FinalEffect value="AP_MothershipCorePurifierWeaponDamage"/>
     </CEffectCreatePersistent>
-    <CEffectSet id="AP_SOAMothershipv4BeamSet">
+   <CEffectEnumArea id="AP_MothershipCorePurifierWeaponSearch">
         <EditorCategories value="Race:Protoss"/>
-        <EffectArray value="AP_SOAMothershipv4BeamPersistent"/>
-        <EffectArray value="AP_SOAMothershipv4SecondaryBeamPersistent"/>
-    </CEffectSet>
-    <CEffectCreatePersistent id="AP_SOAMothershipv4SecondaryBeamPersistent">
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="Ground;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="0.15" Effect="AP_MothershipCorePurifierWeaponDamageDelay"/>
+        <SearchFlags index="CallForHelp" value="1"/>
+    </CEffectEnumArea>
+    <CEffectCreatePersistent id="AP_MothershipCorePurifierWeaponCP">
         <EditorCategories value="Race:Protoss"/>
-        <WhichLocation Value="TargetUnit"/>
+        <Marker>
+            <MatchFlags index="Id" value="1"/>
+        </Marker>
         <TimeScaleSource Value="Caster"/>
         <Flags index="Channeled" value="1"/>
-        <InitialDelay value="0.25"/>
-        <InitialEffect value="AP_SOAMothershipv4BeamDummy"/>
-        <PeriodCount value="3"/>
-        <PeriodicValidator value="AP_MothershipRangeCheckCombine"/>
-        <PeriodicEffectArray value="AP_SOAMothershipv4BeamDamage"/>
-        <PeriodicPeriodArray value="0.375"/>
-    </CEffectCreatePersistent>
+        <ExpireDelay value="0.73"/>
+        <ExpireEffect value="AP_MothershipCorePurifierWeaponDamage"/>
+        <PeriodCount value="11"/>
+        <PeriodicEffectArray value="AP_MothershipCorePurifierWeaponSearch"/>
+        <PeriodicOffsetArray value="-1.25,0,0"/>
+        <PeriodicOffsetArray value="-1,0,0"/>
+        <PeriodicOffsetArray value="-0.75,0,0"/>
+        <PeriodicOffsetArray value="-0.5,0,0"/>
+        <PeriodicOffsetArray value="-0.25,0,0"/>
+        <PeriodicOffsetArray value="0,0,0"/>
+        <PeriodicOffsetArray value="0.25,0,0"/>
+        <PeriodicOffsetArray value="0.5,0,0"/>
+        <PeriodicOffsetArray value="0.75,0,0"/>
+        <PeriodicOffsetArray value="1,0,0"/>
+        <PeriodicOffsetArray value="1.25,0,0"/>
+        <PeriodicPeriodArray value="0.025"/>
+    </CEffectCreatePersistent>  
     <CEffectApplyBehavior id="AP_SOAMothershipv4WarpAwayAB">
         <EditorCategories value="Race:Protoss"/>
         <WhichUnit Value="Source"/>
@@ -12489,6 +13396,9 @@
         <PeriodicEffectArray value="AP_VoidSentryChronoBeamSet"/>
         <PeriodicPeriodArray value="1"/>
     </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_ChronoDroneChronoBeamCP" parent="AP_VoidSentryChronoBeamCP">
+        <PeriodicPeriodArray index="0" value="1.8"/>
+    </CEffectCreatePersistent>
     <CEffectSet id="AP_VoidSentryChronoBeamSet">
         <EffectArray value="AP_VoidSentryChronoBeamAB"/>
     </CEffectSet>
@@ -12682,17 +13592,32 @@
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_KhaydarinBeamDamage"/>
         <EffectArray value="AP_KhaydarinBeamRetarget"/>
+        <EffectArray value="AP_KhaydarinSplashSearch"/>
     </CEffectSet>
     <CEffectSet id="AP_KhaydarinBeamHighDamageSet">
         <ValidatorArray value="AP_KhaydarinBeamDamageHighCheck"/>
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_KhaydarinBeamDamage"/>
         <EffectArray value="AP_KhaydarinBeamRetarget"/>
+        <EffectArray value="AP_KhaydarinSplashSearch"/>
     </CEffectSet>
     <CEffectApplyBehavior id="AP_KhaydarinBeamRetarget">
         <WhichUnit Value="Caster"/>
     </CEffectApplyBehavior>
+    <CEffectSet id="AP_ShieldBatteryRechargeChanneledSet">
+        <EffectArray value="AP_ShieldBatteryRechargeChanneled"/>
+        <EffectArray value="AP_ShieldBatteryRechargeChanneledOvercharged"/>
+        <ValidatorArray value="noMarkers"/>
+        <ValidatorArray value="ShieldsNotFull"/>
+        <ValidatorArray value="NotWarpingIn"/>
+        <ValidatorArray value="HiddenCompareAB"/>
+        <ValidatorArray value="HiddenCompareBA"/>
+        <ValidatorArray value="NotVortexd"/>
+        <ValidatorArray value="SourceNotHidden"/>
+        <ValidatorArray value="AP_NotInterceptor"/>
+    </CEffectSet>
     <CEffectCreateHealer id="AP_ShieldBatteryRechargeChanneled">
+        <ValidatorArray value="AP_CasterIsNotBatteryOvercharged"/>
         <ValidatorArray value="noMarkers"/>
         <ValidatorArray value="ShieldsNotFull"/>
         <ValidatorArray value="NotWarpingIn"/>
@@ -12710,6 +13635,10 @@
         <RechargeVital value="Shields"/>
         <RechargeVitalRate value="36"/>
     </CEffectCreateHealer>
+    <CEffectCreateHealer id="AP_ShieldBatteryRechargeChanneledOvercharged" parent="AP_ShieldBatteryRechargeChanneled">
+        <ValidatorArray index="0" value="AP_CasterHasBatteryOverchargeBehavior"/>
+        <DrainVitalCostFactor value="0"/>
+    </CEffectCreateHealer>
     <CEffectEnumArea id="AP_ShieldBatteryRechargeChanneledRevealSearch">
         <EditorCategories value="Race:Protoss"/>
         <AreaArray Radius="10" Effect="AP_ShieldBatteryRechargeChanneledDamageDummy"/>
@@ -12880,6 +13809,13 @@
         <Abil value="AP_HHWidowMineBlossom"/>
         <WhichUnit Value="Caster"/>
     </CEffectIssueOrder>
+    <CEffectSet id="AP_ShieldRechargeMatrixSet">
+        <EffectArray value="AP_MedicSCBWRestoration@RB"/>
+    </CEffectSet>
+    <CEffectModifyUnit id="AP_ShieldRechargeMatrixModifyUnit">
+        <EditorCategories value="Race:Protoss"/>
+        <VitalArray index="Shields" Change="4"/>
+    </CEffectModifyUnit>
     <CEffectApplyBehavior id="AP_GhostSCBWLockdown@AB">
         <EditorCategories value="Race:Terran"/>
         <Behavior value="AP_GhostSCBWLockdown"/>
@@ -17161,6 +18097,250 @@
         <CaseArray Validator="AP_HERCRooted" Effect="AP_HercGrappleCreatePlaceholderRemove"/>
         <CaseDefault value="AP_HercGrappleLaunchCaster"/>
     </CEffectSwitch>
+    <CEffectApplyBehavior id="AP_TimeFieldPurifierApplyBehavior">
+        <ValidatorArray value="NotFrenzied"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TimeFieldPurifier"/>
+    </CEffectApplyBehavior>
+    <CEffectCreatePersistent id="AP_TimeFieldAiurCreatePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <InitialEffect value="AP_AiurMothershipFeedbackSearchPoint"/>
+        <PeriodCount value="192"/>
+        <PeriodicEffectArray value="AP_TimeFieldAiurSearchArea"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_TimeFieldPurifierCreatePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="192"/>
+        <PeriodicEffectArray value="AP_TimeFieldPurifierSearchArea"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_TimeFieldAiurCoreCreatePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="144"/>
+        <PeriodicEffectArray value="AP_TimeFieldAiurCoreSearchArea"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectCreatePersistent id="AP_TimeFieldPurifierCoreCreatePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="144"/>
+        <PeriodicEffectArray value="AP_TimeFieldPurifierCoreSearchArea"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectEnumArea id="AP_TimeFieldAiurSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="4.8" Effect="AP_TimeFieldAiurApplyBehaviorSet"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_TimeFieldPurifierSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Neutral,Enemy,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="4.8" Effect="AP_TimeFieldPurifierApplyBehavior"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_TimeFieldAiurCoreSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="3.2" Effect="AP_TimeFieldAiurApplyBehaviorSet"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_TimeFieldPurifierCoreSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Neutral,Enemy,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="3.2" Effect="AP_TimeFieldPurifierApplyBehavior"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_TimeFieldAiurApplyBehavior">
+        <ValidatorArray value="NotFrenzied"/>
+        <ValidatorArray value="AP_NotHeroic"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TimeFieldAiur"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_TimeFieldAiurApplyBehaviorHeroic">
+        <ValidatorArray value="NotFrenzied"/>
+        <ValidatorArray value="AP_IsHeroic"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TimeFieldAiurHeroic"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_TimeFieldAiurApplyBehaviorSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_TimeFieldAiurApplyBehavior"/>
+        <EffectArray value="AP_TimeFieldAiurApplyBehaviorHeroic"/>
+    </CEffectSet>
+    <CEffectCreatePersistent id="AP_TimeFieldTaldarimCreatePersistent">
+        <EditorCategories value="Race:Protoss"/>
+        <PeriodCount value="240"/>
+        <PeriodicEffectArray value="AP_TimeFieldTaldarimSearchArea"/>
+        <PeriodicPeriodArray value="0.0625"/>
+    </CEffectCreatePersistent>
+    <CEffectEnumArea id="AP_TimeFieldTaldarimSearchArea">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="5.2" Effect="AP_TimeFieldTaldarimApplyBehavior"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_TimeFieldTaldarimApplyBehavior">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_TimeFieldTaldarim"/>
+    </CEffectApplyBehavior>
+    <CEffectEnumArea id="AP_TimeFieldTaldarimConfusionSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <SearchFilters value="-;Player,Ally,Neutral,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.75" Effect="AP_TimeFieldTaldarimConfusionAB"/>
+        <ImpactLocation Value="TargetUnit"/>
+    </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_TimeFieldTaldarimConfusionAB">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_UnitInTimeFieldTaldarim"/>
+        <ValidatorArray value="AP_NotHeroic"/>
+        <Behavior value="AP_TimeFieldTaldarimConfusion"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_MothershipCoreNexusRecallApplyBehavior">
+        <ValidatorArray value="NotReleasedInterceptor"/>
+        <ValidatorArray value="AP_NotAPLarvaEgg"/>
+        <ValidatorArray value="AP_NotAPLarva"/>
+        <ValidatorArray value="AP_NotAbducted"/>
+        <Behavior value="AP_MothershipCoreRecalling"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_MothershipRecallTaldarimDummyAB">
+        <ValidatorArray value="AP_CasterIsTaldarimMothership"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_MothershipRecallTaldarimDummy"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_MothershipCoreNexusRecallPostBehavior">
+        <EditorCategories value="Race:Protoss"/>
+        <Behavior value="AP_MothershipCoreRecalled"/>
+    </CEffectApplyBehavior>
+    <CEffectSet id="AP_MothershipCoreNexusRecallPrepare">
+        <ValidatorArray value="AP_IsAPNexus"/>
+        <ValidatorArray value="IsNotConstructing"/>
+        <EditorCategories value=""/>
+        <EffectArray value="AP_MothershipCoreNexusRecallSearch"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_MothershipCoreNexusRecallSearch">
+        <AreaArray Radius="7.5" Effect="AP_MothershipCoreNexusRecallApplyBehavior"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterPoint"/>
+        <MinCount value="1"/>
+        <SearchFilters value="-;Ally,Neutral,Enemy,Structure,Missile,Item,Dead,Hidden,Invulnerable"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_MothershipCoreNexusRecallSet">
+        <ValidatorArray value="AP_NotAPLarvaEgg"/>
+        <ValidatorArray value="AP_NotAPLarva"/>
+        <EffectArray value="AP_MothershipCoreNexusRecallTeleport"/>
+        <EffectArray value="AP_MothershipNexusRecallTeleport"/>
+        <EffectArray value="AP_MothershipCoreNexusRecallPostBehavior"/>
+    </CEffectSet>
+    <CEffectTeleport id="AP_MothershipCoreNexusRecallTeleport">
+        <EditorCategories value="Race:Protoss"/>
+        <TargetLocation Effect="AP_MothershipCoreNexusRecallSearch" Value="TargetPoint"/>
+        <SourceLocation Effect="AP_MothershipCoreNexusRecallSearch" Value="CasterPoint"/>
+        <TeleportFlags index="TestCliff" value="1"/>
+        <TeleportFlags index="TestFog" value="0"/>
+        <PlacementArc value="360"/>
+        <PlacementAround Effect="AP_MothershipCoreNexusRecallSearch"/>
+        <PlacementRange value="15"/>
+    </CEffectTeleport>
+    <CEffectTeleport id="AP_MothershipNexusRecallTeleport">
+        <EditorCategories value="Race:Protoss"/>
+        <TargetLocation Effect="AP_MothershipNexusRecallSearch" Value="TargetPoint"/>
+        <SourceLocation Effect="AP_MothershipNexusRecallSearch" Value="CasterPoint"/>
+        <TeleportFlags index="TestCliff" value="1"/>
+        <TeleportFlags index="TestFog" value="0"/>
+        <PlacementArc value="360"/>
+        <PlacementAround Effect="AP_MothershipNexusRecallSearch"/>
+        <PlacementRange value="15"/>
+    </CEffectTeleport>
+    <CEffectRemoveBehavior id="AP_MothershipMassRecallDeathRemove">
+        <ValidatorArray value="AP_NotAPLarvaEgg"/>
+        <ValidatorArray value="AP_NotAPLarva"/>
+        <ValidatorArray value="AP_NotAbducted"/>
+        <EditorCategories value=""/>
+        <BehaviorLink value="AP_MothershipCoreRecalling"/>
+    </CEffectRemoveBehavior>
+    <CEffectEnumArea id="AP_MothershipCoreNexusRecallDeathSearch">
+        <EditorCategories value=""/>
+        <ImpactLocation Value="CasterPoint"/>
+        <SearchFilters value="-;Ally,Neutral,Enemy,Structure,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="9" Effect="AP_MothershipCoreNexusRecallDeathRemove"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_MothershipNexusRecallSearch">
+        <AreaArray Radius="7.5" Effect="AP_MothershipCoreNexusRecallApplyBehavior"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterPoint"/>
+        <MinCount value="1"/>
+        <SearchFilters value="-;Ally,Neutral,Enemy,Structure,Missile,Item,Dead,Hidden,Invulnerable"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_MothershipNexusRecallPrepare">
+        <ValidatorArray value="AP_IsAPNexus"/>
+        <ValidatorArray value="IsNotConstructing"/>
+        <EditorCategories value=""/>
+        <EffectArray value="AP_AiurMothershipFeedbackSearchCaster"/>
+        <EffectArray value="AP_MothershipNexusRecallSearch"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_MothershipMassRecallSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="TargetPoint"/>
+        <SearchFilters value="-;Self,Ally,Neutral,Enemy,Structure,Missile,Item,Uncommandable,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="4.5" Effect="AP_ArbiterMPRecallInitialSet"/>
+        <MinCount value="1"/>
+    </CEffectEnumArea>
+    <CEffectTeleport id="AP_MothershipMassRecallTeleport">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_CasterIsPurifierMothershipOrCore"/>
+        <PlacementArc value="360"/>
+        <PlacementAround Effect="AP_MothershipMassRecallSearch" Value="SourcePoint"/>
+        <PlacementRange value="15"/>
+        <SourceLocation Effect="AP_MothershipMassRecallSearch" Value="TargetPoint"/>
+        <TargetLocation Effect="AP_MothershipMassRecallSearch" Value="SourcePoint"/>
+        <TeleportFlags index="TestCliff" value="1"/>
+        <TeleportFlags index="TestFog" value="0"/>
+    </CEffectTeleport>
+    <CEffectLaunchMissile id="AP_MothershipCorePhotonWeaponLM">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactEffect value="AP_MothershipCorePhotonWeaponDamage"/>
+        <AmmoUnit value="AP_MothershipCoreWeaponWeapon"/>
+        <Movers Link="AP_MothershipCoreWeaponWeaponClose" IfRangeLTE="4"/>
+        <Movers Link="AP_MothershipCoreWeaponWeapon" IfRangeLTE="20"/>
+    </CEffectLaunchMissile>
+    <CEffectDamage id="AP_MothershipCorePhotonWeaponDamage" parent="DU_WEAP">
+        <EditorCategories value="Race:Protoss"/>
+        <Kind value="Ranged"/>
+        <Amount value="20"/>
+    </CEffectDamage>
+    <CEffectModifyUnit id="AP_SetMothershipTaldarimCooldown">
+        <Weapon Weapon="AP_SOAMothershipv4Weapon" CooldownAmount="1.5"/>
+    </CEffectModifyUnit>
+    <CEffectModifyUnit id="AP_SetUpgradedMothershipTaldarimCooldown">
+        <Weapon Weapon="AP_TaldarimMothershipFastAttackWeapon" CooldownAmount="0.5"/>
+    </CEffectModifyUnit>
+    <CEffectEnumArea id="AP_PurifierMothershipAttackSpeedBoostSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="-;Self,Neutral,Enemy,Structure,Missile,Dead,Hidden"/>
+        <AreaArray Radius="6" Effect="AP_PurifierMothershipAttackSpeedBoostSet"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+    </CEffectEnumArea>
+    <CEffectSet id="AP_PurifierMothershipAttackSpeedBoostSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_PurifierMothershipAttackSpeedBoostBuffEmpoweredAB"/>
+        <EffectArray value="AP_PurifierMothershipAttackSpeedBoostBuffAB"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_PurifierMothershipAttackSpeedBoostBuffAB">
+        <ValidatorArray value="AP_PurifierMothershipAttackSpeedBoostBuffEmpoweredNotActive"/>
+        <Behavior value="AP_PurifierMothershipAttackSpeedBoostBuff"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PurifierMothershipAttackSpeedBoostBuffEmpoweredAB">
+        <ValidatorArray value="AP_IsPurifierUnitOrNoShields"/>
+        <Behavior value="AP_PurifierMothershipAttackSpeedBoostBuffEmpowered"/>
+    </CEffectApplyBehavior>
+    <CEffectEnumArea id="AP_TaldarimMothershipGroundSlowSearch">
+        <EditorCategories value="Race:Protoss"/>
+        <ImpactLocation Value="CasterUnit"/>
+        <SearchFilters value="Ground;Self,Player,Ally,Neutral,Structure,Missile,Dead,Hidden"/>
+        <AreaArray Radius="7.5" Effect="AP_TaldarimMothershipGroundSlowAB"/>
+        <SearchFlags index="ExtendByUnitRadius" value="1"/>
+    </CEffectEnumArea>  
+    <CEffectApplyBehavior id="AP_TaldarimMothershipGroundSlowAB">
+        <Behavior value="AP_TaldarimMothershipGroundSlowDebuff"/>
+    </CEffectApplyBehavior>  
     <CEffectCreatePersistent id="AP_TornadoMissileCP">
         <ValidatorArray value="AP_TornadoMaxDistance"/>
         <ValidatorArray value="AP_TornadoMissileFilters"/>
@@ -18663,6 +19843,21 @@
         <SearchFilters value="Ground;Self,Neutral,Enemy,Structure,Missile,Destructible,Dead,Hidden"/>
         <AreaArray Radius="10" Effect="AP_BattlecruiserBonusRangeAB"/>
     </CEffectEnumArea>
+    <CEffectApplyBehavior id="AP_AiurMothershipEnergyRegenAuraBuffAB">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_IsNotAiurUnit"/>
+        <Behavior value="AP_AiurMothershipEnergyRegenAuraBuff"/>
+    </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_AiurMothershipEnergyRegenAuraBuffAiurAB">
+        <EditorCategories value="Race:Protoss"/>
+        <ValidatorArray value="AP_IsAiurUnit"/>
+        <Behavior value="AP_AiurMothershipEnergyRegenAuraBuffAiur"/>
+    </CEffectApplyBehavior> 
+    <CEffectSet id="AP_AiurMothershipEnergyRegenAuraSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_AiurMothershipEnergyRegenAuraBuffAB"/>
+        <EffectArray value="AP_AiurMothershipEnergyRegenAuraBuffAiurAB"/>
+    </CEffectSet>
     <CEffectEnumArea id="AP_FusionCoreFusionReactorSearch">
         <EditorCategories value=""/>
         <SearchFilters value="-;Self,Neutral,Enemy,Missile,Destructible,Dead,Hidden"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 12cede1477..02dfa152d3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -12051,6 +12051,355 @@
     <CModel id="AP_Stalker_Taldarim_Death_Alarak" parent="StalkerDeathBase">
         <Model value="Assets\Units\Protoss\Stalker_Taldarim_Collection_Death\Stalker_Taldarim_Collection_Death.m3"/>
     </CModel>
+    <CModel id="AP_AstralRestoration" parent="OneShotSpellFX">
+        <Model value="Assets\Effects\Protoss\Artanis_AstralWinds\Artanis_AstralWinds.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ScaleMax value="1.800000,1.800000,1.800000"/>
+        <ScaleMin value="1.800000,1.800000,1.800000"/>
+    </CModel>
+    <CModel id="AP_OverloadWeaponSystems" parent="PersistentSpellFX">
+        <Model value="Assets\COOP\Stetmann\Effects\GARY_Stetmann_COOP_TechnoOrbSmall\GARY_Stetmann_COOP_TechnoOrbSmall.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_PurifierMothershipAttackSpeedBoost" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\ProtossWeatherShieldLarge\ProtossWeatherShieldLarge.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_TaldarimMothershipGroundSlowAura" parent="PersistentSpellFX">
+        <Model value="Assets\Units\Protoss\Alarak_COOP_RespawnBase\Alarak_COOP_RespawnBase.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_PurifierMothershipShielding" parent="PersistentSpellFX">
+        <Model value="AP\Assets\Units\Protoss\Mothership_Purifier\Mothership_Purifier_Ex2_Shield_final.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_ChronoDrone" parent="Unit" Race="Protoss">
+        <Model value="Assets\Units\Protoss\Purifier_RogueAI_BotHeal\Purifier_RogueAI_BotHeal.m3"/>
+        <Occlusion value="Show"/>
+        <PlanetPanelCamera value="Star2CameraLow05"/>
+        <ScaleMax value="0.500000,0.500000,0.500000"/>
+        <ScaleMin value="0.500000,0.500000,0.500000"/>
+        <SquibTypeDefault value="Metal"/>
+        <TechPurchaseCamera value="Star2CameraLow05"/>
+        <UnitGlossaryCamera value="Star2CameraLow05"/>
+    </CModel>
+    <CModel id="AP_ChronoDroneDeath" parent="UnitDeath" Race="Protoss">
+        <Model value="Assets\Units\Protoss\Purifier_RogueAI_BotHeal_Death\Purifier_RogueAI_BotHeal_Death.m3"/>
+        <ScaleMax value="0.500000,0.500000,0.500000"/>
+        <ScaleMin value="0.500000,0.500000,0.500000"/>
+    </CModel>
+    <CModel id="AP_TimeFieldAiurImpactModel" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\TemporalFieldImpact\TemporalFieldImpact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_TimeFieldAiurModel" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\TemporalField\TemporalField.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_TimeFieldTaldarimModel" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\TimeWarp_Red\TimeWarp_Red.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_TimeFieldTaldarimImpactModel">
+        <Model value="Assets\Effects\Protoss\TimeWarpImpact_Red\TimeWarpImpact_Red.m3"/>
+    </CModel>
+    <CModel id="AP_TimeFieldPurifierModel" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\TimeWarp_Red\TimeWarp_Red.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_RevitalizeShieldsModel">
+        <Model value="Assets\Effects\Protoss\PlasmaSurgeImpact\PlasmaSurgeImpact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ScaleMax value="2.630000,2.630000,2.630000"/>
+        <ScaleMin value="2.630000,2.630000,2.630000"/>
+    </CModel>
+    <CModel id="AP_BatteryOverchargeModel" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\PurifyLaunch\PurifyLaunch.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Flags index="CloakedUndetectedIsHidden" value="1"/>
+    </CModel>
+    <CModel id="AP_PowerRedirectionBeam" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\MegaLith_Beam\MegaLith_Beam.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ScaleMax value="1.500000,1.500000,1.500000"/>
+        <ScaleMin value="1.500000,1.500000,1.500000"/>
+    </CModel>
+    <CModel id="AP_PurifierPowerUp" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Zerg\Void_Kerrigan_Extinction_Charge\Void_Kerrigan_Extinction_Charge.m3"/>
+        <ScaleMax value="1.200000,1.200000,1.200000"/>
+        <ScaleMin value="1.200000,1.200000,1.200000"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_TaldarimMothershipDeathHealGlaze">
+        <Model value="Assets\Effects\Glaze\Glaze_SoulAbsorption\Glaze_SoulAbsorption.m3"/>
+    </CModel>
+    <CModel id="AP_TaldarimMothershipDeathHealDummyAttackMissile" parent="MissileFX">
+        <Model value="Assets\Effects\Protoss\Alarak_SoulAbsorption_Missile\Alarak_SoulAbsorption_Missile.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <SelectionRadius value="0.333200"/>
+        <ShadowRadius value="0.333200"/>
+        <Events>
+            <Anim value="Stand,00"/>
+            <Name value="Alarak_SoulSteal_Missile"/>
+            <Type value="Sound"/>
+            <Time value="0.009000"/>
+            <Payload value="Alarak_SoulSteal_Missile"/>
+        </Events>
+    </CModel>    
+    <CModel id="AP_PlanetCrackerBeam" parent="PersistentSpellFX">
+        <Model value="AP\Assets\Units\Protoss\Mothership_Purifier\Effects\Mothership_Purifier_Ex2_PlanetCrackerBeam_final.m3"/>
+        <ScaleMax value="1.500000,1.500000,1.500000"/>
+        <ScaleMin value="1.500000,1.500000,1.500000"/>
+        <EditorCategories value="Race:Protoss"/>
+        <SelectionRadius value="0.238000"/>
+        <ShadowRadius value="0.238000"/>
+    </CModel>
+    <CModel id="AP_PlanetCrackerImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Terran\FirebatHitSprite\FirebatHitSprite.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MothershipPurifierPortrait" parent="Portrait" Race="Protoss">
+        <Model value="Assets\Portraits\Protoss\Mothership_Purifier_Collection_Portrait\Mothership_Purifier_Collection_Portrait.m3"/>
+        <Image value="Assets\Textures\mothership_purifier_collection_static.dds"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreTeleportIn" parent="OneShotSpellFX">
+        <Model value="Assets\Effects\Protoss\MothershipTeleportInEx1\MothershipTeleportInEx1.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <ScaleMax value="0.600000,0.600000,0.600000"/>
+        <ScaleMin value="0.600000,0.600000,0.600000"/>
+    </CModel>
+    <CModel id="AP_MothershipAiurPortrait" parent="Portrait">
+        <Model value="Assets\Portraits\Protoss\MothershipPortrait\MothershipPortrait.m3"/>
+        <Lighting value="MothershipPortrait"/>
+        <Image value="Assets\Textures\mothershipportrait_static.dds"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreBeaconLight" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\MotherShipBeaconLight\MotherShipBeaconLight.m3"/>
+        <LowQualityModel value="AP_MotherShipBeaconLightLow"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MotherShipBeaconLightLow" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\MotherShipBeaconLight\MotherShipBeaconLight_Low.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MothershipCorePurifierAttackBeam" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\ColossusBeam\ColossusBeam.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <RadiusLoose value="1.000000"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreWeaponWeapon" parent="MissileFX">
+        <Model value="Assets\Effects\Protoss\MothershipPurifyMissile\MothershipPurifyMissile.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Events>
+            <Anim value="Stand,00"/>
+            <Name value="MotherShip_Purify_AttackLaunch"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="MotherShip_Purify_AttackLaunch"/>
+        </Events>
+    </CModel>
+    <CModel id="AP_MothershipCoreWeaponAttackImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\MothershipPurifyMissileImpact\MothershipPurifyMissileImpact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Events>
+            <Anim value="Death,00"/>
+            <Name value="MotherShip_Purify_AttackImpact"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="MotherShip_Purify_AttackImpact"/>
+        </Events>
+    </CModel>
+    <CModel id="AP_MothershipCorePhotonOvercharge" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\PurifyLaunch\PurifyLaunch.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreWeapon" parent="MissileFX">
+        <Model value="Assets\Effects\Protoss\MotherShipCoreMissile\MotherShipCoreMissile.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreAttackImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\MotherShipCoreMissileImpact\MotherShipCoreMissileImpact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_MothershipCorePurifierMorphAddition" parent="PersistentSpellFX">
+        <Model value="AP\Assets\Units\Protoss\Mothership_Purifier\MotherShipCore_Purifier_Ex2_Morph_Addition_final.m3"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreMorphAddition" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\PurifierMatrixMorph\PurifierMatrixMorph.m3"/>
+    </CModel>
+    <CModel id="AP_PurifierMothershipAttackImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\Arbiter_Purifier_Coop_Missile_Impact\Arbiter_Purifier_Coop_Missile_Impact.m3"/>
+        <ScaleMax value="0.700000,0.700000,0.700000"/>
+        <ScaleMin value="0.700000,0.700000,0.700000"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_PurifierMothershipAttackBeam" parent="MissileFX">
+        <Model value="Assets\Effects\Protoss\MohandarMissile\MohandarMissile.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <RadiusLoose value="1.000000"/>
+        <ScaleMax value="1.200000,1.200000,1.200000"/>
+        <ScaleMin value="1.200000,1.200000,1.200000"/>
+        <SelectionRadius value="0.714000"/>
+        <ShadowRadius value="0.714000"/>
+    </CModel>
+    <CModel id="AP_AiurMothershipAttackImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\MothershipPurifyMissileImpact\MothershipPurifyMissileImpact.m3"/>
+        <ScaleMax value="0.700000,0.700000,0.700000"/>
+        <ScaleMin value="0.700000,0.700000,0.700000"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_AiurMothershipAttackBeam" parent="MissileFX">
+        <Model value="Assets\Effects\Protoss\MothershipPhotonBeam\MothershipPhotonBeam.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <RadiusLoose value="1.000000"/>
+        <ScaleMax value="0.700000,0.700000,0.700000"/>
+        <ScaleMin value="0.700000,0.700000,0.700000"/>
+        <SelectionRadius value="0.714000"/>
+        <ShadowRadius value="0.714000"/>
+    </CModel>
+    <CModel id="AP_AiurMothership" parent="Unit" Race="Protoss">
+        <Model value="Assets\Units\Protoss\Mothership\Mothership.m3"/>
+        <!--RequiredAnims value="Assets\Units\Protoss\Mothership_SwarmAnims\Mothership_SwarmAnims.m3a"/-->
+        <AttachProps Id="Ref_Weapon 01">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <AttachProps Id="Ref_Weapon 02">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <AttachProps Id="Ref_Weapon 03">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <AttachProps Id="Ref_Weapon 04">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <AttachProps Id="Ref_Weapon 05">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <AttachProps Id="Ref_Weapon 06">
+            <Keys index="SetA" value="0"/>
+        </AttachProps>
+        <Occlusion value="Show"/>
+        <PlanetPanelCamera value="Star2CameraLow20"/>
+        <Radius value="2.000000"/>
+        <ScaleMax value="0.600000,0.600000,0.600000"/>
+        <ScaleMin value="0.600000,0.600000,0.600000"/>
+        <SelectionRadius value="3.333000"/>
+        <ShadowRadius value="3.333000"/>
+        <SquibTypeDefault value="Metal"/>
+        <TechPurchaseCamera value="Star2CameraLow20"/>
+        <TechPurchaseSpeed value="0.050000"/>
+        <UnitGlossaryCamera value="Star2CameraLow20"/>
+    </CModel>
+    <CModel id="AP_AiurMothershipDeath">
+        <Model value="Assets\Units\Protoss\MotherShipDeath\MotherShipDeath.m3"/>
+        <LowQualityModel value="ProtossLargeUnitDeathLow"/>
+        <Events>
+            <Anim value="Death,00"/>
+            <Name value="Uni_DeathFXincidentallFire"/>
+            <Type value="Sound"/>
+            <Time value="2.200000"/>
+            <Payload value="Uni_DeathFXincidentallFire"/>
+        </Events>
+        <Events>
+            <Anim value="Death,00"/>
+            <Name value="MothershipVoid_PreDeathExplosion"/>
+            <Type value="Sound"/>
+            <Time value="1.400000"/>
+            <Payload value="AP_MothershipVoid_PreDeathExplosion"/>
+        </Events>
+        <Events>
+            <Anim value="Death,00"/>
+            <Name value="MothershipVoid_DeathExplosion"/>
+            <Type value="Sound"/>
+            <Time value="1.800000"/>
+            <Payload value="AP_MothershipVoid_DeathExplosion"/>
+        </Events>
+    </CModel>
+    <CModel id="AP_PurifierMothership" parent="AP_AiurMothership" Race="Protoss">
+        <Model value="AP\Assets\Units\Protoss\Mothership_Purifier\Mothership_Purifier_Ex2.m3"/>
+    </CModel>
+    <CModel id="AP_PurifierMothershipDeath" parent="AP_AiurMothershipDeath">
+        <Model value="Assets\Units\Protoss\MotherShip_Purifier_Collection_Death\MotherShip_Purifier_Collection_Death.m3"/>
+    </CModel>
+    <CModel id="AP_AiurMothershipUpgrade" parent="AP_AiurMothership" Race="Protoss">
+        <Model value="Assets\Units\Protoss\Mothership_Golden\Mothership_Golden.m3"/>
+    </CModel>
+    <CModel id="AP_AiurMothershipUpgradeDeath" parent="AP_AiurMothershipDeath">
+        <Model value="Assets\Units\Protoss\Mothership_Golden_Death\Mothership_Golden_Death.m3"/>
+    </CModel>
+    <CModel id="AP_MothershipCoreAiur" parent="Unit">
+        <Model value="Assets\Units\Protoss\PurifierMatrix\PurifierMatrix.m3"/>
+        <ScaleMax value="0.900000,0.900000,0.900000"/>
+        <ScaleMin value="0.900000,0.900000,0.900000"/>
+        <Occlusion value="Show"/>
+        <Radius value="1.000000"/>
+        <SelectionRadius value="1.000000"/>
+        <ShadowRadius value="1.000000"/>
+        <SquibTypeDefault value="Metal"/>
+        <TechPurchaseSpeed value="0.050000"/>
+        <TechPurchaseCamera value="Star2CameraHigh05"/>
+        <PlanetPanelCamera value="Star2CameraHigh05"/>
+        <UnitGlossaryCamera value="Star2CameraHigh05"/>
+        <Events>
+            <Anim value="Stand,Work,Start,00"/>
+            <Name value="Core_SpinUp"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="Core_SpinUp"/>
+        </Events>
+        <Events>
+            <Anim value="Stand,Work,End,00"/>
+            <Name value="Core_SpinDown"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="Core_SpinDown"/>
+        </Events>
+        <Events>
+            <Anim value="Spell,00"/>
+            <Name value="Core_Energize"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="Core_Energize"/>
+        </Events>
+        <Events>
+            <Anim value="Attack,00"/>
+            <Name value="Core_BeamLaunch"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="Core_BeamLaunch"/>
+        </Events>
+        <Events>
+            <Anim value="Stand,Morph,End,A,00"/>
+            <Name value="Core_Transport"/>
+            <Type value="Sound"/>
+            <Time value="0.797000"/>
+            <Payload value="Core_Transport"/>
+        </Events>
+        <Events>
+            <Anim value="Spell,A,00"/>
+            <Name value="Core_Transform"/>
+            <Type value="Sound"/>
+            <Time value="0.010000"/>
+            <Payload value="Core_Transform"/>
+        </Events>
+    </CModel>
+    <CModel id="AP_MothershipCoreAiurDeath" parent="UnitDeath" Race="Protoss">
+        <Model value="Assets\Units\Protoss\PurifierMatrix\PurifierMatrix.m3"/>
+        <LowQualityModel value="ProtossLargeUnitDeathLow"/>
+        <Occlusion value="Show"/>
+    </CModel>
+    <CModel id="AP_MothershipCorePurifier" parent="AP_MothershipCoreAiur">
+        <Model value="AP\Assets\Units\Protoss\Mothership_Purifier\MothershipCore_Purifier_Ex2_final.m3"/>
+    </CModel>
+    <CModel id="AP_MothershipCorePurifierDeath" parent="UnitDeath" Race="Protoss">
+        <Model value="Assets\Units\Protoss\MothershipCore_Purifier_Collection\MothershipCore_Purifier_Collection.m3"/>
+        <LowQualityModel value="ProtossLargeUnitDeathLow"/>
+        <Occlusion value="Show"/>
+    </CModel>
+    <CModel id="AP_PurifierStunGlaze" parent="Glaze">
+        <Model value="Assets\Effects\Glaze\Glaze_Fenix_Scout_StunMissile\Glaze_Fenix_Scout_StunMissile.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
     <CModel id="AP_MotherShipTaldarimWarpIn">
         <Model value="Assets\Units\Protoss\MotherShip_Taldarim_WarpIn\MotherShip_Taldarim_WarpIn.m3"/>
         <ScaleMax value="0.600000,0.600000,0.600000"/>
@@ -12836,6 +13185,16 @@
         <EditorCategories value="Race:Zerg"/>
         <Lighting value=""/>
     </CModel>
+    <CModel id="ShieldRechargeMatrixImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\Artanis_AstralWinds_Impact\Artanis_AstralWinds_Impact.m3"/>
+        <ScaleMax value="0.800000,0.800000,0.800000"/>
+        <ScaleMin value="0.800000,0.800000,0.800000"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_SacrificialConduitsGlaze" parent="Glaze">
+        <Model value="Assets\Effects\Glaze\Glaze_SoulAbsorption\Glaze_SoulAbsorption.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
     <CModel id="AP_GhostSCBWLockdown@Glaze" parent="Glaze">
         <Model value="Assets\Effects\Glaze\Glaze_Goliath_Lockdown\Glaze_Goliath_Lockdown.m3"/>
         <EditorCategories value="Race:Terran"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
index c213c0cec6..f958e51fb5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml
@@ -213,6 +213,36 @@
         </MotionPhases>
         <MotionPhases YawPitchRoll="MAX"/>
     </CMoverMissile>
+    <CMoverMissile id="AP_MothershipCoreWeapon" parent="MissileDefault">
+        <MotionPhases index="0">
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <MaxSpeed value="18"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="719.2968"/>
+        </MotionPhases>
+    </CMoverMissile>
+    <CMoverMissile id="AP_MothershipCoreWeaponWeapon" parent="MissileDefault">
+        <MotionPhases index="0">
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <MaxSpeed value="36"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="719.2968"/>
+        </MotionPhases>
+    </CMoverMissile>
+    <CMoverMissile id="AP_MothershipCoreWeaponWeaponClose" parent="MissileDefault">
+        <MotionPhases index="0">
+            <Driver value="Guidance"/>
+            <Acceleration value="3200"/>
+            <MaxSpeed value="12"/>
+            <ClearanceAcceleration value="75"/>
+            <Outro value="-1"/>
+            <YawPitchRoll value="719.2968"/>
+        </MotionPhases>
+    </CMoverMissile>
     <CMoverMissile id="AP_UltrasonicPulseWeapon">
         <MotionPhases>
             <Driver value="Guidance"/>
@@ -1279,26 +1309,6 @@
             <YawPitchRoll value="719.2968"/>
         </MotionPhases>
     </CMoverMissile>
-    <CMoverMissile id="AP_MothershipCoreWeaponWeapon" parent="MissileDefault">
-        <MotionPhases index="0">
-            <Driver value="Guidance"/>
-            <Acceleration value="3200"/>
-            <MaxSpeed value="36"/>
-            <ClearanceAcceleration value="75"/>
-            <Outro value="-1"/>
-            <YawPitchRoll value="719.2968"/>
-        </MotionPhases>
-    </CMoverMissile>
-    <CMoverMissile id="AP_MothershipCoreWeaponWeaponClose" parent="MissileDefault">
-        <MotionPhases index="0">
-            <Driver value="Guidance"/>
-            <Acceleration value="3200"/>
-            <MaxSpeed value="12"/>
-            <ClearanceAcceleration value="75"/>
-            <Outro value="-1"/>
-            <YawPitchRoll value="719.2968"/>
-        </MotionPhases>
-    </CMoverMissile>
     <CMoverMissile id="AP_ArbiterMPWeaponMissile">
         <MotionPhases>
             <Driver value="Guidance"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index aef6d2ebb9..186f4ce0ae 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2507,6 +2507,194 @@
         <EditorCategories value="Race:Protoss,TechType:Unit"/>
         <NodeArray index="Use" Link="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitSOAMothershipv4QueuedOrBetter0"/>
     </CRequirement>
+    <CRequirement id="AP_AiurMothershipRequirements">
+        <EditorCategories value="Race:Protoss,TechType:Unit"/>
+        <NodeArray index="Use" Link="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitMothershipAiurQueuedOrBetter0"/>
+    </CRequirement>
+    <CRequirement id="AP_PurifierMothershipRequirements">
+        <EditorCategories value="Race:Protoss,TechType:Unit"/>
+        <NodeArray index="Use" Link="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitMothershipPurifierQueuedOrBetter0"/>
+    </CRequirement>
+    <CRequirement id="AP_AiurMothershipCoreRequirements">
+        <EditorCategories value="Race:Protoss,TechType:Unit"/>
+        <NodeArray index="Use" Link="AP_AndCountUnitCyberneticsCoreCompleteOnlyTechTreeCheatEqCountUnitMothershipAiurQueuedOrBetter0"/>
+    </CRequirement>
+    <CRequirement id="AP_PurifierMothershipCoreRequirements">
+        <EditorCategories value="Race:Protoss,TechType:Unit"/>
+        <NodeArray index="Use" Link="AP_AndCountUnitCyberneticsCoreCompleteOnlyTechTreeCheatEqCountUnitMothershipPurifierQueuedOrBetter0"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallPlanetCracker">
+        <NodeArray index="Show" Link="AP_AndCanInstallPlanetCrackerCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallOverloadWeaponSystems">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorOverloadWeaponSystemsInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>  
+    <CRequirement id="AP_CanInstallPowerRedirection">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorPowerRedirectionInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>    
+    <CRequirement id="AP_CanInstallRevitalizeShields">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorRevitalizeShieldsInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallBatteryOvercharge">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorBatteryOverchargeInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallThermalLance">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorThermalLanceInstalledCompleteOnlyAtUnit"/>
+    </CRequirement> 
+    <CRequirement id="AP_CanInstallBlackHole">
+        <NodeArray index="Show" Link="AP_NotCountBehaviorBlackHoleInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>  
+    <CRequirement id="AP_CanInstallAstralRestoration">
+        <NodeArray index="Show" Link="AP_AndCanInstallAstralRestorationCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_AstralRestorationCooldown">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountBehaviorAstralRestorationCooldownCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallSummonDeathFleet">
+        <NodeArray index="Show" Link="AP_AndCanInstallSummonDeathFleetCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_SummonDeathFleetCooldown">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountBehaviorSummonDeathFleetCooldownCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_PlanetCrackerCooldown">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountBehaviorPlanetCrackerCooldownCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallTimeField">
+        <NodeArray index="Show" Link="AP_AndCanInstallTimeFieldCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallWormholeModule">
+        <NodeArray index="Show" Link="AP_AndCanInstallWormholeModuleCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallMassRecall">
+        <NodeArray index="Show" Link="AP_AndCanInstallMassRecallCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallNexusRecall">
+        <NodeArray index="Show" Link="AP_AndCanInstallNexusRecallCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallPurifierMothershipDebuff">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallPurifierMothershipDebuffCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallAiurMothershipEnergyRegenAura">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallAiurMothershipEnergyRegenAuraCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallTaldarimMothershipFastAttack">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallTaldarimMothershipFastAttackCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallPurifierMothershipShielding">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallPurifierMothershipShieldingCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallPurifierMothershipAttackSpeedBoost">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallPurifierMothershipAttackSpeedBoostCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallTaldarimMothershipDeathHeal">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallTaldarimMothershipDeathHealCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallTaldarimMothershipGroundSlow">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallTaldarimMothershipGroundSlowCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallAiurMothershipFeedback">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallAiurMothershipFeedbackCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallAiurMothershipShieldRestore">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallAiurMothershipShieldRestoreCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_CanInstallTaldarimAuxiliary">
+        <NodeArray index="Show" Link="AP_CountUpgradeCanInstallTaldarimAuxiliaryCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipPurifierPowerSource">
+        <NodeArray index="Use" Link="AP_CountUpgradeMothershipPurifierPowerSourceCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipAiurShieldArmorAura">
+        <NodeArray index="Use" Link="AP_CountUpgradeMothershipAiurShieldArmorAuraCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HavePlanetCrackerInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorPlanetCrackerInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveOverloadWeaponSystemsInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorOverloadWeaponSystemsInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HavePowerRedirectionInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorPowerRedirectionInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveThermalLanceInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorThermalLanceInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveSummonDeathFleetInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorSummonDeathFleetInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveRevitalizeShieldsInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorRevitalizeShieldsInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveBatteryOverchargeInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorBatteryOverchargeInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveAstralRestorationInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorAstralRestorationInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveBlackHoleInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorBlackHoleInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveTimeFieldInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorTimeFieldInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveWormholeModuleInstalled">
+        <NodeArray index="Show" Link="AP_CountBehaviorWormholeModuleInstalledCompleteOnlyAtUnit"/>
+    </CRequirement>
+    <CRequirement id="AP_HavePurifierMothershipDebuff">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradePurifierMothershipDebuffCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveAiurMothershipEnergyRegenAura">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAiurMothershipEnergyRegenAuraCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveTaldarimMothershipFastAttack">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeTaldarimMothershipFastAttackCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HavePurifierMothershipShielding">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradePurifierMothershipShieldingCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HavePurifierMothershipAttackSpeedBoost">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradePurifierMothershipAttackSpeedBoostCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveTaldarimMothershipGroundSlow">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeTaldarimMothershipGroundSlowCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveTaldarimMothershipDeathHeal">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeTaldarimMothershipDeathHealCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveAiurMothershipFeedback">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAiurMothershipFeedbackCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveAiurMothershipShieldRestore">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAiurMothershipShieldRestoreCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipHangarUpgrade">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeMothershipHangarCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipHangarTaldarimInstalled">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeMothershipHangarTaldarimCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipHangarPurifierInstalled">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeMothershipHangarPurifierCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveMothershipHangarAiurInstalled">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeMothershipHangarAiurCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveSOADragoonRevive">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeSOADragoonReviveCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 4240715fd4..35f5e1a731 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -4715,20 +4715,82 @@
     <CRequirementCountUpgrade id="AP_CountUpgradeStargateFactionTaldarim">
         <Count Link="AP_StargateFactionTaldarim" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementAnd id="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitMothershipAiurQueuedOrBetter0">
+        <Tooltip value=""/>
+        <OperandArray value="AP_CountUnitFleetBeaconCompleteOnlyTechTreeCheat"/>
+        <OperandArray value="AP_EqCountUnitAiurMothershipQueuedOrBetter0"/>
+    </CRequirementAnd>
+    <CRequirementAnd id="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitMothershipPurifierQueuedOrBetter0">
+        <Tooltip value=""/>
+        <OperandArray value="AP_CountUnitFleetBeaconCompleteOnlyTechTreeCheat"/>
+        <OperandArray value="AP_EqCountUnitPurifierMothershipQueuedOrBetter0"/>
+    </CRequirementAnd>
+    <CRequirementAnd id="AP_AndCountUnitCyberneticsCoreCompleteOnlyTechTreeCheatEqCountUnitMothershipAiurQueuedOrBetter0">
+        <Tooltip value=""/>
+        <OperandArray value="AP_CountUnitCyberneticsCoreCompleteOnlyTechTreeCheat"/>
+        <OperandArray value="AP_EqCountUnitAiurMothershipQueuedOrBetter0"/>
+    </CRequirementAnd>
+    <CRequirementAnd id="AP_AndCountUnitCyberneticsCoreCompleteOnlyTechTreeCheatEqCountUnitMothershipPurifierQueuedOrBetter0">
+        <Tooltip value=""/>
+        <OperandArray value="AP_CountUnitCyberneticsCoreCompleteOnlyTechTreeCheat"/>
+        <OperandArray value="AP_EqCountUnitPurifierMothershipQueuedOrBetter0"/>
+    </CRequirementAnd>
     <CRequirementAnd id="AP_AndCountUnitFleetBeaconCompleteOnlyTechTreeCheatEqCountUnitSOAMothershipv4QueuedOrBetter0">
         <Tooltip value=""/>
         <OperandArray value="AP_CountUnitFleetBeaconCompleteOnlyTechTreeCheat"/>
-        <OperandArray value="AP_EqCountUnitSOAMothershipv4QueuedOrBetter0"/>
+        <OperandArray value="AP_EqCountUnitTaldarimMothershipQueuedOrBetter0"/>
     </CRequirementAnd>
-    <CRequirementEq id="AP_EqCountUnitSOAMothershipv4QueuedOrBetter0">
+    <CRequirementEq id="AP_EqCountUnitTaldarimMothershipQueuedOrBetter0">
         <OperandArray index="0" value="AP_SumCountTaldarimMothershipTypesQueuedOrBetter"/>
         <OperandArray index="1" value="0"/>
     </CRequirementEq>
+    <CRequirementEq id="AP_EqCountUnitPurifierMothershipQueuedOrBetter0">
+        <OperandArray index="0" value="AP_SumCountPurifierMothershipTypesQueuedOrBetter"/>
+        <OperandArray index="1" value="0"/>
+    </CRequirementEq>
+    <CRequirementEq id="AP_EqCountUnitAiurMothershipQueuedOrBetter0">
+        <OperandArray index="0" value="AP_SumCountAiurMothershipTypesQueuedOrBetter"/>
+        <OperandArray index="1" value="0"/>
+    </CRequirementEq>
     <CRequirementSum id="AP_SumCountTaldarimMothershipTypesQueuedOrBetter">
         <OperandArray value="AP_CountUnitSOAMothershipv4QueuedOrBetter"/>
         <OperandArray value="AP_CountUnitMothershipTaldarimQueuedOrBetter"/>
         <OperandArray value="AP_CountUnitSOAMothershipv4PlacementQueuedOrBetter"/>
     </CRequirementSum>
+    <CRequirementSum id="AP_SumCountPurifierMothershipTypesQueuedOrBetter">
+        <OperandArray value="AP_CountUnitMothershipCorePurifierQueuedOrBetter"/>
+        <OperandArray value="AP_CountUnitMothershipPurifierQueuedOrBetter"/>
+        <OperandArray value="AP_CountUnitMothershipPurifierPowerSourceQueuedOrBetter"/>
+    </CRequirementSum>
+    <CRequirementSum id="AP_SumCountAiurMothershipTypesQueuedOrBetter">
+        <OperandArray value="AP_CountUnitMothershipCoreAiurQueuedOrBetter"/>
+        <OperandArray value="AP_CountUnitMothershipAiurQueuedOrBetter"/>
+    </CRequirementSum>
+    <CRequirementCountUnit id="AP_CountUnitMothershipCoreAiurQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value=""/>
+        <Count Link="AP_MothershipCoreAiur" State="QueuedOrBetter"/>
+    </CRequirementCountUnit>
+    <CRequirementCountUnit id="AP_CountUnitMothershipAiurQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value=""/>
+        <Count Link="AP_MothershipAiur" State="QueuedOrBetter"/>
+    </CRequirementCountUnit>
+    <CRequirementCountUnit id="AP_CountUnitMothershipCorePurifierQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value=""/>
+        <Count Link="AP_MothershipCorePurifier" State="QueuedOrBetter"/>
+    </CRequirementCountUnit>
+    <CRequirementCountUnit id="AP_CountUnitMothershipPurifierQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value=""/>
+        <Count Link="AP_MothershipPurifier" State="QueuedOrBetter"/>
+    </CRequirementCountUnit>
+    <CRequirementCountUnit id="AP_CountUnitMothershipPurifierPowerSourceQueuedOrBetter">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value=""/>
+        <Count Link="AP_MothershipPurifierPowerSource" State="QueuedOrBetter"/>
+    </CRequirementCountUnit>
     <CRequirementCountUnit id="AP_CountUnitSOAMothershipv4QueuedOrBetter">
         <Flags index="TechTreeCheat" value="0"/>
         <Tooltip value=""/>
@@ -4744,6 +4806,246 @@
         <Tooltip value=""/>
         <Count Link="AP_SOAMothershipv4Placement" State="QueuedOrBetter"/>
     </CRequirementCountUnit>
+    <CRequirementCountBehavior id="AP_CountBehaviorPlanetCrackerInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_PlanetCrackerInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorPlanetCrackerInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorPlanetCrackerInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorPowerRedirectionInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_PowerRedirectionInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorPowerRedirectionInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorPowerRedirectionInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorOverloadWeaponSystemsInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_OverloadWeaponSystemsInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorOverloadWeaponSystemsInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorOverloadWeaponSystemsInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorThermalLanceInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_ThermalLanceInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorThermalLanceInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorThermalLanceInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorSummonDeathFleetInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_SummonDeathFleetInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorSummonDeathFleetInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorSummonDeathFleetInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorRevitalizeShieldsInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_RevitalizeShieldsInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorRevitalizeShieldsInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorRevitalizeShieldsInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorBatteryOverchargeInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_BatteryOverchargeInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorBatteryOverchargeInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorBatteryOverchargeInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorAstralRestorationInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_AstralRestorationInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorAstralRestorationInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorAstralRestorationInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorAstralRestorationCooldownCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_AstralRestorationCooldown" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementCountBehavior id="AP_CountBehaviorSummonDeathFleetCooldownCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_SummonDeathFleetCooldown" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementCountBehavior id="AP_CountBehaviorPlanetCrackerCooldownCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_PlanetCrackerCooldown" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementCountBehavior id="AP_CountBehaviorBlackHoleInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_BlackHoleInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorBlackHoleInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorBlackHoleInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorTimeFieldInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_TimeFieldInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorTimeFieldInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorTimeFieldInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountBehavior id="AP_CountBehaviorWormholeModuleInstalledCompleteOnlyAtUnit">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_WormholeModuleInstalled" State="CompleteOnlyAtUnit"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorWormholeModuleInstalledCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorWormholeModuleInstalledCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementAnd id="AP_AndCanInstallWormholeModuleCompleteOnly">
+        <OperandArray value="AP_CountUpgradeCanInstallWormholeModuleCompleteOnly"/>
+        <OperandArray value="AP_NotCountBehaviorWormholeModuleInstalledCompleteOnlyAtUnit"/>
+    </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallWormholeModuleCompleteOnly">
+        <Count Link="AP_CanInstallWormholeModule" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountBehavior id="AP_CountBehaviorMothershipTaldarimIntegratedPowerCompleteOnlyAtUnit">
+        <Count Link="AP_MothershipTaldarimIntegratedPower" State="CompleteOnlyAtUnit"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountBehavior>
+    <CRequirementNot id="AP_NotCountBehaviorMothershipTaldarimIntegratedPowerCompleteOnlyAtUnit">
+        <OperandArray index="0" value="AP_CountBehaviorMothershipTaldarimIntegratedPowerCompleteOnlyAtUnit"/>
+    </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipHangarCompleteOnly">
+        <Count Link="AP_MothershipHangarInstallation" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipHangarTaldarimCompleteOnly">
+        <Count Link="AP_MothershipTaldarimHangar" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipHangarPurifierCompleteOnly">
+        <Count Link="AP_MothershipPurifierHangar" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipHangarAiurCompleteOnly">
+        <Count Link="AP_MothershipAiurHangar" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAiurMothershipEnergyRegenAuraCompleteOnly">
+        <Count Link="AP_AiurMothershipEnergyRegenAura" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradePurifierMothershipDebuffCompleteOnly">
+        <Count Link="AP_PurifierMothershipDebuff" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeTaldarimMothershipFastAttackCompleteOnly">
+        <Count Link="AP_TaldarimMothershipFastAttack" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeTaldarimMothershipGroundSlowCompleteOnly">
+        <Count Link="AP_TaldarimMothershipGroundSlow" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradePurifierMothershipAttackSpeedBoostCompleteOnly">
+        <Count Link="AP_PurifierMothershipAttackSpeedBoost" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeTaldarimMothershipDeathHealCompleteOnly">
+        <Count Link="AP_TaldarimMothershipDeathHeal" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradePurifierMothershipShieldingCompleteOnly">
+        <Count Link="AP_PurifierMothershipShielding" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAiurMothershipFeedbackCompleteOnly">
+        <Count Link="AP_AiurMothershipFeedback" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAiurMothershipShieldRestoreCompleteOnly">
+        <Count Link="AP_AiurMothershipShieldRestore" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallTaldarimAuxiliaryCompleteOnly">
+        <Count Link="AP_CanInstallTaldarimAuxiliary" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallPlanetCrackerCompleteOnly">
+        <Count Link="AP_CanInstallPlanetCracker" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementAnd id="AP_AndCanInstallPlanetCrackerCompleteOnly">
+        <OperandArray value="AP_CountUpgradeCanInstallPlanetCrackerCompleteOnly"/>
+        <OperandArray value="AP_NotCountBehaviorPlanetCrackerInstalledCompleteOnlyAtUnit"/>
+    </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallAstralRestorationCompleteOnly">
+        <Count Link="AP_CanInstallAstralRestoration" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementAnd id="AP_AndCanInstallAstralRestorationCompleteOnly">
+        <OperandArray value="AP_CountUpgradeCanInstallAstralRestorationCompleteOnly"/>
+        <OperandArray value="AP_NotCountBehaviorAstralRestorationInstalledCompleteOnlyAtUnit"/>
+    </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallSummonDeathFleetCompleteOnly">
+        <Count Link="AP_CanInstallSummonDeathFleet" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementAnd id="AP_AndCanInstallSummonDeathFleetCompleteOnly">
+        <OperandArray value="AP_CountUpgradeCanInstallSummonDeathFleetCompleteOnly"/>
+        <OperandArray value="AP_NotCountBehaviorSummonDeathFleetInstalledCompleteOnlyAtUnit"/>
+    </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallTimeFieldCompleteOnly">
+        <Count Link="AP_CanInstallTimeField" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementAnd id="AP_AndCanInstallTimeFieldCompleteOnly">
+        <OperandArray value="AP_CountUpgradeCanInstallTimeFieldCompleteOnly"/>
+        <OperandArray value="AP_NotCountBehaviorTimeFieldInstalledCompleteOnlyAtUnit"/>
+    </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallMothershipRecallCompleteOnly">
+        <Count Link="AP_CanInstallMothershipRecall" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallAiurMothershipEnergyRegenAuraCompleteOnly">
+        <Count Link="AP_CanInstallAiurMothershipEnergyRegenAura" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallPurifierMothershipDebuffCompleteOnly">
+        <Count Link="AP_CanInstallPurifierMothershipDebuff" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallTaldarimMothershipFastAttackCompleteOnly">
+        <Count Link="AP_CanInstallTaldarimMothershipFastAttack" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallPurifierMothershipShieldingCompleteOnly">
+        <Count Link="AP_CanInstallPurifierMothershipShielding" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallPurifierMothershipAttackSpeedBoostCompleteOnly">
+        <Count Link="AP_CanInstallPurifierMothershipAttackSpeedBoost" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallTaldarimMothershipDeathHealCompleteOnly">
+        <Count Link="AP_CanInstallTaldarimMothershipDeathHeal" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallAiurMothershipFeedbackCompleteOnly">
+        <Count Link="AP_CanInstallAiurMothershipFeedback" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallAiurMothershipShieldRestoreCompleteOnly">
+        <Count Link="AP_CanInstallAiurMothershipShieldRestore" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCanInstallTaldarimMothershipGroundSlowCompleteOnly">
+        <Count Link="AP_CanInstallTaldarimMothershipGroundSlow" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipPurifierPowerSourceCompleteOnly">
+        <Count Link="AP_MothershipPurifierPowerSource" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeMothershipAiurShieldArmorAuraCompleteOnly">
+        <Count Link="AP_MothershipAiurShieldArmorAura" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeSOADragoonReviveCompleteOnly">
         <Count Link="AP_SOADragoonRevive" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
index 7321eb0e66..474c73979e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
@@ -6241,6 +6241,165 @@
         <Pitch value="-2.000000,2.000000"/>
         <Volume value="-9.000000,-9.000000"/>
     </CSound>
+    <CSound id="AP_AiurMothershipAttackLaunch" parent="Combat">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_BeamAttackLaunch0.wav" FacialGroup=""/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_BeamAttackLaunch1.wav" FacialGroup=""/>
+        <Pitch value="-1.000000,1.000000"/>
+        <Volume value="-1.000000,-1.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransform" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_Transform.wav" FacialGroup=""/>
+        <Volume value="2.000000,2.000000"/>
+        <Pitch value="-1.000000,1.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+        <DupeHistoryCount value="1"/>
+    </CSound>
+    <CSound id="AP_CoreTransform2" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_Energize.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-10.000000,-9.000000"/>
+        <Volume value="-2.000000,-2.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransform3" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Oracle_Movement_01.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-10.000000,-10.000000"/>
+        <Volume value="-1.000000,-1.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransform4" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_Movement01.wav"/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_Movement02.wav"/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_Movement03.wav"/>
+        <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_Movement04.wav"/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="4"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-7.000000,-6.000000"/>
+        <Volume value="-2.000000,-2.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransformEnd" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_Energize.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-8.000000,-7.000000"/>
+        <Volume value="1.000000,1.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransformEnd2" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_SpinDown.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-8.000000,-7.000000"/>
+        <Volume value="4.000000,4.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransformEnd3" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_Transform.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="3.000000,3.000000"/>
+        <Volume value="2.000000,2.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_CoreTransformEndHit" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="Assets\Sounds\Core_Transport.wav" FacialGroup=""/>
+        <DupeDestroyCount value="8"/>
+        <DupeHistoryCount value="1"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="3"/>
+        <Pitch value="-3.000000,-2.000000"/>
+        <Volume value="5.000000,5.000000"/>
+        <VolumeRolloffPoints Distance="15.000000"/>
+        <VolumeRolloffPoints Distance="30.000000" Volume="-96.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisAttack" parent="AP_ProtossAck_Void" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Attack00.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Attack01.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Attack02.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Attack03.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Attack04.ogg"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisDeath" parent="AP_ProtossDeath" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Death00.ogg"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisHelp" parent="AP_ProtossHelp" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Help00.ogg"/>
+        <Mode value="3DWorld"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisPissed" parent="AP_ProtossPissed" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Pissed00.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Pissed01.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Pissed02.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Pissed03.ogg"/>
+        <Flags index="Download" value="0"/>
+        <Select value="Sequential"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisWhat" parent="AP_ProtossAck_Void" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_What00.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_What01.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_What02.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_What03.ogg"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisYes" parent="AP_ProtossAck_Void" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Yes00.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Yes01.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Yes02.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Yes03.ogg"/>
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Yes04.ogg"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_SelendisReady" parent="AP_ProtossReady" Folder="Selendis">
+        <AssetArray File="AP\Assets\Sounds\Protoss\Selendis\Selendis_Ready00.ogg"/>
+        <Volume value="2.000000,2.000000"/>
+    </CSound>
+    <CSound id="AP_PlanetCrackerSound" parent="Spell">
+        <AssetArray File="Assets\Sounds\Protoss\Purifier\Purifier_PlanetCracker0.wav"/>
+        <Volume value="-0.920000,-0.920000"/>
+    </CSound>
+    <CSound id="AP_RevitalizeShieldsLaunch" parent="Spell">
+        <AssetArray File="Assets\Sounds\Protoss\Immortal\Immortal_HardenedShieldImpact0.wav"/>
+        <Volume value="1.750000,1.750000"/>
+    </CSound>
+    <CSound id="AP_AstralRestorationLaunch" parent="Spell">
+        <EditorCategories value="Race:Protoss"/>
+        <AssetArray File="AP\Assets\Sounds\Artanis_AstralWind00.wav"/>
+        <AssetArray File="AP\Assets\Sounds\Artanis_AstralWind01.wav"/>
+        <AssetArray File="AP\Assets\Sounds\Artanis_AstralWind02.wav"/>
+        <AssetArray File="AP\Assets\Sounds\Artanis_AstralWind03.wav"/>
+        <Pitch value="-1.000000,1.000000"/>
+        <Volume value="-1.000000,-1.000000"/>
+    </CSound>
     <CSound id="AP_ArbiterMP_CloakFieldOff" parent="Spell">
         <EditorCategories value="Race:Protoss"/>
         <AssetArray File="Assets\Sounds\Protoss\Mothership\Mothership_CloakOff0.wav"/>
@@ -15852,6 +16011,18 @@
         <DupeDestroyCount value="10"/>
         <DupeMuteCount value="5"/>
     </CSound>
+    <CSound id="AP_TaldarimMothershipDeathHeal">
+        <DupeDestroyCount value="3"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="2"/>
+        <Volume value="-6.000000,-4.000000"/>
+    </CSound>
+    <CSound id="AP_TaldarimMothershipDeathHealMissile">
+        <DupeDestroyCount value="3"/>
+        <DupeMaximumMethod value="Replace"/>
+        <DupeMuteCount value="3"/>
+        <Volume value="-5.000000,-3.000000"/>
+    </CSound>
     <CSound id="Uni_DeathFXRagdollFire" parent="Death">
         <AssetArray File="Assets\Sounds\Uni\Deaths\Uni_DeathFXFire0.wav"/>
         <AssetArray File="Assets\Sounds\Uni\Deaths\Uni_DeathFXFire1.wav"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TargetSortData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TargetSortData.xml
index ddf5167c9b..c64ddd48ec 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TargetSortData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TargetSortData.xml
@@ -47,4 +47,14 @@
         <Behavior value="AP_ScoutTaldarimVulcanBlasterAttackTarget"/>
         <Value value="1"/>
     </CTargetSortBehaviorCount>
+    <CTargetSortValidator id="AP_MothershipTargetFire">
+        <Validator value="AP_TargetFirePriority"/>
+    </CTargetSortValidator>
+    <CTargetSortValidator id="AP_TSThreatenBattlecruiser">
+        <Validator value="AP_ThreatensBattlecruiser"/>
+    </CTargetSortValidator>
+    <CTargetSortVital id="AP_TSEnergyDescending">
+        <Vital value="Energy"/>
+        <Descending value="1"/>
+    </CTargetSortVital>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TurretData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TurretData.xml
index 8c34264126..405cecb23a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TurretData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/TurretData.xml
@@ -28,6 +28,9 @@
         <YawArc value="90"/>
         <YawRate value="1999.8632"/>
     </CTurret>
+    <CTurret id="AP_MothershipCoreTurret" parent="FreeRotate">
+        <YawRate value="999.8437"/>
+    </CTurret>
     <CTurret id="AP_AutoTurret" parent="FreeRotate">
         <Idle value="Spin"/>
         <YawIdleRate value="-45"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index a26fe25e08..7badb67261 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -12611,6 +12611,21 @@
         <SubgroupPriority value="4"/>
         <EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
     </CUnit>
+    <CUnit id="AP_MothershipRepairDrone" parent="AP_CarrierRepairDrone">
+        <AbilArray index="4" Link="AP_VoidSentryShieldRepair"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="5.5625"/>
+    </CUnit>
+    <CUnit id="AP_ChronoDrone" parent="AP_CarrierRepairDrone">
+        <AbilArray index="4" Link="AP_ChronoDroneChronoBeam"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="5.5625"/>
+        <CardLayouts index="0">
+            <LayoutButtons Face="AP_ChronoDroneChronoBeam" Type="AbilCmd" AbilCmd="AP_ChronoDroneChronoBeam,Execute" Row="2" Column="0"/>
+        </CardLayouts>
+    </CUnit>
     <CUnit id="AP_Interceptor">
         <Description value="Button/Tooltip/AP_InterceptorUnit"/>
         <DeathRevealRadius value="3"/>
@@ -15964,8 +15979,8 @@
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="AP_RallyNexus,0" Row="1" Column="4"/>
             <LayoutButtons Face="AP_TimeWarp" Type="AbilCmd" AbilCmd="AP_TimeWarp,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_TimeWarp" Type="AbilCmd" AbilCmd="AP_TimeWarp,0" Row="2" Column="0"/>
-<!--            <LayoutButtons Face="AP_Mothership" Type="AbilCmd" AbilCmd="AP_NexusTrainMothership,0" Row="1" Column="0"/>-->
-<!--            <LayoutButtons Face="AP_MothershipCore" Type="AbilCmd" AbilCmd="AP_NexusTrainMothershipCore,0" Row="1" Column="0"/>-->
+            <LayoutButtons Face="AP_MothershipCoreAiur" Type="AbilCmd" AbilCmd="AP_NexusTrainMothershipCore,0" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_MothershipCorePurifier" Type="AbilCmd" AbilCmd="AP_NexusTrainMothershipCore,1" Row="1" Column="1"/>
             <LayoutButtons Face="AttackBuildingPFort" Type="AbilCmd" AbilCmd="AP_attackProtossBuilding,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="AP_stopProtossBuilding,Stop" Row="0" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="AP_RallyNexus,1" Row="1" Column="4"/>
@@ -16004,6 +16019,25 @@
         <Race value="Prot"/>
         <EditorCategories value="ObjectType:Projectile,ObjectFamily:Melee"/>
     </CUnit>
+   <CUnit id="AP_RepulsorCannonWeapon" parent="MISSILE">
+        <Race value="Prot"/>
+        <Mover value="AP_MothershipCoreWeapon"/>
+        <EditorCategories value="ObjectType:Projectile,ObjectFamily:Melee"/>
+    </CUnit>
+    <CUnit id="AP_MothershipPylonPowerUnit">
+        <BehaviorArray Link="AP_PowerRedirectionPowerSource"/>
+        <BehaviorArray Link="Unrepairable"/>
+        <BehaviorArray Link="Unmoved"/>
+        <BehaviorArray Link="AP_MothershipPylonPowerTimer"/>
+        <MinimapRadius value="0"/>
+        <Sight value="0"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="Unselectable" value="1"/>
+        <FlagArray index="Untargetable" value="1"/>
+        <FlagArray index="Invulnerable" value="1"/>
+        <FlagArray index="NoPortraitTalk" value="1"/>
+        <FlagArray index="Unstoppable" value="1"/>
+    </CUnit>
     <CUnit id="AP_ArbiterMP">
         <Description value="Button/Tooltip/AP_Arbiter"/>
         <DeathRevealRadius value="3"/>
@@ -21423,6 +21457,7 @@
         <EditorCategories value="ObjectFamily:Campaign,ObjectType:Projectile"/>
     </CUnit>
     <CUnit id="AP_SOAMothershipv4">
+        <Subtitle value="UnitSubtitle/AP_SOAMothershipv4"/>
         <Description value="Button/Tooltip/AP_MothershipTaldarim"/>
         <DeathRevealRadius value="3"/>
         <Facing value="94.9987"/>
@@ -21469,25 +21504,76 @@
         <AbilArray Link="AP_SOAMothershipLineAttack"/>
         <AbilArray Link="AP_VoidSentryBlackHole"/>
         <AbilArray Link="AP_SOAMothershipBlink"/>
+        <AbilArray Link="AP_SummonDeathFleet"/>
+        <AbilArray Link="AP_MothershipTaldarimHangar"/>
+        <!--- Note: War Council Nerf relies on AP_AutoMorphToMothershipTaldarim to be index 8 and AP_DisplayPowerFieldMothership to be index 0 -->
+        <AbilArray Link="AP_AutoMorphToMothershipTaldarim"/>
+        <AbilArray Link="AP_HangarQueue5"/>
         <AbilArray Link="Warpable"/>
         <AbilArray Link="ProgressRally"/>
-        <AbilArray Link="AP_AutoMorphToMothershipTaldarim"/>
+        <AbilArray Link="AP_TimeFieldTaldarim"/>
+        <AbilArray Link="AP_SOAMothershipBlinkGlobal"/>
+        <AbilArray Link="AP_MothershipTaldarimAuxiliaryOneTimeInstall"/>
+        <AbilArray Link="AP_TaldarimMothershipInstalls"/>
+        <AbilArray Link="AP_MothershipTaldarimBaseAttackSwap"/>
         <BehaviorArray Link="AP_DisplayPowerFieldMothership"/>
         <BehaviorArray Link="AP_MothershipTaldarimTurretDisabler"/>
         <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
         <BehaviorArray Link="AP_MothershipTaldarimMovementNerfOutsidePower"/>
-        <WeaponArray Link="AP_SOAMothershipv4Weapon" Turret="FreeRotate"/>
+        <BehaviorArray Link="AP_ThermalLanceInstalled"/>
+        <BehaviorArray Link="AP_BlackHoleInstalled"/>
+        <BehaviorArray Link="AP_EnableMothershipTaldarimAttack"/>
+        <BehaviorArray Link="AP_EnableUpgradedMothershipTaldarimAttack"/>
+        <BehaviorArray Link="AP_TaldarimMothershipDeathHeal"/>
+        <BehaviorArray Link="AP_TaldarimMothershipGroundSlowAura"/>
         <WeaponArray Turret="AP_MothershipRotate"/>
+        <WeaponArray Link="AP_MothershipTaldarimInterceptorLaunch"/>
         <CardLayouts>
             <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
             <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
             <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
-            <LayoutButtons Face="AP_MothershipTaldarimIntegratedPower" Type="Passive" Requirements="AP_HaveMothershipTaldarimIntegratedPower" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_SOAMothershipLineAttack" Type="AbilCmd" AbilCmd="AP_SOAMothershipLineAttack,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_SummonDeathFleet" Type="AbilCmd" AbilCmd="AP_SummonDeathFleet,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MothershipTaldarimIntegratedPower" Type="Passive" Requirements="AP_HaveMothershipTaldarimIntegratedPower" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_FrontloadedPower" Type="Passive" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_InterceptorMothershipTaldarim" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimHangar,0" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_HangarInstallTaldarim" Type="AbilCmd" AbilCmd="AP_MothershipAuxiliaryOneTimeInstall,3" Row="2" Column="3"/>
+            <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_HangarQueue5,0" Row="2" Column="4"/>
             <LayoutButtons Face="AP_VoidSentryBlackHole" Type="AbilCmd" AbilCmd="AP_VoidSentryBlackHole,0" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_SOAMothershipLineAttack" Type="AbilCmd" AbilCmd="AP_SOAMothershipLineAttack,0" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_TimeFieldTaldarim" Type="AbilCmd" AbilCmd="AP_TimeFieldTaldarim,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_WormholeTransit" Type="AbilCmd" AbilCmd="AP_SOAMothershipBlinkGlobal,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_SOAMothershipBlink" Type="AbilCmd" AbilCmd="AP_SOAMothershipBlink,0" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_MothershipDamageTaldarim" Type="Submenu" SubmenuCardId="MD" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_MothershipUtilityTaldarim" Type="Submenu" SubmenuCardId="MU" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_MothershipAuxiliaryTaldarim" Type="Submenu" SubmenuCardId="MA" SubmenuIsSticky="1" Row="1" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MD">
+            <LayoutButtons Face="AP_SOAMothershipLineAttackInstall" Type="AbilCmd" AbilCmd="AP_TaldarimMothershipInstalls,0" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_SummonDeathFleetInstall" Type="AbilCmd" AbilCmd="AP_TaldarimMothershipInstalls,1" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_SummonDeathFleet" Type="Passive" Requirements="AP_SummonDeathFleetCooldown" Behavior="AP_SummonDeathFleetCooldown" Row="1" Column="1"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MA">
+            <LayoutButtons Face="AP_InterceptorMothershipTaldarim" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimHangar,0" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_HangarInstallTaldarim" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimAuxiliaryOneTimeInstall,3" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_TaldarimMothershipFastAttack" Type="Passive" Requirements="AP_HaveTaldarimMothershipFastAttack" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_TaldarimMothershipFastAttackInstall" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimAuxiliaryOneTimeInstall,1" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_TaldarimMothershipGroundSlow" Type="Passive" Requirements="AP_HaveTaldarimMothershipGroundSlow" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_TaldarimMothershipGroundSlowInstall" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimAuxiliaryOneTimeInstall,0" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_TaldarimMothershipDeathHeal" Type="Passive" Requirements="AP_HaveTaldarimMothershipDeathHeal" Row="0" Column="3"/>
+            <LayoutButtons Face="AP_TaldarimMothershipDeathHealInstall" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimAuxiliaryOneTimeInstall,2" Row="0" Column="3"/>
+            <LayoutButtons Face="AP_MothershipTaldarimBaseAttackEnable" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimBaseAttackSwap,On" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_MothershipTaldarimBaseAttackDisable" Type="AbilCmd" AbilCmd="AP_MothershipTaldarimBaseAttackSwap,Off" Row="1" Column="1"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MU">
+            <LayoutButtons Face="AP_VoidSentryBlackHoleInstall" Type="AbilCmd" AbilCmd="AP_TaldarimMothershipInstalls,2" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_TimeFieldTaldarimInstall" Type="AbilCmd" AbilCmd="AP_TaldarimMothershipInstalls,3" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_WormholeTransitInstall" Type="AbilCmd" AbilCmd="AP_TaldarimMothershipInstalls,4" Row="0" Column="2"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
         </CardLayouts>
         <Radius value="1.375"/>
         <SeparationRadius value="1.375"/>
@@ -21516,6 +21602,441 @@
         <AbilArray index="8" Link=""/>
         <BehaviorArray index="0" Link=""/>
     </CUnit>
+    <CUnit id="AP_MothershipAiur">
+        <Subtitle value="UnitSubtitle/AP_MothershipAiur"/>
+        <Description value="Button/Tooltip/AP_MothershipAiur"/>
+        <DeathRevealRadius value="3"/>
+        <Facing value="94.9987"/>
+        <Race value="Prot"/>
+        <Mob value="Campaign"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="PreventDestroy" value="1"/>
+        <FlagArray index="UseLineOfSight" value="1"/>
+        <FlagArray index="ArmySelect" value="1"/>
+        <PlaneArray index="Air" value="1"/>
+        <Collide index="Flying" value="1"/>
+        <Attributes index="Armored" value="1"/>
+        <Attributes index="Mechanical" value="1"/>
+        <Attributes index="Psionic" value="1"/>
+        <Attributes index="Massive" value="1"/>
+        <LifeStart value="350"/>
+        <LifeMax value="350"/>
+        <LifeArmor value="2"/>
+        <LifeArmorName value="Unit/LifeArmorName/ProtossBuildingPlating"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="0.5625"/>
+        <ShieldsStart value="350"/>
+        <ShieldsMax value="350"/>
+        <ShieldRegenDelay value="10"/>
+        <ShieldRegenRate value="2"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
+        <Mover value="Fly"/>
+        <Speed value="1.4062"/>
+        <Acceleration value="1.375"/>
+        <Deceleration value="1"/>
+        <Sight value="14"/>
+        <Height value="3.75"/>
+        <VisionHeight value="4"/>
+        <Food value="-8"/>
+        <CostCategory value="Army"/>
+        <CostResource index="Minerals" value="400"/>
+        <CostResource index="Vespene" value="400"/>
+        <AttackTargetPriority value="20"/>
+        <KillXP value="50"/>
+        <AbilArray Link="move"/>
+        <AbilArray Link="attack"/>
+        <AbilArray Link="stop"/>
+        <AbilArray Link="Warpable"/>
+        <AbilArray Link="ProgressRally"/>
+        <AbilArray Link="AP_RevitalizeShields"/>
+        <AbilArray Link="AP_MothershipDummyHangar"/>
+        <AbilArray Link="AP_BatteryOverchargeUpgrade"/>
+        <AbilArray Link="AP_AstralRestoration"/>
+        <AbilArray Link="AP_AiurMothershipBlackHole"/>
+        <AbilArray Link="AP_TimeFieldAiur"/>
+        <AbilArray Link="AP_MothershipNexusRecall"/>
+        <AbilArray Link="AP_MothershipAiurHangar"/>
+        <AbilArray Link="AP_AiurMothershipInstalls"/>
+        <AbilArray Link="AP_HangarQueue5"/>
+        <AbilArray Link="AP_MothershipAiurAuxiliaryOneTimeInstall"/>
+        <BehaviorArray Link="AP_MothershipTaldarimTurretDisabler"/>
+        <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <BehaviorArray Link="AP_MothershipAiurCloakingField"/>
+        <BehaviorArray Link="AP_BatteryOverchargeInstalled"/>
+        <BehaviorArray Link="AP_BlackHoleInstalled"/>
+        <WeaponArray Link="AP_AiurMothershipWeapon" Turret="FreeRotate"/>
+        <WeaponArray Turret="AP_MothershipRotate"/>
+        <CardLayouts>
+            <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
+            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
+            <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
+            <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_AiurMothershipBlackHole" Type="AbilCmd" AbilCmd="AP_AiurMothershipBlackHole,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_AstralRestoration" Type="AbilCmd" AbilCmd="AP_AstralRestoration,0" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MothershipAiurShieldArmorAura" Type="Passive" Requirements="AP_HaveMothershipAiurShieldArmorAura" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_TimeFieldAiur" Type="AbilCmd" AbilCmd="AP_TimeFieldAiur,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_RevitalizeShields" Type="AbilCmd" AbilCmd="AP_RevitalizeShields,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_BatteryOvercharge" Type="AbilCmd" AbilCmd="AP_BatteryOverchargeUpgrade,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_HangarInstallAiur" Type="AbilCmd" AbilCmd="AP_MothershipAiurAuxiliaryOneTimeInstall,5" Row="2" Column="3"/>
+            <LayoutButtons Face="AP_MothershipCoreNexusRecall" Type="AbilCmd" AbilCmd="AP_MothershipNexusRecall,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_MothershipCoreMassRecall" Type="AbilCmd" AbilCmd="AP_MothershipMassRecall,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_CloakingFieldMothership" Type="Passive" Row="2" Column="2"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_HangarQueue5,0" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_MothershipDamageAiur" Type="Submenu" SubmenuCardId="MD" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_MothershipUtilityAiur" Type="Submenu" SubmenuCardId="MU" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_MothershipAuxiliaryAiur" Type="Submenu" SubmenuCardId="MA" SubmenuIsSticky="1" Row="1" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MD">
+            <LayoutButtons Face="AP_RevitalizeShieldsInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,0" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_BatteryOverchargeInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,1" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_AstralRestorationInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,2" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_AstralRestoration" Type="Passive" Requirements="AP_AstralRestorationCooldown" Behavior="AP_AstralRestorationCooldown" Row="1" Column="2"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MA">
+            <LayoutButtons Face="AP_MothershipRepairDrones" Type="Passive" Requirements="AP_HaveMothershipHangarAiurInstalled" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_MothershipRepairDronesInstall" Type="AbilCmd" AbilCmd="AP_MothershipAiurAuxiliaryOneTimeInstall,3" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_AiurMothershipShieldRestore" Type="Passive" Requirements="AP_HaveAiurMothershipShieldRestore" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_AiurMothershipShieldRestoreInstall" Type="AbilCmd" AbilCmd="AP_MothershipAiurAuxiliaryOneTimeInstall,1" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_AiurMothershipFeedback" Type="Passive" Requirements="AP_HaveAiurMothershipFeedback" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_AiurMothershipFeedbackInstall" Type="AbilCmd" AbilCmd="AP_MothershipAiurAuxiliaryOneTimeInstall,0" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_AiurMothershipEnergyRegenAura" Type="Passive" Requirements="AP_HaveAiurMothershipEnergyRegenAura" Row="0" Column="3"/>
+            <LayoutButtons Face="AP_AiurMothershipEnergyRegenAuraInstall" Type="AbilCmd" AbilCmd="AP_MothershipAiurAuxiliaryOneTimeInstall,2" Row="0" Column="3"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MU">
+            <LayoutButtons Face="AP_MothershipAiurBlackHoleInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,3" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_TimeFieldAiurInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,4" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_MothershipNexusRecallInstall" Type="AbilCmd" AbilCmd="AP_AiurMothershipInstalls,5" Row="0" Column="2"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <Radius value="1.375"/>
+        <SeparationRadius value="1.375"/>
+        <ScoreMake value="800"/>
+        <ScoreKill value="800"/>
+        <ScoreResult value="BuildOrder"/>
+        <SubgroupPriority value="50"/>
+        <MinimapRadius value="1.375"/>
+        <EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
+        <GlossaryCategory value="Unit/Category/ProtossUnits"/>
+        <GlossaryPriority value="190"/>
+        <GlossaryStrongArray value="Marauder"/>
+        <GlossaryStrongArray value="Roach"/>
+        <GlossaryStrongArray value="Zealot"/>
+        <GlossaryWeakArray value="VikingFighter"/>
+        <GlossaryWeakArray value="Corruptor"/>
+        <GlossaryWeakArray value="VoidRay"/>
+        <HotkeyCategory value="Unit/Category/AP_ProtossUnitsAir"/>
+    </CUnit>
+    <CUnit id="AP_MothershipPurifier">
+        <Subtitle value="UnitSubtitle/AP_MothershipPurifier"/>
+        <Description value="Button/Tooltip/AP_MothershipPurifier"/>
+        <DeathRevealRadius value="3"/>
+        <Facing value="94.9987"/>
+        <Race value="Prot"/>
+        <Mob value="Campaign"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="PreventDestroy" value="1"/>
+        <FlagArray index="UseLineOfSight" value="1"/>
+        <FlagArray index="ArmySelect" value="1"/>
+        <PlaneArray index="Air" value="1"/>
+        <Collide index="Flying" value="1"/>
+        <Attributes index="Armored" value="1"/>
+        <Attributes index="Mechanical" value="1"/>
+        <Attributes index="Psionic" value="1"/>
+        <Attributes index="Massive" value="1"/>
+        <LifeStart value="575"/>
+        <LifeMax value="575"/>
+        <LifeArmor value="2"/>
+        <LifeArmorName value="Unit/LifeArmorName/ProtossBuildingPlating"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="0.5625"/>
+        <ShieldsStart value="575"/>
+        <ShieldsMax value="575"/>
+        <ShieldRegenDelay value="10"/>
+        <ShieldRegenRate value="2"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
+        <Mover value="Fly"/>
+        <Speed value="1.4062"/>
+        <Acceleration value="1.375"/>
+        <Deceleration value="1"/>
+        <Sight value="14"/>
+        <Height value="3.75"/>
+        <VisionHeight value="4"/>
+        <Food value="-9"/>
+        <CostCategory value="Army"/>
+        <CostResource index="Minerals" value="650"/>
+        <CostResource index="Vespene" value="650"/>
+        <AttackTargetPriority value="20"/>
+        <KillXP value="50"/>
+        <AbilArray Link="move"/>
+        <AbilArray Link="attack"/>
+        <AbilArray Link="stop"/>
+        <AbilArray Link="AP_PlanetCracker"/>
+        <AbilArray Link="AP_OverloadWeaponSystems"/>
+        <AbilArray Link="AP_PurifierMothershipBlackHole"/>
+        <AbilArray Link="AP_MothershipDummyHangar"/>
+        <AbilArray Link="AP_MothershipPurifierHangar"/>
+        <AbilArray Link="AP_AutoMorphToMothershipPurifierPowerSource"/>
+        <AbilArray Link="AP_PurifierMothershipBlackHole"/>
+        <AbilArray Link="AP_PurifierMothershipInstalls"/>
+        <AbilArray Link="AP_MothershipPurifierAuxiliaryOneTimeInstall"/>
+        <AbilArray Link="Warpable"/>
+        <AbilArray Link="AP_PowerRedirectionUpgrade"/>
+        <AbilArray Link="ProgressRally"/>
+        <AbilArray Link="AP_TimeFieldPurifier"/>
+        <AbilArray Link="AP_HangarQueue5"/>
+        <AbilArray Link="AP_MothershipMassRecall"/>
+        <BehaviorArray Link="AP_MothershipTaldarimTurretDisabler"/>
+        <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <BehaviorArray Link="AP_PurifierMothershipAttackSpeedBoostAura"/>
+        <BehaviorArray Link="AP_PowerRedirectionInstalled"/>
+        <BehaviorArray Link="AP_BlackHoleInstalled"/>
+        <WeaponArray Link="AP_PurifierMothershipWeapon" Turret="FreeRotate"/>
+        <WeaponArray Turret="AP_MothershipRotate"/>
+        <CardLayouts>
+            <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
+            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
+            <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
+            <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_PurifierMothershipBlackHole" Type="AbilCmd" AbilCmd="AP_PurifierMothershipBlackHole,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_TimeFieldPurifier" Type="AbilCmd" AbilCmd="AP_TimeFieldPurifier,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_HangarInstallPurifier" Type="AbilCmd" AbilCmd="AP_MothershipAuxAP_HaveAiurMothershipEnergyRegenAuraiaryOneTimeInstall,4" Row="2" Column="3"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_HangarQueue5,0" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_MothershipCoreMassRecall" Type="AbilCmd" AbilCmd="AP_MothershipMassRecall,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_PlanetCracker" Type="AbilCmd" AbilCmd="AP_PlanetCracker,0" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_PowerRedirectionUpgrade" Type="AbilCmd" AbilCmd="AP_PowerRedirectionUpgrade,0" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MobilePowerField" Type="Passive" Requirements="AP_HaveMothershipPurifierPowerSource" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_OverloadWeaponSystems" Type="AbilCmd" AbilCmd="AP_OverloadWeaponSystems,0" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MothershipUtilityPurifier" Type="Submenu" SubmenuCardId="MU" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_MothershipDamagePurifier" Type="Submenu" SubmenuCardId="MD" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_MothershipAuxiliaryPurifier" Type="Submenu" SubmenuCardId="MA" SubmenuIsSticky="1" Row="1" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MD">
+            <LayoutButtons Face="AP_OverloadWeaponSystemsInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,0" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_PlanetCrackerInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,2" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_PlanetCracker" Type="Passive" Requirements="AP_PlanetCrackerCooldown" Behavior="AP_PlanetCrackerCooldown" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_PowerRedirectionInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,1" Row="0" Column="0"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MA">
+            <LayoutButtons Face="AP_MothershipChronoDrones" Type="Passive" Requirements="AP_HaveMothershipHangarPurifierInstalled" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_MothershipChronoDronesInstall" Type="AbilCmd" AbilCmd="AP_MothershipPurifierAuxiliaryOneTimeInstall,3" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_PurifierMothershipDebuff" Type="Passive" Requirements="AP_HavePurifierMothershipDebuff" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_PurifierMothershipDebuffInstall" Type="AbilCmd" AbilCmd="AP_MothershipPurifierAuxiliaryOneTimeInstall,0" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_PurifierMothershipShielding" Type="Passive" Requirements="AP_HavePurifierMothershipShielding" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_PurifierMothershipShieldingInstall" Type="AbilCmd" AbilCmd="AP_MothershipPurifierAuxiliaryOneTimeInstall,1" Row="0" Column="2"/>
+            <LayoutButtons Face="AP_PurifierMothershipAttackSpeedBoost" Type="Passive" Requirements="AP_HavePurifierMothershipAttackSpeedBoost" Row="0" Column="3"/>
+            <LayoutButtons Face="AP_PurifierMothershipAttackSpeedBoostInstall" Type="AbilCmd" AbilCmd="AP_MothershipPurifierAuxiliaryOneTimeInstall,2" Row="0" Column="3"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <CardLayouts CardId="MU">
+            <LayoutButtons Face="AP_MothershipPurifierBlackHoleInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,3" Row="0" Column="0"/>
+            <LayoutButtons Face="AP_TimeFieldPurifierInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,4" Row="0" Column="1"/>
+            <LayoutButtons Face="AP_MothershipMassRecallInstall" Type="AbilCmd" AbilCmd="AP_PurifierMothershipInstalls,5" Row="0" Column="2"/>
+            <LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
+        </CardLayouts>
+        <Radius value="1.375"/>
+        <SeparationRadius value="1.375"/>
+        <ScoreMake value="800"/>
+        <ScoreKill value="800"/>
+        <ScoreResult value="BuildOrder"/>
+        <SubgroupPriority value="50"/>
+        <MinimapRadius value="1.375"/>
+        <EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
+        <GlossaryCategory value="Unit/Category/ProtossUnits"/>
+        <GlossaryPriority value="190"/>
+        <GlossaryStrongArray value="Marauder"/>
+        <GlossaryStrongArray value="Roach"/>
+        <GlossaryStrongArray value="Zealot"/>
+        <GlossaryWeakArray value="VikingFighter"/>
+        <GlossaryWeakArray value="Corruptor"/>
+        <GlossaryWeakArray value="VoidRay"/>
+        <HotkeyCategory value="Unit/Category/AP_ProtossUnitsAir"/>
+    </CUnit>
+    <CUnit id="AP_MothershipPurifierPowerSource" parent="AP_MothershipPurifier">
+        <AbilArray index="8" Link=""/>
+        <BehaviorArray Link="AP_MothershipPurifierPowerSource"/>
+        <BehaviorArray Link="AP_MatrixOverload"/>
+    </CUnit>
+    <CUnit id="AP_MothershipCoreAiur">
+        <Subtitle value="UnitSubtitle/AP_MothershipAiur"/>
+        <Description value="Button/Tooltip/AP_MothershipCoreAiur"/>
+        <DeathRevealRadius value="3"/>
+        <Facing value="94.9987"/>
+        <Race value="Prot"/>
+        <Mob value="Campaign"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="PreventDestroy" value="1"/>
+        <FlagArray index="UseLineOfSight" value="1"/>
+        <FlagArray index="ArmySelect" value="1"/>
+        <PlaneArray index="Air" value="1"/>
+        <Collide index="Flying" value="1"/>
+        <Attributes index="Armored" value="1"/>
+        <Attributes index="Mechanical" value="1"/>
+        <Attributes index="Psionic" value="1"/>
+        <LifeStart value="130"/>
+        <LifeMax value="130"/>
+        <LifeArmor value="1"/>
+        <LifeArmorName value="Unit/LifeArmorName/ProtossBuildingPlating"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="0.5625"/>
+        <ShieldsStart value="60"/>
+        <ShieldsMax value="60"/>
+        <ShieldRegenDelay value="10"/>
+        <ShieldRegenRate value="2"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
+        <Mover value="Fly"/>
+        <Speed value="2.25"/>
+        <Acceleration value="2"/>
+        <Deceleration value="2"/>
+        <Sight value="11"/>
+        <Height value="3.75"/>
+        <VisionHeight value="4"/>
+        <Food value="-2"/>
+        <CostCategory value="Army"/>
+        <CostResource index="Minerals" value="100"/>
+        <CostResource index="Vespene" value="100"/>
+        <AttackTargetPriority value="20"/>
+        <KillXP value="50"/>
+        <AbilArray Link="move"/>
+        <AbilArray Link="attack"/>
+        <AbilArray Link="stop"/>
+        <AbilArray Link="AP_TimeFieldAiurCore"/>
+        <AbilArray Link="AP_BatteryOvercharge"/>
+        <AbilArray Link="AP_MothershipCoreNexusRecall"/>
+        <AbilArray Link="AP_MorphToMothershipAiur"/>
+        <AbilArray Link="Warpable"/>
+        <AbilArray Link="ProgressRally"/>
+        <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <WeaponArray Link="AP_RepulsorCannon" Turret="AP_MothershipCoreTurret"/>
+        <CardLayouts>
+            <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
+            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
+            <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
+            <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_MothershipAiur" Type="AbilCmd" AbilCmd="AP_MorphToMothershipAiur,Execute" Row="1" Column="0"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_MorphToMothershipAiur,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_TimeFieldAiurCore" Type="AbilCmd" AbilCmd="AP_TimeFieldAiurCore,Execute" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_BatteryOvercharge" Type="AbilCmd" AbilCmd="AP_BatteryOvercharge,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MothershipCoreNexusRecall" Type="AbilCmd" AbilCmd="AP_MothershipCoreNexusRecall,Execute" Row="2" Column="2"/>
+        </CardLayouts>
+        <Radius value="0.75"/>
+        <SeparationRadius value="0.75"/>
+        <ScoreMake value="800"/>
+        <ScoreKill value="800"/>
+        <ScoreResult value="BuildOrder"/>
+        <SubgroupPriority value="44"/>
+        <MinimapRadius value="0.75"/>
+        <EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
+        <GlossaryCategory value="Unit/Category/ProtossUnits"/>
+        <GlossaryPriority value="190"/>
+        <GlossaryStrongArray value="Marauder"/>
+        <GlossaryStrongArray value="Roach"/>
+        <GlossaryStrongArray value="Zealot"/>
+        <GlossaryWeakArray value="VikingFighter"/>
+        <GlossaryWeakArray value="Corruptor"/>
+        <GlossaryWeakArray value="VoidRay"/>
+        <HotkeyCategory value="Unit/Category/AP_ProtossUnitsAir"/>
+    </CUnit>
+    <CUnit id="AP_MothershipCorePurifier">
+        <Subtitle value="UnitSubtitle/AP_MothershipPurifier"/>
+        <Description value="Button/Tooltip/AP_MothershipCorePurifier"/>
+        <DeathRevealRadius value="3"/>
+        <Facing value="94.9987"/>
+        <Race value="Prot"/>
+        <Mob value="Campaign"/>
+        <FlagArray index="Turnable" value="0"/>
+        <FlagArray index="PreventDestroy" value="1"/>
+        <FlagArray index="UseLineOfSight" value="1"/>
+        <FlagArray index="ArmySelect" value="1"/>
+        <PlaneArray index="Air" value="1"/>
+        <Collide index="Flying" value="1"/>
+        <Attributes index="Armored" value="1"/>
+        <Attributes index="Mechanical" value="1"/>
+        <Attributes index="Psionic" value="1"/>
+        <LifeStart value="130"/>
+        <LifeMax value="130"/>
+        <LifeArmor value="1"/>
+        <LifeArmorName value="Unit/LifeArmorName/ProtossBuildingPlating"/>
+        <EnergyStart value="50"/>
+        <EnergyMax value="200"/>
+        <EnergyRegenRate value="0.5625"/>
+        <ShieldsStart value="130"/>
+        <ShieldsMax value="130"/>
+        <ShieldRegenDelay value="10"/>
+        <ShieldRegenRate value="2"/>
+        <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
+        <Mover value="Fly"/>
+        <Speed value="2.25"/>
+        <Acceleration value="2"/>
+        <Deceleration value="2"/>
+        <Sight value="11"/>
+        <Height value="3.75"/>
+        <VisionHeight value="4"/>
+        <Food value="-3"/>
+        <CostCategory value="Army"/>
+        <CostResource index="Minerals" value="150"/>
+        <CostResource index="Vespene" value="150"/>
+        <AttackTargetPriority value="20"/>
+        <KillXP value="50"/>
+        <AbilArray Link="move"/>
+        <AbilArray Link="attack"/>
+        <AbilArray Link="stop"/>
+        <AbilArray Link="AP_TimeFieldPurifierCore"/>
+        <AbilArray Link="AP_PowerRedirection"/>
+        <AbilArray Link="AP_MothershipCoreMassRecall"/>
+        <AbilArray Link="AP_MorphToMothershipPurifier"/>
+        <AbilArray Link="Warpable"/>
+        <AbilArray Link="ProgressRally"/>
+        <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <WeaponArray Link="AP_MothershipCorePurifierWeapon" Turret="AP_MothershipCoreTurret"/>
+        <CardLayouts>
+            <LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
+            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
+            <LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
+            <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
+            <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
+            <LayoutButtons Face="AP_MothershipPurifier" Type="AbilCmd" AbilCmd="AP_MorphToMothershipPurifier,Execute" Row="1" Column="0"/>
+            <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_MorphToMothershipPurifier,Cancel" Row="2" Column="4"/>
+            <LayoutButtons Face="AP_TimeFieldPurifierCore" Type="AbilCmd" AbilCmd="AP_TimeFieldPurifierCore,Execute" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_PowerRedirection" Type="AbilCmd" AbilCmd="AP_PowerRedirection,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_MothershipCoreMassRecall" Type="AbilCmd" AbilCmd="AP_MothershipCoreMassRecall,Execute" Row="2" Column="2"/>
+        </CardLayouts>
+        <Radius value="0.75"/>
+        <SeparationRadius value="0.75"/>
+        <ScoreMake value="800"/>
+        <ScoreKill value="800"/>
+        <ScoreResult value="BuildOrder"/>
+        <SubgroupPriority value="44"/>
+        <MinimapRadius value="0.75"/>
+        <EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
+        <GlossaryCategory value="Unit/Category/ProtossUnits"/>
+        <GlossaryPriority value="190"/>
+        <GlossaryStrongArray value="Marauder"/>
+        <GlossaryStrongArray value="Roach"/>
+        <GlossaryStrongArray value="Zealot"/>
+        <GlossaryWeakArray value="VikingFighter"/>
+        <GlossaryWeakArray value="Corruptor"/>
+        <GlossaryWeakArray value="VoidRay"/>
+        <HotkeyCategory value="Unit/Category/AP_ProtossUnitsAir"/>
+    </CUnit>
+    <CUnit id="AP_TaldarimMothershipDeathHealMissle" parent="MISSILE">
+        <Race value="Prot"/>
+        <Mover value="AP_AlarakSoulAbsorptionDummyAttackMissile"/>
+        <EditorCategories value="ObjectType:Projectile,ObjectFamily:Campaign"/>
+        <FlagArray index="Invulnerable" value="1"/>
+    </CUnit>
+    <CUnit id="AP_TaldarimMothershipDeathHealDummyAttackMissile" parent="MISSILE_INVULNERABLE">
+        <Race value="Prot"/>
+        <EditorCategories value="ObjectType:Projectile,ObjectFamily:Campaign"/>
+    </CUnit>
     <CUnit id="AP_Reaver">
         <DeathRevealRadius value="3"/>
         <Race value="Prot"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index ed3588d1dc..432810df55 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -987,10 +987,24 @@
         <EffectArray Reference="Weapon,AP_CarrierTaldarimLaser,Level" Value="1"/>
         <EffectArray Reference="Effect,AP_CarrierTaldarimLaserDamage,Amount" Value="5"/>
         <!--  Mothership -->
-        <EffectArray Reference="Weapon,AP_MothershipBeam,Level" Value="1"/>
-        <EffectArray Reference="Effect,AP_MothershipBeamDamage,Amount" Value="1.000000"/>
         <EffectArray Reference="Weapon,AP_SOAMothershipv4Weapon,Level" Value="1"/>
+        <EffectArray Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Level" Value="1"/>
         <EffectArray Reference="Effect,AP_SOAMothershipv4BeamDamage,Amount" Value="4"/>
+        <EffectArray Reference="Effect,AP_SOAMothershipv4FastBeamDamage,Amount" Value="2"/>
+        <EffectArray Reference="Weapon,AP_RepulsorCannon,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_MothershipCoreRepulsorCannonDamage,Amount" Value="1"/>
+        <EffectArray Reference="Weapon,AP_AiurMothershipWeapon,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_AiurMothershipBeamDamage,Amount" Value="1"/>
+        <EffectArray Reference="Weapon,AP_PurifierMothershipWeapon,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_PurifierMothershipBeamDamage,Amount" Value="1"/>
+        <EffectArray Reference="Weapon,AP_MothershipCorePurifierWeapon,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_MothershipCorePurifierWeaponDamage,Amount" Value="2"/>
+        <EffectArray Reference="Effect,AP_MothershipCorePurifierWeaponFriendlyDamage,Amount" Value="2"/>
+        <EffectArray Reference="Weapon,AP_MothershipPurifierBomberLaunch,Level" Value="1"/>
+        <EffectArray Reference="Weapon,AP_MothershipTaldarimInterceptorLaunch,Level" Value="1"/>
+        <EffectArray Reference="Weapon,AP_MothershipAiurInterceptorLaunch,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_MothershipBomberDamageDisplay,Amount" Value="1"/>
+        <EffectArray Reference="Effect,AP_MothershipInterceptorDamageDisplay,Amount" Value="1"/>
         <!-- Phoenix -->
         <EffectArray Reference="Effect,AP_IonCannonsULeft,Amount" Value="1"/>
         <EffectArray Reference="Effect,AP_IonCannonsURight,Amount" Value="1"/>
@@ -1107,10 +1121,18 @@
         <!--        <EffectArray Reference="Unit,Mothership,LifeArmor" Value="1.000000"/>-->
         <EffectArray Reference="Unit,AP_SOAMothershipv4,LifeArmorLevel" Value="1"/>
         <EffectArray Reference="Unit,AP_SOAMothershipv4,LifeArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,LifeArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,LifeArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,LifeArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,LifeArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,LifeArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,LifeArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,LifeArmorLevel" Value="1"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,LifeArmor" Value="1"/>
-        <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,LifeArmorLevel" Value="1"/>
-        <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,LifeArmor" Value="1"/>
         <!-- Oracle -->
         <EffectArray Reference="Unit,AP_Oracle,LifeArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_Oracle,LifeArmorLevel" Value="1"/>
@@ -1295,10 +1317,18 @@
         <!--        <EffectArray Reference="Unit,Mothership,ShieldArmorLevel" Value="1"/>-->
         <EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldArmorLevel" Value="1"/>
         <EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,ShieldArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,ShieldArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,ShieldArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,ShieldArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,ShieldArmor" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,ShieldArmorLevel" Value="1"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,ShieldArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldArmorLevel" Value="1"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldArmor" Value="1"/>
-        <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,ShieldArmorLevel" Value="1"/>
-        <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,ShieldArmor" Value="1"/>
         <!-- Oracle -->
         <EffectArray Reference="Unit,AP_Oracle,ShieldArmor" Value="1"/>
         <EffectArray Reference="Unit,AP_Oracle,ShieldArmorLevel" Value="1"/>
@@ -8478,6 +8508,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SOAMothershipv4,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel1.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirArmorsLevel2" parent="AP_BaseProtossAirArmors">
         <Name value="Upgrade/Name/ProtossAirArmorsLevel2"/>
@@ -8516,6 +8551,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SOAMothershipv4,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel2.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirArmorsLevel3" parent="AP_BaseProtossAirArmors">
         <Name value="Upgrade/Name/ProtossAirArmorsLevel3"/>
@@ -8554,6 +8594,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SOAMothershipv4,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,LifeArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-airarmorlevel3.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirArmorsLevel4" parent="AP_BaseProtossAirArmors">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
@@ -8590,6 +8635,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SOAMothershipv4,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel4.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirArmorsLevel5" parent="AP_BaseProtossAirArmors">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
@@ -8627,6 +8677,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_SOAMothershipv4,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,LifeArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airarmorlevel5.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirWeaponsQuatro" parent="AP_BaseProtossAirWeapons"/>
     <CUpgrade id="AP_ProtossAirWeaponsLevel1" parent="AP_BaseProtossAirWeapons">
@@ -8662,6 +8717,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifier,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifierGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_RepulsorCannon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipCorePurifierWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_AiurMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_PurifierMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirWeaponsLevel2" parent="AP_BaseProtossAirWeapons">
         <Name value="Upgrade/Name/ProtossAirWeaponsLevel2"/>
@@ -8696,6 +8756,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifier,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifierGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_RepulsorCannon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipCorePurifierWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_AiurMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_PurifierMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirWeaponsLevel3" parent="AP_BaseProtossAirWeapons">
         <Name value="Upgrade/Name/ProtossAirWeaponsLevel3"/>
@@ -8730,6 +8795,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifier,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifierGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_RepulsorCannon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipCorePurifierWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_AiurMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_PurifierMothershipWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirWeaponsLevel4" parent="AP_BaseProtossAirWeapons">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
@@ -8763,6 +8833,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifier,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifierGround,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_RepulsorCannon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipCorePurifierWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_AiurMothershipWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_PurifierMothershipWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossAirWeaponsLevel5" parent="AP_BaseProtossAirWeapons">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
@@ -8796,6 +8871,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifier,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_TempestPurifierGround,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_TaldarimMothershipFastAttackWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_RepulsorCannon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipCorePurifierWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_AiurMothershipWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_PurifierMothershipWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossGroundArmorsQuatro" parent="AP_BaseProtossGroundArmors"/>
     <CUpgrade id="AP_ProtossGroundArmorsPreplacedNoBuild" parent="AP_BaseProtossGroundArmors">
@@ -9307,6 +9387,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_ShieldBattery,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossShieldsLevel2" parent="AP_BaseProtossShields">
         <Name value="Upgrade/Name/ProtossShieldsLevel2"/>
@@ -9405,6 +9490,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_ShieldBattery,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel2.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossShieldsLevel3" parent="AP_BaseProtossShields">
         <Name value="Upgrade/Name/ProtossShieldsLevel3"/>
@@ -9503,6 +9593,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_ShieldBattery,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,ShieldArmorIcon" Value="Assets\Textures\btn-upgrade-protoss-shieldslevel3.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossShieldsLevel4" parent="AP_BaseProtossShields">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
@@ -9600,6 +9695,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_ShieldBattery,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel4.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_ProtossShieldsLevel5" parent="AP_BaseProtossShields">
         <Icon value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
@@ -9697,6 +9797,11 @@
         <EffectArray Operation="Set" Reference="Actor,AP_ShieldBattery,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_PhoenixPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_TempestPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipAiur,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipPurifierPowerSource,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCoreAiur,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Actor,AP_MothershipCorePurifier,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
     </CUpgrade>
     <CUpgrade id="AP_DestroyerImprovedOverlords">
         <EffectArray Operation="Set" Reference="Abil,AP_LarvaTrain,InfoArray[Train3].Time" Value="2.500000"/>
@@ -12328,6 +12433,10 @@
         <EffectArray Operation="Set" Reference="Abil,AP_ZergBuild,InfoArray[Build1].Time" Value="15"/>
     </CUpgrade>
     <CUpgrade id="AP_UnavailableInThisMission"/>
+    <CUpgrade id="AP_AiurMothershipEnergyRegenAura">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipAiur"/>
+    </CUpgrade>
     <CUpgrade id="AP_VoidZealotWhirlwind">
         <EffectArray Operation="Set" Reference="Actor,AP_ZealotAiur,UnitIcon" Value="Assets\Textures\btn-unit-protoss-zealot-aiur.dds"/>
         <EffectArray Operation="Set" Reference="Actor,AP_ZealotAiur,GroupIcon.Image[0]" Value="Assets\Textures\wireframe-protoss-zealotelite.dds"/>
@@ -12641,6 +12750,77 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_CarrierPurifierPrismaticBeamDummy,Options[Disabled]" Value="0"/>
         <AffectedUnitArray value="AP_CarrierPurifier"/>
     </CUpgrade>
+     <CUpgrade id="AP_PurifierMothershipDebuff">
+        <EffectArray Operation="Set" Reference="Effect,AP_PurifierMothershipSecondaryBeamPersistent,FinalEffect" Value="AP_PurifierMothershipDebuffAB"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipPurifier"/>
+        <AffectedUnitArray value="AP_MothershipPurifierPowerSource"/>
+    </CUpgrade>
+    <CUpgrade id="AP_PurifierMothershipShielding">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipPurifier"/>
+        <AffectedUnitArray value="AP_MothershipPurifierPowerSource"/>
+    </CUpgrade>
+    <CUpgrade id="AP_PurifierMothershipAttackSpeedBoost">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipPurifier"/>
+        <AffectedUnitArray value="AP_MothershipPurifierPowerSource"/>
+    </CUpgrade>
+    <CUpgrade id="AP_TaldarimMothershipDeathHeal">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_SOAMothershipv4"/>
+        <AffectedUnitArray value="AP_MothershipTaldarim"/>
+    </CUpgrade>
+    <CUpgrade id="AP_TaldarimMothershipGroundSlow">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_SOAMothershipv4"/>
+        <AffectedUnitArray value="AP_MothershipTaldarim"/>
+    </CUpgrade>
+    <CUpgrade id="AP_TaldarimMothershipFastAttack">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_SOAMothershipv4"/>
+        <AffectedUnitArray value="AP_MothershipTaldarim"/>
+    </CUpgrade>
+    <CUpgrade id="AP_AiurMothershipFeedback">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipAiur"/>
+    </CUpgrade>
+    <CUpgrade id="AP_AiurMothershipShieldRestore">
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_MothershipAiur"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MothershipHangarInstallation">
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipTaldarimInterceptorLaunch,Options[Hidden]" Value="0"/>
+        <AffectedUnitArray value="AP_SOAMothershipv4"/>
+        <AffectedUnitArray value="AP_MothershipTaldarim"/>
+        <AffectedUnitArray value="AP_MothershipAiur"/>
+        <AffectedUnitArray value="AP_MothershipPurifier"/>
+        <AffectedUnitArray value="AP_MothershipPurifierPowerSource"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MothershipTaldarimHangar">
+        <EffectArray Operation="Set" Reference="Weapon,AP_MothershipTaldarimInterceptorLaunch,Options[Disabled]" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_MothershipTaldarimHangar,MaxCount" Value="8"/>
+        <AffectedUnitArray value="AP_SOAMothershipv4"/>
+        <AffectedUnitArray value="AP_MothershipTaldarim"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MothershipPurifierHangar"/>
+    <CUpgrade id="AP_MothershipAiurHangar"/>
+    <CUpgrade id="AP_CanInstallPlanetCracker"/>
+    <CUpgrade id="AP_CanInstallAstralRestoration"/>
+    <CUpgrade id="AP_CanInstallSummonDeathFleet"/>
+    <CUpgrade id="AP_CanInstallTimeField"/>
+    <CUpgrade id="AP_CanInstallWormholeModule"/>
+    <CUpgrade id="AP_CanInstallPurifierMothershipDebuff"/>
+    <CUpgrade id="AP_CanInstallAiurMothershipEnergyRegenAura"/>
+    <CUpgrade id="AP_CanInstallTaldarimMothershipFastAttack"/>
+    <CUpgrade id="AP_CanInstallPurifierMothershipShielding"/>
+    <CUpgrade id="AP_CanInstallAiurMothershipFeedback"/>
+    <CUpgrade id="AP_CanInstallTaldarimMothershipGroundSlow"/>
+    <CUpgrade id="AP_CanInstallPurifierMothershipAttackSpeedBoost"/>
+    <CUpgrade id="AP_CanInstallAiurMothershipShieldRestore"/>
+    <CUpgrade id="AP_CanInstallTaldarimMothershipDeathHeal"/>
+    <CUpgrade id="AP_MothershipPurifierPowerSource"/>
+    <CUpgrade id="AP_MothershipAiurShieldArmorAura"/>
     <CUpgrade id="AP_VoidRaySpeedUpgrade">
         <ScoreAmount value="300"/>
         <ScoreResult value="BuildOrder"/>
@@ -15111,6 +15291,11 @@
         <EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldRegenRate" Value="0.05"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldRegenRate" Value="0.05"/>
         <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,ShieldRegenRate" Value="0.05"/>
         <!-- Oracle -->
         <EffectArray Reference="Unit,AP_Oracle,ShieldRegenRate" Value="0.05"/>
         <EffectArray Reference="Unit,AP_OracleStasisTrap,ShieldRegenRate" Value="0.05"/>
@@ -15248,6 +15433,11 @@
         <EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldRegenRate" Value="5"/>
         <EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldRegenRate" Value="5"/>
         <EffectArray Reference="Unit,AP_SOAMothershipv4Placement,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifier,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AP_MothershipPurifierPowerSource,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AP_MothershipCorePurifier,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AP_MothershipCoreAiur,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AP_MothershipAiur,ShieldRegenRate" Value="5"/>
         <!-- Oracle -->
         <EffectArray Reference="Unit,AP_Oracle,ShieldRegenRate" Value="5"/>
         <EffectArray Reference="Unit,AP_OracleStasisTrap,ShieldRegenRate" Value="5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index b85d770f4e..1fe8dc6d6a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -139,6 +139,11 @@
         <CombineArray value="AP_SourceIsNotAPHellion"/>
         <Type value="And"/>
     </CValidatorCombine>
+    <CValidatorCombine id="AP_NoShieldsAndFriendly">
+        <CombineArray value="ShieldsNotFull"/>
+        <CombineArray value="AP_FriendlyOrNeutralTarget"/>
+        <Type value="And"/>
+    </CValidatorCombine>
     <CValidatorUnitCompareBehaviorCount id="AP_NotHaveImpalingStrikeResist">
         <Behavior value="AP_ImpalingStrikeResist"/>
     </CValidatorUnitCompareBehaviorCount>
@@ -941,6 +946,10 @@
         <Value value="AP_Larva"/>
         <ResultFailed value="Error,Error/CantTargetLarva"/>
     </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsMothershipPylonPowerUnit">
+        <Value value="AP_MothershipPylonPowerUnit"/>
+        <ResultFailed value="Error,Error/CantTargetLarva"/>
+    </CValidatorUnitType>
     <CValidatorCombine id="IsLair" parent="CValidatorCombine">
         <!-- Override -->
         <CombineArray value="AP_IsVanillaLair"/>
@@ -1667,6 +1676,9 @@
         <CombineArray value="NotMothership"/>
         <CombineArray value="NotTrain"/>
     </CValidatorCombine>
+    <CValidatorUnitCompareAttackPriority id="AP_ThreatensBattlecruiser" parent="ThreatensUnit" unitLink="Hydralisk">
+        <AttackerAlternateType value="Battlecruiser"/>
+    </CValidatorUnitCompareAttackPriority>
     <CValidatorPlayerRequirement id="AP_SpectrePermanentCloakNotPurchased">
         <Find value="1"/>
         <Value value="AP_SpectrePermanentCloak"/>
@@ -2556,6 +2568,9 @@
     <CValidatorUnitFilters id="AP_UnitIsBiological">
         <Filters value="Biological;-"/>
     </CValidatorUnitFilters>
+    <CValidatorUnitFilters id="AP_IsStructure">
+        <Filters value="-;Structure"/>
+    </CValidatorUnitFilters>
     <CValidatorPlayerRequirement id="AP_HaveMultiTaskMAFServosLiberator">
         <Find value="1"/>
         <Value value="AP_HaveMultiTaskMAFServosLiberator"/>
@@ -3290,6 +3305,209 @@
         <CombineArray value="AP_IsVanillaNexus"/>
         <CombineArray value="AP_IsAPNexus"/>
     </CValidatorCombine>
+    <CValidatorUnitType id="AP_NotMothershipAiur">
+        <Value value="AP_MothershipAiur"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
+    <CValidatorUnitCompareBehaviorCount id="AP_HasMothershipCoreRecalling">
+        <WhichUnit Value="Source"/>
+        <Compare value="GE"/>
+        <Value value="1"/>
+        <Behavior value="AP_MothershipCoreRecalling"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HasPowerRedirectedPhoton">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_PowerRedirectionPhoton"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HasPowerRedirectedKhaydarin">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_PowerRedirectionKhaydarin"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorCombine id="AP_HavePowerRedirected">
+        <Type value="And"/>
+        <CombineArray value="CasterNotDead"/>
+        <CombineArray value="NotDead"/>
+        <CombineArray value="AP_HasPowerRedirectedPhoton"/>
+        <CombineArray value="AP_HasPowerRedirectedKhaydarin"/>
+    </CValidatorCombine>
+    <CValidatorUnitFilters id="AP_FriendlyTargetExcludeSelf">
+        <Filters value="-;Enemy"/>
+    </CValidatorUnitFilters>
+    <CValidatorUnitFilters id="AP_EnemyTargetExcludeSelf">
+        <Filters value="Enemy;-"/>
+    </CValidatorUnitFilters>
+    <CValidatorUnitCompareBehaviorCount id="AP_TargetFirePriority">
+        <Compare value="GT"/>
+        <Behavior value="AP_TargetFire"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorCombine id="AP_IsPhotonOrKhaydarin">
+        <ResultFailed value="Error,e_cmdCantTargetThatUnit"/>
+        <CombineArray value="AP_IsAPPhotonCannon"/>
+        <CombineArray value="AP_IsKhaydarinMonolith"/>
+    </CValidatorCombine>
+    <CValidatorUnitCompareBehaviorCount id="AP_CasterIsNotBatteryOvercharged">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_BatteryOvercharge"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_CasterHasBatteryOverchargeBehavior">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_BatteryOvercharge"/>
+        <Compare value="GT"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NoAstralRestoration">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_AstralRestorationCaster"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_CasterAstralRestoration">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_AstralRestorationCaster"/>
+        <Compare value="GT"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_CasterOverloadWeaponSystems">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_OverloadWeaponSystems"/>
+        <Compare value="GT"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotCasterOverloadWeaponSystems">
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_OverloadWeaponSystems"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NoPurifierMothershipTarget">
+        <WhichUnit Value="Target"/>
+        <Behavior value="AP_PurifierMothershipTarget"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorPlayerRequirement id="AP_HavePurifierMothershipDebuff">
+        <Find value="1"/>
+        <Value value="AP_HavePurifierMothershipDebuff"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveMothershipAiurShieldArmorAura">
+        <Find value="1"/>
+        <Value value="AP_HaveMothershipAiurShieldArmorAura"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveEnhancedTargeting">
+        <Find value="1"/>
+        <Value value="AP_HaveKaraxTurretRange"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoEnhancedTargeting">
+        <Find value="0"/>
+        <Value value="AP_HaveKaraxTurretRange"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorCombine id="AP_CasterIsTaldarimMothership">
+        <CombineArray value="AP_CasterIsSlowedTaldarimMothership"/>
+        <CombineArray value="AP_CasterIsFasterTaldarimMothership"/>
+    </CValidatorCombine>
+    <CValidatorUnitType id="AP_CasterIsSlowedTaldarimMothership">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_SOAMothershipv4"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_CasterIsFasterTaldarimMothership">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_MothershipTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_CasterIsAiurMothership">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_MothershipAiur"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_CasterIsPurifierMothershipOrCore">
+        <CombineArray value="AP_CasterIsPurifierMothership"/>
+        <CombineArray value="AP_CasterIsPurifierMothershipCore"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_CasterIsPurifierMothership">
+        <CombineArray value="AP_CasterIsPurifierMothershipUpgraded"/>
+        <CombineArray value="AP_CasterIsPurifierMothershipBase"/>
+    </CValidatorCombine>
+    <CValidatorUnitType id="AP_CasterIsPurifierMothershipCore">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_MothershipCorePurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_CasterIsPurifierMothershipBase">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_MothershipPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_CasterIsPurifierMothershipUpgraded">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_MothershipPurifierPowerSource"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_CasterIsMothership">
+        <CombineArray value="AP_CasterIsTaldarimMothership"/>
+        <CombineArray value="AP_CasterIsAiurMothership"/>
+        <CombineArray value="AP_CasterIsPurifierMothership"/>
+    </CValidatorCombine>
+    <CValidatorPlayerRequirement id="AP_CanInstallAiurMothershipFeedback">
+        <Find value="1"/>
+        <Value value="AP_CanInstallAiurMothershipFeedback"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveAiurMothershipFeedback">
+        <Find value="1"/>
+        <Value value="AP_HaveAiurMothershipFeedback"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveAiurMothershipShieldRestore">
+        <Find value="1"/>
+        <Value value="AP_HaveAiurMothershipShieldRestore"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveTaldarimMothershipFastAttack">
+        <Find value="1"/>
+        <Value value="AP_HaveTaldarimMothershipFastAttack"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NotHaveTaldarimMothershipFastAttack">
+        <Value value="AP_HaveTaldarimMothershipFastAttack"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorUnitCompareBehaviorCount id="AP_MothershipTaldarimBaseAttackSwap">
+        <Behavior value="AP_EnableMothershipTaldarimAttackSwap"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveSOASuperShield">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_SoASuperShield"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorCombine id="AP_UseSuperShieldGlaze">
+        <CombineArray value="AP_HaveSOASuperShield"/>
+        <CombineArray value="AP_HaveTaldarimRecallShield"/>
+    </CValidatorCombine>
+    <CValidatorUnitCompareBehaviorCount id="AP_HavePlanetCrackerInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_PlanetCrackerInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveRevitalizeShieldsInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_RevitalizeShieldsInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveOverloadWeaponSystemsInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_OverloadWeaponSystemsInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveAstralRestorationInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_AstralRestorationInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveSummonDeathFleetInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_SummonDeathFleetInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_HaveThermalLanceInstalled">
+        <WhichUnit Value="Caster"/>
+        <Value value="1"/>
+        <Behavior value="AP_ThermalLanceInstalled"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorPlayerRequirement id="AP_HaveMothershipTaldarimIntegratedPower">
+        <Find value="1"/>
+        <Value value="AP_HaveMothershipTaldarimIntegratedPower"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorUnitType id="AP_CasterIsArbiter">
+        <WhichUnit Value="Caster"/>
+        <Value value="AP_ArbiterMP"/>
+    </CValidatorUnitType>
+    <CValidatorUnitCompareBehaviorCount id="AP_TaldarimRecall">
+        <Value value="1"/>
+        <Behavior value="AP_MothershipRecallTaldarimDummy"/>
+    </CValidatorUnitCompareBehaviorCount>
     <CValidatorCombine id="AP_NoRecallingBehaviors">
         <Type value="And"/>
         <CombineArray value="AP_IsNotArbiterRecalling"/>
@@ -3858,6 +4076,191 @@
         <Value value="AP_ArbiterMP"/>
         <Find value="0"/>
     </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsZealotPurifier">
+        <Value value="AP_ZealotPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsAdept">
+        <Value value="AP_Adept"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsColossusPurifier">
+        <Value value="AP_ColossusPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsScoutPurifier">
+        <Value value="AP_ScoutPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsStalkerPurifier">
+        <Value value="AP_StalkerPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsPhoenixPurifier">
+        <Value value="AP_PhoenixPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsImmortalPurifier">
+        <Value value="AP_ImmortalPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsTempestPurifier">
+        <Value value="AP_TempestPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsSentryPurifier">
+        <Value value="AP_SentryPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsPurifierMothershipCore">
+        <Value value="AP_MothershipCorePurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsPurifierMothershipBase">
+        <Value value="AP_MothershipPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsPurifierMothershipUpgraded">
+        <Value value="AP_MothershipPurifierPowerSource"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_IsPurifierMothership">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsPurifierMothershipBase"/>
+        <CombineArray value="AP_IsPurifierMothershipUpgraded"/>
+    </CValidatorCombine>
+    <CValidatorUnitType id="AP_TargetIsNotPurifierMothershipBase">
+        <Find value="0"/>
+        <Value value="AP_MothershipPurifier"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_TargetIsNotPurifierMothershipUpgraded">
+        <Find value="0"/>
+        <Value value="AP_MothershipPurifierPowerSource"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_IsPurifierUnit">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsAdept"/>
+        <CombineArray value="AP_IsZealotPurifier"/>
+        <CombineArray value="AP_IsCarrierPurifier"/>
+        <CombineArray value="AP_IsImmortalPurifier"/>
+        <CombineArray value="AP_IsPhoenixPurifier"/>
+        <CombineArray value="AP_IsTempestPurifier"/>
+        <CombineArray value="AP_IsStalkerPurifier"/>
+        <CombineArray value="AP_IsVoidRayPurifier"/>
+        <CombineArray value="AP_IsScoutPurifier"/>
+        <CombineArray value="AP_IsColossusPurifier"/>
+        <CombineArray value="AP_IsSentryPurifier"/>
+        <CombineArray value="AP_IsDisruptor"/>
+        <CombineArray value="AP_IsPurifierMothershipCore"/>
+        <CombineArray value="AP_IsPurifierMothership"/>
+    </CValidatorCombine>
+    <CValidatorUnitType id="AP_IsSentryTaldarim">
+        <Value value="AP_Monitor"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsDarkTemplarTaldarim">
+        <Value value="AP_DarkTemplarTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsScoutTaldarim">
+        <Value value="AP_ScoutTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsCarrierTaldarim">
+        <Value value="AP_CarrierTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsHighTemplarTaldarim">
+        <Value value="AP_HighTemplarTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsSlayer">
+        <Value value="AP_Slayer"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsTaldarimMothershipBase">
+        <Value value="AP_SOAMothershipv4"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsTaldarimMothershipUpgraded">
+        <Value value="AP_MothershipTaldarim"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_IsTaldarimMothership">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsTaldarimMothershipBase"/>
+        <CombineArray value="AP_IsTaldarimMothershipUpgraded"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_IsTaldarimUnit">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsSupplicant"/>
+        <CombineArray value="AP_IsSentryTaldarim"/>
+        <CombineArray value="AP_IsDarkTemplarTaldarim"/>
+        <CombineArray value="AP_IsSlayer"/>
+        <CombineArray value="AP_IsHighTemplarTaldarim"/>
+        <CombineArray value="AP_IsImmortalTaldarim"/>
+        <CombineArray value="AP_IsAPColossusTaldarim"/>
+        <CombineArray value="AP_IsVoidRayTaldarim"/>
+        <CombineArray value="AP_IsScoutTaldarim"/>
+        <CombineArray value="AP_IsPhoenixTaldarim"/>
+        <CombineArray value="AP_IsCarrierTaldarim"/>
+        <CombineArray value="AP_IsTaldarimMothership"/>
+    </CValidatorCombine>
+    <CValidatorUnitType id="AP_IsZealotAiur">
+        <Value value="AP_ZealotAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsDarkTemplarAiur">
+        <Value value="AP_DarkTemplarAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsScoutAiur">
+        <Value value="AP_ScoutMP"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsDragoon">
+        <Value value="AP_Dragoon"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsReaver">
+        <Value value="AP_Reaver"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsArbiter">
+        <Value value="AP_ArbiterMP"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsVoidRayAiur">
+        <Value value="AP_VoidRayAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsPhoenixAiur">
+        <Value value="AP_PhoenixAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsSentryAiur">
+        <Value value="AP_SentryAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsHighTemplarAiur">
+        <Value value="AP_HighArchonTemplar"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsAiurMothership">
+        <Value value="AP_MothershipAiur"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_IsAiurMothershipCore">
+        <Value value="AP_MothershipCoreAiur"/>
+    </CValidatorUnitType>
+    <CValidatorCombine id="AP_IsAiurUnit">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsZealotAiur"/>
+        <CombineArray value="AP_IsSentryAiur"/>
+        <CombineArray value="AP_IsDarkTemplarAiur"/>
+        <CombineArray value="AP_IsDragoon"/>
+        <CombineArray value="AP_IsHighTemplarAiur"/>
+        <CombineArray value="AP_IsImmortalAiur"/>
+        <CombineArray value="AP_IsReaver"/>
+        <CombineArray value="AP_IsVoidRayAiur"/>
+        <CombineArray value="AP_IsScoutAiur"/>
+        <CombineArray value="AP_IsPhoenixAiur"/>
+        <CombineArray value="AP_IsArbiter"/>
+        <CombineArray value="AP_IsCarrierAiur"/>
+        <CombineArray value="AP_IsAiurMothership"/>
+        <CombineArray value="AP_IsAiurMothershipCore"/>
+    </CValidatorCombine>
+    <CValidatorUnitCompareVital id="AP_ShieldsEqual0">
+        <Compare value="Eq"/>
+        <Vital value="Shields"/>
+    </CValidatorUnitCompareVital>
+    <CValidatorCombine id="AP_IsPurifierUnitOrNoShields">
+        <Type value="Or"/>
+        <CombineArray value="AP_IsPurifierUnit"/>
+        <CombineArray value="AP_ShieldsEqual0"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_IsNotTaldarimUnit">
+        <Negate value="1"/>
+        <CombineArray value="AP_IsTaldarimUnit"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_IsNotAiurUnit">
+        <Negate value="1"/>
+        <CombineArray value="AP_IsAiurUnit"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_NotPurifierAndHaveShields">
+        <Type value="And"/>
+        <CombineArray value="AP_IsNotPurifierUnit"/>
+        <CombineArray value="AP_ShieldsGT0"/>
+    </CValidatorCombine>
     <CValidatorUnitType id="AP_TargetIsNotCarrierAiur">
         <Value value="AP_CarrierAiur"/>
         <Find value="0"/>
@@ -3877,6 +4280,14 @@
         <CombineArray value="AP_IsCarrierAiur"/>
         <CombineArray value="AP_IsCarrierPurifier"/>
     </CValidatorCombine>
+    <CValidatorUnitCompareBehaviorCount id="AP_UnitInTimeFieldTaldarim">
+        <WhichUnit Value="Target"/>
+        <Behavior value="AP_TimeFieldTaldarim"/>
+        <Value value="1"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotTimeFieldTaldarimConfusion">
+        <Behavior value="AP_TimeFieldTaldarimConfusion"/>
+    </CValidatorUnitCompareBehaviorCount>
     <CValidatorUnitCompareBehaviorCount id="AP_NotInterceptorHidden">
         <Behavior value="AP_InterceptorHidden"/>
     </CValidatorUnitCompareBehaviorCount>
@@ -4103,6 +4514,10 @@
         <Find value="1"/>
         <Value value="AP_HaveSiegeTankSiegeModeProgressiveRangeIncease"/>
     </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveAiurMothershipEnergyRegenAura">
+        <Find value="1"/>
+        <Value value="AP_HaveAiurMothershipEnergyRegenAura"/>
+    </CValidatorPlayerRequirement>
     <CValidatorPlayerRequirement id="AP_HHWidowMineAttackRangeUpgraded">
         <Find value="1"/>
         <Value value="AP_HaveHHWidowMineAttackRange"/>
@@ -5362,6 +5777,7 @@
         <Value value="AP_HaveKaraxInstantStructureWarp"/>
     </CValidatorPlayerRequirement>
     <CValidatorUnitType id="AP_IsAPShieldBattery">
+        <ResultFailed value="CantTargetThatUnit"/>
         <Value value="AP_ShieldBattery"/>
     </CValidatorUnitType>
     <CValidatorCombine id="AP_KaraxInstantWarpStructures">
@@ -5739,6 +6155,10 @@
     <CValidatorPlayerRequirement id="AP_NotHaveMothershipTaldarimIntegratedPower">
         <Value value="AP_HaveMothershipTaldarimIntegratedPower"/>
     </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveMothershipHangarTaldarimInstalled">
+        <Find value="1"/>
+        <Value value="AP_HaveMothershipHangarTaldarimInstalled"/>
+    </CValidatorPlayerRequirement>
     <CValidatorUnitCompareBehaviorCount id="AP_NotHaveCreepFrenzy13Crawler">
         <Behavior value="AP_CreepFrenzy13Crawler"/>
     </CValidatorUnitCompareBehaviorCount>
@@ -7589,6 +8009,9 @@
         <CombineArray value="AP_CasterHasMaxShields40"/>
         <CombineArray value="AP_CasterNotWorker"/>
     </CValidatorCombine>
+    <CValidatorUnitCompareBehaviorCount id="AP_PurifierMothershipAttackSpeedBoostBuffEmpoweredNotActive">
+        <Behavior value="AP_PurifierMothershipAttackSpeedBoostBuffEmpowered"/>
+    </CValidatorUnitCompareBehaviorCount>
     <CValidatorCombine id="AP_SILiberatorAGMorphValidatorCombine">
         <Type value="And"/>
         <CombineArray value="CasterNotDead"/>
@@ -7695,6 +8118,11 @@
         <PowerLink value="PowerSource"/>
         <Compare value="GT"/>
     </CValidatorLocationComparePower>
+    <CValidatorLocationComparePower id="AP_BuildingHasAtLeastNormalPower">
+        <ResultFailed value="Error,Error/AP_BuildingIsUnpowered"/>
+        <PowerLink value="PowerSource"/>
+        <Compare value="GT"/>
+    </CValidatorLocationComparePower>
     <CValidatorUnitCompareBehaviorCount id="AP_TacticalStimpackTestBuff">
         <Behavior value="AP_Stimpack"/>
     </CValidatorUnitCompareBehaviorCount>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index b50f73d01c..5f0a7cda70 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1691,12 +1691,19 @@
         <Effect value="AP_BomberLaunchPersistent"/>
         <AllowedMovement value="Slowing"/>
     </CWeaponLegacy>
-    <CWeaponLegacy id="AP_InterceptorsTaldarimDummy" parent="AP_InterceptorsDummy">
+    <CWeaponLegacy id="AP_MothershipTaldarimInterceptorLaunch" parent="AP_InterceptorsDummy">
         <Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+        <Options index="Disabled" value="1"/>
+        <Options index="Hidden" value="1"/>
+        <DisplayEffect value="AP_InterceptorBeamDamage"/>
+        <Range value="7"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_InterceptorsPurifierDummy" parent="AP_InterceptorsDummy">
         <Icon value="Assets\Textures\btn-unit-collection-purifier-bomber.dds"/>
     </CWeaponLegacy>
+    <CWeaponLegacy id="AP_InterceptorsTaldarimDummy" parent="AP_InterceptorsDummy">
+        <Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
+    </CWeaponLegacy>
     <CWeaponLegacy id="AP_CarrierTaldarimLaser">
         <EditorCategories value="Race:Protoss"/>
         <Options index="DisplayCooldown" value="1"/>
@@ -2290,35 +2297,44 @@
         <Range value="7"/>
         <RangeSlop value="0"/>
         <Period value="1.25"/>
-        <Effect value="AP_PhotonCannonLM"/>
+        <Effect value="AP_PhotonCannonSet"/>
     </CWeaponLegacy>
-    <CWeaponLegacy id="AP_MothershipCoreWeapon">
-        <Options index="Hidden" value="1"/>
+    <CWeaponLegacy id="AP_MothershipCorePhotonWeapon">
         <EditorCategories value="Race:Protoss"/>
         <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
-        <DisplayEffect value="AP_MothershipCoreWeaponDamage"/>
+        <DisplayEffect value="AP_MothershipCorePhotonWeaponDamage"/>
         <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="13"/>
-        <MinScanRange value="7"/>
-        <RangeSlop value="0"/>
         <Period value="1.25"/>
-        <Effect value="AP_MothershipCoreWeaponLM"/>
+        <Effect value="AP_MothershipCorePhotonWeaponLM"/>
+        <Arc value="360"/>
+    </CWeaponLegacy>
+    <CWeaponLegacy id="AP_RepulsorCannon">
+        <EditorCategories value="Race:Protoss"/>
+        <Options index="OnlyFireWhileInAttackOrder" value="0"/>
+        <Options index="OnlyFireAtAttackOrderTarget" value="0"/>
+        <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
+        <DisplayEffect value="AP_MothershipCoreRepulsorCannonDamage"/>
+        <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <RangeSlop value="0"/>
+        <Range value="7"/>
+        <Period value="0.85"/>
+        <Effect value="AP_MothershipCorePlasmaDisruptorLaunchMissile"/>
         <AllowedMovement value="Slowing"/>
-        <Arc value="4.9987"/>
     </CWeaponLegacy>
-    <CWeaponLegacy id="AP_MothershipCoreWeaponSurgeSwitch">
+    <CWeaponLegacy id="AP_MothershipCoreWeapon">
         <Options index="Hidden" value="1"/>
         <EditorCategories value="Race:Protoss"/>
         <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
         <DisplayEffect value="AP_MothershipCoreWeaponDamage"/>
         <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <MinScanRange value="7"/>
         <Range value="13"/>
+        <MinScanRange value="7"/>
         <RangeSlop value="0"/>
-        <Arc value="4.9987"/>
-        <Period value="12.5"/>
+        <Period value="1.25"/>
         <Effect value="AP_MothershipCoreWeaponLM"/>
         <AllowedMovement value="Slowing"/>
+        <Arc value="360"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_ArbiterMPWeapon">
         <EditorCategories value="Race:Protoss"/>
@@ -2440,6 +2456,71 @@
         <Effect value="AP_SOAMothershipv4BeamSet"/>
         <AllowedMovement value="Moving"/>
     </CWeaponLegacy>
+    <CWeaponLegacy id="AP_TaldarimMothershipFastAttackWeapon">
+        <EditorCategories value="Race:Protoss"/>
+        <Options index="OnlyFireWhileInAttackOrder" value="0"/>
+        <Options index="OnlyFireAtAttackOrderTarget" value="0"/>
+        <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
+        <DisplayEffect value="AP_SOAMothershipv4FastBeamDamage"/>
+        <DisplayAttackCount value="6"/>
+        <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <Range value="7"/>
+        <Arc value="360"/>
+        <Period value="1"/>
+        <DamagePoint value="0"/>
+        <Effect value="AP_SOAMothershipv4FastBeamSet"/>
+        <AllowedMovement value="Moving"/>
+    </CWeaponLegacy>
+    <CWeaponLegacy id="AP_PurifierMothershipWeapon">
+        <EditorCategories value="Race:Protoss"/>
+        <LegacyOptions index="KeepChanneling" value="1"/>
+        <LegacyOptions index="CanRetargetWhileChanneling" value="1"/>
+        <RangeSlop value="3"/>
+        <AcquireScanFilters value="-;Player,Ally,Neutral"/>
+        <Options index="OnlyFireWhileInAttackOrder" value="0"/>
+        <Options index="OnlyFireAtAttackOrderTarget" value="0"/>
+        <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
+        <DisplayEffect value="AP_PurifierMothershipBeamDamage"/>
+        <DisplayAttackCount value="6"/>
+        <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <Range value="7"/>
+        <Arc value="360"/>
+        <Period value="2.21"/>
+        <DamagePoint value="0"/>
+        <Effect value="AP_PurifierMothershipWeaponSet"/>
+        <AllowedMovement value="Moving"/>
+    </CWeaponLegacy>
+    <CWeaponLegacy id="AP_AiurMothershipWeapon">
+        <EditorCategories value="Race:Protoss"/>
+        <LegacyOptions index="KeepChanneling" value="1"/>
+        <Options index="OnlyFireWhileInAttackOrder" value="0"/>
+        <Options index="OnlyFireAtAttackOrderTarget" value="0"/>
+        <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
+        <DisplayEffect value="AP_AiurMothershipBeamDamage"/>
+        <DisplayAttackCount value="6"/>
+        <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <Range value="7"/>
+        <Arc value="360"/>
+        <Period value="2.21"/>
+        <DamagePoint value="0"/>
+        <Effect value="AP_AiurMothershipBeamSet"/>
+        <AllowedMovement value="Moving"/>
+    </CWeaponLegacy>
+    <CWeaponLegacy id="AP_MothershipCorePurifierWeapon">
+        <EditorCategories value="Race:Protoss"/>
+        <Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
+        <DisplayEffect value="AP_MothershipCorePurifierWeaponDamage"/>
+        <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AcquirePrioritization value="ByDistanceFromTarget"/>
+        <Range value="7"/>
+        <RangeSlop value="0"/>
+        <Arc value="90"/>
+        <Period value="2"/>
+        <DamagePoint value="0.0832"/>
+        <Effect value="AP_MothershipCorePurifierWeaponInitialSet"/>
+        <LegacyOptions index="KeepChanneling" value="1"/>
+        <AllowedMovement value="Slowing"/>
+    </CWeaponLegacy>
     <CWeaponLegacy id="AP_ReaverScarabsLaunch">
         <EditorCategories value="Race:Protoss"/>
         <Options index="LinkedCooldown" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 068dfaa51f..1dccd02de5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -284,6 +284,7 @@ Button/Hotkey/AP_MorphBackToStargate=M
 Button/Hotkey/AP_MorphMorphalisk=V
 Button/Hotkey/AP_MorphToHellion=E
 Button/Hotkey/AP_MorphToHellionTank=D
+Button/Hotkey/AP_MorphToMothership=U
 Button/Hotkey/AP_MorphToOverseer=V
 Button/Hotkey/AP_Morphling=G
 Button/Hotkey/AP_MorphlingPrimalMorphs=V
@@ -293,7 +294,27 @@ Button/Hotkey/AP_MorphlingToImpaler=R
 Button/Hotkey/AP_MorphlingToPrimalIgniterMerge=R
 Button/Hotkey/AP_MorphlingToTyrannozorMerge=T
 Button/Hotkey/AP_Mothership=E
+Button/Hotkey/AP_MothershipAuxiliary=T
+Button/Hotkey/AP_MothershipAuxiliary1=Q
+Button/Hotkey/AP_MothershipAuxiliary2=E
+Button/Hotkey/AP_MothershipAuxiliary3=R
+Button/Hotkey/AP_MothershipAuxiliary4=F
 Button/Hotkey/AP_MothershipCore=M
+Button/Hotkey/AP_MothershipCoreAiur=F
+Button/Hotkey/AP_MothershipCorePurifier=G
+Button/Hotkey/AP_MothershipDamage=F
+Button/Hotkey/AP_MothershipDamage1=Q
+Button/Hotkey/AP_MothershipDamage2=E
+Button/Hotkey/AP_MothershipDamage3=R
+Button/Hotkey/AP_MothershipDamagePrimary=R
+Button/Hotkey/AP_MothershipTaldarimBaseAttackEnable=T
+Button/Hotkey/AP_MothershipTaldarimBaseAttackDisable=G
+Button/Hotkey/AP_MothershipUtility=Q
+Button/Hotkey/AP_MothershipUtility1=E
+Button/Hotkey/AP_MothershipUtility2=R
+Button/Hotkey/AP_MothershipUtility3=T
+Button/Hotkey/AP_MothershipUtility4=F
+Button/Hotkey/AP_MothershipUtilityPrimary=E
 Button/Hotkey/AP_Mutalisk=T
 Button/Hotkey/AP_NPSwarm=E
 Button/Hotkey/AP_NanoRepair=N
@@ -328,6 +349,7 @@ Button/Hotkey/AP_OracleHallucination=L
 Button/Hotkey/AP_OracleRevelation=R
 Button/Hotkey/AP_OracleWeaponOff=D
 Button/Hotkey/AP_OracleWeaponOn=C
+Button/Hotkey/AP_OverloadWeaponSystems=R
 Button/Hotkey/AP_Overlord=V
 Button/Hotkey/AP_ParasiticBomb=R
 Button/Hotkey/AP_PerditionTurret=P
@@ -336,6 +358,7 @@ Button/Hotkey/AP_PhasingMode=E
 Button/Hotkey/AP_PhoenixAiurGravitonBeam=G
 Button/Hotkey/AP_PhoenixHallucination=X
 Button/Hotkey/AP_PhotonCannon=C
+Button/Hotkey/AP_PlanetCracker=R
 Button/Hotkey/AP_PlanetaryFortressLoad=O
 Button/Hotkey/AP_PoisonNova=X
 Button/Hotkey/AP_Predator=P
@@ -523,6 +546,8 @@ Button/Hotkey/AP_TechReactorAI=Z
 Button/Hotkey/AP_TemplarArchive=T
 Button/Hotkey/AP_TerranBuild=B
 Button/Hotkey/AP_Thor=T
+Button/Hotkey/AP_TimeFieldAiurCore=C
+Button/Hotkey/AP_TimeFieldPurifierCore=C
 Button/Hotkey/AP_ThorMengsk=T
 Button/Hotkey/AP_ThorMengskSiege=V
 Button/Hotkey/AP_TimeWarp=C
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 2646b53953..c6d30b4b00 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -18,6 +18,8 @@ Abil/Name/AP_AscendantSacrifice=Ascendant Sacrifice
 Abil/Name/AP_AssaultMode=Assault Mode
 Abil/Name/AP_AssimilatorPipesMorph=Assimilator Pipes Morph
 Abil/Name/AP_AssimilatorToAutomatedAssimilator=Assimilator To Automated Assimilator
+Abil/Name/AP_AstralRestoration=Astral Restoration
+Abil/Name/AP_AstralRestorationInstall=Install Astral Restoration
 Abil/Name/AP_AttackRedirect=Attack Redirect
 Abil/Name/AP_AutomatedExtractorToExtractor=Automated Extractor To Extractor
 Abil/Name/AP_BanelingLaunch=Baneling Launch
@@ -204,6 +206,7 @@ Abil/Name/AP_MorphToSwarmHostRooted=Morph To Swarm Host Rooted
 Abil/Name/AP_MorphToSwarmHostUprooted=Morph To Swarm Host Uprooted
 Abil/Name/AP_MorphToTechReactor=Morph To Tech Reactor
 Abil/Name/AP_MorphZerglingToBaneling=Morph (Zergling -> Baneling)
+Abil/Name/AP_MothershipCoreMassRecall=Mass Recall
 Abil/Name/AP_MutaliskMorphToBroodLord=Mutalisk Morph To Brood Lord
 Abil/Name/AP_MutaliskMorphToViper=Mutalisk Morph To Snake Caster
 Abil/Name/AP_NPSwarm=NP Swarm
@@ -245,12 +248,17 @@ Abil/Name/AP_OracleStasisTrapBuild=Build Stasis Ward
 Abil/Name/AP_OracleWeapon=Oracle Weapon
 Abil/Name/AP_OrbitalCommandLand=Land (Orbital Command)
 Abil/Name/AP_OrbitalLiftOff=Lift Off (Orbital Command)
+Abil/Name/AP_OverloadWeaponSystems=Overload Weapon Systems
+Abil/Name/AP_OverloadWeaponSystemsInstall=Install Overload Weapon Systems
 Abil/Name/AP_PerditionTurretBurrow=Perdition Turret Burrow
 Abil/Name/AP_PerditionTurretUnburrow=Perdition Turret Unburrow
 Abil/Name/AP_PhaseCannon=Phase Cannon
 Abil/Name/AP_PhasingMode=Phasing Mode
+Abil/Name/AP_PhotonOvercharge=Photon Overcharge
 Abil/Name/AP_PlaceHealingDrone=Place Bio-Mechanical Repair Drone
 Abil/Name/AP_PlacePointDefenseDrone=Place Point Defense Drone
+Abil/Name/AP_PlanetCracker=Planet Cracker
+Abil/Name/AP_PlanetCrackerInstall=Install Planet Cracker
 Abil/Name/AP_PoisonNova=Toxic Blast
 Abil/Name/AP_PrimalHeal=Primal Heal
 Abil/Name/AP_PrimalSlash=Primal Slash
@@ -278,6 +286,7 @@ Abil/Name/AP_ReactorMorph=Nuclear Reactor Morph
 Abil/Name/AP_ReaverHangar=Reaver Hangar
 Abil/Name/AP_RefineryToAutomatedRefinery=Refinery To Automated Refinery
 Abil/Name/AP_Repair=Repair
+Abil/Name/AP_RevitalizeShields=Revitalize Shields
 Abil/Name/AP_RoboticsFacilityTrain=Train (Robotics Facility)
 Abil/Name/AP_RoboticsFacilityWarpTrain=Robotics Facility Warp Train
 Abil/Name/AP_RogueGhostCloak=Cloak
@@ -367,6 +376,8 @@ Abil/Name/AP_StimpackRedirect=Stimpack Redirect
 Abil/Name/AP_StopRedirect=Stop Redirect
 Abil/Name/AP_StukovInfestedSiegeTankDeepTunnel=Deep Tunnel
 Abil/Name/AP_SuicideBuilding=Suicide
+Abil/Name/AP_SummonDeathFleet=Summon Death Fleet
+Abil/Name/AP_SummonDeathFleetInstall=Install Summon Death Fleet
 Abil/Name/AP_SummonMercenaries=Summon Mercenaries
 Abil/Name/AP_SuperStimpackNova=Stim Infusion
 Abil/Name/AP_SupplyDepotLower=Lower
@@ -381,6 +392,11 @@ Abil/Name/AP_TerranBuild=Build (SCV)
 Abil/Name/AP_TerranBuildDrop=Calldown
 Abil/Name/AP_ThorReborn=Thor Reborn
 Abil/Name/AP_ThorWreckage=Thor Wreckage
+Abil/Name/AP_TimeFieldAiur=Empowered Deceleration Field
+Abil/Name/AP_TimeFieldAiurCore=Deceleration Field
+Abil/Name/AP_TimeFieldPurifier=Empowered Acceleration Field
+Abil/Name/AP_TimeFieldPurifierCore=Acceleration Field
+Abil/Name/AP_TimeFieldTaldarim=Maddening Field
 Abil/Name/AP_TimeWarp=Chrono Boost
 Abil/Name/AP_TornadoMissile=Tornado Missile
 Abil/Name/AP_TorrasqueChrysalis=Torrasque Chrysalis
@@ -466,6 +482,7 @@ Abil/Name/MercCompoundResearch=Research
 Abil/Name/que5CancelToSelection2=Queue (5) (Cancel To Selection)
 Actor/AddonIndicator/AP_TechLab=T
 Actor/AddonIndicator/AP_TechReactor=TR
+Alert/Text/AP_MothershipComplete=Mothership complete.
 Alert/Text/AP_NovaReviveComplete=Revival complete.
 Alert/Text/AP_TorrasqueReviveComplete=Morph complete.
 Alert/Text/AP_ZerglingReconstitution=Unit complete.
@@ -475,17 +492,21 @@ Behavior/Name/AP_330mmBarrageCannons=330mm Barrage Cannon
 Behavior/Name/AP_AberrationArmorAuraTarget=Protective Cover
 Behavior/Name/AP_AdeptPsionicTransferDamageBuff=Psionic Transfer
 Behavior/Name/AP_AdeptPsionicTransferDamageDebuff=Psionic Transfer
+Behavior/Name/AP_AiurMothershipEnergyRegenAuraBuff=Honor in Unity
+Behavior/Name/AP_AiurMothershipEnergyRegenAuraBuffAiur=Glory in Unity
 Behavior/Name/AP_AlarakLightningStrikes=Lightning Strikes
 Behavior/Name/AP_AlarakStalkerPhasingArmorBuff=Phase Armor
 Behavior/Name/AP_AmorphousArmorcloud=Microbial Shroud
 Behavior/Name/AP_ArbiterMPCloakFieldEffect=Cloaking Field
 Behavior/Name/AP_ArbiterMPStasisField=Stasis Field
 Behavior/Name/AP_AscendantSacrificeSelfBuff=Power Overwhelming
+Behavior/Name/AP_AstralRestorationCaster=Astral Restoration
 Behavior/Name/AP_BansheeCloak=Cloak
 Behavior/Name/AP_BansheeCloakCrossSpectrumDampeners=Cloak
 Behavior/Name/AP_BansheeCloak_Stukov=Cloak
 Behavior/Name/AP_BattlecruiserBonusRange=Field-Assist Targeting System
 Behavior/Name/AP_BattlecruiserCloak=Cloak
+Behavior/Name/AP_BatteryOvercharge=Battery Overcharge
 Behavior/Name/AP_BileDucts=Bile Ducts
 Behavior/Name/AP_BurstCapacitorsDamageBuff=Burst Capacitors
 Behavior/Name/AP_CarrierRepairDroneRecall=Carrier Repair Drone Recall
@@ -572,8 +593,11 @@ Behavior/Name/AP_MercTorrasqueTimerBehavior=Reincarnation Suppressed
 Behavior/Name/AP_MindControl=Mind Control
 Behavior/Name/AP_MindControlImmune=Big Brain
 Behavior/Name/AP_MineDroneCountdown=Widow Mine Detonating
+Behavior/Name/AP_MothershipAiurShieldArmor=Valorous Resolve
+Behavior/Name/AP_MothershipAiurSlow=Time Slowed
+Behavior/Name/AP_MothershipAiurSlowHeroic=Time Slowed
 Behavior/Name/AP_MothershipTaldarimMovementNerfOutsidePower=Pylon Power Loss
-Behavior/Name/AP_NPSwarm=Parasitic Domination
+Behavior/Name/AP_MothershipTaldarimRecallShield=Recall Shield
 Behavior/Name/AP_NeuralParasite=Neural Parasite
 Behavior/Name/AP_NexusInvulnerability=Nexus Invulnerability
 Behavior/Name/AP_NovaApolloCloak=Cloaked
@@ -585,6 +609,7 @@ Behavior/Name/AP_NovaPsiStrikeWalkStopStun=NovaPsiStrikeWalkStopStun
 Behavior/Name/AP_NovaUnitLockdown=Lockdown
 Behavior/Name/AP_NovaWeaponInvictusLongshotLockdown=Lockdown
 Behavior/Name/AP_NoxiousDamage=Noxious Cloud
+Behavior/Name/AP_NPSwarm=Parasitic Domination
 Behavior/Name/AP_ObserverSquadSight=Squad Sight
 Behavior/Name/AP_ObserverTargetLock=Target Lock
 Behavior/Name/AP_OdinInfested=Infested
@@ -592,10 +617,18 @@ Behavior/Name/AP_OracleRevelation=Revealed
 Behavior/Name/AP_OracleStasisTrapStunTarget=Stasis
 Behavior/Name/AP_OracleStasisTrapTarget=Stasis
 Behavior/Name/AP_OracleWeapon=Pulsar Beam
+Behavior/Name/AP_OverloadWeaponSystems=Overload Weapon Systems
+Behavior/Name/AP_OverloadWeaponSystemsStun=Overloaded Weapon Systems
 Behavior/Name/AP_ParalyticSpines=Paralytic Spines
 Behavior/Name/AP_PersonalCloakingFree=Cloak
 Behavior/Name/AP_PersonalDefensiveMatrix=Ionic Force Field
 Behavior/Name/AP_PhaseBlinkDamage=Phase Blink
+Behavior/Name/AP_PhotonOverchage=Photon Overcharge
+Behavior/Name/AP_PlanetCracker=Planet Cracker
+Behavior/Name/AP_PlanetCrackerChargeUp=Planet Cracker Charging
+Behavior/Name/AP_PowerRedirectionCaster=Power Redirection
+Behavior/Name/AP_PowerRedirectionKhaydarin=Power Redirection
+Behavior/Name/AP_PowerRedirectionPhoton=Power Redirection
 Behavior/Name/AP_PredatorChargeImpactReady=Concussive Momentum
 Behavior/Name/AP_PredatorChargeSlow=Concussive Charge Debuff
 Behavior/Name/AP_PredatorCloak=Phase Cloak
@@ -611,6 +644,10 @@ Behavior/Name/AP_PsionicLiftSlow=Immobilized
 Behavior/Name/AP_PsionicLiftStun=Immobilized
 Behavior/Name/AP_PsionicLiftUp=Immobilized
 Behavior/Name/AP_PurificationNova=Phased
+Behavior/Name/AP_PurifierMothershipAttackSpeedBoostBuff=Enhanced Power
+Behavior/Name/AP_PurifierMothershipAttackSpeedBoostBuffEmpowered=Overloaded Power
+Behavior/Name/AP_PurifierMothershipDebuff=Burning
+Behavior/Name/AP_PurifierMothershipShielding=Cybros Shielding
 Behavior/Name/AP_QueenBurstHeal=Rapid Transfusion
 Behavior/Name/AP_QueenClassicParasite=Parasite
 Behavior/Name/AP_QueenSCBWEnsnare=Ensnare
@@ -660,6 +697,7 @@ Behavior/Name/AP_SeekerMissileTimeout=Seeker Missile timeout
 Behavior/Name/AP_SensorTowerRangeBuff=Assisted Targeting
 Behavior/Name/AP_SentryReclamation=Reclamation
 Behavior/Name/AP_ShadowCharging=Shadow Charging
+Behavior/Name/AP_TaldarimMothershipGroundSlowDebuff=Shadow of Death
 Behavior/Name/AP_SiegeTankMengskSlowHeroic=Shock and Awe
 Behavior/Name/AP_SiegeTankMengskStun=Shock and Awe
 Behavior/Name/AP_Slow=Slow
@@ -683,6 +721,11 @@ Behavior/Name/AP_SupplyDrop=Supply drop
 Behavior/Name/AP_SwarmGrenade=Swarm Grenade
 Behavior/Name/AP_ThermalLancesFireBeam=Burning
 Behavior/Name/AP_ThorMengskArmorAuraTarget=Bulwark Field
+Behavior/Name/AP_TimeFieldAiur=Decelerated
+Behavior/Name/AP_TimeFieldAiurHeroic=Decelerated (Heroic)
+Behavior/Name/AP_TimeFieldPurifier=Accelerated
+Behavior/Name/AP_TimeFieldTaldarim=Verge of Madness
+Behavior/Name/AP_TimeFieldTaldarimConfusion=Driven to Madness
 Behavior/Name/AP_TimeWarpProduction=Chrono Boost
 Behavior/Name/AP_TorrasqueTimerBehavior=Reincarnation Suppressed
 Behavior/Name/AP_TyrannozorTyrantsProtectionTarget=Tyrant's Protection
@@ -755,14 +798,18 @@ Behavior/Tooltip/AP_AP_NovaArmorBlinkSuitBlinkCloaked=This unit is cloaked and w
 Behavior/Tooltip/AP_AberrationArmorAuraTarget=An Aberration is granting this unit <d ref="Behavior,AP_AberrationArmorAuraTarget,DamageResponse.ModifyFraction*100"/>% damage reduction.
 Behavior/Tooltip/AP_AdeptPsionicTransferDamageBuff=Enemies that touch this unit take increased damage.
 Behavior/Tooltip/AP_AdeptPsionicTransferDamageDebuff=This unit is taking increased damage.
+Behavior/Tooltip/AP_AiurMothershipEnergyRegenAuraBuff=This unit has <d ref="Behavior,AP_AiurMothershipEnergyRegenAuraBuff,Modification.VitalRegenArray[Energy]" precision="1"/> increased energy regeneration.
+Behavior/Tooltip/AP_AiurMothershipEnergyRegenAuraBuffAiur=This unit has <d ref="Behavior,AP_AiurMothershipEnergyRegenAuraBuffAiur,Modification.VitalRegenArray[Energy]" precision="1"/> increased energy regeneration.
 Behavior/Tooltip/AP_AlarakLightningStrikes=Alarak's next Deadly Charge also deals <d ref="Effect,AlarakLightningStrikesDamage,Amount"/> damage to <d ref="Effect,AlarakLightningStrikesSearch,AreaArray[0].MaxCount"/> enemy units near the primary target.
 Behavior/Tooltip/AP_AmorphousArmorcloud=Incoming damage from air units reduced by <d ref="Behavior,AP_AmorphousArmorcloud,DamageResponse.ModifyFraction*100" precision="1"/>%.
 Behavior/Tooltip/AP_ArbiterMPCloakFieldEffect=This unit is cloaked unless revealed by <c val="FFE303">Detectors</c> or effects.
 Behavior/Tooltip/AP_AscendantSacrificeSelfBuff=This unit has increased shields and its abilities deal increased damage.
+Behavior/Tooltip/AP_AstralRestorationCaster=Healing units within range of Cloaking Field.
 Behavior/Tooltip/AP_BansheeCloak=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_BansheeCloakCrossSpectrumDampeners=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_BansheeCloak_Stukov=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_BattlecruiserBonusRange=+<d ref="Behavior,AP_BattlecruiserBonusRange,Modification.RangedWeaponRange"/> weapon range.
+Behavior/Tooltip/AP_BatteryOvercharge=Restoration rate increased by <d ref="(Behavior,AP_BatteryOvercharge,Modification.HealDealtMultiplier - 1) * 100"/>%. Restoring shields does not consume energy.
 Behavior/Tooltip/AP_BattlecruiserMengskBehemothReactorIndicator=Battlecruiser special abilities require 25 less energy to cast. Pride of Augustgrad cooldown-based ability cooldowns are 20% shorter.
 Behavior/Tooltip/AP_Charging=This Zealot is charging, allowing it to quickly close the distance with its target.
 Behavior/Tooltip/AP_Contaminated=This structure is unable to train new units or research upgrades.
@@ -831,6 +878,9 @@ Behavior/Tooltip/AP_MatrixOverloadTarget=This unit's movement and attack speed h
 Behavior/Tooltip/AP_MedicSCBWOpticFlare=Sight range reduced to melee range. Passive detection disabled.
 Behavior/Tooltip/AP_MercTorrasqueTimerBehavior=Cannot revive at this time.
 Behavior/Tooltip/AP_MindControlImmune=This unit is immune to mind control effects.
+Behavior/Tooltip/AP_MothershipAiurShieldArmor=This unit has increased shield armor.
+Behavior/Tooltip/AP_MothershipAiurSlow=Attack and move speed reduced by <d ref="(1 - Behavior,AP_MothershipAiurSlow,Modification.MoveSpeedMultiplier) * 100"/>%.
+Behavior/Tooltip/AP_MothershipAiurSlowHeroic=Attack and move speed reduced by <d ref="(1 - Behavior,AP_MothershipAiurSlowHeroic,Modification.MoveSpeedMultiplier) * 100"/>%.
 Behavior/Tooltip/AP_MothershipTaldarimMovementNerfOutsidePower=The Mothership travels <d ref="(Behavior,AP_MothershipTaldarimMovementNerfOutsidePower,Modification.MoveSpeedMultiplier - 1) * 100"/>% slower outside Pylon power fields.
 Behavior/Tooltip/AP_NPSwarm=This unit is being controlled by the Swarm.
 Behavior/Tooltip/AP_NeuralParasite=This unit is being controlled by an Infestor.
@@ -847,10 +897,17 @@ Behavior/Tooltip/AP_OracleRevelation=This unit or structure is providing vision
 Behavior/Tooltip/AP_OracleStasisTrapStunTarget=This unit cannot move or attack.
 Behavior/Tooltip/AP_OracleStasisTrapTarget=This unit cannot move, attack, or be damaged.
 Behavior/Tooltip/AP_OracleWeapon=This Oracle's weapon is enabled and can attack ground units.
+Behavior/Tooltip/AP_OverloadWeaponSystems=Can hit additional targets with increased speed, but cannot move.
+Behavior/Tooltip/AP_OverloadWeaponSystemsStun=Stunned
+Behavior/Tooltip/AP_PlanetCracker=Firing the Planet Cracker and is unable to perform any other actions.
+Behavior/Tooltip/AP_PlanetCrackerChargeUp=Preparing for planetary annihilation...
 Behavior/Tooltip/AP_ParalyticSpines=This unit's attack speed is slowed.
 Behavior/Tooltip/AP_PersonalCloakingFree=This unit is cloaked and will only be revealed by detectors or effects.
 Behavior/Tooltip/AP_PersonalDefensiveMatrix=Nova is absorbing a portion of the damage dealt to her.
 Behavior/Tooltip/AP_PhaseBlinkDamage=This unit's next attack will deal double the damage.
+Behavior/Tooltip/AP_PowerRedirectionCaster=Redirecting power, cannot perform any other actions.
+Behavior/Tooltip/AP_PowerRedirectionKhaydarin=Attack speed increased by <d ref="(Behavior,AP_PowerRedirectionKhaydarin,Modification.AdditiveAttackSpeedFactor) * 100"/>%. Deal <d ref="(Effect,AP_KhaydarinSplashDamage,Amount)"> splash damage on attack.
+Behavior/Tooltip/AP_PowerRedirectionPhoton=Attack speed increased by <d ref="(Behavior,AP_PowerRedirectionPhoton,Modification.AdditiveAttackSpeedFactor) * 100"/>%. Attakcs hit <d ref="(Effect,AP_PhotonCannonSearch,AreaArray.MaxCount) additional targets.
 Behavior/Tooltip/AP_PredatorChargeImpactReady=This unit's next attack will apply a slow in an area around it.
 Behavior/Tooltip/AP_PredatorChargeSlow=This unit's movement and attack speeds are reduced.
 Behavior/Tooltip/AP_PredatorCloak=This unit is cloaked ignores unit collision.
@@ -863,6 +920,10 @@ Behavior/Tooltip/AP_PsionicLiftDamage=Taking damage over time.
 Behavior/Tooltip/AP_PsionicLiftFlier=This unit is stunned and taking damage over time.
 Behavior/Tooltip/AP_PsionicLiftRaise=This unit is stunned and taking damage over time.
 Behavior/Tooltip/AP_PurificationNova=This unit is invulnerable and is able to move through other units.
+Behavior/Tooltip/AP_PurifierMothershipAttackSpeedBoostBuff=Attack speed increased by <d ref="Behavior,AP_PurifierMothershipAttackSpeedBoostBuff,Modification.AttackSpeedMultiplier*100 - 100"/>%.
+Behavior/Tooltip/AP_PurifierMothershipAttackSpeedBoostBuffEmpowered=Attack speed increased by <d ref="Behavior,AP_PurifierMothershipAttackSpeedBoostBuffEmpowered,Modification.AttackSpeedMultiplier*100 - 100"/>%.
+Behavior/Tooltip/AP_PurifierMothershipDebuff=Taking <d ref="Behavior,AP_PurifierMothershipDebuff,Duration/Behavior,AP_PurifierMothershipDebuff,Period * Effect,AP_PurifierMothershipDebuffDOT,Amount" precision="1"/> damage over <d ref="Behavior,AP_PurifierMothershipDebuff,Duration" precision="2"/> seconds and armor reduced by <d ref="-1*Behavior,AP_PurifierMothershipDebuff,Modification.LifeArmorBonus"/>.
+Behavior/Tooltip/AP_PurifierMothershipShielding=This unit is taking <d ref="(1-Behavior,AP_PurifierMothershipShielding,DamageResponse.ModifyFraction)*100"/>% reduced damage.
 Behavior/Tooltip/AP_QueenBurstHeal=Regenerating life.
 Behavior/Tooltip/AP_QueenClassicParasite=This unit can detect cloaked or burrowed units and has increased vision.
 Behavior/Tooltip/AP_QueenSCBWEnsnare=Unit's movement and attack speed is slowed.
@@ -897,6 +958,7 @@ Behavior/Tooltip/AP_ScoutPurifierSolariteReactorRecover=Recovering shields quick
 Behavior/Tooltip/AP_ScoutTaldarimVulcanBlaster=The Oppressor has engaged the Vulcan Blasters.
 Behavior/Tooltip/AP_SensorTowerRangeBuff=This structure has increased attack range.
 Behavior/Tooltip/AP_SentryReclamation=This unit is temporarily under Karax's control. It will self-destruct once this effect expires.
+Behavior/Tooltip/AP_TaldarimMothershipGroundSlowDebuff=Attack and movement speed reduced by <d ref="(1 - Behavior,AP_TaldarimMothershipGroundSlowDebuff,Modification.MoveSpeedMultiplier) * 100"/>%.
 Behavior/Tooltip/AP_SiegeTankMengskSlowHeroic=Target's movement speed is reduced for a short period of time.
 Behavior/Tooltip/AP_SiegeTankMengskStun=Target is stunned.
 Behavior/Tooltip/AP_Slow=Target's movement speed is reduced for a short period of time.
@@ -917,6 +979,11 @@ Behavior/Tooltip/AP_SupplyDrop=This Supply Depot is providing an additional 8 su
 Behavior/Tooltip/AP_SwarmGrenade=This unit is slowed and cannot attack or use energy-based abilities.
 Behavior/Tooltip/AP_ThermalLancesFireBeam=This unit is taking additional damage over time.
 Behavior/Tooltip/AP_ThorMengskArmorAuraTarget=A Blackhammer is granting this unit +<d ref="Behavior,AP_ThorMengskArmorAuraTarget,Modification.LifeArmorBonus"/> armor.
+Behavior/Tooltip/AP_TimeFieldAiur=Attack and move speed reduced by <d ref="(1 - Behavior,AP_TimeFieldAiur,Modification.MoveSpeedMultiplier) * 100"/>%.
+Behavior/Tooltip/AP_TimeFieldAiurHeroic=Attack and move speed reduced by <d ref="(1 - Behavior,AP_TimeFieldAiurHeroic,Modification.MoveSpeedMultiplier) * 100"/>%.
+Behavior/Tooltip/AP_TimeFieldPurifier=Attack and move speed increased by <d ref="((Behavior,AP_TimeFieldPurifier,Modification.MoveSpeedMultiplier) * 100) - 100"/>%.
+Behavior/Tooltip/AP_TimeFieldTaldarim=Attack and move speed reduced by <d ref="(1 - Behavior,AP_TimeFieldTaldarim,Modification.AttackSpeedMultiplier) * 100"/>%.
+Behavior/Tooltip/AP_TimeFieldTaldarimConfusion=Attacking nearby allies with <d ref="((Behavior,AP_TimeFieldTaldarimConfusion,Modification.AttackSpeedMultiplier) * 100) - 100"/>% increased attack and movement speed.
 Behavior/Tooltip/AP_TimeWarpProduction=This structure is in an accelerated state.
 Behavior/Tooltip/AP_TorrasqueTimerBehavior=Cannot revive at this time.
 Behavior/Tooltip/AP_UltraliskBurrowChargeStun=This unit is stunned.
@@ -1008,6 +1075,13 @@ Button/Name/AP_AdvancedHealingAI=Advanced Healing AI
 Button/Name/AP_AdvancedWeaponryRaven=Hunter-Seeker Missile
 Button/Name/AP_AerodynamicGlaveShape=Aerodynamic Glaive Shape
 Button/Name/AP_AiurFaction=<c val="64e4fa">Aiur</c> Faction
+Button/Name/AP_AiurMothershipBlackHole=Black Hole
+Button/Name/AP_AiurMothershipEnergyRegenAura=Symbol of Unity
+Button/Name/AP_AiurMothershipEnergyRegenAuraInstall=Install Symbol of Unity
+Button/Name/AP_AiurMothershipFeedback=Harmonized Feedback Conductors
+Button/Name/AP_AiurMothershipFeedbackInstall=Install Harmonized Feedback Conductors
+Button/Name/AP_AiurMothershipShieldRestore=Khalai Shield Rechargers
+Button/Name/AP_AiurMothershipShieldRestoreInstall=Install Khalai Shield Rechargers
 Button/Name/AP_AlarakACMyLifefortheHighlord=Devotion
 Button/Name/AP_AlarakColossusChargedBlastChargeTime=Rapid Power Cycling
 Button/Name/AP_AlarakHavocAbilityRange=Bloodshard Resonance
@@ -1048,6 +1122,8 @@ Button/Name/AP_AscendantAbilityEfficiency=Breath of Creation
 Button/Name/AP_AscendantSacrifice=Sacrifice
 Button/Name/AP_AssaultModeMengsk=Assault Mode
 Button/Name/AP_Assimilator=Warp In Assimilator
+Button/Name/AP_AstralRestoration=Astral Restoration
+Button/Name/AP_AstralRestorationInstall=Install Astral Restoration
 Button/Name/AP_AttackChampions=Attack
 Button/Name/AP_AutomatedAssimilator=Orbital Assimilator
 Button/Name/AP_AutomatedExtractor=Mutate into Automated Extractor
@@ -1074,6 +1150,8 @@ Button/Name/AP_BansheeSpeed=Hyperflight Rotors
 Button/Name/AP_Banshee_BlackOpsAirstrike=Rocket Barrage
 Button/Name/AP_Barracks=Build Barracks
 Button/Name/AP_BarracksMengsk=Build Elite Barracks
+Button/Name/AP_BatteryOvercharge=Battery Overcharge
+Button/Name/AP_BatteryOverchargeInstall=Install Battery Overcharge
 Button/Name/AP_Battlecruiser=Build Battlecruiser
 Button/Name/AP_BattlecruiserBehemothReactor=Behemoth Reactor
 Button/Name/AP_BattlecruiserCovertOpsEngines=Moirai Impulse Drive
@@ -1151,6 +1229,7 @@ Button/Name/AP_ChargePredator=Concussive Charge
 Button/Name/AP_ChitinousPlating=Chitinous Plating
 Button/Name/AP_CliffJumper=Cliff Jumper
 Button/Name/AP_CliffWalk=Cliff Walk
+Button/Name/AP_CloakingFieldMothership=Cloaking Field
 Button/Name/AP_CloakOnBanshee=Cloak
 Button/Name/AP_CloakOnBanshee_Stukov=Cloak
 Button/Name/AP_CloakOnBattlecruiser=Cloak
@@ -1267,6 +1346,7 @@ Button/Name/AP_EnergizerReclamation=Reclamation
 Button/Name/AP_EngineeringBay=Build Engineering Bay
 Button/Name/AP_EvolutionChamber=Mutate into Evolution Chamber
 Button/Name/AP_EvolvedAcidSpores=Soronan Acid
+Button/Name/AP_ExpandedCloakingCapability=Expanded Cloaking Capability
 Button/Name/AP_ExplodeVolatileInfested=Explode
 Button/Name/AP_ExplosiveGlaive=Sundering Glaive
 Button/Name/AP_ExplosiveMode=Explosive Payload
@@ -1332,6 +1412,9 @@ Button/Name/AP_HHWidowMineDeathBlossom=Executioner Missiles
 Button/Name/AP_HHWidowMineRangeAttack=Black Market Launchers
 Button/Name/AP_HHWraithFury=Trigger Override
 Button/Name/AP_Hallucination=Hallucination
+Button/Name/AP_HangarInstallAiur=Install Interceptor Hangar
+Button/Name/AP_HangarInstallPurifier=Install Bomber Hangar
+Button/Name/AP_HangarInstallTaldarim=Install Interceptor Hangar
 Button/Name/AP_HardenedShield=Hardened Shield
 Button/Name/AP_Hatchery=Mutate into Hatchery
 Button/Name/AP_HaveBarrier=Improved Barrier
@@ -1463,6 +1546,10 @@ Button/Name/AP_InfestorPassive=Infestor
 Button/Name/AP_InstigatorBlinkOverdrive=Blink Overdrive
 Button/Name/AP_InstigatorModernizedServos=Modernized Servos
 Button/Name/AP_Interceptor=Build Interceptor
+Button/Name/AP_InterceptorInstall=Install Interceptor Hangar
+Button/Name/AP_InterceptorMothershipAiur=Build Interceptor
+Button/Name/AP_InterceptorMothershipPurifier=Build Bomber
+Button/Name/AP_InterceptorMothershipTaldarim=Build Interceptor
 Button/Name/AP_InterceptorPurifier=Build Bomber
 Button/Name/AP_InterceptorTaldarim=Build Interceptor
 Button/Name/AP_Irradiate=Irradiate
@@ -1557,6 +1644,7 @@ Button/Name/AP_MindBolt=Kinetic Blast
 Button/Name/AP_MindControl=Mind Control
 Button/Name/AP_MissilePods=Missile Pods
 Button/Name/AP_MissileTurret=Build Missile Turret
+Button/Name/AP_MobilePowerField=Mobile Power Field
 Button/Name/AP_MonarchBlades=Monarch Blades
 Button/Name/AP_Monitor=Warp in Havoc
 Button/Name/AP_MorphBackToRoboticsFacility=Transform to Robotics Facility
@@ -1589,10 +1677,39 @@ Button/Name/AP_MorphlingToTyrannozorMerge=Merge to Tyrannozor
 Button/Name/AP_MorphtoDefiler=Morph to Defiler
 Button/Name/AP_MorphtoHunter=Morph to Baneling
 Button/Name/AP_MorphtoSplitterling=Morph to Baneling
-Button/Name/AP_Mothership=Warp In Mothership
-Button/Name/AP_MothershipCore=Warp In Mothership Core
-Button/Name/AP_MothershipTaldarim=Warp in Mothership
+Button/Name/AP_Mothership=Warp In Tal'darim Mothership
+Button/Name/AP_MothershipAiur=Morph to Aiur Mothership
+Button/Name/AP_MothershipAiurShieldArmorAura=Valorous Resolve
+Button/Name/AP_MothershipAuxiliary=Install Auxiliary Upgrades
+Button/Name/AP_MothershipBlackHole=Black Hole
+Button/Name/AP_MothershipPurifierBlackHole=Black Hole
+Button/Name/AP_MothershipBlackHoleInstall=Install Black Hole
+Button/Name/AP_MothershipChronoDrones=Chrono Drones
+Button/Name/AP_MothershipChronoDronesInstall=Install Chrono Drones
+Button/Name/AP_MothershipCloakField=Cloaking Field
+Button/Name/AP_MothershipCoreAiur=Warp In Aiur Mothership Core
+Button/Name/AP_MothershipCoreAiurQuantumProjection=Quantum Projection
+Button/Name/AP_MothershipCoreMassRecall=Mass Recall
+Button/Name/AP_MothershipCoreNexusRecall=Nexus Recall
+Button/Name/AP_MothershipCorePurifier=Warp In Purifier Mothership Core
+Button/Name/AP_MothershipCorePurifierControlledBurn=Controlled Burn
+Button/Name/AP_MothershipDamage=Install Offensive Ability
+Button/Name/AP_MothershipMassRecallInstall=Install Mass Recall
+Button/Name/AP_MothershipNexusRecallInstall=Install Nexus Recall
+Button/Name/AP_MothershipPowerField=Mobile Power Supply
+Button/Name/AP_MothershipPurifier=Morph to Purifier Mothership
+Button/Name/AP_MothershipPurifierBlackHoleInstall=Install Black Hole
+Button/Name/AP_MothershipRepairDrones=Repair Drones
+Button/Name/AP_MothershipRepairDronesInstall=Install Repair Drones
+Button/Name/AP_MothershipTaldarim=Warp in Tal'darim Mothership
+Button/Name/AP_MothershipTaldarimBaseAttackDisable=Enable Blood-Fused Particles
+Button/Name/AP_MothershipTaldarimBaseAttackEnable=Enable Base Attack
 Button/Name/AP_MothershipTaldarimIntegratedPower=Integrated Power
+Button/Name/AP_MothershipTaldarimMassRecall=Mass Recall
+Button/Name/AP_MothershipTaldarimMassRecallInstall=Install Mass Recall
+Button/Name/AP_MothershipTaldarimNexusRecall=Nexus Recall
+Button/Name/AP_MothershipTaldarimNexusRecallInstall=Install Nexus Recall
+Button/Name/AP_MothershipUtility=Install Utility Ability
 Button/Name/AP_MoveChampions=Move
 Button/Name/AP_MultiLockTargetingSystem=Multi-Lock Weapons System
 Button/Name/AP_MuscularAugments=Muscular Augments
@@ -1666,6 +1783,8 @@ Button/Name/AP_OracleSustainablePulsarBeam=Temporal Acceleration Beam
 Button/Name/AP_OracleWeaponOff=Deactivate Pulsar Beam
 Button/Name/AP_OracleWeaponOn=Activate Pulsar Beam
 Button/Name/AP_OrganicCarapace=Organic Carapace
+Button/Name/AP_OverloadWeaponSystems=Overload Weapon Systems
+Button/Name/AP_OverloadWeaponSystemsInstall=Install Overload Weapon Systems
 Button/Name/AP_Overlord=Morph to Overlord
 Button/Name/AP_OverlordSightUpgrade=Antennae
 Button/Name/AP_OverlordSpeed=Pneumatized Carapace
@@ -1699,10 +1818,15 @@ Button/Name/AP_PhoenixHallucination=Summon Phoenix Hallucination
 Button/Name/AP_PhoenixPurifier=Warp in Mirage
 Button/Name/AP_PhoenixTaldarim=Warp in Skirmisher
 Button/Name/AP_PhotonCannon=Warp In Photon Cannon
+Button/Name/AP_PlanetCracker=Planet Cracker
+Button/Name/AP_PlanetCrackerInstall=Install Planet Cracker
 Button/Name/AP_PlanetaryFortressAdvancedTargeting=Ibiks Tracking Scanners
 Button/Name/AP_PlanetaryFortressAttackAirlift=Armament Stabilizers
 Button/Name/AP_PlanetaryFortressLoad=Load
 Button/Name/AP_PoisonNova=Toxic Blast
+Button/Name/AP_PowerRedirection=Power Redirection
+Button/Name/AP_PowerRedirectionUpgrade=Enhanced Power Redirection
+Button/Name/AP_PowerRedirectionInstall=Install Enhanced Power Redirection
 Button/Name/AP_Predator=Build Predator
 Button/Name/AP_PredatorAdaptiveDefenses=Adaptive Defenses
 Button/Name/AP_PredatorVespeneSynthesis=Vespene Synthesis
@@ -1753,6 +1877,13 @@ Button/Name/AP_PurificationNova=Purification Nova
 Button/Name/AP_PurificationNovaEarly=Explode Purification Nova
 Button/Name/AP_PurificationNovaTargeted=Purification Nova
 Button/Name/AP_PurifierFaction=<c val="f2bf16">Purifier</c> Faction
+Button/Name/AP_PurifierMothershipAttackSpeedBoost=Amplified Power Rerouter
+Button/Name/AP_PurifierMothershipAttackSpeedBoostInstall=Install Amplified Power Rerouter
+Button/Name/AP_PurifierMothershipBlackHole=Black Hole
+Button/Name/AP_PurifierMothershipDebuff=Purified Embers
+Button/Name/AP_PurifierMothershipDebuffInstall=Install Purified Embers
+Button/Name/AP_PurifierMothershipShielding=Cybros Shielding
+Button/Name/AP_PurifierMothershipShieldingInstall=Install Cybros Shielding
 Button/Name/AP_Pygalisk=Morph Pygalisk
 Button/Name/AP_PygaliskCombatCarapace=Combat Carapace
 Button/Name/AP_PygaliskDucalBlades=Ducal Blades
@@ -1799,6 +1930,8 @@ Button/Name/AP_RespawnZergling=Zergling Reconstitution
 Button/Name/AP_RestrainedDestruction=Restrained Destruction
 Button/Name/AP_RestructuredThrusters=Mobility Protocols
 Button/Name/AP_RetributionField=Lightning Field
+Button/Name/AP_RevitalizeShields=Revitalize Shields
+Button/Name/AP_RevitalizeShieldsInstall=Install Revitalize Shields
 Button/Name/AP_RipwaveMissiles=Ripwave Missiles
 Button/Name/AP_Roach=Morph to Roach
 Button/Name/AP_RoachCorpserPassive=Roach
@@ -1861,6 +1994,7 @@ Button/Name/AP_SOAHeroicShield=Guardian Shell
 Button/Name/AP_SOAMatrixOverload=Matrix Overload
 Button/Name/AP_SOAMothershipBlink=Blink
 Button/Name/AP_SOAMothershipLineAttack=Thermal Lance
+Button/Name/AP_SOAMothershipLineAttackInstall=Install Thermal Lance
 Button/Name/AP_SOAOrbitalStrike=Orbital Strike
 Button/Name/AP_SOAProxyPylon=Deploy Pylon
 Button/Name/AP_SOAPurifierBeam=Purifier Beam
@@ -2003,6 +2137,8 @@ Button/Name/AP_StukovInfestedSiegeTankAmmo=Volatile Biomass
 Button/Name/AP_StukovInfestedSiegeTankDeepTunnel=Deep Tunnel
 Button/Name/AP_StukovInfestedSiegeTankRoot=Root
 Button/Name/AP_StukovInfestedSiegeTankUproot=Uproot
+Button/Name/AP_SummonDeathFleet=Summon Death Fleet
+Button/Name/AP_SummonDeathFleetInstall=Install Summon Death Fleet
 Button/Name/AP_SummonEchidnaWorm=Summon Echidna Worm
 Button/Name/AP_SummonHunterKiller=Hunter Killers
 Button/Name/AP_SummonMercRoach=Caustic Horrors
@@ -2035,6 +2171,12 @@ Button/Name/AP_SwarmHostUprootUnburrow=Unburrow
 Button/Name/AP_SwarmSeeds=Swarm Seeds
 Button/Name/AP_SwarmlingPassive=Rapid Gestation
 Button/Name/AP_TaldarimFaction=<c val="d40d24">Tal'darim</c> Faction
+Button/Name/AP_TaldarimMothershipFastAttack=Blood-Fused Particles
+Button/Name/AP_TaldarimMothershipFastAttackInstall=Install Blood-Fused Particles
+Button/Name/AP_TaldarimMothershipDeathHeal=Soul-Forged Conduits
+Button/Name/AP_TaldarimMothershipDeathHealInstall=Install Soul-Forged Conduits
+Button/Name/AP_TaldarimMothershipGroundSlow=Shadow of Death
+Button/Name/AP_TaldarimMothershipGroundSlowInstall=Install Shadow of Death
 Button/Name/AP_TaldarimWarpConduit=War Configuration
 Button/Name/AP_TargetLock=Target Lock
 Button/Name/AP_TechReactor=Build Tech Reactor
@@ -2092,6 +2234,14 @@ Button/Name/AP_ThorMengsk=Build Blackhammer
 Button/Name/AP_ThorMengskArmorAura=Bulwark Field
 Button/Name/AP_ThorMengskSiege=Overwatch Mode
 Button/Name/AP_ThorRapidReload=Rapid Reload
+Button/Name/AP_TimeFieldAiur=Empowered Deceleration Field
+Button/Name/AP_TimeFieldAiurCore=Deceleration Field
+Button/Name/AP_TimeFieldAiurInstall=Install Empowered Deceleration Field
+Button/Name/AP_TimeFieldPurifier=Empowered Acceleration Field
+Button/Name/AP_TimeFieldPurifierCore=Acceleration Field
+Button/Name/AP_TimeFieldPurifierInstall=Install Empowered Acceleration Field
+Button/Name/AP_TimeFieldTaldarim=Maddening Field
+Button/Name/AP_TimeFieldTaldarimInstall=Install Maddening Field
 Button/Name/AP_TimeWarp=Chrono Boost
 Button/Name/AP_TissueAssimilation=Tissue Assimilation
 Button/Name/AP_TornadoMissile=Haywire Missiles
@@ -2184,6 +2334,7 @@ Button/Name/AP_VoidRaySwarmDamageBoost=Prismatic Alignment
 Button/Name/AP_VoidRayTaldarim=Warp in Destroyer
 Button/Name/AP_VoidRayVoidPrismaticRange=Prismatic Range
 Button/Name/AP_VoidSentryBlackHole=Black Hole
+Button/Name/AP_VoidSentryBlackHoleInstall=Install Black Hole
 Button/Name/AP_VoidSentryChronoBeam=Chrono Beam
 Button/Name/AP_VoidSentryMobileMode=Mobile Mode
 Button/Name/AP_VoidSentryPhasingMode=Phasing Mode
@@ -2225,6 +2376,8 @@ Button/Name/AP_WidowMineConcealment=Concealment
 Button/Name/AP_WidowMineDemolitionArmaments=Demolition Payload
 Button/Name/AP_WidowMineUnburrow=Deactivate Mine
 Button/Name/AP_WildMutation=Wild Mutation
+Button/Name/AP_WormholeTransit=Wormhole Transit
+Button/Name/AP_WormholeTransitInstall=Install Wormhole Transit
 Button/Name/AP_Wraith=Build Wraith
 Button/Name/AP_WraithAdvancedLaserTechnology=Advanced Laser Technology
 Button/Name/AP_WraithCloakOff=Decloak
@@ -2350,6 +2503,10 @@ Button/Tooltip/AP_AdvancedHealingAI=The Medivac can heal two targets at once.
 Button/Tooltip/AP_AdvancedWeaponryRaven=Adds a Hunter-Seeker Missile weapon that automatically attacks enemy units and does not cost energy.
 Button/Tooltip/AP_AerodynamicGlaveShape=Increases Mutalisk attack range by 2.
 Button/Tooltip/AP_AiurFaction=Produce units from Aiur faction
+Button/Tooltip/AP_AiurMothershipBlackHole=Stuns enemy units in the target area for <d ref="Effect,AP_AiurMothershipBlackHolePersistent,PeriodCount*Effect,AP_AiurMothershipBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_AiurMothershipEnergyRegenAura=Friendly units within the Aiur Mothership's Cloaking Field now also gain <d ref="Behavior,AP_AiurMothershipEnergyRegenAuraBuff,Modification.VitalRegenArray[Energy]" precision="1"/> increased energy regeneration. Aiur units instead gain <d ref="Behavior,AP_AiurMothershipEnergyRegenAuraBuffAiur,Modification.VitalRegenArray[Energy]" precision="1"/> increased energy regeneration.
+Button/Tooltip/AP_AiurMothershipFeedback=After the Aiur Mothership uses an ability, it casts Feedback on a nearby enemy unit.
+Button/Tooltip/AP_AiurMothershipShieldRestore=Whenever the Aiur Mothership deals weapon damages, it restores <d ref="Effect,AP_AiurMothershipShieldRestore,VitalArray[Shields].Change"/> shields to a nearby friendly unit.
 Button/Tooltip/AP_AlarakACMyLifefortheHighlord=Supplicants are the first units sacrificed to heal Alarak when he is near death.
 Button/Tooltip/AP_AlarakColossusChargedBlastChargeTime=Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast.
 Button/Tooltip/AP_AlarakHavocAbilityRange=Increases the radius of Squad Sight and the range of Target Lock and Force Field.
@@ -2367,6 +2524,7 @@ Button/Tooltip/AP_AnionPulseCrystals=Improves Ion Cannon weapon attack range by
 Button/Tooltip/AP_AnnihilatorTwilightChassis=The Annihilator gains +<d ref="$UpgradeEffectArrayValue:AP_AnnihilatorTwilightChassis:Unit,AP_ImmortalShakuras,LifeMax$"/> Maximum Life.<n/><n/><c val="FFE303">War Council Upgrade.</c>
 Button/Tooltip/AP_Apocalypse=Deals <d ref="Effect,AP_ApocalypseDamage,Amount"/> damage to enemy units and <d ref="(Effect,AP_ApocalypseDamage,Amount) + (Effect,AP_ApocalypseDamage,AttributeBonus[Structure])"/> damage to enemy structures in a large area.
 Button/Tooltip/AP_ApolloCloakOnNova=Cloaks Nova for <d ref="Behavior,AP_NovaApolloCloak,Duration"/> seconds, preventing enemy units from seeing or attacking her. A cloaked unit will only be revealed by detectors or effects.
+Button/Tooltip/AP_AppendAiurMothershipFeedback=<n/><n/>Astral Restoration instead casts 3 Feedbacks over it's duration.
 Button/Tooltip/AP_AppendProtossBullet=</n><c val="FFE303">• Protoss</c>
 Button/Tooltip/AP_AppendTerranBullet=</n><c val="FFE303">• Terran</c>
 Button/Tooltip/AP_AppendWarCouncilAbility=<n/><n/><c val="FFE303">War Council Ability.</c>
@@ -2398,6 +2556,8 @@ Button/Tooltip/AP_AscendantSacrifice=Reduces target friendly unit to <d ref="Eff
 Button/Tooltip/AP_AssaultModeMengsk=Transforms the Sky Fury to Assault Mode. In this mode Sky Furies move on the ground and can only attack ground targets.
 Button/Tooltip/AP_Assimilator=Warped in over a Vespene Geyser to allow harvesting of vespene gas.
 Button/Tooltip/AP_AssimilatorRich=Warped in over a Vespene Geyser to allow harvesting of vespene gas.
+Button/Tooltip/AP_AstralRestoration=Channel the Astral Winds through the Mothership, increasing the radius of Cloaking Field by 50% and restoring 80 health and 160 shields over 10 seconds to friendly units and structures within the Cloaking Field.
+Button/Tooltip/AP_AstralRestorationInstall=<d ref="Abil,AP_AstralRestoration,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_AstralRestoration,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Channel the Astral Winds through the Mothership, increasing the radius of Cloaking Field by 50% and restoring 160 health and 160 shields over 10 seconds to friendly units and structures within the Cloaking Field.
 Button/Tooltip/AP_AttackChampions=Orders selected units to move to the target point, fighting nearby enemies along the way. Targeting a unit with the Attack command orders that it be attacked until it is destroyed.
 Button/Tooltip/AP_AutoTurret=Automated defensive turret. <n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_AutomatedAssimilator=Warped in over a Vespene Geyser to allow harvesting of vespene gas.
@@ -2456,6 +2616,8 @@ Button/Tooltip/AP_Barracks=Infantry production facility. <n/><n/><c val="ffff8a"
 Button/Tooltip/AP_BarracksFlying=Barracks must land to start unit production.
 Button/Tooltip/AP_BarracksMengsk=Elite infantry production facility.
 Button/Tooltip/AP_BarracksMengskFlying=Elite Barracks must land to start unit production.
+Button/Tooltip/AP_BatteryOvercharge=Empowers a Shield Battery, increasing its restoration speed by <d ref="(Behavior,AP_BatteryOvercharge,Modification.HealDealtMultiplier - 1) * 100"/>% and allows them to restore shields without consuming energy for <d ref="Behavior,AP_BatteryOvercharge,Duration"/> seconds.
+Button/Tooltip/AP_BatteryOverchargeInstall=<d ref="Abil,AP_BatteryOverchargeUpgrade,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_BatteryOverchargeUpgrade,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Empowers a Shield Battery, increasing its restoration speed by <d ref="(Behavior,AP_BatteryOvercharge,Modification.HealDealtMultiplier - 1) * 100"/>% and allows them to restore shields without consuming energy for <d ref="Behavior,AP_BatteryOvercharge,Duration"/> seconds.
 Button/Tooltip/AP_Battlecruiser=Powerful warship.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_BattlecruiserBehemothReactor=Battlecruiser special abilities require 25 less energy to cast.
 Button/Tooltip/AP_BattlecruiserCovertOpsEngines=Increases Battlecruiser movement speed.
@@ -2547,6 +2709,7 @@ Button/Tooltip/AP_ChargePredator=Intercepts enemy ground units. The first attack
 Button/Tooltip/AP_ChitinousPlating=Increases Ultralisk armor by 2.
 Button/Tooltip/AP_CliffJumper=This unit can jump up and down cliffs.
 Button/Tooltip/AP_CliffWalk=This unit can walk up and down cliffs.
+Button/Tooltip/AP_CloakingFieldMothership=Cloaks friendly units and structures near the Mothership.
 Button/Tooltip/AP_CloakOnBanshee=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="-1 * (Behavior,AP_BansheeCloak,Modification.VitalRegenArray[2] + Unit,AP_Banshee,EnergyRegenRate)" precision="1"/> energy per second.</c>
 Button/Tooltip/AP_CloakOnBansheeFree=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.
 Button/Tooltip/AP_CloakOnBansheeUpgrade=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.<n/><n/><c val="f078ff">Drains <d ref="0.45 / Behavior,TimeScaleConversionBehavior,Duration)" precision="1"/> energy per second.</c>
@@ -2687,6 +2850,7 @@ Button/Tooltip/AP_EnergizerReclamation=Temporarily takes control of target enemy
 Button/Tooltip/AP_EngineeringBay=Contains upgrades for Terran infantry units. Enables the construction of Terran defensive structures.
 Button/Tooltip/AP_EvolutionChamber=Contains upgrades for Zerg ground units. <n/><n/><c val="ffff8a">Enables:</c><n/>- Spore Crawlers from Drones
 Button/Tooltip/AP_EvolvedAcidSpores=Increases ground attack damage.
+Button/Tooltip/AP_ExpandedCloakingCapability=The Mothership now also cloaks itself with Cloaking Field.
 Button/Tooltip/AP_ExplodeVolatileInfested=The Volatile Infested detonates where it is standing, damaging nearby enemy units and structures.
 Button/Tooltip/AP_ExplosiveGlaive=Mutalisk gains +9 damage vs. armored units. Doesn't affect bounces.
 Button/Tooltip/AP_ExplosiveMode=Arms the Thor's Javelin missile launchers. Javelin missiles deal splash damage to nearby air units and additional damage vs. light units.
@@ -2774,6 +2938,7 @@ Button/Tooltip/AP_HHWidowMineRangeAttack=Sentinel missile range is increased by
 Button/Tooltip/AP_HHWraithFury=<c val="FFFF8A">Wraith</c> attack speed increases by 10% with each attack, up to a maximum of 100%.<n/><n/><c val="#ColorAttackInfo">Passive ability.</c>
 Button/Tooltip/AP_Hallucination=Creates hallucinations that cannot use active abilities, cannot deal damage, and die more easily. Hallucinations last <d ref="Behavior,AP_HallucinationTimedLife,Duration"/> seconds. Enemy detectors reveal hallucinations.
 Button/Tooltip/AP_HammerSecurity=A private security firm based in the Kel-Morian Combine. H-Sec provides corporate security, and often finds itself at odds with the Dominion.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_HangarInstallTaldarim=Allow the Tal'Darim Mothership to build Interceptors that launch alongside it's primary weapon.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_HardenedShield=Reduces incoming damage to a maximum of 10 while the Immortal still has shields.
 Button/Tooltip/AP_HardenedShieldStalwart=Reduces incoming damage to a maximum of 10 while the Stalwart still has shields.
 Button/Tooltip/AP_HatchToHive=Evolve this Hatchery directly to a Hive, allowing additional upgrades and structures to be produced. Also spawns all Zerg units and receives gathered resources.
@@ -2935,6 +3100,10 @@ Button/Tooltip/AP_InfestorTerran=An Infested Terran does moderate damage and las
 Button/Tooltip/AP_InstigatorBlinkOverdrive=Instigators gain another +<d ref="$UpgradeEffectArrayValue:AP_InstigatorBlinkOverdrive:Abil,AP_BlinkMultiple,Cost[0].Charge.CountMax$"/> maximum Blink charges and +<d ref="$UpgradeEffectArrayValue:AP_InstigatorBlinkOverdrive:Effect,AP_VoidStalkerBlinkMultiple,Range$"/> Blink range.
 Button/Tooltip/AP_InstigatorModernizedServos=Increases movement speed by <d ref="$UpgradeEffectArrayValue:AP_InstigatorModernizedServos:Unit,AP_StalkerPurifier,Speed$ / Unit,AP_StalkerPurifier,Speed * 100" player="0"/>%.<n/><n/><c val="FFE303">War Council Upgrade.</c>
 Button/Tooltip/AP_Interceptor=Builds Interceptors that automatically attack the Carrier's target. Carriers may not attack without Interceptors.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
+Button/Tooltip/AP_InterceptorInstall=Allow the Mothership to build Interceptors that launch alongside it's primary weapon.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
+Button/Tooltip/AP_InterceptorMothershipAiur=Builds Interceptors that automatically attack the Mothership's target.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
+Button/Tooltip/AP_InterceptorMothershipPurifier=Builds Bombers that automatically attack the Mothership's target.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_InterceptorMothershipTaldarim=Builds Interceptors that automatically attack the Mothership's target.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_InterceptorPurifier=Builds Bombers that automatically attack the Trireme's target.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_InterceptorTaldarim=Builds Interceptors that automatically attack the Skylord's target. Skylords may not attack without Interceptors.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_InterceptorUnit=Combat drones that automatically strafe their Carrier's target. Carriers may not attack without Interceptors.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
@@ -3094,6 +3263,7 @@ Button/Tooltip/AP_MindControl=Permanently converts targeted unit to player contr
 Button/Tooltip/AP_MissilePods=Missile Pods deal <d ref="Effect,AP_HurricaneMissileDamage,Amount * Effect,AP_HurricaneMissileDamagePersistent,PeriodCount"/> (+<d ref="Effect,AP_HurricaneMissileDamage,AttributeBonus[0] * Effect,AP_HurricaneMissileDamagePersistent,PeriodCount"/> vs. light) damage to air units in target area.
 Button/Tooltip/AP_MissilePodsUpgraded=Missile Pods deal <d ref="Effect,AP_HurricaneMissileDamage,Amount * Effect,AP_HurricaneMissileDamagePersistent,PeriodCount"/> damage to air units in target area.
 Button/Tooltip/AP_MissileTurret=Primary anti-air defensive structure. <n/><n/><c val="#ColorAttackInfo">Can attack air units.</c><n/><c val="FFE303">Detector</c>
+Button/Tooltip/AP_MobilePowerField=The Mothership has a permanent Pylon Power Field around it.
 Button/Tooltip/AP_MonarchBlades=Splash damage of Ultralisk attacks increased to <d ref="Effect,AP_HotSUltraliskKaiserBladesSecondaryUpgradeDamage,Amount"/>.
 Button/Tooltip/AP_Monitor=Tal'darim Faction<n/>Robotic support unit. Can use Target Lock, Squad Sight, and Force Field.
 Button/Tooltip/AP_MorphBackToRoboticsFacility=Transforms this Warp Robotics Facility back to a Robotics Facility.
@@ -3124,10 +3294,34 @@ Button/Tooltip/AP_MorphlingToTyrannozorMerge=Combine two Morphlings into a Tyran
 Button/Tooltip/AP_MorphtoDefiler=Caster
 Button/Tooltip/AP_MorphtoHunter=Hunter Strain<n/><n/>Suicide unit. Deals damage over a small area upon death. Launches toward enemies at range 6.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_MorphtoSplitterling=Splitter Strain<n/><n/>Suicide unit. Deals damage over a small area upon death. Splits into smaller units as it dies. <n/><n/><c val="ffff8a">Can attack ground units.</c>
-Button/Tooltip/AP_Mothership=Ultimate Protoss vessel. Can use Photon Overcharge, Mass Recall, and Time Warp abilities. Cloaks nearby friendly units and structures.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
-Button/Tooltip/AP_MothershipCore=Mobile flying caster. Can use Photon Overcharge, Mass Recall, and Time Warp abilities. Can upgrade into the Mothership.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
-Button/Tooltip/AP_MothershipTaldarim=Tal'darim Faction<n/>Ultimate Protoss vessel. Can use Black Hole, Blink, and Thermal Lance.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_MothershipAiur=Aiur Faction<n/>Ultimate Aiur vessel. Can use Battery Overcharge, Revitalize Shields, and Black Hole. Cloaks nearby friendly units.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_MothershipAiurBlackHoleInstall=<d ref="Abil,AP_AiurMothershipBlackHole,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Stuns enemy units in the target area for <d ref="Effect,AP_AiurMothershipBlackHolePersistent,PeriodCount*Effect,AP_AiurMothershipBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_MothershipAiurShieldArmorAura=Friendly units that are cloaked by the Aiur Mothership gain +<d ref="Behavior,AP_MothershipAiurShieldArmor,Modification.ShieldArmorBonus"/> shield armor.
+Button/Tooltip/AP_MothershipAuxiliary=Install auxiliary upgrades for the Mothership, which are passive effects that improve the Mothership. These upgrades persist through death.
+Button/Tooltip/AP_MothershipChronoDrones=A chrono drone automatically casts Chrono Beam on nearby friendly units near the Mothership, granting <d ref="100*Behavior,AP_VoidSentryChronoBeam,Modification.AdditiveAttackSpeedFactor"/>% attack and <d ref="100*Behavior,AP_VoidSentryChronoBeam,Modification.AdditiveMoveSpeedFactor"/>% movement speed for <d ref="Behavior,AP_VoidSentryChronoBeam,Duration"/> seconds.</n></n><c val="FF4040">The drone can not target the Purifier Mothership.</c>
+Button/Tooltip/AP_MothershipCloakField=Cloaks friendly units and structures near the Mothership.
+Button/Tooltip/AP_MothershipCoreAiur=Mobile flying caster. Can use Battery Overcharge, Nexus Recall, and Time Warp abilities. Can upgrade into an Aiur Mothership.<n/><n/><c val="#ColorAttackInfo">Can attack air and ground units.</c>
+Button/Tooltip/AP_MothershipCoreAiurQuantumProjection=Battery Overcharge and Deceleration Field gain +<d ref="Upgrade,AP_MothershipCoreAiurQuantumProjection,EffectArray[0].Value"/> cast range, and Nexus Recall gains <d ref="($UpgradeEffectArrayValue:AP_MothershipCoreAiurQuantumProjection:Effect,AP_MothershipCoreNexusRecallSearch,AreaArray[0].Radius$/Effect,AP_MothershipCoreNexusRecallSearch,AreaArray[0].Radius)*100" player="0"/>% increased size.
+Button/Tooltip/AP_MothershipCoreMassRecall=Teleports all friendly units in the target area to the location of the Mothership.
+Button/Tooltip/AP_MothershipCoreNexusRecall=Teleports all friendly units near the Mothership to the target Nexus.
+Button/Tooltip/AP_MothershipCorePurifier=Mobile flying caster. Can use Power Redirection, Mass Recall, and Time Warp abilities. Can upgrade into a Purifier Mothership.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
+Button/Tooltip/AP_MothershipCorePurifierControlledBurn=Purifier Mothership Cores gain +2 range and 25% attack speed.
+Button/Tooltip/AP_MothershipDamage=Install an offensive ability for the Mothership. <n/><n/>Different Mothership abilities can be swapped at any time, but you must pay their installation cost whenever you swap.
+Button/Tooltip/AP_MothershipMassRecallInstall=<d ref="Abil,AP_MothershipMassRecall,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_MothershipMassRecall,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Teleports all friendly units in the target area to the location of the Mothership.
+Button/Tooltip/AP_MothershipNexusRecallInstall=<d ref="Abil,AP_MothershipNexusRecall,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_MothershipNexusRecall,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Teleports all friendly units near the Mothership to the target Nexus.
+Button/Tooltip/AP_MothershipPowerField=Provides power in a small radius around the Mothership.
+Button/Tooltip/AP_MothershipPurifier=Purifier Faction<n/>Ultimate Purifier vessel. Can use Enhanced Power Redirection, Overload Weapon Systems, and Black Hole. Creates a power field.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_MothershipPurifierBlackHoleInstall=<d ref="Abil,AP_PurifierMothershipBlackHole,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Stuns enemy units in the target area for <d ref="Effect,AP_PurifierMothershipBlackHolePersistent,PeriodCount*Effect,AP_PurifierMothershipBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_MothershipRepairDrones=Two shield-repair drones automatically restore shields to friendly units near the Mothership.
+Button/Tooltip/AP_MothershipTaldarim=Tal'darim Faction<n/>Ultimate Tal'darim vessel. Can use Thermal Lance, Black Hole, and Blink.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_MothershipTaldarimBaseAttackDisable=Enables the Tal'darim Mothership's upgraded attack, firing at a faster rate but doing less damage per attack.
+Button/Tooltip/AP_MothershipTaldarimBaseAttackEnable=Enables the Tal'darim Mothership's base attack, firing at a slower rate but doing more damage per attack.
 Button/Tooltip/AP_MothershipTaldarimIntegratedPower=The mothership regains full movement speed outside Pylon power fields.<n/><c val="FF4040">Cannot be found if overpowered items are excluded.</c>
+Button/Tooltip/AP_MothershipTaldarimMassRecall=Teleports all friendly units in the target area to the location of the Mothership. </n><c val="#ColorAttackInfo">Tal'darim bonus:</c> After teleporting, grant all friend units a barrier that absorbs up to <d ref="Behavior,AP_MothershipTaldarimRecallShield,DamageResponse.ModifyLimit"/> damage for <d ref="Behavior,AP_MothershipTaldarimRecallShield,Duration"/> seconds.
+Button/Tooltip/AP_MothershipTaldarimMassRecallInstall=<d ref="Abil,AP_MothershipMassRecall,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_MothershipMassRecall,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Teleports all friendly units in the target area to the location of the Mothership. </n><c val="#ColorAttackInfo">Tal'darim bonus:</c> After teleporting, grant all friend units a barrier that absorbs up to <d ref="Behavior,AP_MothershipTaldarimRecallShield,DamageResponse.ModifyLimit"/> damage for <d ref="Behavior,AP_MothershipTaldarimRecallShield,Duration"/> seconds.
+Button/Tooltip/AP_MothershipTaldarimNexusRecall=Teleports all friendly units near the Mothership to the target Nexus.  </n><c val="#ColorAttackInfo">Tal'darim bonus:</c> After teleporting, grant all friend units a barrier that absorbs up to <d ref="Behavior,AP_MothershipTaldarimRecallShield,DamageResponse.ModifyLimit"/> damage for <d ref="Behavior,AP_MothershipTaldarimRecallShield,Duration"/> seconds.
+Button/Tooltip/AP_MothershipTaldarimNexusRecallInstall=<d ref="Abil,AP_MothershipNexusRecall,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_MothershipNexusRecall,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Teleports all friendly units near the Mothership to the target Nexus.  </n><c val="#ColorAttackInfo">Tal'darim bonus:</c> After teleporting, grant all friend units a barrier that absorbs up to <d ref="Behavior,AP_MothershipTaldarimRecallShield,DamageResponse.ModifyLimit"/> damage for <d ref="Behavior,AP_MothershipTaldarimRecallShield,Duration"/> seconds.
+Button/Tooltip/AP_MothershipUtility=Install a utility ability for the Mothership. <n/><n/>Different Mothership abilities can be swapped at any time, but you must pay their installation cost whenever you swap.
 Button/Tooltip/AP_MoveChampions=Orders selected units to move to the target area or follow the target unit. Moving units will not engage enemies.
 Button/Tooltip/AP_MultiLockTargetingSystem=The Goliath can target ground and air units simultaneously.
 Button/Tooltip/AP_MuscularAugments=Increases Hydralisk movement speed.
@@ -3211,6 +3405,8 @@ Button/Tooltip/AP_OracleWeaponOn=Charges the Oracle's Pulsar Beam and allows it
 Button/Tooltip/AP_OrbitalCommandFlying=Primary structure. Must land to receive resources, produce units, or use abilities.
 Button/Tooltip/AP_OrbitalCommandUnit=Primary structure. Used to train SCVs and receive gathered resources. Can use the Scanner Sweep ability. Can use the abilities Calldown: MULE and Calldown: Extra Supplies.
 Button/Tooltip/AP_OrganicCarapace=Increases life by 25.
+Button/Tooltip/AP_OverloadWeaponSystems=Disable movement, increase attack speed by <d ref="100*Behavior,AP_OverloadWeaponSystems,Modification.AdditiveAttackSpeedFactor"/>%, and cause the Mothership to hit an additional <d ref="Effect,AP_PurifierMothershipWeaponOverloadSearch,AreaArray[0].MaxCount - Effect,AP_PurifierMothershipWeaponSearch,AreaArray[0].MaxCount"/> targets with its weapon for <d ref="Behavior,AP_OverloadWeaponSystems,Duration"/> seconds. After the overload, the Mothership is stunned for <d ref="Behavior,AP_OverloadWeaponSystemsStun,Duration" precision="1"/> seconds.
+Button/Tooltip/AP_OverloadWeaponSystemsInstall=<d ref="Abil,AP_OverloadWeaponSystems,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Disables movement, increases attack speed by <d ref="100*Behavior,AP_OverloadWeaponSystems,Modification.AdditiveAttackSpeedFactor"/>%, and causes the Mothership to hit an additional <d ref="Effect,AP_PurifierMothershipWeaponOverloadSearch,AreaArray[0].MaxCount - Effect,AP_PurifierMothershipWeaponSearch,AreaArray[0].MaxCount"/> targets with its weapon for <d ref="Behavior,AP_OverloadWeaponSystems,Duration"/> seconds. After the overload, the Mothership is stunned for <d ref="Behavior,AP_OverloadWeaponSystemsStun,Duration" precision="1"/> seconds.
 Button/Tooltip/AP_Overlord=Increases supply. Supply allows you to create more units.<n/><n/><c val="ffff8a">Cannot attack.</c>
 Button/Tooltip/AP_OverlordCocoon=This cocoon contains an Overlord as it is morphing into an Overseer.
 Button/Tooltip/AP_OverlordSightUpgrade=Increases Overlord sight range.
@@ -3249,12 +3445,17 @@ Button/Tooltip/AP_PhoenixPurifier=Purifier Faction<n/>Air superiority starfighte
 Button/Tooltip/AP_PhoenixTaldarim=Tal'darim Faction<n/>Fast skirmish starfighter.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_PhoenixTaldarimAA=Tal'darim Faction<n/>Fast skirmish starfighter.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_PhotonCannon=Primary defensive structure.<n/><n/><c val="ffff8a">Can attack ground and air units.</c><n/><c val="FFE303">Detector</c>
+Button/Tooltip/AP_PlanetCracker=Teleport to a nearby location and fire the Planet Cracker after a <d ref="Behavior,AP_PlanetCrackerChargeUp,Duration"/> charge-up, dealing <d ref="Behavior,AP_PlanetCracker,Duration/Behavior,AP_PlanetCracker,Period * Effect,AP_PlanetCrackerDamage,Amount"/> damage over <d ref="Behavior,AP_PlanetCracker,Duration"/> seconds ALL UNITS in the area. The radius grows over the course of the duration, and the Mothership is unable to take any other action during this time.
+Button/Tooltip/AP_PlanetCrackerInstall=<d ref="Abil,AP_PlanetCracker,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_PlanetCracker,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Teleport to a nearby location and fire the Planet Cracker after a <d ref="Behavior,AP_PlanetCrackerChargeUp,Duration"/> charge-up, dealing <d ref="Behavior,AP_PlanetCracker,Duration/Behavior,AP_PlanetCracker,Period * Effect,AP_PlanetCrackerDamage,Amount"/> damage over <d ref="Behavior,AP_PlanetCracker,Duration"/> seconds ALL UNITS in the area. The radius grows over the course of the duration, and the Mothership is unable to take any other action during this time.
 Button/Tooltip/AP_PlanetaryFortress=Primary structure. Used to train SCVs and receive gathered resources. Has exceptional combat capabilities that are extremely potent against swarms of small units.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_PlanetaryFortressAdvancedTargeting=Allows Planetary Fortress to attack air units.
 Button/Tooltip/AP_PlanetaryFortressAttackAirlift=Allows Planetary Fortress to attack while lifted off.
 Button/Tooltip/AP_PlanetaryFortressLoad=Loads nearby SCVs into the Planetary Fortress.
 Button/Tooltip/AP_PointDefenseDrone=Uses a laser to shoot down enemy missiles.  <n/>Cannot target special attacks. <n/>Times out after <d ref="Behavior,AP_PointDefenseDroneTimedLife,Duration"/> seconds.<n/><n/><c val="f078ff">Each shot consumes 10 energy.</c>
 Button/Tooltip/AP_PoisonNova=Instantly deals 20 damage to enemy units nearby.
+Button/Tooltip/AP_PowerRedirection=Transfer power to a Photon Cannon or Khaydarin Monolith, powering them if they are unpowered. The Mothership Core cannot perform any other action while transferring power. Lasts <d ref="Behavior,AP_PowerRedirectionPhoton,Duration"/> seconds.<n/><n/><c val="ffff8a">Photon Cannon:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionPhoton,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to hit an additional <d ref="Effect,AP_PhotonCannonSearch,AreaArray[0].MaxCount"/> targets. <n/><n/><c val="ffff8a">Khaydarin Monolith:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionKhaydarin,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to splash in a small radius around the target, dealing <d ref="Effect,AP_KhaydarinSplashDamage,Amount"/> damage.
+Button/Tooltip/AP_PowerRedirectionUpgrade=Transfer power to a Photon Cannon or Khaydarin Monolith, powering them if they are unpowered. Lasts <d ref="Behavior,AP_PowerRedirectionPhoton,Duration"/> seconds.<n/><n/><c val="ffff8a">Photon Cannon:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionPhoton,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to hit an additional <d ref="Effect,AP_PhotonCannonSearch,AreaArray[0].MaxCount"/> targets. <n/><n/><c val="ffff8a">Khaydarin Monolith:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionKhaydarin,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to splash in a small radius around the target, dealing <d ref="Effect,AP_KhaydarinSplashDamage,Amount"/> damage.
+Button/Tooltip/AP_PowerRedirectionInstall=<d ref="Abil,AP_PowerRedirectionUpgrade,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_PowerRedirectionUpgrade,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Transfer power to a Photon Cannon or Khaydarin Monolith, powering them if they are unpowered. Lasts <d ref="Behavior,AP_PowerRedirectionPhoton,Duration"/> seconds.<n/><n/><c val="ffff8a">Photon Cannon:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionPhoton,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to hit an additional <d ref="Effect,AP_PhotonCannonSearch,AreaArray[0].MaxCount"/> targets. <n/><n/><c val="ffff8a">Khaydarin Monolith:</c> Increase attack speed by <d ref="(Behavior,AP_PowerRedirectionKhaydarin,Modification.AdditiveAttackSpeedFactor * 100)"/>% and cause attacks to splash in a small radius around the target, dealing <d ref="Effect,AP_KhaydarinSplashDamage,Amount"/> damage.
 Button/Tooltip/AP_Predator=Anti-infantry specialist that deals area damage with each attack.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_PredatorAdaptiveDefenses=Predators gain recharging shields, and take 50% reduced splash and ranged damage while the shield is active. A portion of damage dealt by Lightning Field also restores shields.<n/><n/>Shields have 2 base armor and are improved by Terran Vehicle Armor upgrades.
 Button/Tooltip/AP_PredatorVespeneSynthesis=Predators generate 1 Vespene for their owner every time Lightning Field deals damage.
@@ -3304,6 +3505,10 @@ Button/Tooltip/AP_PurificationNovaEarly=Explode the Purification Nova early, dea
 Button/Tooltip/AP_PurificationNovaTargeted=Shoots out a ball of energy that lasts <d ref="Behavior,AP_PurificationNovaTargettedTarget,Duration"/> seconds and emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage and an additional <d ref="Effect,AP_PurificationNovaDamage,ShieldBonus"/> shield damage to nearby enemy ground units and structures. Friendly ground units take <d ref="Effect,AP_PurificationNovaFriendlyDamage,Amount"/> splash damage. The Disruptor is immobile while this is active.
 Button/Tooltip/AP_PurificationNovaTargetedUpgrade=Shoots out a ball of energy that lasts <d ref="Behavior,AP_PurificationNovaTargettedTarget,Duration"/> seconds and emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage and an additional <d ref="Effect,AP_PurificationNovaDamage,ShieldBonus"/> shield damage to nearby enemy ground units and structures. Friendly ground units take <d ref="Effect,AP_PurificationNovaFriendlyDamage,Amount"/> splash damage.
 Button/Tooltip/AP_PurifierFaction=Produce units from Purifier faction
+Button/Tooltip/AP_PurifierMothershipAttackSpeedBoost=Friendly units near the Purifier Mothership gain <d ref="Behavior,AP_PurifierMothershipAttackSpeedBoostBuff,Modification.AttackSpeedMultiplier*100 - 100"/>% attack speed, increased to <d ref="Behavior,AP_PurifierMothershipAttackSpeedBoostBuffEmpowered,Modification.AttackSpeedMultiplier*100 - 100"/>% when their shields are depleted. Purifier units always gain <d ref="Behavior,AP_PurifierMothershipAttackSpeedBoostBuffEmpowered,Modification.AttackSpeedMultiplier*100 - 100"/>% attack speed.
+Button/Tooltip/AP_PurifierMothershipBlackHole=Stuns enemy units in the target area for <d ref="Effect,AP_PurifierMothershipBlackHolePersistent,PeriodCount*Effect,AP_PurifierMothershipBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_PurifierMothershipDebuff=The Purifier Mothership's weapon deals an additional <d ref="Behavior,AP_PurifierMothershipDebuff,Duration/Behavior,AP_PurifierMothershipDebuff,Period * Effect,AP_PurifierMothershipDebuffDOT,Amount" precision="2"/> damage over <d ref="Behavior,AP_PurifierMothershipDebuff,Duration" precision="2"/> seconds to its targets and reduces their armor by <d ref="-1*Behavior,AP_PurifierMothershipDebuff,Modification.LifeArmorBonus"/> for the duration.
+Button/Tooltip/AP_PurifierMothershipShielding=While charging up and firing the Planet Cracker, or while under the effects of Overload Weapon Systems, the Purifier Mothership takes <d ref="(1-Behavior,AP_PurifierMothershipShielding,DamageResponse.ModifyFraction)*100"/>% reduced damage.<n/><n/>When the Purifier Mothership uses Power Redirection, the friendly structure also takes <d ref="(1-Behavior,AP_PurifierMothershipShielding,DamageResponse.ModifyFraction)*100"/>% reduced damage for the duration.
 Button/Tooltip/AP_Pygalisk=New xenotype created by Dominion scientists.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_PygaliskCombatCarapace=Pygalisks gain +<d ref="$UpgradeEffectArrayValue:AP_PygaliskCombatCarapace:Unit,AP_Pygalisk,LifeMax$"/> maximum health.
 Button/Tooltip/AP_PygaliskDucalBlades=Pygalisks deal area damage.
@@ -3353,6 +3558,8 @@ Button/Tooltip/AP_ResearchMagFieldLaunchers=Increases <c val="ffff8a">Cyclone's<
 Button/Tooltip/AP_RespawnZergling=Respawns up to <d ref="Effect,AP_ZerglingRespawnTooltipDummy,SpawnCount"/> Zerglings at no cost until all Zerglings have returned to life.
 Button/Tooltip/AP_RestrainedDestruction=Purification Nova does 50% reduced damage to friendly units and structures.
 Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals <d ref="Effect,AP_RetributionFieldDamage,Amount"/> damage.
+Button/Tooltip/AP_RevitalizeShields=Regenerate the shields of friendly units and structures in the target area, restoring <d ref="Effect,AP_RevitalizeShieldsModifyUnit,VitalArray[Shields].Change"/> shields to each.
+Button/Tooltip/AP_RevitalizeShieldsInstall=<d ref="Abil,AP_RevitalizeShields,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Regenerate the shields of friendly units and structures in the target area, restoring <d ref="Effect,AP_RevitalizeShieldsModifyUnit,VitalArray[Shields].Change"/> shields to each.
 Button/Tooltip/AP_RipwaveMissiles=Viking missiles deal area damage.
 Button/Tooltip/AP_Roach=Assault unit. Regenerates life quickly when burrowed.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_RoachCorpserPassive=Corpser Strain<n/><n/>Roach Warren enables you to morph Roaches.
@@ -3425,6 +3632,7 @@ Button/Tooltip/AP_SOAHeroicShield=Friendly units become invulnerable for <d time
 Button/Tooltip/AP_SOAMatrixOverload=All friendly units gain <d ref="Behavior,AP_MatrixOverloadTarget,Modification.MoveSpeedMultiplier*100-100"/>% movement speed and <d ref="Behavior,AP_MatrixOverloadTarget,Modification.AttackSpeedMultiplier*100-100"/>% attack speed within Pylon power fields. Effect lasts for up to <d ref="Behavior,AP_MatrixOverloadTarget,Duration"/> seconds after leaving.<n/><n/><c val="ffff8a">Passive ability.</c>
 Button/Tooltip/AP_SOAMothershipBlink=Teleports the Mothership to target location.
 Button/Tooltip/AP_SOAMothershipLineAttack=Deals <d ref="Effect,AP_SOAMothershipLineAttackDamage,Amount"/> damage to all enemies in a straight line up to 10 range away.
+Button/Tooltip/AP_SOAMothershipLineAttackInstall=<d ref="Abil,AP_SOAMothershipLineAttack,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Deals <d ref="Effect,AP_SOAMothershipLineAttackDamage,Amount"/> damage to all enemies in a straight line up to 10 range away.
 Button/Tooltip/AP_SOAOrbitalStrike=Fire 5 lasers onto the battlefield from orbit, each of them dealing <d ref="Effect,AP_SOAOrbitalStrikeDamage,Amount"/> (<d ref="Effect,AP_SOAOrbitalStrikeDamage,AttributeBonus[Armored]+Effect,AP_SOAOrbitalStrikeDamage,Amount"/> vs armored units) area damage.
 Button/Tooltip/AP_SOAProxyPylon=Quickly warps in a Pylon to any visible location.
 Button/Tooltip/AP_SOAPurifierBeam=Fires a beam that deals <d ref="Effect,AP_SOAPurifierBeamDamage,Amount*Behavior,AP_SOAPurifierBeamFiring,Duration*(1/Behavior,AP_SOAPurifierBeamFiring,Period)" player="current"/> (<d ref="(Effect,AP_SOAPurifierBeamDamage,Amount+Effect,AP_SOAPurifierBeamDamage,AttributeBonus[Armored])*Behavior,AP_SOAPurifierBeamFiring,Duration*(1/Behavior,AP_SOAPurifierBeamFiring,Period)" player="current"/> vs Armored) damage over <d ref="Behavior,AP_SOAPurifierBeamFiring,Duration" player="current"/> seconds. The beam will auto-acquire targets if not manually controlled.
@@ -3591,6 +3799,8 @@ Button/Tooltip/AP_StukovInfestedSiegeTankDeepTunnel=Can travel quickly to any vi
 Button/Tooltip/AP_StukovInfestedSiegeTankRoot=Roots the Infested Siege Tank. A rooted Infested Siege Tank gains the ability to attack at long-range with Volatile Burst, but is unable to move.
 Button/Tooltip/AP_StukovInfestedSiegeTankUproot=Uproots the Infested Siege Tank. An uprooted Infested Siege Tank has the ability to move but can only attack with Impaler Tentacle. Moves much faster on creep.
 Button/Tooltip/AP_StukovInfestedSiegeTankUprooted=Heavy tank. Can root itself to provide long-range artillery support by consuming Infested infantry units. Can use the Deep Tunnel ability to travel quickly to any visible location with creep.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
+Button/Tooltip/AP_SummonDeathFleet=Warp in <d ref="Effect,AP_SummonDeathFleet,PeriodCount"/> Destroyers around the Mothership with a timed life of <d ref="Behavior,AP_SummonDeathFleetTimer,Duration"/> seconds.
+Button/Tooltip/AP_SummonDeathFleetInstall=<d ref="Abil,AP_SummonDeathFleet,Cost[0].Vital"/> Energy<n/><d ref="Abil,AP_SummonDeathFleet,Cost[0].Cooldown.TimeUse"/> second cooldown<n/>Warp in <d ref="Effect,AP_SummonDeathFleet,PeriodCount"/> Destroyers around the Mothership with a timed life of <d ref="Behavior,AP_SummonDeathFleetTimer,Duration"/> seconds.
 Button/Tooltip/AP_SummonEchidnaWorm=Summons an Echidna Worm at the target location.<n/>Echidna Worms cannot transport units, but have increased health, can generate Creep and Creep Tumors, and workers can dropoff their gathered resources at an Echidna Worm.<n/><n/><c val="#ColorAttackInfo">Bonus: Zerg move faster on creep.</c>
 Button/Tooltip/AP_SummonHunterKiller=Summon <d ref="Effect,AP_SummonZergMercenaryDummy,PeriodicPeriodArray[4]"/> Hunter Killers.<n/><n/>Initially bred by Daggoth as a superior Hydralisk strain, and charged to protect Kerrigan, Hunter Killers are renowned across the sector for their brutality.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c><n/><c val="FF4040">Cannot morph into Lurkers or Impalers.</c>
 Button/Tooltip/AP_SummonMercRoach=Summon <d ref="Effect,AP_SummonZergMercenaryDummy,PeriodicPeriodArray[9]"/> Caustic Horrors.<n/><n/>Elite Roaches, that have evolved to attack air units. Regenerate life quickly when burrowed.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c><n/><c val="FF4040">Cannot morph into Ravagers.</c>
@@ -3623,6 +3833,9 @@ Button/Tooltip/AP_SwarmHostUprootUnburrow=Unburrows the Swarm Host. Prevents it
 Button/Tooltip/AP_SwarmSeeds=The Brood Lord shoots Broodlings at its target. A Broodling is a small creature that can attack ground units.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_SwarmlingPassive=Morphs almost instantly. Spawns in groups of three.
 Button/Tooltip/AP_TaldarimFaction=Produce units from Tal'darim faction
+Button/Tooltip/AP_TaldarimMothershipDeathHeal=Friendly non-worker units that die near the Tal'darim Mothership have their souls consumed, restoring <d ref="(Effect,AP_TaldarimMothershipDeathHealMU,VitalArray[Shields].Change)"/> shields and <d ref="(Effect,AP_TaldarimMothershipDeathHealMU,VitalArray[Life].Change)"/> life.</n></n>The souls of friendly Tal'darim units are more potent, instead restoring <d ref="(Effect,AP_TaldarimMothershipDeathHealTaldarimMU,VitalArray[Shields].Change)"/> shields and <d ref="(Effect,AP_TaldarimMothershipDeathHealTaldarimMU,VitalArray[Life].Change)"/> life, as well as <d ref="(Effect,AP_TaldarimMothershipDeathHealTaldarimMU,VitalArray[Energy].Change)"/> energy.
+Button/Tooltip/AP_TaldarimMothershipFastAttack=Increase attack speed of the Mothership's primary weapon by 121% and causes it to deal damage much faster, but reduce its weapon damage by 50%.<n/><n    /><c val="ffff8a">Can be toggled on and off in the Auxiliary menu.</c>
+Button/Tooltip/AP_TaldarimMothershipGroundSlow=The Tal'darim Mothership becomes a beacon of the Highlord's Will, reducing the attack and movement speed of nearby enemy ground units by <d ref="(1 - Behavior,AP_TaldarimMothershipGroundSlowDebuff,Modification.MoveSpeedMultiplier) * 100"/>%.
 Button/Tooltip/AP_TaldarimWarpConduit=Warp Prisms transform between modes faster and increases power radius in Phasing Mode.
 Button/Tooltip/AP_TargetLock=Increases damage dealt to target enemy unit by <d ref="Behavior,AP_ObserverTargetLock,Modification.DamageTakenFraction[Splash]*100"/>%. Effect lasts as long as the Havoc remains locked onto the target.
 Button/Tooltip/AP_TechLab=Enables additional unit construction options.
@@ -3691,6 +3904,14 @@ Button/Tooltip/AP_ThorRapidReload=Increases Thor's ground attack speed.
 Button/Tooltip/AP_ThorUpgraded=Heavy assault mech. Can use 330mm Barrage Cannons.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_ThorWreckage=Heavy assault mech. Can use 250mm Strike Cannons.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_ThorWreckageUpgraded=Heavy assault mech.  Can use 330mm Barrage Cannon.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
+Button/Tooltip/AP_TimeFieldAiur=Creates a time-slowing field at the target location, reducing the attack and movement speed of enemy units in the area by <d ref="(1 - Behavior,AP_TimeFieldAiur,Modification.MoveSpeedMultiplier) * 100"/>%. Lasts <d ref="Effect,AP_TimeFieldAiurCreatePersistent,PeriodCount*Effect,AP_TimeFieldAiurCreatePersistent,PeriodicPeriodArray[0]"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units are slowed by <d ref="(1 - Behavior,AP_TimeFieldAiurHeroic,Modification.MoveSpeedMultiplier) * 100"/>%.</c>
+Button/Tooltip/AP_TimeFieldAiurCore=Creates a time-slowing field at the target location, reducing the attack and movement speed of enemy units in the area by <d ref="(1 - Behavior,AP_TimeFieldAiur,Modification.MoveSpeedMultiplier) * 100"/>%. Lasts <d ref="Effect,AP_TimeFieldAiurCoreCreatePersistent,PeriodCount*Effect,AP_TimeFieldAiurCoreCreatePersistent,PeriodicPeriodArray[0]"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units are slowed by <d ref="(1 - Behavior,AP_TimeFieldAiurHeroic,Modification.MoveSpeedMultiplier) * 100"/>%.</c>
+Button/Tooltip/AP_TimeFieldAiurInstall=<d ref="Abil,AP_TimeFieldAiur,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Creates a time-slowing field at the target location, reducing the attack and movement speed of enemy units in the area by <d ref="(1 - Behavior,AP_TimeFieldAiur,Modification.MoveSpeedMultiplier) * 100"/>%. Lasts <d ref="Effect,AP_TimeFieldAiurCreatePersistent,PeriodCount*Effect,AP_TimeFieldAiurCreatePersistent,PeriodicPeriodArray[0]"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units are slowed by <d ref="(1 - Behavior,AP_TimeFieldAiurHeroic,Modification.MoveSpeedMultiplier) * 100"/>%.</c>
+Button/Tooltip/AP_TimeFieldPurifier=Creates a time-speeding field at the target location, increasing the attack and movement speed of friendly units in the area by <d ref="((Behavior,AP_TimeFieldPurifier,Modification.MoveSpeedMultiplier) * 100) - 100"/>%. Lasts <d ref="Effect,AP_TimeFieldPurifierCreatePersistent,PeriodCount*Effect,AP_TimeFieldPurifierCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_TimeFieldPurifierCore=Creates a time-speeding field at the target location, increasing the attack and movement speed of friendly units in the area by <d ref="((Behavior,AP_TimeFieldPurifier,Modification.MoveSpeedMultiplier) * 100) - 100"/>%. Lasts <d ref="Effect,AP_TimeFieldPurifierCoreCreatePersistent,PeriodCount*Effect,AP_TimeFieldPurifierCoreCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_TimeFieldPurifierInstall=<d ref="Abil,AP_TimeFieldPurifier,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Creates a time-speeding field at the target location, increasing the attack and movement speed of friendly units in the area by <d ref="((Behavior,AP_TimeFieldPurifier,Modification.MoveSpeedMultiplier) * 100) - 100"/>%. Lasts <d ref="Effect,AP_TimeFieldPurifierCreatePersistent,PeriodCount*Effect,AP_TimeFieldPurifierCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
+Button/Tooltip/AP_TimeFieldTaldarim=Enstrangle time at the target location, reducing the attack speed of enemy units by <d ref="(1 - Behavior,AP_TimeFieldTaldarim,Modification.AttackSpeedMultiplier) * 100"/>%. The Mothership confuses enemies in a small radius around its weapon targets in the field, forcing them to attack their allies with <d ref="((Behavior,AP_TimeFieldTaldarimConfusion,Modification.AttackSpeedMultiplier) * 100) - 100"/>% increased attack speed. Lasts <d ref="Effect,AP_TimeFieldTaldarimCreatePersistent,PeriodCount*Effect,AP_TimeFieldTaldarimCreatePersistent,PeriodicPeriodArray[0]"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units cannot be confused.</c>
+Button/Tooltip/AP_TimeFieldTaldarimInstall=<d ref="Abil,AP_TimeFieldTaldarim,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Enstrangle time at the target location, reducing the attack speed of enemy units by <d ref="(1 - Behavior,AP_TimeFieldTaldarim,Modification.AttackSpeedMultiplier) * 100"/>%. The Mothership confuses enemies in a small radius around its weapon targets in the field, forcing them to attack their allies with <d ref="((Behavior,AP_TimeFieldTaldarimConfusion,Modification.AttackSpeedMultiplier) * 100) - 100"/>% increased attack speed. Lasts <d ref="Effect,AP_TimeFieldTaldarimCreatePersistent,PeriodCount*Effect,AP_TimeFieldTaldarimCreatePersistent,PeriodicPeriodArray[0]"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units cannot be confused.</c>
 Button/Tooltip/AP_TimeWarp=Places target structure in a Chrono Boost, causing it to operate <d ref="((Behavior,AP_TimeWarpProduction,Modification.TimeScale) - 1) * 100" precision="1"/>% faster.
 Button/Tooltip/AP_TissueAssimilation=Gains life equal to 40% of all damage dealt from normal attacks.
 Button/Tooltip/AP_TornadoMissile=When attacking a mechanical unit, the Warhound launches electrically charged missiles at its target, dealing 30 damage per volley.<n/><c val="#ColorAttackInfo">Can attack ground units.</c>
@@ -3797,6 +4018,7 @@ Button/Tooltip/AP_VoidRayShakuras=Nerazim Faction<n/>Surgical strike craft. Atta
 Button/Tooltip/AP_VoidRaySwarmDamageBoost=Realigns the Scorcher's Prismatic Beam to gain +<d ref="Behavior,AP_VoidRaySwarmDamageBoost,Modification[0].DamageDealtAttributeScaled[Armored]"/> damage vs. armored units for <d ref="Behavior,AP_VoidRaySwarmDamageBoost,Duration[0]"/> seconds. Movement speed reduced while active.
 Button/Tooltip/AP_VoidRayTaldarim=Tal'darim Faction<n/>Area assault craft. Can use Destruction Beam to attack multiple units.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_VoidRayVoidPrismaticRange=Increases the range of the Void Ray's Prismatic Beam as it continues to attack, up to a maximum of +<d ref="$UpgradeEffectArrayValue:AP_VoidRayPrismaticRange:Behavior,AP_VoidRayChargeBeamRangePhase3,Modification.WeaponRange$"/> range.
+Button/Tooltip/AP_VoidSentryBlackHoleInstall=<d ref="Abil,AP_VoidSentryBlackHole,Cost[0].Vital"/> Energy<n/>No Cooldown<n/>Stuns enemy units in the target area for <d ref="Effect,AP_VoidSentryBlackHolePersistent,PeriodCount*Effect,AP_VoidSentryBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds. 
 Button/Tooltip/AP_VoidSentryBlackHole=Stuns enemy units in the target area for <d ref="Effect,AP_VoidSentryBlackHolePersistent,PeriodCount*Effect,AP_VoidSentryBlackHolePersistent,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_VoidSentryChronoBeam=Friendly target gains 50% attack and 50% movement speed.
 Button/Tooltip/AP_VoidSentryMobileMode=Transforms the Energizer to Mobile Mode. The Energizer can move, but no longer creates a power field.
@@ -3846,6 +4068,8 @@ Button/Tooltip/AP_WidowMineConcealment=This unit is no longer revealed while rel
 Button/Tooltip/AP_WidowMineDemolitionArmaments=Allows Widow Mines to attack buildings.
 Button/Tooltip/AP_WidowMineUnburrow=Unburrows the Widow Mine and deactivates its weapon, allowing it to move.
 Button/Tooltip/AP_WildMutation=Friendly zerg units in the target area gain +<d ref="Behavior,AP_WildMutation,Modification.VitalMaxArray[1]"/> maximum life and <d ref="(Behavior,AP_WildMutation,Modification.AttackSpeedMultiplier - 1) * 100"/>% increased attack speed for <d ref="Behavior,AP_WildMutation,Duration"/> seconds.<n/><n/><c val="ffff8a">Does not affect heroic units.</c>
+Button/Tooltip/AP_WormholeTransit=Teleports the Mothership to target location anywhere on the map.<n/></n><c val="FF4040">This ability shares a cooldown with Blink.</c>
+Button/Tooltip/AP_WormholeTransitInstall=Teleports the Mothership to target location anywhere on the map.<n/></n><c val="FF4040">This ability shares a cooldown with Blink.</c>
 Button/Tooltip/AP_Wraith=Highly mobile flying unit. Excellent at surgical strikes.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_WraithAdvancedLaserTechnology=<c val="ffff8a">Burst Lasers</c> do more damage and hit both air and ground units. Replaces Gemini Missiles weapon.
 Button/Tooltip/AP_WraithCloakOff=Decloaks the selected unit, making it visible to enemies.
@@ -5042,6 +5266,8 @@ Effect/Name/AP_RetributionFieldSet=Retribution Field (Set)
 Effect/Name/AP_RevelationDestroy=Revelation (Destroy)
 Effect/Name/AP_RevelationPersistent=Revelation (Persistent)
 Effect/Name/AP_RevelationSet=Revelation (Set)
+Effect/Name/AP_RevitalizeShieldsModifyUnit=Revitalize Shields (Heal)
+Effect/Name/AP_RevitalizeShieldsSearchArea=Revitalize Shields (Search)
 Effect/Name/AP_RoachCorpserAcidSalivaLM=Roach Corpser Acid Saliva LM
 Effect/Name/AP_RoachCorpserAcidSalivaSet=Roach Corpser Acid Saliva Set
 Effect/Name/AP_RoachCorpserAcidSalivaU=Roach Corpser Acid Saliva U
@@ -5565,6 +5791,7 @@ Effect/Name/RemoveCoreRecallingBehaviorVikingGround2=Remove Core Recalling Behav
 Effect/Name/RemoveRecallingBehaviorVikingAir2=Remove Recalling Behavior Viking Air
 Effect/Name/RemoveRecallingBehaviorVikingGround2=Remove Recalling Behavior Viking Ground
 Error/AP_AlreadyChronoBoosted=Target is already accelerated
+Error/AP_BuildingIsUnpowered=Building must be powered
 Error/AP_ForbiddenByOption=Not allowed by multiworld options
 Error/AP_ImpalerBurrowed=Must Burrow to attack.
 Error/AP_LeapAttackError=Too close to leap
@@ -5644,7 +5871,11 @@ RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find P
 RequirementNode/Tooltip/AP_CountUpgradeImmortalImprovedBarrierCompleteOnly=Find Improved Barrier (Immortal)
 RequirementNode/Tooltip/AP_CountUpgradeInstigatorModernizedServosCompleteOnly=Find Modernized Servos (Instigator)
 RequirementNode/Tooltip/AP_CountUpgradeMirageGravitonBeamCompleteOnly=Find Graviton Beam (Mirage)
-RequirementNode/Tooltip/AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly=Find Integrated Power (Mothership)
+RequirementNode/Tooltip/AP_CountUpgradeMothershipAiurShieldArmorAuraCompleteOnly=Find Valorous Resolve (Aiur Mothership)
+RequirementNode/Tooltip/AP_CountUpgradeMothershipCoreAiurQuantumProjectionCompleteOnly=Find Quantum Projection (Aiur Mothership Core)
+RequirementNode/Tooltip/AP_CountUpgradeMothershipCorePurifierControlledBurnCompleteOnly=Find Controlled Burn (Purifier Mothership Core War Council)
+RequirementNode/Tooltip/AP_CountUpgradeMothershipPurifierPowerSourceCompleteOnly=Find Mobile Power Field (Purifier Mothership War Council)
+RequirementNode/Tooltip/AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly=Find Integrated Power (Tal'darim Mothership)
 RequirementNode/Tooltip/AP_CountUpgradeObserverScopophobiaCompleteOnly=Find Induce Scopophobia (Observer)
 RequirementNode/Tooltip/AP_CountUpgradeOracleStasisWardUpgradeCompleteOnly=Find Stasis Calibration (Oracle)
 RequirementNode/Tooltip/AP_CountUpgradeReaverKhalaiReplicatorsCompleteOnly=Find Khalai Replicators (Reaver)
@@ -5695,7 +5926,9 @@ RequirementNode/Tooltip/AP_CountUpgradeWrathwalkerAerialTrackingCompleteOnly=Fin
 RequirementNode/Tooltip/AP_EnergizerTransformToPhasingMode=Transform to Phasing Mode
 RequirementNode/Tooltip/AP_Eq1667402654CountUnitAP_DukesRevengeQueuedOrBetter0=Can only control one Jackson's Revenge
 RequirementNode/Tooltip/AP_Eq777695981SumCountUnitAP_MercUltraliskQueuedOrBetterCountUnitAP_MercUltraliskBurrowedQueuedOrBetterCountUnitAP_MercTorrasqueCorpseQueuedOrBetter0=Can only control one Torrasque
-RequirementNode/Tooltip/AP_EqCountUnitSOAMothershipv4QueuedOrBetter0=No Mothership
+RequirementNode/Tooltip/AP_EqCountUnitAiurMothershipQueuedOrBetter0=No Aiur Mothership or Mothership Core
+RequirementNode/Tooltip/AP_EqCountUnitPurifierMothershipQueuedOrBetter0=No Purifier Mothership or Mothership Core
+RequirementNode/Tooltip/AP_EqCountUnitTaldarimMothershipQueuedOrBetter0=No Tal'darim Mothership
 RequirementNode/Tooltip/AP_EqCountUpgradeProtossAirArmorsLevel1CompleteOnly1=Protoss Air Armor Level 1
 RequirementNode/Tooltip/AP_EqCountUpgradeProtossAirArmorsLevel2CompleteOnly1=Protoss Air Armor Level 2
 RequirementNode/Tooltip/AP_EqCountUpgradeProtossAirArmorsLevel3CompleteOnly1=Protoss Air Armor Level 3
@@ -5869,6 +6102,7 @@ Unit/Name/AP_CarrierAiur=Carrier
 Unit/Name/AP_CarrierPurifier=Trireme
 Unit/Name/AP_CarrierRepairDrone=Repair Drone
 Unit/Name/AP_CarrierTaldarim=Skylord
+Unit/Name/AP_ChronoDrone=Chrono Drone
 Unit/Name/AP_Colossus=Colossus
 Unit/Name/AP_ColossusPurifier=Colossus
 Unit/Name/AP_ColossusTaldarim=Wrathwalker
@@ -6074,6 +6308,11 @@ Unit/Name/AP_MindBoltWeapon=Kinetic Blast
 Unit/Name/AP_MissileTurret=Missile Turret
 Unit/Name/AP_Monitor=Havoc
 Unit/Name/AP_Morphling=Morphling
+Unit/Name/AP_MothershipAiur=Mothership
+Unit/Name/AP_MothershipCoreAiur=Mothership Core
+Unit/Name/AP_MothershipCorePurifier=Mothership Core
+Unit/Name/AP_MothershipPurifier=Mothership
+Unit/Name/AP_MothershipRepairDrone=Shielding Drone
 Unit/Name/AP_Mutalisk=Mutalisk
 Unit/Name/AP_MutaliskBroodlord=Mutalisk
 Unit/Name/AP_MutaliskViper=Mutalisk
@@ -6319,6 +6558,8 @@ UnitSubtitle/AP_HotSSplitter=Splitter Strain
 UnitSubtitle/AP_HydraliskImpaler=Impaler Strain
 UnitSubtitle/AP_HydraliskLurker=Lurker Strain
 UnitSubtitle/AP_HydraliskLurkerImpaler=Lurker + Impaler
+UnitSubtitle/AP_MothershipAiur=Aiur Faction
+UnitSubtitle/AP_MothershipPurifier=Purifier Faction
 UnitSubtitle/AP_MutaliskBroodLord=Brood Lord Strain
 UnitSubtitle/AP_MutaliskBroodlordViper=Broodlord + Viper
 UnitSubtitle/AP_MutaliskViper=Viper Strain
@@ -6329,6 +6570,7 @@ UnitSubtitle/AP_PrimalZergling=Primal Strain
 UnitSubtitle/AP_RoachCorpser=Corpser Strain
 UnitSubtitle/AP_RoachVile=Vile Strain
 UnitSubtitle/AP_RoachVileCorpser=Vile + Corpser
+UnitSubtitle/AP_SOAMothershipv4=Tal'darim Faction
 UnitSubtitle/AP_SwarmHostSplitA=Carrion Strain
 UnitSubtitle/AP_SwarmHostSplitAB=Carrion + Creeper
 UnitSubtitle/AP_SwarmHostSplitB=Creeper Strain
@@ -6809,6 +7051,7 @@ UserData/AP_CampaignPerk/GPTier6Power1_Name=Purifier Beam
 UserData/AP_CampaignPerk/GPTier6Power1_TargetInstructions=Choose Beam Location
 UserData/AP_CampaignPerk/GPTier6Power1_Tooltip=Energy Cost: <d ref="Abil,AP_SOAPurifierBeam,Cost[0].Vital[2]"/><n/>Cooldown: <d ref="Abil,AP_SOAPurifierBeam,Cost[0].Cooldown.TimeUse"/><n/><n/>The Spear of Adun fires a controllable beam at the surface that deals <d ref="Effect,AP_SOAPurifierBeamDamage,Amount*Behavior,AP_SOAPurifierBeamFiring,Duration*(1/Behavior,AP_SOAPurifierBeamFiring,Period)"/> damage (<d ref="(Effect,AP_SOAPurifierBeamDamage,Amount+Effect,AP_SOAPurifierBeamDamage,AttributeBonus[Armored])*Behavior,AP_SOAPurifierBeamFiring,Duration*(1/Behavior,AP_SOAPurifierBeamFiring,Period)"/> vs Armored) to enemy units and structures over <d ref="Behavior,AP_SOAPurifierBeamFiring,Duration"/> seconds. <n/><n/>The beam automatically acquires targets if it is not manually controlled.
 Weapon/Name/AP_90mmCannons=90mm Cannons
+Weapon/Name/AP_AiurMothershipWeapon=Photon Beam
 Weapon/Name/AP_ATALaserBattery=ATA Laser Battery
 Weapon/Name/AP_ATSLaserBattery=ATS Laser Battery
 Weapon/Name/AP_ATXLaserBatteryMengsk=Laser Battery
@@ -6945,6 +7188,7 @@ Weapon/Name/AP_MercRoachAcidSalivaAir=Acid Saliva (Air)
 Weapon/Name/AP_MercRoachMelee=Needle Spines (Melee)
 Weapon/Name/AP_MercRoachVileAcidSaliva=Acid Saliva (Ground)
 Weapon/Name/AP_MercRoachVileAcidSalivaAir=Acid Saliva (Air)
+Weapon/Name/AP_MothershipCorePurifierWeapon=Flame Lance
 Weapon/Name/AP_MothershipCoreWeapon=Purify
 Weapon/Name/AP_NeedleClaws=Needle Claws
 Weapon/Name/AP_NeedleSpines=Needle Spines
@@ -6978,11 +7222,13 @@ Weapon/Name/AP_PsionicShockwave=Psionic Shockwave
 Weapon/Name/AP_PsionicShockwaveUpgrade=Psionic Shockwave
 Weapon/Name/AP_PunisherGrenades=Punisher Grenades
 Weapon/Name/AP_PunisherGrenadesMengsk=Punisher Grenades
+Weapon/Name/AP_PurifierMothershipWeapon=Purification Array
 Weapon/Name/AP_Pygalisk=Princeps Blades
 Weapon/Name/AP_PygaliskHeadAttack=Headbutt
 Weapon/Name/AP_RailGunTurret=RGX Perforator
 Weapon/Name/AP_RavagerWeapon=Plasma Discharge
 Weapon/Name/AP_ReaverScarabsLaunch=Scarabs
+Weapon/Name/AP_RepulsorCannon=Repulsor Cannon
 Weapon/Name/AP_RoachCorpserAcidSaliva=Acid Saliva
 Weapon/Name/AP_RoachCorpserMelee=Roach Corpser Melee
 Weapon/Name/AP_RoachCorpserSpray=Acid Spray
@@ -7037,6 +7283,7 @@ Weapon/Name/AP_StukovInfestedSiegeTankImpalerTentacle=Impaler Tentacle
 Weapon/Name/AP_Suicide=Suicide
 Weapon/Name/AP_SuicideBuilding=Suicide
 Weapon/Name/AP_SupplicantWeapon=Blood Orb
+Weapon/Name/AP_TaldarimMothershipFastAttackWeapon=Terminator Beam
 Weapon/Name/AP_Talons=Talons
 Weapon/Name/AP_TalonsMissile=Talons
 Weapon/Name/AP_TempestPurifier=Kinetic Overload
@@ -7090,6 +7337,7 @@ Weapon/Tip/AP_Lurker=<c val="#ColorAttackInfo">Must be burrowed to attack.</c>
 Weapon/Tip/AP_MedivacSiegeTankAirlift=Requires a loaded Siege Tank in Siege mode.<n/><n/><n/>If used with Siege Breakers, deals <d ref="Effect,AP_ArcliteShockCannonDummy,Amount"/> damage.<n/><n/>If used with Shock Divisions, deals damage depending on rank:<n/>Rank 0: <d ref="Effect,AP_SiegeTankMengskSiegedDummy,Amount" precision="2"/> + <d ref="Effect,AP_SiegeTankMengskSiegedDummy,AttributeBonus[Armored]"/> vs Armoured.<n/>+25% damage per rank.<n/>Has <d ref="Behavior,AP_SiegeTankMengskRangeBonus,Modification.WeaponRange"/> extra range if Shock Division is at least at rank 2.
 Weapon/Tip/AP_NovaWeaponBlazefireBlade=Deals <d ref="Effect,AP_NovaWeaponBlazefireBladeDamageCloaked,Amount - Effect,AP_NovaWeaponBlazefireBladeDamageUncloaked,Amount"/> extra damage if Nova is cloaked
 Weapon/Tip/AP_PrismaticBeam=Deals <d ref="Effect,AP_PrismaticBeamMUx2,Amount"/> (<d ref="Effect,AP_PrismaticBeamMUx2,Amount + Effect,AP_PrismaticBeamMUx2,AttributeBonus[Armored]"/> vs Armored) damage if halfway charged,<n/><d ref="Effect,AP_PrismaticBeamMUx3,Amount"/> (<d ref="Effect,AP_PrismaticBeamMUx3,Amount + Effect,AP_PrismaticBeamMUx3,AttributeBonus[Armored]"/> vs Armored) damage if fully charged.
+Weapon/Tip/AP_PurifierMothershipWeapon=Deals damage to up to <d ref="Effect,AP_PurifierMothershipWeaponSearch,AreaArray[0].MaxCount + 1"/> targets within range of the Purifier Mothership.
 Weapon/Tip/AP_PygaliskHeadAttack=Only used against structures.
 Weapon/Tip/AP_StalwartLightningWeapon=Ignores armor. Deals <d ref="Effect,AP_StalwartLightningWeaponBounceDamage,Amount"/> damage to up to <d ref="Effect,AP_StalwartLightningWeaponSearch,AreaArray[0].MaxCount"/> enemies within <d ref="Effect,AP_StalwartLightningWeaponSearch,AreaArray[0].Radius"/> range of the target.
 Weapon/Tip/AP_StukovInfestedSiegeTank=Launches a Volatile Infested with timed life that will detonate on the targeted enemy.  Deals high damage to groups, and buildings.<n/><n/><c val="#ColorAttackInfo">Must have volatile ammo to attack.</c>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index e2aa452e20..ee9cbee8e5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -6966,6 +6966,10 @@ Unit/EditorPrefix/AP_MindBoltWeapon=Weapon -
 Unit/EditorPrefix/AP_MissileTurret=AP -
 Unit/EditorPrefix/AP_Monitor=AP - Sentry -
 Unit/EditorPrefix/AP_Morphling=AP -
+Unit/EditorPrefix/AP_MothershipAiur=AP -
+Unit/EditorPrefix/AP_MothershipCoreAiur=AP -
+Unit/EditorPrefix/AP_MothershipCorePurifier=AP -
+Unit/EditorPrefix/AP_MothershipPurifier=AP -
 Unit/EditorPrefix/AP_Mutalisk=AP -
 Unit/EditorPrefix/AP_NeedleSpinesWeapon=Weapon -
 Unit/EditorPrefix/AP_NeuralParasiteWeapon=Weapon -
@@ -7319,6 +7323,11 @@ Unit/EditorSuffix/AP_MercUltraliskBurrowed=(Merc)
 Unit/EditorSuffix/AP_MercWraith=(Merc)
 Unit/EditorSuffix/AP_MercZerglingBurrowed=(Merc)
 Unit/EditorSuffix/AP_Monitor=- Tal'darim
+Unit/EditorSuffix/AP_MothershipAiur=(Aiur)
+Unit/EditorSuffix/AP_MothershipCoreAiur=(Aiur)
+Unit/EditorSuffix/AP_MothershipCorePurifier=(Purifier)
+Unit/EditorSuffix/AP_MothershipPurifier=(Purifier)
+Unit/EditorSuffix/AP_MothershipPurifierPowerSource=(Purifier - Power Source)
 Unit/EditorSuffix/AP_NovaHero=- NC
 Unit/EditorSuffix/AP_NovaHoloDecoy=(Holo Decoy)
 Unit/EditorSuffix/AP_NovaPlasmaPuddleSmall=(Small)
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 55dec3772e..4654c51076 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1420,8 +1420,8 @@ void libABFE498B_gf_AP_Triggers_unlockProtossUnits2 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Protoss_unlockSkylord, // 12
         libABFE498B_gf_AP_Triggers_Protoss_unlockPurger, // 13
         libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisher, // 14
-        ap_triggers_PlayerConsumer_sig, // 15 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 16 reserved for Mothership
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothership, // 15
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothership, // 16
         libABFE498B_gf_AP_Triggers_Protoss_unlockOppressor, // 17
         libABFE498B_gf_AP_Triggers_Protoss_unlockCaladrius, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockMistWing, // 19
@@ -1735,16 +1735,16 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge4 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch, // 5
         libABFE498B_gf_AP_Triggers_Protoss_unlockPulsarChronoclysm, // 6
         libABFE498B_gf_AP_Triggers_Protoss_unlockPulsarEntropicReversal, // 7
-        ap_triggers_PlayerConsumer_sig, // 8  reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 9  reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 10 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 11 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 12 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 13 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 14 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 15 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 16 reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 17 reserved for Mothership
+        libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTimeFieldModules, // 8 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipWormholeModules, // 9  
+        libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipHangarInstallations, // 10 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration, // 11 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker, // 12 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet, // 13 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors, // 14 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers, // 15 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity, // 16 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding, // 17 
         libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorOptimizedLogistics, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorArmorMeltingBlasters, // 19
         libABFE498B_gf_AP_Triggers_Protoss_unlockCaladriusSideMissiles, // 20
@@ -1768,11 +1768,11 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge5 (int lp_player, int lp_bitAr
         lp_player,
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Protoss_unlockReaverBargainBinPrices, // 0
-        ap_triggers_PlayerConsumer_sig, // 1
-        ap_triggers_PlayerConsumer_sig, // 2
-        ap_triggers_PlayerConsumer_sig, // 3
-        ap_triggers_PlayerConsumer_sig, // 4
-        ap_triggers_PlayerConsumer_sig, // 5
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter, // 1
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers, // 2
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath, // 3
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits, // 4
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles, // 5    
         ap_triggers_PlayerConsumer_sig, // 6
         ap_triggers_PlayerConsumer_sig, // 7
         ap_triggers_PlayerConsumer_sig, // 8
@@ -1862,11 +1862,11 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_
         libABFE498B_gf_AP_Triggers_Protoss_unlockScoutExpeditionaryHull, // 12
         libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13
         libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStasisCalibration, // 14
-        libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower, // 15
-        ap_triggers_PlayerConsumer_sig, // 16  reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 17  reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 18  reserved for Mothership
-        ap_triggers_PlayerConsumer_sig, // 19  reserved for Mothership
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower, // 15
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipValorousResolve, // 16  
+        libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField, // 17
+        ap_triggers_PlayerConsumer_sig, // 18  
+        ap_triggers_PlayerConsumer_sig, // 19 
         libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorVulcanBlaster, // 20
         libABFE498B_gf_AP_Triggers_Protoss_unlockCaladriusCoronaBeam, // 21
         libABFE498B_gf_AP_Triggers_Protoss_unlockMistWingPhantomDash, // 22
@@ -8102,6 +8102,35 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothership (int lp_player)
 
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothership (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    if ((libABFE498B_gv_aP_Triggers_Protoss_has_AiurMothership[lp_player] == false)) {
+        libABFE498B_gv_aP_Triggers_Protoss_has_AiurMothership[lp_player] = true;
+        libABFE498B_gf_AP_Triggers_Protoss_unlockStargate(lp_player);
+        TechTreeAbilityAllow(lp_player, AbilityCommand("AP_ProtossBuild", 5), true);
+        TechTreeAbilityAllow(lp_player, AbilityCommand("AP_ProtossBuild", 14), true);
+        TechTreeUnitAllow(lp_player, "AP_MothershipAiur", true);
+        TechTreeUnitAllow(lp_player, "AP_MothershipCoreAiur", true);
+    }
+
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothership (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    if ((libABFE498B_gv_aP_Triggers_Protoss_has_PurifierMothership[lp_player] == false)) {
+        libABFE498B_gv_aP_Triggers_Protoss_has_PurifierMothership[lp_player] = true;
+        libABFE498B_gf_AP_Triggers_Protoss_unlockStargate(lp_player);
+        TechTreeAbilityAllow(lp_player, AbilityCommand("AP_ProtossBuild", 5), true);
+        TechTreeAbilityAllow(lp_player, AbilityCommand("AP_ProtossBuild", 14), true);
+        TechTreeUnitAllow(lp_player, "AP_MothershipPurifier", true);
+        TechTreeUnitAllow(lp_player, "AP_MothershipPurifierPowerSource", true);
+        TechTreeUnitAllow(lp_player, "AP_MothershipCorePurifier", true);
+    }
+
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiter (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -9160,12 +9189,114 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (in
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestructuredThrusters", 1);
 }
 
-void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower (int lp_player) {
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTimeFieldModules (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallTimeField", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipWormholeModules (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallWormholeModule", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipHangarInstallations (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MothershipHangarInstallation", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MothershipTaldarimIntegratedPower", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallSummonDeathFleet", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallTaldarimMothershipGroundSlow", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallTaldarimMothershipDeathHeal", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallTaldarimMothershipFastAttack", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MothershipPurifierPowerSource", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallPlanetCracker", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallPurifierMothershipDebuff", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallPurifierMothershipShielding", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallPurifierMothershipAttackSpeedBoost", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipValorousResolve (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MothershipAiurShieldArmorAura", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallAstralRestoration", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallAiurMothershipFeedback", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallAiurMothershipShieldRestore", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CanInstallAiurMothershipEnergyRegenAura", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -9774,6 +9905,11 @@ void libABFE498B_gf_AP_Triggers_clearProtossTech (int lp_player) {
     TechTreeUnitAllow(lp_player, "AP_SOAMothershipv4", false);
     TechTreeUnitAllow(lp_player, "AP_SOAMothershipv4Placement", false);
     TechTreeUnitAllow(lp_player, "AP_MothershipTaldarim", false);
+    TechTreeUnitAllow(lp_player, "AP_MothershipAiur", false);
+    TechTreeUnitAllow(lp_player, "AP_MothershipCoreAiur", false);
+    TechTreeUnitAllow(lp_player, "AP_MothershipCorePurifier", false);
+    TechTreeUnitAllow(lp_player, "AP_MothershipPurifier", false);
+    TechTreeUnitAllow(lp_player, "AP_MothershipPurifierPowerSource", false);
     TechTreeUnitAllow(lp_player, "AP_TempestPurifier", false);
     TechTreeUnitAllow(lp_player, "AP_ArbiterMP", false);
     TechTreeUnitAllow(lp_player, "AP_Oracle", false);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index ce328baab2..770867d486 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -108,6 +108,8 @@ bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Caladrius;
 bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_MistWing;
 bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Tempest;
 bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_TaldarimMothership;
+bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_AiurMothership;
+bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_PurifierMothership;
 bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Arbiter;
 bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Oracle;
 bool libABFE498B_gv_aP_Triggers_DebugMode;
@@ -805,6 +807,8 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCaladrius (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockMistWing (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTempest (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothership (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothership (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothership (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiter (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockOracle (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPhotonCannon (int lp_player);
@@ -970,7 +974,24 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_pl
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player);
-void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTimeFieldModules (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipWormholeModules (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipHangarInstallations (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipValorousResolve (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockProgressiveProxyPylon (int lp_player, int lp_level);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPylonOvercharge (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index 8944a2ab1d..766d14f7de 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
index aed99a5218..1d9a4f6459 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 3e9eb9dded..214ff13a4e 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4760,8 +4760,8 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSkylord, // 12
                     libABFE498B_gf_AP_Triggers_Protoss_unlockPurger, // 13
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisher, // 14
-                    ap_triggers_PlayerConsumer_sig, // 15 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 16 reserved for Mothership
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothership, // 15
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothership, // 16
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOppressor, // 17
                     libABFE498B_gf_AP_Triggers_Protoss_unlockCaladrius, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockMistWing, // 19
@@ -5309,16 +5309,16 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch, // 5
                     libABFE498B_gf_AP_Triggers_Protoss_unlockPulsarChronoclysm, // 6
                     libABFE498B_gf_AP_Triggers_Protoss_unlockPulsarEntropicReversal, // 7
-                    ap_triggers_PlayerConsumer_sig, // 8  reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 9  reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 10 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 11 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 12 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 13 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 14 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 15 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 16 reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 17 reserved for Mothership
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTimeFieldModules, // 8 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipWormholeModules, // 9  
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipHangarInstallations, // 10 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration, // 11 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker, // 12 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet, // 13 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors, // 14 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers, // 15 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity, // 16 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding, // 17 
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorOptimizedLogistics, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorArmorMeltingBlasters, // 19
                     libABFE498B_gf_AP_Triggers_Protoss_unlockCaladriusSideMissiles, // 20
@@ -5368,11 +5368,11 @@
                     lp_player,
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Protoss_unlockReaverBargainBinPrices, // 0
-                    ap_triggers_PlayerConsumer_sig, // 1
-                    ap_triggers_PlayerConsumer_sig, // 2
-                    ap_triggers_PlayerConsumer_sig, // 3
-                    ap_triggers_PlayerConsumer_sig, // 4
-                    ap_triggers_PlayerConsumer_sig, // 5
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter, // 1
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers, // 2
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath, // 3
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits, // 4
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles, // 5    
                     ap_triggers_PlayerConsumer_sig, // 6
                     ap_triggers_PlayerConsumer_sig, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
@@ -5516,11 +5516,11 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockScoutExpeditionaryHull, // 12
                     libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStasisCalibration, // 14
-                    libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower, // 15
-                    ap_triggers_PlayerConsumer_sig, // 16  reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 17  reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 18  reserved for Mothership
-                    ap_triggers_PlayerConsumer_sig, // 19  reserved for Mothership
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower, // 15
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAiurMothershipValorousResolve, // 16  
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField, // 17
+                    ap_triggers_PlayerConsumer_sig, // 18  
+                    ap_triggers_PlayerConsumer_sig, // 19 
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOppressorVulcanBlaster, // 20
                     libABFE498B_gf_AP_Triggers_Protoss_unlockCaladriusCoronaBeam, // 21
                     libABFE498B_gf_AP_Triggers_Protoss_unlockMistWingPhantomDash, // 22
@@ -63706,6 +63706,8 @@
             <Item Type="Variable" Library="ABFE498B" Id="D2C02AEB"/>
             <Item Type="Variable" Library="ABFE498B" Id="0F481473"/>
             <Item Type="Variable" Library="ABFE498B" Id="3F8E2454"/>
+            <Item Type="Variable" Library="ABFE498B" Id="57B8E956"/>
+            <Item Type="Variable" Library="ABFE498B" Id="205B865C"/>
             <Item Type="Variable" Library="ABFE498B" Id="3723A32A"/>
             <Item Type="Variable" Library="ABFE498B" Id="49094D88"/>
         </Element>
@@ -64215,6 +64217,30 @@
             <Value>false</Value>
             <ValueType Type="bool"/>
         </Element>
+        <Element Type="Variable" Id="57B8E956">
+            <Identifier>aP_Triggers_Protoss_has_AiurMothership</Identifier>
+            <VariableType>
+                <Type Value="bool"/>
+                <ArraySize Dim="0" Value="20"/>
+            </VariableType>
+            <Value Type="Param" Library="ABFE498B" Id="950203CF"/>
+        </Element>
+        <Element Type="Param" Id="950203CF">
+            <Value>false</Value>
+            <ValueType Type="bool"/>
+        </Element>
+        <Element Type="Variable" Id="205B865C">
+            <Identifier>aP_Triggers_Protoss_has_PurifierMothership</Identifier>
+            <VariableType>
+                <Type Value="bool"/>
+                <ArraySize Dim="0" Value="20"/>
+            </VariableType>
+            <Value Type="Param" Library="ABFE498B" Id="3F821C5C"/>
+        </Element>
+        <Element Type="Param" Id="3F821C5C">
+            <Value>false</Value>
+            <ValueType Type="bool"/>
+        </Element>
         <Element Type="Variable" Id="3723A32A">
             <VariableType>
                 <Type Value="bool"/>
@@ -64308,6 +64334,8 @@
             <Item Type="Comment" Library="ABFE498B" Id="D2F7E6E7"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="376B16F7"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="8C81657A"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="CD0B76F8"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F937DD86"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6B8BC77B"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="17F71020"/>
         </Element>
@@ -70385,6 +70413,352 @@
             <Value>false</Value>
             <ValueType Type="bool"/>
         </Element>
+        <Element Type="FunctionDef" Id="CD0B76F8">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothership</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FD36727C"/>
+        </Element>
+        <Element Type="ParamDef" Id="ACA55283">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="5FD09307"/>
+        </Element>
+        <Element Type="Param" Id="5FD09307">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="FD36727C">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="230A3547"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9F0600D2"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="69B939B5"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="DCF5FBEC"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="BC216E4A"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6768221D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1BBCC4BF"/>
+        </Element>
+        <Element Type="FunctionCall" Id="230A3547">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F06FFD84"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4C0CC1A4"/>
+        </Element>
+        <Element Type="Param" Id="F06FFD84">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="57B8E956"/>
+            <Array Type="Param" Library="ABFE498B" Id="FEA9CF21"/>
+        </Element>
+        <Element Type="Param" Id="FEA9CF21">
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="4C0CC1A4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>true</Value>
+            <ValueType Type="bool"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9F0600D2">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="43B7CA33"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8E4A3F4A"/>
+        </Element>
+        <Element Type="Param" Id="8E4A3F4A">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="B97BA144"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="FunctionCall" Id="69B939B5">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="ADE981F2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="64A59958"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E63518D4"/>
+        </Element>
+        <Element Type="Param" Id="ADE981F2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="64A59958">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="E63518D4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
+            <Value>AP_ProtossBuild</Value>
+            <ValueType Type="abilcmd"/>
+            <ValueId Id="5"/>
+        </Element>
+        <Element Type="FunctionCall" Id="DCF5FBEC">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A7A42042"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="505BC94A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0131D14A"/>
+        </Element>
+        <Element Type="Param" Id="A7A42042">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="505BC94A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="0131D14A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
+            <Value>AP_ProtossBuild</Value>
+            <ValueType Type="abilcmd"/>
+            <ValueId Id="14"/>
+        </Element>
+        <Element Type="FunctionCall" Id="BC216E4A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="519F508C"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A8D66C90"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="EF9917D6"/>
+        </Element>
+        <Element Type="Param" Id="519F508C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="A8D66C90">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="EF9917D6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipAiur</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="6768221D">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="446B7368"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1C35665A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8F09221B"/>
+        </Element>
+        <Element Type="Param" Id="446B7368">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="1C35665A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="8F09221B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipCoreAiur</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="1BBCC4BF">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E12194B5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0C843F6A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E0AF31BC"/>
+        </Element>
+        <Element Type="Param" Id="E12194B5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="57B8E956"/>
+            <Array Type="Param" Library="ABFE498B" Id="508298C9"/>
+        </Element>
+        <Element Type="Param" Id="508298C9">
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ACA55283"/>
+        </Element>
+        <Element Type="Param" Id="0C843F6A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+        </Element>
+        <Element Type="Param" Id="E0AF31BC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>false</Value>
+            <ValueType Type="bool"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F937DD86">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothership</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B88300CE"/>
+        </Element>
+        <Element Type="ParamDef" Id="0E177ED0">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="8A928C54"/>
+        </Element>
+        <Element Type="Param" Id="8A928C54">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B88300CE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4C25505D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8037339C"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1E954CF9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1AA91D0F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="CD3D3B76"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4F25FFA2"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="74860BA1"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2136622F"/>
+        </Element>
+        <Element Type="FunctionCall" Id="4C25505D">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="98AFA0C5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="51A0D68A"/>
+        </Element>
+        <Element Type="Param" Id="98AFA0C5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="205B865C"/>
+            <Array Type="Param" Library="ABFE498B" Id="EC604224"/>
+        </Element>
+        <Element Type="Param" Id="EC604224">
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="51A0D68A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
+            <Value>true</Value>
+            <ValueType Type="bool"/>
+        </Element>
+        <Element Type="FunctionCall" Id="8037339C">
+            <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="43B7CA33"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8B792A15"/>
+        </Element>
+        <Element Type="Param" Id="8B792A15">
+            <ParameterDef Type="ParamDef" Library="ABFE498B" Id="B97BA144"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="FunctionCall" Id="1E954CF9">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4ADF03EC"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E7D7F5F7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C1C61D0B"/>
+        </Element>
+        <Element Type="Param" Id="4ADF03EC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="E7D7F5F7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="C1C61D0B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
+            <Value>AP_ProtossBuild</Value>
+            <ValueType Type="abilcmd"/>
+            <ValueId Id="5"/>
+        </Element>
+        <Element Type="FunctionCall" Id="1AA91D0F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7BEFA89D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="18925A26"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="91DC9E30"/>
+        </Element>
+        <Element Type="Param" Id="7BEFA89D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="18925A26">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="91DC9E30">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
+            <Value>AP_ProtossBuild</Value>
+            <ValueType Type="abilcmd"/>
+            <ValueId Id="14"/>
+        </Element>
+        <Element Type="FunctionCall" Id="CD3D3B76">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C3018964"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7C91C851"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="98173AAD"/>
+        </Element>
+        <Element Type="Param" Id="C3018964">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="7C91C851">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="98173AAD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipPurifier</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="4F25FFA2">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DF35A4B0"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FC9C1D78"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A79C574F"/>
+        </Element>
+        <Element Type="Param" Id="DF35A4B0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="FC9C1D78">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="A79C574F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipPurifierPowerSource</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="74860BA1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D6A3A201"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B900345E"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9714D0F0"/>
+        </Element>
+        <Element Type="Param" Id="D6A3A201">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="B900345E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
+        </Element>
+        <Element Type="Param" Id="9714D0F0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipCorePurifier</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="2136622F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+            <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BA5AA548"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="89A15B91"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="90DEB9A8"/>
+        </Element>
+        <Element Type="Param" Id="BA5AA548">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+            <Variable Type="Variable" Library="ABFE498B" Id="205B865C"/>
+            <Array Type="Param" Library="ABFE498B" Id="76DE6F52"/>
+        </Element>
+        <Element Type="Param" Id="76DE6F52">
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E177ED0"/>
+        </Element>
+        <Element Type="Param" Id="89A15B91">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+        </Element>
+        <Element Type="Param" Id="90DEB9A8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+            <Value>false</Value>
+            <ValueType Type="bool"/>
+        </Element>
         <Element Type="FunctionDef" Id="6B8BC77B">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="00B13B13"/>
@@ -70934,7 +71308,24 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="64F45D80"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F996C036"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="C5F7A652"/>
-            <Item Type="FunctionDef" Library="ABFE498B" Id="D661BFB5"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="859A52CC"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="0C113388"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="0C365F7D"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F059DA81"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="6A5D0761"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="953BD393"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="DD366A30"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="BF425834"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="DBD1D8C5"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="AB826C4A"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="1D8C3BE1"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="55029861"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="B5B81ABA"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="1CE17D6C"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="BC07C218"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="D6C62ACE"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="2F7E6A79"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="B65A13A9"/>
         </Element>
         <Element Type="FunctionDef" Id="5941C032">
             <FlagAction/>
@@ -77468,39 +77859,668 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="FunctionDef" Id="D661BFB5">
-            <Identifier>AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower</Identifier>
+        <Element Type="FunctionDef" Id="859A52CC">
+            <Identifier>AP_Triggers_Protoss_unlockMothershipTimeFieldModules</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="DA0279E0"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FCC7BB93"/>
+        </Element>
+        <Element Type="ParamDef" Id="DA0279E0">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="02FCF704"/>
+        </Element>
+        <Element Type="Param" Id="02FCF704">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="FCC7BB93">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="17DF9EDF"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="41A5F7DA"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B546A38F"/>
+        </Element>
+        <Element Type="Param" Id="17DF9EDF">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="DA0279E0"/>
+        </Element>
+        <Element Type="Param" Id="41A5F7DA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallTimeField</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="B546A38F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="0C113388">
+            <Identifier>AP_Triggers_Protoss_unlockMothershipWormholeModules</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="31358CA7"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C8E77D9F"/>
+        </Element>
+        <Element Type="ParamDef" Id="31358CA7">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="292E1D1D"/>
+        </Element>
+        <Element Type="Param" Id="292E1D1D">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C8E77D9F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D41B711B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="97C5428A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="53A2FD7D"/>
+        </Element>
+        <Element Type="Param" Id="D41B711B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="31358CA7"/>
+        </Element>
+        <Element Type="Param" Id="97C5428A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallWormholeModule</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="53A2FD7D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="0C365F7D">
+            <Identifier>AP_Triggers_Protoss_unlockMothershipHangarInstallations</Identifier>
             <FlagAction/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="66B29439"/>
-            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="AEE89171"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="506A5A4B"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2A84F9A2"/>
         </Element>
-        <Element Type="ParamDef" Id="66B29439">
+        <Element Type="ParamDef" Id="506A5A4B">
             <ParameterType>
                 <Type Value="int"/>
             </ParameterType>
-            <Default Type="Param" Library="ABFE498B" Id="C975520C"/>
+            <Default Type="Param" Library="ABFE498B" Id="B2717A98"/>
         </Element>
-        <Element Type="Param" Id="C975520C">
+        <Element Type="Param" Id="B2717A98">
             <Value>0</Value>
             <ValueType Type="int"/>
         </Element>
-        <Element Type="FunctionCall" Id="AEE89171">
+        <Element Type="FunctionCall" Id="2A84F9A2">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="BF4971CB"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="BD7D3690"/>
-            <Parameter Type="Param" Library="ABFE498B" Id="D5D64DCD"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="EA12BA64"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="67945A9C"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DF12087D"/>
         </Element>
-        <Element Type="Param" Id="BF4971CB">
+        <Element Type="Param" Id="EA12BA64">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
-            <Parameter Type="ParamDef" Library="ABFE498B" Id="66B29439"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="506A5A4B"/>
         </Element>
-        <Element Type="Param" Id="BD7D3690">
+        <Element Type="Param" Id="67945A9C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MothershipHangarInstallation</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="DF12087D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F059DA81">
+            <Identifier>AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="CFC54A7E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0D396B81"/>
+        </Element>
+        <Element Type="ParamDef" Id="CFC54A7E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="2E861060"/>
+        </Element>
+        <Element Type="Param" Id="2E861060">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="0D396B81">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="90BFA4F8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F8F9891E"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="80723687"/>
+        </Element>
+        <Element Type="Param" Id="90BFA4F8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="CFC54A7E"/>
+        </Element>
+        <Element Type="Param" Id="F8F9891E">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
             <Value>AP_MothershipTaldarimIntegratedPower</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
-        <Element Type="Param" Id="D5D64DCD">
+        <Element Type="Param" Id="80723687">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="6A5D0761">
+            <Identifier>AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="3371DC3F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="73442E6F"/>
+        </Element>
+        <Element Type="ParamDef" Id="3371DC3F">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="BD42D6F4"/>
+        </Element>
+        <Element Type="Param" Id="BD42D6F4">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="73442E6F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="123FACE5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="699AC178"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="11A1BBD8"/>
+        </Element>
+        <Element Type="Param" Id="123FACE5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="3371DC3F"/>
+        </Element>
+        <Element Type="Param" Id="699AC178">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallSummonDeathFleet</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="11A1BBD8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="953BD393">
+            <Identifier>AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="F49FB0D5"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E2D2C9DF"/>
+        </Element>
+        <Element Type="ParamDef" Id="F49FB0D5">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="932FA514"/>
+        </Element>
+        <Element Type="Param" Id="932FA514">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="E2D2C9DF">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4D35C95B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="14962475"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="600DCEC4"/>
+        </Element>
+        <Element Type="Param" Id="4D35C95B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="F49FB0D5"/>
+        </Element>
+        <Element Type="Param" Id="14962475">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallTaldarimMothershipGroundSlow</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="600DCEC4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="DD366A30">
+            <Identifier>AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="30B16850"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B8E35CB5"/>
+        </Element>
+        <Element Type="ParamDef" Id="30B16850">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="EEFD9426"/>
+        </Element>
+        <Element Type="Param" Id="EEFD9426">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B8E35CB5">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E691DEE5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C7B7A72D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="430371E6"/>
+        </Element>
+        <Element Type="Param" Id="E691DEE5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="30B16850"/>
+        </Element>
+        <Element Type="Param" Id="C7B7A72D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallTaldarimMothershipDeathHeal</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="430371E6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="BF425834">
+            <Identifier>AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8CD7E62C"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="535704C2"/>
+        </Element>
+        <Element Type="ParamDef" Id="8CD7E62C">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="5FB3E2F4"/>
+        </Element>
+        <Element Type="Param" Id="5FB3E2F4">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="535704C2">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BC9D1BB7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8352873E"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1CD2B3E1"/>
+        </Element>
+        <Element Type="Param" Id="BC9D1BB7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8CD7E62C"/>
+        </Element>
+        <Element Type="Param" Id="8352873E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallTaldarimMothershipFastAttack</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="1CD2B3E1">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="DBD1D8C5">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9E9CC041"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4EAA5FB6"/>
+        </Element>
+        <Element Type="ParamDef" Id="9E9CC041">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="B81CDADB"/>
+        </Element>
+        <Element Type="Param" Id="B81CDADB">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="4EAA5FB6">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0BAE3AEA"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="20B839F9"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BC851888"/>
+        </Element>
+        <Element Type="Param" Id="0BAE3AEA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9E9CC041"/>
+        </Element>
+        <Element Type="Param" Id="20B839F9">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MothershipPurifierPowerSource</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="BC851888">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="AB826C4A">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="D094340E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F7C7A946"/>
+        </Element>
+        <Element Type="ParamDef" Id="D094340E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="1673D4B6"/>
+        </Element>
+        <Element Type="Param" Id="1673D4B6">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="F7C7A946">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="76D2EFA4"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="89CE8DD7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4E404036"/>
+        </Element>
+        <Element Type="Param" Id="76D2EFA4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="D094340E"/>
+        </Element>
+        <Element Type="Param" Id="89CE8DD7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallPlanetCracker</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="4E404036">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="1D8C3BE1">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="EFCF0F82"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FCDAC074"/>
+        </Element>
+        <Element Type="ParamDef" Id="EFCF0F82">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="58BBF9ED"/>
+        </Element>
+        <Element Type="Param" Id="58BBF9ED">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="FCDAC074">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A9D05BC8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5C0AB842"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C4085433"/>
+        </Element>
+        <Element Type="Param" Id="A9D05BC8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="EFCF0F82"/>
+        </Element>
+        <Element Type="Param" Id="5C0AB842">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallPurifierMothershipDebuff</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="C4085433">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="55029861">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7CFA0973"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3D20DFB1"/>
+        </Element>
+        <Element Type="ParamDef" Id="7CFA0973">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="0537DE87"/>
+        </Element>
+        <Element Type="Param" Id="0537DE87">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="3D20DFB1">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6A2F9905"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B811A515"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="878346CE"/>
+        </Element>
+        <Element Type="Param" Id="6A2F9905">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="7CFA0973"/>
+        </Element>
+        <Element Type="Param" Id="B811A515">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallPurifierMothershipShielding</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="878346CE">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="B5B81ABA">
+            <Identifier>AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="47599C24"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="083237B0"/>
+        </Element>
+        <Element Type="ParamDef" Id="47599C24">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="66F330B3"/>
+        </Element>
+        <Element Type="Param" Id="66F330B3">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="083237B0">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="09661247"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B5F20F79"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4E5BB60E"/>
+        </Element>
+        <Element Type="Param" Id="09661247">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="47599C24"/>
+        </Element>
+        <Element Type="Param" Id="B5F20F79">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallPurifierMothershipAttackSpeedBoost</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="4E5BB60E">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="1CE17D6C">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothershipValorousResolve</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ABC81A6C"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="336BD5EF"/>
+        </Element>
+        <Element Type="ParamDef" Id="ABC81A6C">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="88EF6320"/>
+        </Element>
+        <Element Type="Param" Id="88EF6320">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="336BD5EF">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9F93063A"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="279E8278"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5CF1FBA3"/>
+        </Element>
+        <Element Type="Param" Id="9F93063A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="ABC81A6C"/>
+        </Element>
+        <Element Type="Param" Id="279E8278">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MothershipAiurShieldArmorAura</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="5CF1FBA3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="BC07C218">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="757C1168"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D7648F45"/>
+        </Element>
+        <Element Type="ParamDef" Id="757C1168">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="9FE76CEE"/>
+        </Element>
+        <Element Type="Param" Id="9FE76CEE">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D7648F45">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D950721D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="AA003D1D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8E196B1B"/>
+        </Element>
+        <Element Type="Param" Id="D950721D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="757C1168"/>
+        </Element>
+        <Element Type="Param" Id="AA003D1D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallAstralRestoration</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="8E196B1B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="D6C62ACE">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="33436747"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="78370B08"/>
+        </Element>
+        <Element Type="ParamDef" Id="33436747">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="175B8039"/>
+        </Element>
+        <Element Type="Param" Id="175B8039">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="78370B08">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6D76BD3F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="8697B0F6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="24760D9D"/>
+        </Element>
+        <Element Type="Param" Id="6D76BD3F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="33436747"/>
+        </Element>
+        <Element Type="Param" Id="8697B0F6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallAiurMothershipFeedback</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="24760D9D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="2F7E6A79">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A535A62F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5F0DCC93"/>
+        </Element>
+        <Element Type="ParamDef" Id="A535A62F">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="A8C9AE72"/>
+        </Element>
+        <Element Type="Param" Id="A8C9AE72">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="5F0DCC93">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6B6A176D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FDD23B02"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7B806574"/>
+        </Element>
+        <Element Type="Param" Id="6B6A176D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="A535A62F"/>
+        </Element>
+        <Element Type="Param" Id="FDD23B02">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallAiurMothershipShieldRestore</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="7B806574">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="B65A13A9">
+            <Identifier>AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C98EFF09"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3F680AFF"/>
+        </Element>
+        <Element Type="ParamDef" Id="C98EFF09">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="CD18FABF"/>
+        </Element>
+        <Element Type="Param" Id="CD18FABF">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="3F680AFF">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="629EBDD7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="254716A8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7CEACA71"/>
+        </Element>
+        <Element Type="Param" Id="629EBDD7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="C98EFF09"/>
+        </Element>
+        <Element Type="Param" Id="254716A8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CanInstallAiurMothershipEnergyRegenAura</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="7CEACA71">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
             <Value>1</Value>
             <ValueType Type="int"/>
@@ -83297,6 +84317,11 @@
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6417FE61"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6690B8A9"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3A0FFF23"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8170D855"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9F5F309D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0714DBBE"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="41DAFDB8"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="DDC8FB1A"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E16473AC"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="AB8F600A"/>
             <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="EFDACB3E"/>
@@ -84317,6 +85342,106 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Unit"/>
         </Element>
+        <Element Type="FunctionCall" Id="8170D855">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D5B83AA7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5080CAAE"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="187159C2"/>
+        </Element>
+        <Element Type="Param" Id="D5B83AA7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
+        </Element>
+        <Element Type="Param" Id="5080CAAE">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
+        <Element Type="Param" Id="187159C2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipAiur</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="9F5F309D">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="75B46B21"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FD13AC2B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FB6B4E4B"/>
+        </Element>
+        <Element Type="Param" Id="75B46B21">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
+        </Element>
+        <Element Type="Param" Id="FD13AC2B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
+        <Element Type="Param" Id="FB6B4E4B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipCoreAiur</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="0714DBBE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="98B7BCA2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C5D1FB17"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="643A670B"/>
+        </Element>
+        <Element Type="Param" Id="98B7BCA2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
+        </Element>
+        <Element Type="Param" Id="C5D1FB17">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
+        <Element Type="Param" Id="643A670B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipCorePurifier</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="41DAFDB8">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D882F82D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="33562B19"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="58B32216"/>
+        </Element>
+        <Element Type="Param" Id="D882F82D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
+        </Element>
+        <Element Type="Param" Id="33562B19">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
+        <Element Type="Param" Id="58B32216">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipPurifier</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
+        <Element Type="FunctionCall" Id="DDC8FB1A">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7B1A0CD7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="D8F7B656"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F73D4D3B"/>
+        </Element>
+        <Element Type="Param" Id="7B1A0CD7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
+        </Element>
+        <Element Type="Param" Id="D8F7B656">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
+            <Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
+        </Element>
+        <Element Type="Param" Id="F73D4D3B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
+            <Value>AP_MothershipPurifierPowerSource</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Unit"/>
+        </Element>
         <Element Type="FunctionCall" Id="E16473AC">
             <FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
             <Parameter Type="Param" Library="ABFE498B" Id="B0CC35BD"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 7c9192bce2..eb40bc92c7 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 0b7312a99f..6be1c2ea03 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -169,6 +169,8 @@ FunctionDef/Name/lib_ABFE498B_0AB04574=AP_Triggers_Terran_unlockVikingAesirTurbi
 FunctionDef/Name/lib_ABFE498B_0B070864=AP_Triggers_Zerg_unlockPrimalIgniter
 FunctionDef/Name/lib_ABFE498B_0B71373D=AP_Triggers_Protoss_unlockProbeWarpin
 FunctionDef/Name/lib_ABFE498B_0B9FD37F=AP_Triggers_Terran_unlockPredatorCharge
+FunctionDef/Name/lib_ABFE498B_0C113388=AP_Triggers_Protoss_unlockMothershipWormholeModules
+FunctionDef/Name/lib_ABFE498B_0C365F7D=AP_Triggers_Protoss_unlockMothershipHangarInstallations
 FunctionDef/Name/lib_ABFE498B_0CC89C9C=AP_Triggers_Terran_unlockWidowMineDemolitionArmaments
 FunctionDef/Name/lib_ABFE498B_0D072F28=AP_Triggers_Zerg_GuardianExplosiveSpores
 FunctionDef/Name/lib_ABFE498B_0D47683E=AP_Triggers_Zerg_MutaliskSeveringGlave
@@ -219,7 +221,9 @@ FunctionDef/Name/lib_ABFE498B_1BAA9376=AP_Triggers_Zerg_AdvancedTargetingOptics
 FunctionDef/Name/lib_ABFE498B_1C1CE788=AP_Triggers_Zerg_SwarmHostOrganicCarapace
 FunctionDef/Name/lib_ABFE498B_1C63B5BD=AP_Triggers_Zerg_GuardianPropellantSacs
 FunctionDef/Name/lib_ABFE498B_1C7597C1=AP_Triggers_Terran_unlockDominionTrooperCPO7SalamanderFlamethrower
+FunctionDef/Name/lib_ABFE498B_1CE17D6C=AP_Triggers_Protoss_unlockAiurMothershipValorousResolve
 FunctionDef/Name/lib_ABFE498B_1D64B648=AP_Triggers_Protoss_unlockPulsarChronoShear
+FunctionDef/Name/lib_ABFE498B_1D8C3BE1=AP_Triggers_Protoss_unlockPurifierMothershipPurifiedEmbers
 FunctionDef/Name/lib_ABFE498B_1DF62118=AP_Triggers_Protoss_unlockSupplicantSacrifice
 FunctionDef/Name/lib_ABFE498B_1ED0A5FF=AP_Triggers_Protoss_unlockDestroyer
 FunctionDef/Name/lib_ABFE498B_1F0E4304=AP_Triggers_Terran_unlockEmperorsShadowSovereignTacticalMissiles
@@ -278,6 +282,7 @@ FunctionDef/Name/lib_ABFE498B_2DCA5300=AP_Triggers_Terran_unlockMarauderMagRailM
 FunctionDef/Name/lib_ABFE498B_2EB53A38=AP_Triggers_Zerg_SwarmHostCarrion
 FunctionDef/Name/lib_ABFE498B_2EED33D4=AP_Triggers_Zerg_AberrationConstructRegeneration
 FunctionDef/Name/lib_ABFE498B_2F0A0E5C=AP_Triggers_Terran_unlockReaperJetPackOverdrive
+FunctionDef/Name/lib_ABFE498B_2F7E6A79=AP_Triggers_Protoss_unlockAiurMothershipKhalaiShieldRechargers
 FunctionDef/Name/lib_ABFE498B_2FDFD4B9=AP_Triggers_Protoss_unlockOracleStasisCalibration
 FunctionDef/Name/lib_ABFE498B_2FF6495C=AP_Triggers_Zerg_ZerglingReconstitution
 FunctionDef/Name/lib_ABFE498B_3021896B=AP_Triggers_unlockTerranUnits2
@@ -400,6 +405,7 @@ FunctionDef/Name/lib_ABFE498B_53DD343F=AP_Triggers_Terran_unlockWarhound
 FunctionDef/Name/lib_ABFE498B_54410EA7=AP_Triggers_Terran_unlockSiegeTankAdvancedSiegeTech
 FunctionDef/Name/lib_ABFE498B_545082E3=AP_Triggers_Protoss_unlockStalkerPhaseReactor
 FunctionDef/Name/lib_ABFE498B_54B26CCA=AP_Triggers_Zerg_BanelingHunter
+FunctionDef/Name/lib_ABFE498B_55029861=AP_Triggers_Protoss_unlockPurifierMothershipCybrosShielding
 FunctionDef/Name/lib_ABFE498B_5575D85C=AP_Triggers_Protoss_unlockEnergizerReclamation
 FunctionDef/Name/lib_ABFE498B_55DF3B98=AP_Triggers_Zerg_InfestedSiegeTankDeepTunnel
 FunctionDef/Name/lib_ABFE498B_5641E14A=AP_Triggers_Protoss_unlockOppressor
@@ -481,6 +487,7 @@ FunctionDef/Name/lib_ABFE498B_6922BCB5=AP_Triggers_Terran_unlockSCVHostileEnviro
 FunctionDef/Name/lib_ABFE498B_6933E179=AP_Triggers_Protoss_unlockAdeptPhaseBulwark
 FunctionDef/Name/lib_ABFE498B_69559D93=AP_Triggers_Terran_unlockViking
 FunctionDef/Name/lib_ABFE498B_6A22B8B0=AP_Triggers_Protoss_unlockArchonWeaponUpgrade
+FunctionDef/Name/lib_ABFE498B_6A5D0761=AP_Triggers_Protoss_unlockTaldarimMothershipSummonDeathFleet
 FunctionDef/Name/lib_ABFE498B_6ABA9B1A=AP_Triggers_Protoss_unlockCorsair
 FunctionDef/Name/lib_ABFE498B_6AF34EBC=AP_Triggers_Terran_unlockScienceVessel
 FunctionDef/Name/lib_ABFE498B_6AFDD1B2=AP_Triggers_Protoss_unlockCaladriusSideMissiles
@@ -593,6 +600,7 @@ FunctionDef/Name/lib_ABFE498B_848D560C=AP_Triggers_Zerg_CorruptorCausticSpray
 FunctionDef/Name/lib_ABFE498B_8494B3E9=AP_Triggers_Protoss_unlockDarkArchonIndomitableWill
 FunctionDef/Name/lib_ABFE498B_84C27A7C=AP_Triggers_checkSoA
 FunctionDef/Name/lib_ABFE498B_857A2149=AP_Triggers_Terran_unlockDominionTrooperOptimizedLogistics
+FunctionDef/Name/lib_ABFE498B_859A52CC=AP_Triggers_Protoss_unlockMothershipTimeFieldModules
 FunctionDef/Name/lib_ABFE498B_85D3604E=AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel
 FunctionDef/Name/lib_ABFE498B_85E3728C=AP_Triggers_Protoss_unlockAdeptDisruptiveTransfer
 FunctionDef/Name/lib_ABFE498B_862C698C=AP_Triggers_Zerg_HydraliskResourceEfficiency
@@ -647,6 +655,7 @@ FunctionDef/Name/lib_ABFE498B_92E7D1F2=AP_Triggers_Protoss_unlockHighTemplarPlas
 FunctionDef/Name/lib_ABFE498B_932B5D76=AP_Triggers_Zerg_unlockHunterKiller
 FunctionDef/Name/lib_ABFE498B_93581A6E=AP_Triggers_Terran_unlockMedivac
 FunctionDef/Name/lib_ABFE498B_93CD4DD1=AP_Triggers_Zerg_NydusWormFamilyJormungandrStrain
+FunctionDef/Name/lib_ABFE498B_953BD393=AP_Triggers_Protoss_unlockTaldarimMothershipShadowOfDeath
 FunctionDef/Name/lib_ABFE498B_95432208=AP_Triggers_Terran_unlockCycloneTargetingOptics
 FunctionDef/Name/lib_ABFE498B_95839BE4=AP_Triggers_Terran_unlockSpectrePsionicLash
 FunctionDef/Name/lib_ABFE498B_96391C8B=AP_Triggers_Protoss_unlockCenturionResourceEfficiency
@@ -728,6 +737,7 @@ FunctionDef/Name/lib_ABFE498B_A9C6E0DA=AP_Triggers_Terran_unlockReaperCombatDrug
 FunctionDef/Name/lib_ABFE498B_AA5E406B=AP_Triggers_setTradeOptions
 FunctionDef/Name/lib_ABFE498B_AAAA4339=AP_Triggers_Zerg_GuardianPrimordialFury
 FunctionDef/Name/lib_ABFE498B_AAAC397C=AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam
+FunctionDef/Name/lib_ABFE498B_AB826C4A=AP_Triggers_Protoss_unlockPurifierMothershipPlanetCracker
 FunctionDef/Name/lib_ABFE498B_ABCCCE41=AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam
 FunctionDef/Name/lib_ABFE498B_AC4B1D2E=AP_Triggers_Terran_unlockMissileTurretResourceEfficency
 FunctionDef/Name/lib_ABFE498B_AC87C419=AP_Triggers_Terran_unlockMedivacResourceEfficiency
@@ -763,8 +773,10 @@ FunctionDef/Name/lib_ABFE498B_B4277D0C=AP_Triggers_Zerg_MutaliskSunderingGlave
 FunctionDef/Name/lib_ABFE498B_B450ECF4=AP_Triggers_Terran_unlockVanadiumPlating
 FunctionDef/Name/lib_ABFE498B_B4C430EA=AP_Triggers_Zerg_unlockInfestedSiegeTank
 FunctionDef/Name/lib_ABFE498B_B591CDBF=AP_Triggers_Terran_unlockFirebat
+FunctionDef/Name/lib_ABFE498B_B5B81ABA=AP_Triggers_Protoss_unlockPurifierMothershipAmplifiedPowerRerouter
 FunctionDef/Name/lib_ABFE498B_B5F8A5F3=AP_Triggers_Terran_unlockVikingAntiMechanicalMunition
 FunctionDef/Name/lib_ABFE498B_B656F036=AP_Triggers_Protoss_unlockHavocEnduringSight
+FunctionDef/Name/lib_ABFE498B_B65A13A9=AP_Triggers_Protoss_unlockAiurMothershipSymbolOfUnity
 FunctionDef/Name/lib_ABFE498B_B6C25A68=AP_Triggers_setKerriganOptions
 FunctionDef/Name/lib_ABFE498B_B6C4E35F=AP_Triggers_Protoss_unlockAiurZealot
 FunctionDef/Name/lib_ABFE498B_B75FC8D4=AP_Triggers_Terran_unlockGoliathOptimizedLogistics
@@ -780,6 +792,7 @@ FunctionDef/Name/lib_ABFE498B_BA0E1EC5=AP_Triggers_Zerg_NydusWormRavenousAppetit
 FunctionDef/Name/lib_ABFE498B_BA5280E4=AP_Triggers_Zerg_BanelingCentrifugalHooks
 FunctionDef/Name/lib_ABFE498B_BADDFA87=AP_Triggers_Terran_unlockMedicStabilizerMedpacks
 FunctionDef/Name/lib_ABFE498B_BC057FD5=AP_Triggers_Zerg_unlockInfestedDiamondBack
+FunctionDef/Name/lib_ABFE498B_BC07C218=AP_Triggers_Protoss_unlockAiurMothershipAstralRestoration
 FunctionDef/Name/lib_ABFE498B_BC29CCFF=AP_Triggers_Zerg_unlockSwarmHost
 FunctionDef/Name/lib_ABFE498B_BC5C802E=AP_Triggers_Zerg_SISCVChargeCount
 FunctionDef/Name/lib_ABFE498B_BCAA01BD=AP_Triggers_Terran_unlockNovaGadgetHoloDecoy
@@ -794,6 +807,7 @@ FunctionDef/Name/lib_ABFE498B_BE599270=AP_Triggers_Zerg_unlockTorrasque
 FunctionDef/Name/lib_ABFE498B_BEA57859=AP_Triggers_setGenericUpgradeOptions
 FunctionDef/Name/lib_ABFE498B_BEF6FFBD=AP_Triggers_unlockProtossSolariteCore
 FunctionDef/Name/lib_ABFE498B_BF3374AE=AP_Triggers_Zerg_UltraliskTissueAnimation
+FunctionDef/Name/lib_ABFE498B_BF425834=AP_Triggers_Protoss_unlockTaldarimMothershipBloodFusedParticles
 FunctionDef/Name/lib_ABFE498B_BF439A41=AP_Triggers_Zerg_OverlordImprovedOverlord
 FunctionDef/Name/lib_ABFE498B_BF54FEC3=AP_Triggers_Terran_unlockMedicOpticalFlare
 FunctionDef/Name/lib_ABFE498B_BF94715F=AP_Triggers_Zerg_BroodLordSplitterMitosis
@@ -850,6 +864,7 @@ FunctionDef/Name/lib_ABFE498B_CBD4471B=AP_Triggers_Zerg_unlockInfestedBunker
 FunctionDef/Name/lib_ABFE498B_CCA989E6=AP_Triggers_Terran_unlockDiamondbackBurstCapacitors
 FunctionDef/Name/lib_ABFE498B_CCC73615=AP_Triggers_Protoss_unlockReaver
 FunctionDef/Name/lib_ABFE498B_CCD6216D=AP_Triggers_giveTerranDefaultTech
+FunctionDef/Name/lib_ABFE498B_CD0B76F8=AP_Triggers_Protoss_unlockAiurMothership
 FunctionDef/Name/lib_ABFE498B_CD3AA52B=AP_Triggers_Protoss_unlockOrbitalAssimilators
 FunctionDef/Name/lib_ABFE498B_CD3DFA80=AP_Triggers_unlockTerranUnits
 FunctionDef/Name/lib_ABFE498B_CD53B9B0=AP_Triggers_Terran_unlockWidowMineBlackMarketLaunchers
@@ -880,8 +895,8 @@ FunctionDef/Name/lib_ABFE498B_D4C5B753=AP_Triggers_Terran_unlockMarauder
 FunctionDef/Name/lib_ABFE498B_D5BC1EC6=AP_Triggers_Zerg_BanelingRupture
 FunctionDef/Name/lib_ABFE498B_D6264068=AP_Triggers_Zerg_EchidnaWormOuroborosStrain
 FunctionDef/Name/lib_ABFE498B_D6356590=AP_Triggers_Terran_unlockSensorTowerEnhancedVision
-FunctionDef/Name/lib_ABFE498B_D661BFB5=AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower
 FunctionDef/Name/lib_ABFE498B_D6714F21=AP_Triggers_Zerg_RoachOrganicCarapace
+FunctionDef/Name/lib_ABFE498B_D6C62ACE=AP_Triggers_Protoss_unlockAiurMothershipHarmonizedFeedbackConductors
 FunctionDef/Name/lib_ABFE498B_D6DF8DC2=AP_Triggers_Zerg_NydusWormFamilyResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_D722AC62=AP_Triggers_Terran_unlockNovaWeaponMonomolecularBlade
 FunctionDef/Name/lib_ABFE498B_D785BFFE=AP_Triggers_unlockProtossProgressiveUpgrades
@@ -904,6 +919,7 @@ FunctionDef/Name/lib_ABFE498B_DA66DCED=AP_Triggers_Zerg_unlockHydralisk
 FunctionDef/Name/lib_ABFE498B_DAFAD881=AP_Triggers_Zerg_HydraliskAncillaryCarapace
 FunctionDef/Name/lib_ABFE498B_DB337F35=AP_Triggers_Zerg_InfestedLiberatorDefenderMode
 FunctionDef/Name/lib_ABFE498B_DB9CA11F=AP_Triggers_Zerg_SwarmQueenResourceEfficiency
+FunctionDef/Name/lib_ABFE498B_DBD1D8C5=AP_Triggers_Protoss_unlockPurifierMothershipMobilePowerField
 FunctionDef/Name/lib_ABFE498B_DBDF9EAF=AP_Triggers_Terran_unlockBattlecruiserProgressiveMissilePods
 FunctionDef/Name/lib_ABFE498B_DBECB8EC=AP_Triggers_Zerg_unlockInfestedMarine
 FunctionDef/Name/lib_ABFE498B_DBFA2D3B=AP_Triggers_Protoss_unlockOverwatch
@@ -914,6 +930,7 @@ FunctionDef/Name/lib_ABFE498B_DCBAF056=AP_Triggers_Zerg_unlockDevourer
 FunctionDef/Name/lib_ABFE498B_DCD45537=AP_Triggers_Zerg_unlockInfestedSCV
 FunctionDef/Name/lib_ABFE498B_DD02F4F8=AP_Triggers_Terran_unlockFirebatJuggernautPlating
 FunctionDef/Name/lib_ABFE498B_DD165652=AP_Triggers_Zerg_CellDivision
+FunctionDef/Name/lib_ABFE498B_DD366A30=AP_Triggers_Protoss_unlockTaldarimMothershipSoulForgedConduits
 FunctionDef/Name/lib_ABFE498B_DD51D531=AP_Triggers_Protoss_unlockWarpPrismGraviticDrive
 FunctionDef/Name/lib_ABFE498B_DD70556E=AP_Triggers_Protoss_unlockStalwart
 FunctionDef/Name/lib_ABFE498B_DD8BC236=AP_Triggers_Zerg_DefilerComorbidity
@@ -981,6 +998,7 @@ FunctionDef/Name/lib_ABFE498B_EE6613D9=AP_Triggers_Terran_unlockSignalBeacon
 FunctionDef/Name/lib_ABFE498B_EEF40D5F=AP_Triggers_Zerg_BullfrogWildMutation
 FunctionDef/Name/lib_ABFE498B_EFBB1950=AP_Triggers_Protoss_unlockArbiterSpacetimeAnchor
 FunctionDef/Name/lib_ABFE498B_F0269CE5=AP_Triggers_Terran_unlockHellionOptimizedLogistics
+FunctionDef/Name/lib_ABFE498B_F059DA81=AP_Triggers_Protoss_unlockTaldarimMothershipIntegratedPower
 FunctionDef/Name/lib_ABFE498B_F085F181=AP_Triggers_Zerg_ProgressiveFungalSnare
 FunctionDef/Name/lib_ABFE498B_F0AE94EE=AP_Triggers_Terran_unlockHiveMindEmulatorZerg
 FunctionDef/Name/lib_ABFE498B_F0CA1C82=AP_Triggers_Protoss_unlockTriremeSolarBeam
@@ -1010,6 +1028,7 @@ FunctionDef/Name/lib_ABFE498B_F8A76E33=AP_Triggers_Protoss_unlockMirageGravitonB
 FunctionDef/Name/lib_ABFE498B_F8FBCC9F=AP_Triggers_Protoss_unlockAirWeapons
 FunctionDef/Name/lib_ABFE498B_F8FD91EE=AP_Triggers_Zerg_unlockInfestedMedic
 FunctionDef/Name/lib_ABFE498B_F9130E50=AP_Triggers_Protoss_unlockCarrierGravitonCatapult
+FunctionDef/Name/lib_ABFE498B_F937DD86=AP_Triggers_Protoss_unlockPurifierMothership
 FunctionDef/Name/lib_ABFE498B_F996C036=AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction
 FunctionDef/Name/lib_ABFE498B_F9AC760F=AP_Triggers_Zerg_VespeneEfficiency
 FunctionDef/Name/lib_ABFE498B_FA0C159C=AP_Triggers_Zerg_MalignantCreep
@@ -1082,6 +1101,7 @@ ParamDef/Name/lib_ABFE498B_0BEEBA94=player
 ParamDef/Name/lib_ABFE498B_0C4763DB=player
 ParamDef/Name/lib_ABFE498B_0D5788FA=player
 ParamDef/Name/lib_ABFE498B_0DD1BD0F=player
+ParamDef/Name/lib_ABFE498B_0E177ED0=player
 ParamDef/Name/lib_ABFE498B_0E2814E3=player
 ParamDef/Name/lib_ABFE498B_0F261626=player
 ParamDef/Name/lib_ABFE498B_0F39508B=player
@@ -1219,8 +1239,10 @@ ParamDef/Name/lib_ABFE498B_30046E4A=player
 ParamDef/Name/lib_ABFE498B_302E8782=level
 ParamDef/Name/lib_ABFE498B_30320A8F=player
 ParamDef/Name/lib_ABFE498B_3037D521=player
+ParamDef/Name/lib_ABFE498B_30B16850=player
 ParamDef/Name/lib_ABFE498B_31026A71=player
 ParamDef/Name/lib_ABFE498B_31224874=player
+ParamDef/Name/lib_ABFE498B_31358CA7=player
 ParamDef/Name/lib_ABFE498B_31EF723F=player
 ParamDef/Name/lib_ABFE498B_31F2DBF5=player
 ParamDef/Name/lib_ABFE498B_320DF3F8=player
@@ -1233,7 +1255,9 @@ ParamDef/Name/lib_ABFE498B_32F75C46=player
 ParamDef/Name/lib_ABFE498B_32FF58AD=player
 ParamDef/Name/lib_ABFE498B_33082353=player
 ParamDef/Name/lib_ABFE498B_330B3852=player
+ParamDef/Name/lib_ABFE498B_33436747=player
 ParamDef/Name/lib_ABFE498B_335FD38A=player
+ParamDef/Name/lib_ABFE498B_3371DC3F=player
 ParamDef/Name/lib_ABFE498B_3378E8D8=level
 ParamDef/Name/lib_ABFE498B_33D1D523=player
 ParamDef/Name/lib_ABFE498B_33D91F34=player
@@ -1321,6 +1345,7 @@ ParamDef/Name/lib_ABFE498B_46ACE917=player
 ParamDef/Name/lib_ABFE498B_46C1897F=player
 ParamDef/Name/lib_ABFE498B_46D39834=player
 ParamDef/Name/lib_ABFE498B_46E012CE=player
+ParamDef/Name/lib_ABFE498B_47599C24=player
 ParamDef/Name/lib_ABFE498B_475B6A0C=player
 ParamDef/Name/lib_ABFE498B_4787C36F=player
 ParamDef/Name/lib_ABFE498B_47C47FAC=player
@@ -1358,6 +1383,7 @@ ParamDef/Name/lib_ABFE498B_4F190EE7=player
 ParamDef/Name/lib_ABFE498B_4FD8D736=player
 ParamDef/Name/lib_ABFE498B_4FFD5263=player
 ParamDef/Name/lib_ABFE498B_5045A002=player
+ParamDef/Name/lib_ABFE498B_506A5A4B=player
 ParamDef/Name/lib_ABFE498B_50A7D56F=player
 ParamDef/Name/lib_ABFE498B_512F1974=bitArrayValue
 ParamDef/Name/lib_ABFE498B_513A3946=player
@@ -1450,7 +1476,6 @@ ParamDef/Name/lib_ABFE498B_65188698=player
 ParamDef/Name/lib_ABFE498B_6551A323=player
 ParamDef/Name/lib_ABFE498B_655BE29F=player
 ParamDef/Name/lib_ABFE498B_6650A065=bitArrayValue
-ParamDef/Name/lib_ABFE498B_66B29439=player
 ParamDef/Name/lib_ABFE498B_67549B31=player
 ParamDef/Name/lib_ABFE498B_67BDBEBF=player
 ParamDef/Name/lib_ABFE498B_67C0ED2A=player
@@ -1513,6 +1538,7 @@ ParamDef/Name/lib_ABFE498B_74D1700B=player
 ParamDef/Name/lib_ABFE498B_74E19969=player
 ParamDef/Name/lib_ABFE498B_750A1E67=protossValue
 ParamDef/Name/lib_ABFE498B_75570CCE=player
+ParamDef/Name/lib_ABFE498B_757C1168=player
 ParamDef/Name/lib_ABFE498B_75A3E02D=player
 ParamDef/Name/lib_ABFE498B_75A6D1EC=player
 ParamDef/Name/lib_ABFE498B_75C2562B=player
@@ -1545,6 +1571,7 @@ ParamDef/Name/lib_ABFE498B_7C6A2BF2=player
 ParamDef/Name/lib_ABFE498B_7C94192B=player
 ParamDef/Name/lib_ABFE498B_7CB892BB=player
 ParamDef/Name/lib_ABFE498B_7CD80A64=player
+ParamDef/Name/lib_ABFE498B_7CFA0973=player
 ParamDef/Name/lib_ABFE498B_7D087641=player
 ParamDef/Name/lib_ABFE498B_7D48AA8A=player
 ParamDef/Name/lib_ABFE498B_7DC33D2C=player
@@ -1606,6 +1633,7 @@ ParamDef/Name/lib_ABFE498B_8BA94016=player
 ParamDef/Name/lib_ABFE498B_8BCD87DD=player
 ParamDef/Name/lib_ABFE498B_8C410A98=player
 ParamDef/Name/lib_ABFE498B_8CC2F9BF=player
+ParamDef/Name/lib_ABFE498B_8CD7E62C=player
 ParamDef/Name/lib_ABFE498B_8CDFA65D=player
 ParamDef/Name/lib_ABFE498B_8D327E85=newUpgrade
 ParamDef/Name/lib_ABFE498B_8DDC17F6=player
@@ -1666,6 +1694,7 @@ ParamDef/Name/lib_ABFE498B_9CCD3E05=player
 ParamDef/Name/lib_ABFE498B_9D72F60F=player
 ParamDef/Name/lib_ABFE498B_9DCAB020=player
 ParamDef/Name/lib_ABFE498B_9E166274=player
+ParamDef/Name/lib_ABFE498B_9E9CC041=player
 ParamDef/Name/lib_ABFE498B_9EC8A002=player
 ParamDef/Name/lib_ABFE498B_9EDBA69E=player
 ParamDef/Name/lib_ABFE498B_9F9F31CB=level
@@ -1688,6 +1717,7 @@ ParamDef/Name/lib_ABFE498B_A3998F43=player
 ParamDef/Name/lib_ABFE498B_A3FE033F=player
 ParamDef/Name/lib_ABFE498B_A4159DD0=player
 ParamDef/Name/lib_ABFE498B_A51B9485=player
+ParamDef/Name/lib_ABFE498B_A535A62F=player
 ParamDef/Name/lib_ABFE498B_A582E154=player
 ParamDef/Name/lib_ABFE498B_A63C9FFD=player
 ParamDef/Name/lib_ABFE498B_A6D0AA33=player
@@ -1703,6 +1733,7 @@ ParamDef/Name/lib_ABFE498B_A9DFE500=player
 ParamDef/Name/lib_ABFE498B_AAF140EA=player
 ParamDef/Name/lib_ABFE498B_AB7F060F=player
 ParamDef/Name/lib_ABFE498B_AB8CF831=player
+ParamDef/Name/lib_ABFE498B_ABC81A6C=player
 ParamDef/Name/lib_ABFE498B_ABDB6B3F=player
 ParamDef/Name/lib_ABFE498B_ABF9F03A=player
 ParamDef/Name/lib_ABFE498B_AC177CA2=player
@@ -1710,6 +1741,7 @@ ParamDef/Name/lib_ABFE498B_AC3A827F=player
 ParamDef/Name/lib_ABFE498B_AC58AA9E=player
 ParamDef/Name/lib_ABFE498B_AC6D5C98=player
 ParamDef/Name/lib_ABFE498B_AC938D14=player
+ParamDef/Name/lib_ABFE498B_ACA55283=player
 ParamDef/Name/lib_ABFE498B_ACA56802=player
 ParamDef/Name/lib_ABFE498B_AE345364=player
 ParamDef/Name/lib_ABFE498B_AE6ACE0F=player
@@ -1816,6 +1848,7 @@ ParamDef/Name/lib_ABFE498B_C900B0F6=player
 ParamDef/Name/lib_ABFE498B_C90A9AAB=player
 ParamDef/Name/lib_ABFE498B_C9354091=player
 ParamDef/Name/lib_ABFE498B_C9699C93=player
+ParamDef/Name/lib_ABFE498B_C98EFF09=player
 ParamDef/Name/lib_ABFE498B_C9E57784=player
 ParamDef/Name/lib_ABFE498B_CA59940A=player
 ParamDef/Name/lib_ABFE498B_CA672396=player
@@ -1834,10 +1867,12 @@ ParamDef/Name/lib_ABFE498B_CF0C4236=player
 ParamDef/Name/lib_ABFE498B_CF29B4F5=player
 ParamDef/Name/lib_ABFE498B_CF4071F4=player
 ParamDef/Name/lib_ABFE498B_CF5BACB9=player
+ParamDef/Name/lib_ABFE498B_CFC54A7E=player
 ParamDef/Name/lib_ABFE498B_D007DC2F=player
 ParamDef/Name/lib_ABFE498B_D024D572=player
 ParamDef/Name/lib_ABFE498B_D05F0401=player
 ParamDef/Name/lib_ABFE498B_D074093B=player
+ParamDef/Name/lib_ABFE498B_D094340E=player
 ParamDef/Name/lib_ABFE498B_D0CF385B=player
 ParamDef/Name/lib_ABFE498B_D0D0FBC4=player
 ParamDef/Name/lib_ABFE498B_D14F29A5=player
@@ -1888,6 +1923,7 @@ ParamDef/Name/lib_ABFE498B_D950DC8E=player
 ParamDef/Name/lib_ABFE498B_D96F59A8=player
 ParamDef/Name/lib_ABFE498B_D9D7CFB5=player
 ParamDef/Name/lib_ABFE498B_D9F52E88=player
+ParamDef/Name/lib_ABFE498B_DA0279E0=player
 ParamDef/Name/lib_ABFE498B_DA02CC06=player
 ParamDef/Name/lib_ABFE498B_DA2F7B4C=player
 ParamDef/Name/lib_ABFE498B_DA58C200=player
@@ -1972,6 +2008,7 @@ ParamDef/Name/lib_ABFE498B_EFC96772=bitArrayValue
 ParamDef/Name/lib_ABFE498B_EFCAB576=player
 ParamDef/Name/lib_ABFE498B_EFCB5ECE=player
 ParamDef/Name/lib_ABFE498B_EFCCD71C=player
+ParamDef/Name/lib_ABFE498B_EFCF0F82=player
 ParamDef/Name/lib_ABFE498B_F022FA9B=player
 ParamDef/Name/lib_ABFE498B_F04899D6=player
 ParamDef/Name/lib_ABFE498B_F090A110=player
@@ -1991,6 +2028,7 @@ ParamDef/Name/lib_ABFE498B_F398D83C=player
 ParamDef/Name/lib_ABFE498B_F3A3135A=player
 ParamDef/Name/lib_ABFE498B_F3C04C11=player
 ParamDef/Name/lib_ABFE498B_F463F629=player
+ParamDef/Name/lib_ABFE498B_F49FB0D5=player
 ParamDef/Name/lib_ABFE498B_F4A955B5=player
 ParamDef/Name/lib_ABFE498B_F4EFD9BB=player
 ParamDef/Name/lib_ABFE498B_F4F259E1=player
@@ -2077,6 +2115,7 @@ Variable/Name/lib_ABFE498B_151AC5A2=AP_Triggers_onDifficultyNormal
 Variable/Name/lib_ABFE498B_18123A83=medivac
 Variable/Name/lib_ABFE498B_190E37B1=AP_Triggers_Terran_hasMedic
 Variable/Name/lib_ABFE498B_1C2C06EC=AP_Triggers_Protoss_has_Wrathwalker
+Variable/Name/lib_ABFE498B_205B865C=AP_Triggers_Protoss_has_PurifierMothership
 Variable/Name/lib_ABFE498B_224863BA=kerriganOptions
 Variable/Name/lib_ABFE498B_232483FD=buildingValue
 Variable/Name/lib_ABFE498B_2652A7C0=AP_Triggers_Option_KerriganPrimalStatusByMap
@@ -2147,6 +2186,7 @@ Variable/Name/lib_ABFE498B_5613E176=armory7Value
 Variable/Name/lib_ABFE498B_56AD3F20=AP_Triggers_Protoss_has_WarpPrism
 Variable/Name/lib_ABFE498B_56CB28C1=AP_Triggers_Terran_hasMarauder
 Variable/Name/lib_ABFE498B_576AC7D9=GasRegion
+Variable/Name/lib_ABFE498B_57B8E956=AP_Triggers_Protoss_has_AiurMothership
 Variable/Name/lib_ABFE498B_5C408E14=currentPlayer
 Variable/Name/lib_ABFE498B_5CE022DC=AP_Triggers_Protoss_has_Centurion
 Variable/Name/lib_ABFE498B_5E9E2DA9=researchSpeedValue