diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWorm.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWorm.m3
deleted file mode 100644
index 393e1cdb0..000000000
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWorm.m3 and /dev/null differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeath.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeath.m3
deleted file mode 100644
index 77b8f48d8..000000000
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeath.m3 and /dev/null differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathAcid.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathAcid.m3
deleted file mode 100644
index 78d75b483..000000000
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathAcid.m3 and /dev/null differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathFire.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathFire.m3
deleted file mode 100644
index 7dd1668bc..000000000
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Zerg/OmegaWorm/OmegaWormDeathFire.m3 and /dev/null differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 1347bd508..df1a7d789 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -3746,6 +3746,22 @@
             <Flags index="ToSelection" value="1"/>
         </CmdButtonArray>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_DisruptorBlink">
+        <AbilSetId value="DisruptorBlnk"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_DisruptorBlink"/>
+        <Flags index="BestUnit" value="0"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Charge TimeStart="8" TimeUse="8"/>
+            <Cooldown Link="Blink" TimeUse="8"/>
+        </Cost>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StalkerBlinkMultiple" Requirements="AP_UseRestructThrust">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_BlinkDummy">
         <!-- Dummy Ability for CActorRange -->
         <!-- See Effect AP_Blink -->
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 62cdd997e..589d647e6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -7896,6 +7896,7 @@
         <Inherits index="BaseModelScale" value="1"/>
         <Inherits index="Scale" value="1"/>
         <On Terms="Effect.AP_VoidStalkerBlinkMultiple.Stop; At Source" Send="Create"/>
+        <On Terms="Effect.AP_DisruptorBlink.Stop; At Source" Send="Create"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachOrigin"/>
     </CActorModel>
@@ -7926,6 +7927,7 @@
         <On Terms="Effect.AP_Blink.Stop; At Source" Send="Create"/>
         <On Terms="Effect.AP_VoidStalkerBlinkShieldRestore.Stop; At Source" Send="Create"/>
         <On Terms="Effect.AP_VoidStalkerBlinkMultiple.Stop; At Source" Send="Create"/>
+        <On Terms="Effect.AP_DisruptorBlink; At Source" Send="Create"/>
         <Host Subject="_Selectable"/>
         <HostSiteOps Ops="SOpAttachOrigin"/>
         <Sound value="Stalker_Blink"/>
@@ -7945,6 +7947,9 @@
     <CActorRange id="AP_NovaArmorBlinkSuitBlink_Range" parent="RangeAbil" abil="AP_NovaArmorBlinkSuitBlink">
         <Abil Link="AP_BlinkDummy"/>
     </CActorRange>
+    <CActorRange id="AP_DisruptorBlink_Range" parent="RangeAbil" abil="AP_DisruptorBlink">
+        <Abil Link="AP_BlinkDummy"/>
+    </CActorRange>
     <CActorRange id="AP_DarkTemplarShadowDash_Range" parent="RangeAbil" abil="AP_DarkTemplarShadowDash">
         <Abil Link="AP_BlinkDummy"/>
     </CActorRange>
@@ -16694,15 +16699,15 @@
         <On Terms="UnitDeathCustomize; ValidateUnit IsHallucination" Send="DeathCustomize Hallucination"/>
         <On Terms="Behavior.AP_PurificationNovaCooldownVisual.On" Send="AnimBracketStop Work"/>
         <On Terms="Behavior.AP_PurificationNovaCooldownVisual.Off" Send="AnimBracketStart Work Stand,Work,Start Stand,Work Stand,Work,End"/>
-        <On Terms="Behavior.AP_PurificationNova.On" Send="ModelSwap PurificationNovaModelSwap"/>
+        <On Terms="Behavior.AP_PurificationNova.On" Send="ModelSwap AP_PurificationNovaModelSwap"/>
         <On Terms="Behavior.AP_PurificationNova.Off" Send="ModelSwap Disruptor"/>
-        <On Terms="Behavior.AP_PurificationNova.On" Send="Create PurificationNovaBirth"/>
+        <On Terms="Behavior.AP_PurificationNova.On" Send="Create AP_PurificationNovaBirth"/>
         <On Terms="AbilCooldown.AP_PurificationNovaTargeted.Spend" Send="AnimBracketStart Cover Cover,Start Cover Cover,End"/>
         <On Terms="AbilCooldown.AP_PurificationNovaTargeted.Regen" Send="AnimBracketStop Cover"/>
-        <Model value="Disruptor"/>
+        <Model value="Disruptor_Purifier_Collection"/>
         <ModelFlags index="OutlineEmitter" value="1"/>
         <BuildModel value="ProtossUnitBirth"/>
-        <DeathArray index="Normal" ModelLink="DisruptorDeath" SoundLink="AP_Disruptor_Death"/>
+        <DeathArray index="Normal" ModelLink="Disruptor_Purifier_Collection_Death" SoundLink="AP_Disruptor_Death"/>
         <DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
         <DeathCustoms ActorModel="DisruptorDeathRagdoll" ModelLink="DisruptorDeathRagdoll" Name="RagdollBasic">
             <BodySquibs Name="BloodReduced"/>
@@ -16724,13 +16729,13 @@
         <DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
         <DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
         <DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
-        <DeathCustoms ActorModel="SpineCrawlerHurlDeathRagdollWithTeamColor" ModelLink="DisruptorDeathRagdoll" Name="RagdollSpineCrawlerHurl">
+        <DeathCustoms ActorModel="SpineCrawlerHurlDeathRagdollWithTeamColor" ModelLink="Disruptor_Purifier_DeathRagdoll" Name="RagdollSpineCrawlerHurl">
             <BodySquibs Name="None"/>
         </DeathCustoms>
-        <DeathActorModel value="DisruptorDeath"/>
-        <PlacementModel value="Disruptor"/>
+        <DeathActorModel value="AP_DisruptorDeath"/>
+        <PlacementModel value="Disruptor_Purifier_Collection"/>
         <PlacementSound value="Protoss_BuildingPlacementSmall"/>
-        <PortraitModel value="AP_DisruptorPortrait"/>
+        <PortraitModel value="Disruptor_Purifier_Portrait"/>
         <TerrainSquibs>
             <MovementDistance value="0.150000,0.150000"/>
             <IdlePeriod value="0.100000,0.250000"/>
@@ -16743,14 +16748,15 @@
         <BarOffset value="90"/>
         <BarWidth value="65"/>
         <GroupIcon>
-            <Image value="Assets\Textures\Wireframe-protoss-disruptor.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-taldarim-disruptor.dds"/>
         </GroupIcon>
         <GroupSoundArray index="What" value="Zealot_GroupWhat"/>
         <GroupSoundArray index="Yes" value="Zealot_GroupYes"/>
         <GroupSoundArray index="Attack" value="Zealot_GroupAttack"/>
         <GroupSoundArray index="Movement" value="AP_Disruptor_Movement"/>
         <GroupSoundArray index="Board" value="Zealot_GroupBoard"/>
-        <HeroIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
+        <HeroIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
+        <HighlightTooltip value="Unit/Name/AP_PurifierDisruptor"/>
         <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-groundarmorlevel0.dds"/>
         <SoundArray index="Ready" value="AP_Pusher_Ready"/>
         <SoundArray index="Help" value="AP_Pusher_Help"/>
@@ -16763,16 +16769,22 @@
         <SoundArray index="Click" value="Observer_Click"/>
         <SoundArray index="ClickError" value="Observer_ClickError"/>
         <SoundArray index="Highlight" value="Observer_Highlight"/>
-        <UnitIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
+        <UnitIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
         <Wireframe>
-            <Image value="Assets\Textures\Wireframe-protoss-disruptor.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-taldarim-disruptor.dds"/>
         </Wireframe>
         <WireframeShield>
-            <Image value="Assets\Textures\Wireframe-protoss-disruptor-shield01.dds"/>
-            <Image value="Assets\Textures\Wireframe-protoss-disruptor-shield02.dds"/>
-            <Image value="Assets\Textures\Wireframe-protoss-disruptor-shield03.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield01.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield02.dds"/>
+            <Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield03.dds"/>
         </WireframeShield>
     </CActorUnit>
+    <CActorModel id="AP_PurificationNovaBirth" parent="ModelAnimationStyleOneShot">
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachOrigin"/>
+        <Inherits index="Visibility" value="1"/>
+        <Model value="PurificationNovaBirth"/>
+    </CActorModel>
     <CActorSound id="AP_Disruptor_Land" parent="SoundOneShot"/>
     <CActorAction id="AP_DisruptorAttack" parent="GenericAttack" effectAttack="AP_DisruptorWeaponDamage">
         <LaunchSiteOps Ops="SOpAttachCenter"/>
@@ -16790,6 +16802,14 @@
         <HostImpact Subject="_Unit" Scope="Target"/>
         <HostImpactSiteOps Ops="SOpAttachCenter"/>
     </CActorBeamSimple>
+    <CActorModel id="AP_PerfectedPowerNova" parent="ModelAnimationStyleOneShot">
+        <FogVisibility value="Hidden"/>
+        <On Terms="Effect.AP_PurificationNovaSearch.Start; At Caster; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
+        <On Terms="Effect.AP_PurificationNovaTargettedSearch.Start; At Target; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
+        <On Terms="UnitDeath.AP_DisruptorPhased; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
+        <Host Subject="_Unit"/>
+        <HostSiteOps Ops="SOpAttachCenter" HoldPosition="1" HoldRotation="1"/>
+    </CActorModel>
     <CActorModel id="AP_DisruptorDeath">
         <Aliases value="_Main"/>
         <Aliases value="_Unit"/>
@@ -16817,7 +16837,7 @@
         <On Terms="AnimDone; AnimName Death" Send="Destroy"/>
         <Host Subject="::Creator"/>
         <HostSiteOps Ops="SOpDeathMotionGround"/>
-        <Model value="UnitDeathModel"/>
+        <Model value="Disruptor_Purifier_Collection_Death"/>
         <ModelFlags index="SuppressMissingAttachErrors" value="1"/>
         <ModelFlags index="UpdateVisibility" value="0"/>
         <ModelFlags index="UseSyncSeed" value="1"/>
@@ -16866,7 +16886,7 @@
         <On Terms="AnimDone; AnimName Death" Send="Destroy"/>
         <Host Subject="::Creator"/>
         <HostSiteOps Ops="SOpDeathMotionGround"/>
-        <Model value="UnitDeathModelNoTeamColor"/>
+        <Model value="Disruptor_Purifier_Collection_DeathRagdoll"/>
         <ModelFlags index="UpdateVisibility" value="0"/>
         <ModelFlags index="UseSyncSeed" value="1"/>
         <EventDataSound Name="NydusCanalThud" Actor="UnitSound" Sound="NydusWorm_DeathThud"/>
@@ -16905,7 +16925,7 @@
         <Macros value="ChargingAnim"/>
         <Macros value="TerrainSquibAnimations"/>
         <Macros value="PhysicsDeathsSwarmGround"/>
-        <Model value="PurificationNovaModelSwap"/>
+        <Model value="AP_PurificationNovaModelSwap"/>
         <DeathArray index="Normal" SoundLink="Disruptor_Death"/>
         <DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
         <DeathActorModel value="UnitDeathModelWithDeathMotionGround"/>
@@ -22801,9 +22821,10 @@
         <FogVisibility value="Hidden"/>
         <On Terms="Effect.AP_PurificationNovaSearch.Start; At Caster" Send="Create"/>
         <On Terms="Effect.AP_PurificationNovaTargettedSearch.Start; At Target" Send="Create"/>
+        <On Terms="UnitDeath.AP_DisruptorPhased" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachCenter" HoldPosition="1" HoldRotation="1"/>
-        <Model value="PurificationNova"/>
+        <Model value="AP_PurificationNova"/>
     </CActorModel>
     <CActorForceSphere id="AP_PurificationNovaForce">
         <On Terms="Effect.AP_PurificationNovaDamage.Start; At Target" Send="Create"/>
@@ -33105,6 +33126,9 @@
         <On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="Create"/>
         <On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
         <On Terms="Behavior.AP_CorsairPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="Create"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
+        <On Terms="Behavior.AP_DisruptorPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.On" Send="Create"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.On" Send="StatusIncrement ActiveCount"/>
         <On Terms="Behavior.AP_OraclePermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 80e90ba85..b08966718 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -45,6 +45,14 @@
             <StateFlags index="Cloak" value="1"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_DisruptorPermanentCloak">
+        <InfoFlags index="Hidden" value="1"/>
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <DisableValidatorArray value="AP_HaveDisruptorPermanentCloak"/>
+        <Modification>
+            <StateFlags index="Cloak" value="1"/>
+        </Modification>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_GhostPermanentCloak">
         <InfoFlags index="Hidden" value="1"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
@@ -4084,6 +4092,15 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Duration value="3"/>
         <Modification MoveSpeedBonus="-2.2382"/>
+        <DisableValidatorArray value="AP_NoRestructedThrusters"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurificationNovaTargettedCasterUseThrust">
+        <Alignment value="Positive"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
+        <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
+        <DisableValidatorArray value="AP_UseRestructedThrusters"/>
+        <Duration value="3"/>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_PurificationNovaTargettedTarget">
         <Alignment value="Positive"/>
@@ -4101,7 +4118,7 @@
         <PeriodicEffect value="AP_PurificationNovaNotificationSearch"/>
         <FinalEffect value="Suicide"/>
         <ExpireEffect value="AP_PurificationNovaTargettedSearchSet"/>
-        <Modification MoveSpeedBonus="2">
+        <Modification>
             <StateFlags index="Invulnerable" value="1"/>
             <StateFlags index="Benign" value="1"/>
             <StateFlags index="Passive" value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 8a57a0500..9020129bd 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -7,6 +7,32 @@
     <CButton id="AP_AcidExplosionImmunity">
         <Icon value="Assets\Textures\btn-upgrade-terran-acidexplosionimmunity.dds"/>
     </CButton>
+    <CButton id="AP_PermanentlyCloakedDisruptor">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_RestructuredThrusters">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_DisruptorBlink">
+        <Icon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
+        <AlertIcon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
+        <HotkeyAlias value="AP_Blink"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_PerfectedPower">
+        <Icon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_RestrainedDestruction">
+        <Icon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="Attack">
         <!-- Override -->
         <SimpleDisplayText value=""/>
@@ -4278,8 +4304,8 @@
         <Universal value="1"/>
     </CButton>
     <CButton id="AP_Disruptor">
-        <Icon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
-        <AlertIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
+        <Icon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
     </CButton>
     <CButton id="AP_ImmortalShakuras">
         <Icon value="Assets\Textures\btn-unit-protoss-immortal-nerazim.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index a639e5790..0a30af17d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -11390,6 +11390,19 @@
         <WhichUnit Value="Caster"/>
         <Behavior value="AP_PurificationNovaCooldownVisual"/>
     </CEffectApplyBehavior>
+    <CEffectTeleport id="AP_DisruptorBlink">
+        <Name value="Effect/Name/AP_Blink"/>
+        <ValidatorArray value="AP_CasterNotFungalGrowthed"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Marker Link="Effect/AP_Blink"/>
+        <WhichUnit Value="Caster"/>
+        <ClearQueuedOrders value="0"/>
+        <PlacementAround Value="CasterUnit"/>
+        <PlacementRange value="8"/>
+        <Range value="8"/>
+        <TargetLocation Value="TargetPoint"/>
+        <TeleportFlags index="TestCliff" value="1"/>
+    </CEffectTeleport>
     <CEffectDamage id="AP_PurificationNovaDamage">
         <ValidatorArray value="AP_DisruptorDamageFilter"/>
         <EditorCategories value=""/>
@@ -11398,6 +11411,29 @@
         <ShieldBonus value="55"/>
         <Amount value="145"/>
         <Death value="Electrocute"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_PurificationNovaEnemyDamage">
+        <ValidatorArray value="AP_DisruptorDamageFilter"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <ShieldBonus value="55"/>
+        <Amount value="145"/>
+        <Death value="Electrocute"/>
+        <SearchFilters value="-;Player,Ally,Neutral"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_PurificationNovaFriendlyDamage">
+        <ValidatorArray value="AP_DisruptorDamageFilter"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <ShieldBonus value="27.5"/>
+        <Amount value="72.5"/>
+        <Death value="Electrocute"/>
+        <SearchFilters value="-;Enemy"/>
     </CEffectDamage>
     <CEffectIssueOrder id="AP_PurificationNovaMorph">
         <EditorCategories value="Race:Protoss"/>
@@ -11426,6 +11462,8 @@
         <EditorCategories value=""/>
         <SearchFilters value="Ground;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="2.5" Effect="AP_PurificationNovaDamage"/>
+        <AreaArray Radius="2.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <AreaArray Radius="2.5" Effect="AP_PurificationNovaFriendlyDamage"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_PurificationNovaSearchSet">
@@ -11457,9 +11495,15 @@
         <WhichUnit Value="Caster"/>
         <Behavior value="AP_PurificationNovaTargettedCaster"/>
     </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PurificationNovaTargettedCasterBC">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PurificationNovaTargettedCasterUseThrust"/>
+    </CEffectApplyBehavior>
     <CEffectSet id="AP_PurificationNovaTargettedInitialSet">
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_PurificationNovaTargettedCasterAB"/>
+        <EffectArray value="AP_PurificationNovaTargettedCasterBC"/>
         <EffectArray value="AP_PurificationNovaTargettedCU"/>
         <TargetLocationType value="Point"/>
     </CEffectSet>
@@ -11475,11 +11519,68 @@
         <ImpactLocation Value="TargetUnit"/>
         <SearchFilters value="Ground;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="1.5" Effect="AP_PurificationNovaDamage"/>
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchGroundEnemy">
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="Ground;Self,Player,Ally,Neutral,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAir">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAirFriend">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Enemy,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaFriendlyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAirEnemy">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Player,Ally,Neutral,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchGroundFriendly">
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="Ground;Self,Enemy,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaFriendlyDamage"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_PurificationNovaTargettedSearchSet">
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_PurificationNovaTargettedSearch"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAir"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchGroundEnemy"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchGroundFriendly"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAirFriend"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAirEnemy"/>
         <EffectArray value="Kill"/>
     </CEffectSet>
     <CEffectApplyBehavior id="AP_PurificationNovaTargettedSpawnAB">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 51665b127..aae1ae7b9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -8761,7 +8761,7 @@
         <ShadowRadius value="0.000000"/>
     </CModel>
     <CModel id="AP_OmegaWorm" parent="Building" Race="Zerg">
-        <Model value="AP\Assets\Units\Zerg\OmegaWorm\OmegaWorm.m3"/>
+        <Model value="Assets\Units\Zerg\NydusDragon\NydusDragon.m3"/>
         <Events>
             <Anim value="Birth,00"/>
             <Name value="NydusGreater_Birth"/>
@@ -8816,7 +8816,7 @@
         <UnitGlossaryCamera value="Star2CameraLow15"/>
     </CModel>
     <CModel id="AP_OmegaWormDeath" parent="BuildingDeath" Race="Zerg">
-        <Model value="AP\Assets\Units\Zerg\OmegaWorm\OmegaWormDeath.m3"/>
+        <Model value="Assets\Units\Zerg\NydusDragonDeath\NydusDragonDeath.m3"/>
         <LowQualityModel value="ZergLargeBuildingDeathLow"/>
         <Events>
             <Anim value="Death,00"/>
@@ -8839,7 +8839,7 @@
         <Occlusion value="Show"/>
     </CModel>
     <CModel id="AP_OmegaWormDeathAcid" parent="BuildingDeath" Race="Zerg">
-        <Model value="AP\Assets\Units\Zerg\OmegaWorm\OmegaWormDeathAcid.m3"/>
+        <Model value="Assets\Units\Zerg\NydusDragonDeathAcid\NydusDragonDeathAcid.m3"/>
         <LowQualityModel value="ZergLargeBuildingDeathLow"/>
         <Events>
             <Anim value="Death,00"/>
@@ -8862,7 +8862,7 @@
         <Occlusion value="Show"/>
     </CModel>
     <CModel id="AP_OmegaWormDeathFire" parent="BuildingDeath" Race="Zerg">
-        <Model value="AP\Assets\Units\Zerg\OmegaWorm\OmegaWormDeathFire.m3"/>
+        <Model value="Assets\Units\Zerg\NydusDragonDeathFire\NydusDragonDeathFire.m3"/>
         <LowQualityModel value="ZergLargeBuildingDeathLow"/>
         <Events>
             <Anim value="Death,00"/>
@@ -8897,6 +8897,18 @@
         <TechPurchaseCamera value="Star2CameraLow15"/>
         <UnitGlossaryCamera value="Star2CameraLow15"/>
     </CModel>
+    <CModel id="AP_ImmortalAttackPurifierImpact" parent="ImpactFX">
+        <Model value="Assets\Effects\Protoss\Immortal_Collection_Missile_Impact\Immortal_Collection_Missile_Impact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CModel>
+    <CModel id="AP_PerfectedPowerNova" parent="OneShotSpellFX">
+        <Model value="Assets\Effects\Protoss\Adept_Collection_Purifier_RicochetGlaive_Missile_Impact\Adept_Collection_Purifier_RicochetGlaive_Missile_Impact.m3"/>
+        <EditorCategories value="Race:Protoss"/>
+        <Radius value="2.500000"/>
+        <RadiusLoose value="2.500000"/>
+        <ScaleMax value="0.750000,0.750000,0.750000"/>
+        <ScaleMin value="0.750000,0.750000,0.750000"/>
+    </CModel>
     <CModel id="Medivac">
         <!-- Override -->
         <!-- Shield Effect -->
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 8522b7cdf..442cfc4a0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -58,6 +58,34 @@
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_NotCountUpgradeHotSHaveSwarmHostSplitACompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDisruptorPermanentCloak">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDisruptorPermanentCloakCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveDisruptorPerfectedPower">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveRestrainedDestruction">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoRestrainedDestruction">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeDisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoRestructThrust">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeDisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoDisruptorPerfectedPower">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeDisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_UseRestructThrust">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeDisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_UseCombatShield">
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCombatShieldCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 5469f538f..cf682c05f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6202,4 +6202,29 @@
     <CRequirementCountUpgrade id="AP_CountUpgradeAP_RoachVileCompleteOnlyTechTreeCheat">
         <Count Link="AP_RoachVile" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDisruptorPermanentCloakCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_DisruptorPermanentCloak" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDisruptorRestructuredThrustersCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_DisruptorRestructuredThrusters" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementNot id="AP_NotCountUpgradeDisruptorRestructuredThrustersCompleteOnly">
+        <OperandArray index="0" value="AP_CountUpgradeDisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDisruptorPerfectedPowerCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_DisruptorPerfectedPower" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDisruptorRestrainedDestructionCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_DisruptorRestrainedDestruction" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementNot id="AP_NotCountUpgradeDisruptorPerfectedPowerCompleteOnly">
+        <OperandArray index="0" value="AP_CountUpgradeDisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirementNot>
+    <CRequirementNot id="AP_NotCountUpgradeDisruptorRestrainedDestructionCompleteOnly">
+        <OperandArray index="0" value="AP_CountUpgradeDisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirementNot>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 72d630a49..53fef861d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15785,7 +15785,9 @@
         <AbilArray Link="Warpable"/>
         <AbilArray Link="AP_PurificationNovaTargeted"/>
         <AbilArray Link="ProgressRally"/>
+        <AbilArray Link="AP_DisruptorBlink"/>
         <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
+        <BehaviorArray Link="AP_DisruptorPermanentCloak"/>
         <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"/>
@@ -15795,6 +15797,11 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_PurificationNovaTargeted" Type="AbilCmd" AbilCmd="AP_PurificationNovaTargeted,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_PermanentlyCloakedDisruptor" Type="Passive" Requirements="AP_HaveDisruptorPermanentCloak" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_DisruptorBlink" Type="AbilCmd" AbilCmd="AP_DisruptorBlink,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_RestructuredThrusters" Type="Passive" Requirements="AP_UseRestructThrust" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PerfectedPower" Type="Passive" Requirements="AP_HaveDisruptorPerfectedPower" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_RestrainedDestruction" Type="Passive" Requirements="AP_HaveRestrainedDestruction" Row="1" Column="3"/>
         </CardLayouts>
         <SeparationRadius value="0.375"/>
         <InnerRadius value="0.5"/>
@@ -15848,7 +15855,7 @@
         <ShieldRegenDelay value="10"/>
         <ShieldRegenRate value="2"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
-        <Speed value="2.25"/>
+        <Speed value="4.25"/>
         <Acceleration value="1000"/>
         <LateralAcceleration value="46.0625"/>
         <StationaryTurningRate value="999.8437"/>
@@ -15875,7 +15882,6 @@
             <LayoutButtons Face="AcquireMove" Type="AbilCmd" AbilCmd="move,AcquireMove" Row="0" Column="4"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
-            <LayoutButtons Face="AP_PurificationNova" Type="AbilCmd" AbilCmd="AP_PurificationNova,Execute" Row="2" Column="0"/>
         </CardLayouts>
         <SeparationRadius value="0.375"/>
         <InnerRadius value="0.5"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 2b54fc41c..e9c231510 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -8991,6 +8991,31 @@
         <EffectArray Operation="Set" Reference="Behavior,AP_SpawnLarva,InfoArray[0].MaxCount" Value="6"/>
         <EditorCategories value="Race:Zerg"/>
     </CUpgrade>
+    <CUpgrade id="AP_DisruptorPermanentCloak">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DisruptorRestructuredThrusters">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <EffectArray Operation="Set" Reference="Button,AP_PurificationNovaTargeted,Tooltip" Value="Button/Tooltip/AP_PurificationNovaTargetedUpgrade"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DisruptorRestrainedDestruction">
+        <Icon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DisruptorPerfectedPower">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EffectArray Reference="Effect,AP_PurificationNovaDamage,Amount" Value="55"/>
+        <EffectArray Operation="Subtract" Reference="Effect,AP_PurificationNovaEnemyDamage,ShieldBonus" Value="55"/>
+        <EffectArray Reference="Effect,AP_PurificationNovaEnemyDamage,Amount" Value="55"/>
+        <EffectArray Operation="Subtract" Reference="Effect,AP_PurificationNovaDamage,ShieldBonus" Value="55"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <Icon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+    </CUpgrade>
     <CUpgrade id="AP_K5Apocalypse">
         <EditorCategories value="Race:Zerg,UpgradeType:Talents"/>
     </CUpgrade>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 7cb5f39a3..2fa694058 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -21,6 +21,10 @@
         <Find value="1"/>
         <Value value="AP_HavePermanentCloakWraith"/>
     </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveDisruptorPermanentCloak">
+        <Find value="1"/>
+        <Value value="AP_HaveDisruptorPermanentCloak"/>
+    </CValidatorPlayerRequirement>
     <CValidatorPlayerRequirement id="AP_HaveHotSHaveRaptor">
         <Find value="1"/>
         <Value value="AP_HaveHotSHaveRaptor"/>
@@ -3528,6 +3532,30 @@
         <CombineArray value="AP_DisruptorPhasedDamageFilter"/>
         <CombineArray value="AP_IsNotFriendly"/>
     </CValidatorCombine>
+    <CValidatorPlayerRequirement id="AP_HaveDisruptorPerfectedPower">
+        <Find value="1"/>
+        <Value value="AP_HaveDisruptorPerfectedPower"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoDisruptorPerfectedPower">
+        <Find value="1"/>
+        <Value value="AP_NoDisruptorPerfectedPower"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveRestrainedDestruction">
+        <Find value="1"/>
+        <Value value="AP_HaveRestrainedDestruction"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoRestructedThrusters">
+        <Find value="1"/>
+        <Value value="AP_NoRestructThrust"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoRestrainedDestruction">
+        <Find value="1"/>
+        <Value value="AP_NoRestrainedDestruction"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_UseRestructedThrusters">
+        <Find value="1"/>
+        <Value value="AP_UseRestructThrust"/>
+    </CValidatorPlayerRequirement>
     <CValidatorUnitType id="AP_IsNotAPDisruptor">
         <Value value="AP_Disruptor"/>
         <Find value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader
index 16f720da2..a6862ab25 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader and b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/GameData.version b/Mods/ArchipelagoPlayer.SC2Mod/GameData.version
index b754b81f2..c9b6b6c0d 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/GameData.version and b/Mods/ArchipelagoPlayer.SC2Mod/GameData.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/GameText.version b/Mods/ArchipelagoPlayer.SC2Mod/GameText.version
index 8abf5674b..6d5d373cd 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/GameText.version and b/Mods/ArchipelagoPlayer.SC2Mod/GameText.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
index 4f7d91761..e93395f8b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
@@ -7,7 +7,6 @@
 <Actor id="AP_SOAGravitonBombTargetSound"/>
 <Actor id="AP_SOAOrbitalStrikeTargetModel"/>
 <Actor id="AP_SOATargetingModeConfirmationSound"/>
-<Actor id="AP_Stargate"/>
 <Behavior id="AP_ZerglingRespawnPrimary"/>
 <Behavior id="AP_SiegeTankSiegeModeProgressiveRangeIncease"/>
 <Behavior id="AP_SIBarracksTrainTimedLifeHasBeenApplied"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
index e4694f1b8..08f946459 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -87,7 +87,7 @@ asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,AP_NydusWormTransportUnloadSound,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=TrainComplete,TrainError
-Unit=AP_Hydralisk,AP_InfestedAbomination,AP_Roach,AP_Zergling
+Unit=AP_Drone,AP_Hydralisk,AP_InfestedAbomination,AP_Roach,AP_Zergling
 id=AP_NydusWormTransport
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
@@ -1260,6 +1260,11 @@ asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
 Actor=##id##_Range,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_VoidStalkerBlinkShieldRestore
+id=AP_DisruptorBlink
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_VoidStalkerBlinkMultiple
 id=AP_BlinkDummy
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
@@ -1844,11 +1849,6 @@ id=AP_HangarQueue5
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_GravitonBeam
-asset=Assets\Textures\WayPointLine.dds
-asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect
 id=AP_GravitonBeamVoidCampaign
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
@@ -3499,7 +3499,7 @@ asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=Error
-id=AP_que8
+id=AP_que7
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -3743,30 +3743,6 @@ Sound
 id=Egg_Ready
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound
-id=NydusNetwork
-path=Assets\Textures\.dds
-asset=Wireframe-Zerg-##id##,btn-armor-zerg-building,btn-building-zerg-nydusnetwork,btn-upgrade-protoss-shieldslevel0,ui_ingame_workercount_bg
-Actor=AP_GimbalZTurret,BuildingTerrainFlatten,BuildingTerrainFlattenEditor,BuildingTerrainFlattenInstant,CliffLocalSelection,CliffLocalSelectionObserver,CliffPreSelection,CliffPreSelectionObserver,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,DeadAnimationMacro,EditorSelection,FlyerHelperSplat,FlyerShadow,GlazeSnowUnitMP,GroundLocalFlashingSelection,GroundLocalSelection,GroundLocalSelectionObserver,GroundPreSelection,GroundPreSelectionObserver,GroundShadow,GroundSyncFlashingSelection,GroundSyncSelection,ModelPretargetGround,##id##Build,PlaceholderModel,PlacementModel,PortraitActor,PrimaryGroundSyncSelectionObserver,QueueAnim,SecondaryGroundSyncSelectionObserver,Snapshot,SnowVisualUnitMacroMP,SoundEmitter,TerrainMgr,UnitDeathModel,UnitDeathModelUnscaled,UnitDeathSound,UnitDeathVoice,UnitFootprint,UnitSound
-Model=Invisible,##id##,##id##Death,##id##DeathUnderConstruction,##id##Placement,##id##Portrait,ProtossSmallUnitDeathLow,TerranSmallUnitDeathLow,ZergSmallUnitDeathLow
-Sound=Alert_ZergBuildError,##id##_Ambience,##id##_Ready,##id##_What,Zerg_BuildingMorphWhat,Zerg_BuildingPlacement
-id=NydusRumble
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Model
-id=NydusWorm_DeathCry
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Sound
-id=NydusWorm_Birth
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Sound
-id=Nydus_ConstructionStart
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Sound
-id=Nydus_ConstructionFinish
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Sound
-id=Nydus_Unburrow
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Sound
 id=ZergBuildingStopSound
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound=Zerg_BuildingReady
@@ -3837,7 +3813,7 @@ Sound=NydusWorm_Load
 id=AP_NydusWormTransportUnloadSound
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound=NydusWorm_Unload
-id=OmegaRumble
+id=AP_OmegaRumble
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=NydusRumble
 id=AP_NydusWorm
@@ -3859,6 +3835,24 @@ id=AP_NydusWormBuild
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_OmegaWormBuild
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_NydusRumble
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Model=NydusRumble
+id=AP_NydusWorm_Birth
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Sound=NydusWorm_Birth
+id=AP_NydusWorm_DeathCry
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Sound=NydusWorm_DeathCry
+id=AP_Nydus_ConstructionFinish
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Sound=Nydus_ConstructionFinish
+id=AP_Nydus_ConstructionStart
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Sound=Nydus_ConstructionStart
+id=AP_Nydus_Unburrow
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Sound=Nydus_Unburrow
 default=AP_SITerranBuildingBuild
 Actor=AP_GimbalZTurret,AP_SITerranConstructionAttached,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_SICocoonInfestedFinishDeath
@@ -7845,6 +7839,9 @@ Sound=AP_Mothership_BlinkDown
 id=AP_Mothership_BlinkUpSound
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound=AP_Mothership_BlinkUp
+id=AP_PurificationNovaBirth
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Model=PurificationNovaBirth
 id=AP_Disruptor_Land
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound
@@ -12871,7 +12868,7 @@ id=AP_PhoenixPurifier
 path=Assets\Textures\.dds
 asset=Wireframe-protoss-phoenix-purifier,Wireframe-protoss-phoenix-purifier-shield01,Wireframe-protoss-phoenix-purifier-shield02,Wireframe-protoss-phoenix-purifier-shield03,btn-unit-protoss-phoenix-purifier,btn-upgrade-protoss-airarmorlevel0
 Model=##id##,##id##Death,##id##Placement,##id##Portrait,##id##WarpIn
-Sound=AP_Mirage_Attack,AP_Mirage_Help,AP_Mirage_Movement,AP_Mirage_Pissed,AP_Mirage_Ready,AP_Mirage_What,AP_Mirage_Yes,##id##_Ambience
+Sound=AP_Mirage_Attack,AP_Mirage_Help,AP_Mirage_Movement,AP_Mirage_Pissed,AP_Mirage_Ready,AP_Mirage_What,AP_Mirage_Yes,##id##_Ambience,Phoenix_GravitonBeamVO
 id=AP_Scourge
 path=Assets\Textures\.dds
 asset=btn-unit-zerg-scourge,btn-upgrade-zerg-flyercarapace-level0,wireframe-zerg-scourge
@@ -12948,9 +12945,9 @@ Model=##id##,##id##Death,##id##Placement,##id##WarpIn,##id##WarpInStargate,AP_Co
 Sound=##id##_Ambience,##id##_Movement,AP_Corsair_Attack,AP_Corsair_Help,AP_Corsair_Pissed,AP_Corsair_Ready,AP_Corsair_What,AP_Corsair_Yes
 id=AP_Disruptor
 path=Assets\Textures\.dds
-asset=Btn-unit-protoss-disruptor,Wireframe-protoss-disruptor,Wireframe-protoss-disruptor-shield01,Wireframe-protoss-disruptor-shield02,Wireframe-protoss-disruptor-shield03,btn-upgrade-protoss-groundarmorlevel0
-Actor=##id##_Land,ChargingAnim,HallucinationBirthSoundMedium,PhysicsDeathsSwarmGround,PhysicsDeathsVoidGround,SpineCrawlerHurlDeathRagdollWithTeamColor,TerrainSquibAnimations,TerrainSquibHarnessContinuous
-Model=##id##Portrait,Disruptor,DisruptorDeath,DisruptorDeathRagdoll,HallucinationDeath,ProtossUnitBirth,PurificationNovaModelSwap,WaterRippleMedium
+asset=Wireframe-protoss-disruptor,btn-unit-collection-purifier-disruptor,btn-upgrade-protoss-groundarmorlevel0,wireframe-collection-taldarim-disruptor,wireframe-collection-taldarim-disruptor-shield01,wireframe-collection-taldarim-disruptor-shield02,wireframe-collection-taldarim-disruptor-shield03
+Actor=##id##_Land,AP_PurificationNovaBirth,ChargingAnim,HallucinationBirthSoundMedium,PhysicsDeathsSwarmGround,PhysicsDeathsVoidGround,SpineCrawlerHurlDeathRagdollWithTeamColor,TerrainSquibAnimations,TerrainSquibHarnessContinuous
+Model=AP_PurificationNovaModelSwap,Disruptor,Disruptor_Purifier_Collection,Disruptor_Purifier_Collection_Death,Disruptor_Purifier_DeathRagdoll,Disruptor_Purifier_Portrait,HallucinationDeath,ProtossUnitBirth,WaterRippleMedium
 PhysicsMaterial=Water
 Sound=##id##_Ambience,##id##_Movement,AP_Pusher_Attack,AP_Pusher_Help,AP_Pusher_Pissed,AP_Pusher_Ready,AP_Pusher_What,AP_Pusher_Yes,Protoss_BuildingPlacementSmall
 id=AP_DisruptorPhased
@@ -13702,7 +13699,7 @@ Effect=LarvaRelease
 Unit=Larva
 id=AP_SalvageNydus
 asset=Assets\Textures\btn-missing-kaeo.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,Nydus_Unburrow,TerrainMgr
+Actor=AP_GimbalZTurret,AP_Nydus_Unburrow,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_SalvageShared
 id=AP_WraithCloak
 asset=Assets\Textures\btn-ability-terran-cloak.dds
@@ -13802,6 +13799,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_BansheePermanentCloak
 asset=Assets\Textures\btn-missing-kaeo.dds
 Actor=AP_DetectorRadarSetup,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_DisruptorPermanentCloak
+asset=Assets\Textures\btn-missing-kaeo.dds
+Actor=AP_DetectorRadarSetup,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_GhostPermanentCloak
 asset=Assets\Textures\btn-missing-kaeo.dds
 Actor=AP_DetectorRadarSetup,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -15153,6 +15153,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_PurificationNovaTargettedCaster
 asset=Assets\Textures\btn-ability-protoss-arcshield.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_PurificationNovaTargettedCasterUseThrust
+asset=Assets\Textures\btn-ability-protoss-arcshield.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaTargettedTarget
 asset=Assets\Textures\btn-ability-protoss-arcshield.dds
 Actor=AP_Disruptor_DisruptionOvercharge_LoopSound,AP_Disruptor_DisruptionOvercharge_StartSound,AP_GimbalZTurret,AP_PurificationNovaRangeIndicator,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -16330,6 +16333,10 @@ id=AP_BirthRaptor
 asset=Assets\Textures\btn-unit-zerg-zergling-raptor.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Button=Zergling
+id=AP_BirthDrone
+asset=Assets\Textures\btn-unit-zerg-drone.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Button=Drone
 id=AP_BirthRoach
 asset=Assets\Textures\btn-unit-zerg-roach.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -16344,6 +16351,10 @@ Button=Roach
 id=AP_BirthHydralisk
 asset=Assets\Textures\btn-unit-zerg-hydralisk.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_BirthHydraliskImpaler
+asset=Assets\Textures\btn-unit-zerg-hydralisk-impaler.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Button=Hydralisk
 id=AP_BirthHydraliskLurker
 asset=Assets\Textures\btn-unit-zerg-hydralisk-lurker.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -16937,9 +16948,6 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_NPSwarm
 asset=Assets\Textures\BTN-Ability-Zerg-NeuralParasite-color.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_GravitonBeam
-asset=Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_GravitonBeamVoidCampaign
 asset=Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -17956,6 +17964,22 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_AcidExplosionImmunity
 asset=Assets\Textures\btn-upgrade-terran-acidexplosionimmunity.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_PermanentlyCloakedDisruptor
+asset=Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_RestructuredThrusters
+asset=Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_DisruptorBlink
+asset=Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Button=AP_Blink
+id=AP_PerfectedPower
+asset=Assets\Textures\btn-ability-spearofadun-purifierbeam.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_RestrainedDestruction
+asset=Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ChainReaction
 asset=Assets\Textures\BTN-Ability-Swarm-Kerrigan-ChainReaction.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -18025,7 +18049,7 @@ id=AP_FireOnTheMove
 asset=AP\Assets\Textures\btn-ability-terran-fireonthemove.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ShapedHull
-asset=Assets\Textures\btn-techupgrade-terran-shapedhull.dds
+asset=AP\Assets\Textures\btn-techupgrade-terran-shapedhull-colored.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_TriLithiumPowerCells
 asset=AP\Assets\Custom\Textures\btn-upgrade-terran-trilithium-power-cell.dds
@@ -18364,7 +18388,7 @@ id=AP_AdvancedWeaponryRaven
 asset=Assets\Textures\btn-upgrade-terran-nova-specialordance.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_CliffJumper
-asset=Assets\Textures\BTN-Ability-Terran-JetPack-color.dds
+asset=AP\Assets\Textures\btn-ability-terran-goliath-jetpack.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_LaserTargetingSystem
 asset=Assets\Textures\btn-upgrade-terran-lazertargetingsystem.dds
@@ -18477,6 +18501,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_RepairDrones
 asset=Assets\Textures\btn-ability-protoss-carrierrepairdrones.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_GravitonBeam
+asset=Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PhoenixAiurGravitonBeam
 asset=Assets\Textures\btn-ability-protoss-gravitonbeam-color.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -18507,6 +18534,12 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_HaveBarrier
 asset=Assets\Textures\btn-ability-protoss-barrier-upgraded.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_AnnihilatorAerialTracking
+asset=Assets\Textures\btn-progression-protoss-fenix-12-immortalandscoutchampions-research.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_StalwartDualityCharge
+asset=assets\textures\btn-upgrade-protoss-fenix-disruptorpurificationecho.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ImmortalTaldarimScatterCannon
 asset=Assets\Textures\BTN-Ability-Protoss-ScatterCannon.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -18921,7 +18954,7 @@ id=AP_ValkyrieEnhancedClusterLaunchers
 asset=assets\textures\btn-ability-stetmann-corruptormissilebarrage.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ValkyrieShapedHull
-asset=Assets\Textures\btn-techupgrade-terran-shapedhull.dds
+asset=AP\Assets\Textures\btn-techupgrade-terran-shapedhull-colored.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ValkyrieATSRockets
 asset=Assets\Textures\btn-ability-hornerhan-viking-missileupgrade.dds
@@ -19078,10 +19111,6 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_NydusWormRavenousAppetite
 asset=Assets\Textures\ui_tipicon_evolution_hydralisk-waves.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_BirthHydraliskImpaler
-asset=Assets\Textures\btn-unit-zerg-hydralisk-impaler.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Button=Hydralisk
 id=AP_SummonNydusWorm
 asset=Assets\Textures\btn-building-zerg-nydusworm.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -19168,10 +19197,10 @@ id=AP_MedivacPermanentCloak
 asset=AP\Assets\Custom\Textures\btn-permacloak-medivac.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_SiegeTankShapedHull
-asset=Assets\Textures\btn-techupgrade-terran-shapedhull.dds
+asset=AP\Assets\Textures\btn-techupgrade-terran-shapedhull-colored.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_GoliathShapedHull
-asset=Assets\Textures\btn-techupgrade-terran-shapedhull.dds
+asset=AP\Assets\Textures\btn-techupgrade-terran-shapedhull-colored.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_VultureAutoRepair
 asset=assets\textures\ui_tipicon_campaign_space01-repair.dds
@@ -19210,7 +19239,7 @@ id=AP_HHWraithFury
 asset=Assets\Textures\btn-ability-hornerhan-wraith-attackspeed.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_BansheeShapedHull
-asset=Assets\Textures\btn-techupgrade-terran-shapedhull.dds
+asset=AP\Assets\Textures\btn-techupgrade-terran-shapedhull-colored.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_BansheeAdvancedOptics
 asset=Assets\Textures\btn-ability-terran-detectionconedebuff.dds
@@ -19381,6 +19410,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_ReaverCapacity
 asset=AP\Assets\Textures\btn-upgrade-protoss-increasedscarabcapacity@scbw.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_ReaverKhalaiReplicators
+asset=assets\textures\btn-ability-protoss-entomb.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_VanguardStriderStabilization
 asset=Assets\Textures\BTN-Ability-Terran-ShredderMissile-Color.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -19414,6 +19446,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_WrathwalkerLongRangeChargedBlast
 asset=Assets\Textures\BTN-Upgrade-Protoss-ExtendedThermalLance.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_WrathwalkerAerialTracking
+asset=assets\textures\btn-upgrade-protoss-wrathwalker-cantargetairunits.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ShroudOfAdun
 asset=Assets\Textures\Talent-Vorazun-Level01-ShadowStalk.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -20296,11 +20331,8 @@ id=AP_NPSwarmLM
 Actor=AP_GimbalZTurret,AP_NPSwarm,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_NPSwarmAB
 Unit=AP_NPSwarmWeapon
-id=AP_GravitonBeam
-Actor=AP_GimbalZTurret,##id##,##id##Impact,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=##id##InitialSet,##id##PeriodicSet
 id=AP_GravitonBeamVoidCampaign
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,AP_GravitonBeam,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=##id##InitialSet,##id##PeriodicSet
 id=AP_Corruption
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -20390,7 +20422,7 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 Effect=AP_PurificationNovaApply,AP_PurificationNovaApplySpeed,AP_PurificationNovaCooldownVisualAB,AP_PurificationNovaMorph
 id=AP_PurificationNovaTargettedInitialSet
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=AP_PurificationNovaTargettedCU,AP_PurificationNovaTargettedCasterAB
+Effect=AP_PurificationNovaTargettedCU,AP_PurificationNovaTargettedCasterAB,AP_PurificationNovaTargettedCasterBC
 id=AP_ChargedBlastSearch
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ForceField
@@ -21262,7 +21294,7 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 Effect=AP_PurificationNovaMorphBack,AP_PurificationNovaSearch
 id=AP_PurificationNovaTargettedSearchSet
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=AP_PurificationNovaTargettedSearch,Kill
+Effect=AP_PurificationNovaTargettedSearch,AP_PurificationNovaTargettedSearchAir,AP_PurificationNovaTargettedSearchAirEnemy,AP_PurificationNovaTargettedSearchAirFriend,AP_PurificationNovaTargettedSearchGroundEnemy,AP_PurificationNovaTargettedSearchGroundFriendly,Kill
 id=AP_OverchargeSearchSet
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_OverchargePushSearch,AP_OverchargeSearch
@@ -24124,6 +24156,9 @@ Behavior=AP_DisableEnergyRegen
 id=AP_DisableCasterWeaponsApplyBehavior
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Behavior=AP_DisablePhoenixWeapons
+id=AP_GravitonBeam
+Actor=AP_GimbalZTurret,##id##Impact,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=##id##InitialSet,##id##PeriodicSet
 id=AP_GravitonBeamInitialSet
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_DisableCasterEnergyRegenApplyBehavior,AP_DisableCasterWeaponsApplyBehavior,AP_GravitonBeamHaltTerranBuild,AP_GravitonBeamHeightBehavior,AttackCancel,InstantUnburrow
@@ -25229,6 +25264,10 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 Behavior=AP_PurificationNovaCooldownVisual
 id=AP_PurificationNovaDamage
 Actor=AP_GimbalZTurret,AP_PurificationNovaForce,AP_PurificationNovaImpact,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_PurificationNovaEnemyDamage
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_PurificationNovaFriendlyDamage
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaMorph
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaMorphBack
@@ -25237,7 +25276,7 @@ id=AP_PurificationNovaNotificationDamage
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaSearch
 Actor=AP_DisruptorExplosionForce,AP_Disruptor_DisruptionOvercharge_Attack,AP_Disruptor_DisruptionOvercharge_StopSound,AP_GimbalZTurret,AP_PurificationNova,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=AP_PurificationNovaDamage
+Effect=AP_PurificationNovaDamage,AP_PurificationNovaEnemyDamage,AP_PurificationNovaFriendlyDamage
 id=AP_PurificationNovaTargettedCU
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_PurificationNovaTargettedSpawnSet
@@ -25248,11 +25287,29 @@ Effect=AP_PurificationNovaTargettedIssueOrder,AP_PurificationNovaTargettedSpawnA
 id=AP_PurificationNovaTargettedCasterAB
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Behavior=AP_PurificationNovaTargettedCaster
+id=AP_PurificationNovaTargettedCasterBC
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Behavior=AP_PurificationNovaTargettedCasterUseThrust
 id=AP_PurificationNovaTargettedIssueOrder
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaTargettedSearch
 Actor=AP_Disruptor_DisruptionOvercharge_Attack,AP_Disruptor_DisruptionOvercharge_StopSound,AP_GimbalZTurret,AP_PurificationNova,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_PurificationNovaDamage
+id=AP_PurificationNovaTargettedSearchGroundEnemy
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_PurificationNovaEnemyDamage
+id=AP_PurificationNovaTargettedSearchAir
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_PurificationNovaDamage
+id=AP_PurificationNovaTargettedSearchAirFriend
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_PurificationNovaFriendlyDamage
+id=AP_PurificationNovaTargettedSearchAirEnemy
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_PurificationNovaEnemyDamage
+id=AP_PurificationNovaTargettedSearchGroundFriendly
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=AP_PurificationNovaFriendlyDamage
 id=AP_PurificationNovaTargettedSpawnAB
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Behavior=AP_PurificationNovaTargettedTarget
@@ -29239,13 +29296,16 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_DarkArchonMindControlState
 asset=Assets\Effects\Protoss\DarkArchon_MindControl_State\DarkArchon_MindControl_State.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_DisruptorPortrait
-asset=Assets\Textures\DisruptorPortrait_Static.dds
+id=AP_PurificationNovaModelSwap
+asset=Assets\Units\Protoss\Disruptor_PhaseMode\Disruptor_PhaseMode.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Light=DisruptorPortrait
 id=AP_DisruptorAttackBeam
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=ArchonAttackBeamLow
+id=AP_DisruptorPortrait
+asset=Assets\Textures\DisruptorPortrait_Static.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Light=DisruptorPortrait
 id=AP_Glaze_Alarak_COOP_Sacrifice
 asset=Assets\Effects\Glaze\##id##\##id##.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -31251,9 +31311,6 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_PurificationNovaImpact
 asset=Assets\Effects\Protoss\Disruptor_PurificationNova_Impact\Disruptor_PurificationNova_Impact.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_PurificationNovaModelSwap
-asset=Assets\Units\Protoss\Disruptor_PhaseMode\Disruptor_PhaseMode.m3
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_PurificationNovaRangeIndicator
 asset=Assets\Effects\Protoss\Disruptor_PhaseMode_Cursor\Disruptor_PhaseMode_Cursor.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -31338,6 +31395,9 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_Tyrannosaur_Cleave
 asset=Assets\Effects\Zerg\Primal_Tyrannosaur_Coop_Cleave\Primal_Tyrannosaur_Coop_Cleave.m3
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=ImmortalAttackPurifierImpact
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Model=ImmortalAttackImpactLow
 parent=AP_StukovBuildingCrawlerLegs
 id=AP_SIBarracksLegs
 Sound=AP_SIBuildingMedium_footstep,AP_SIBuildingMedium_footstep_swtnr
@@ -35123,10 +35183,10 @@ Actor=AP_GimbalZTurret,BlipVisual,CommandCenter_UpgradeCancel,CommandUIHarnessAt
 Behavior=TerranBuildingBurnDown
 Button=CalldownMULE,Cancel,CancelBuilding,Lift,Rally,SCV,Scan,SupplyDrop
 id=AP_OmegaWorm
-Abil=AP_OmegaCreepBuild,AP_OmegaTrain,AP_OmegaTrainSwarmling,AP_SalvageNydus,AP_que8,BuildinProgressNydusCanal,Rally
-Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MechaFlamesLargeBuilding,NydusWorm_Birth,NydusWorm_DeathCry,Nydus_ConstructionFinish,Nydus_ConstructionStart,Nydus_Unburrow,OmegaRumble,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodLargeBuilding
-Behavior=AP_makeCreep8x6
-Button=AP_BirthAberration,AP_BirthCorpser,AP_BirthHydralisk,AP_BirthHydraliskImpaler,AP_BirthHydraliskLurker,AP_BirthRaptor,AP_BirthRoach,AP_BirthSwarmling,AP_BirthVile,AP_BirthZergling,AP_BuildCreepTumorPropagate,AP_NydusRecall,AP_NydusWormJormungandrStrain,AP_NydusWormSubterraneanScales,##id##OuroborosStrain,Cancel,Rally
+Abil=AP_OmegaCreepBuild,AP_OmegaTrain,AP_OmegaTrainSwarmling,AP_RallyHatchery,AP_SalvageNydus,AP_que7,BuildInProgress
+Actor=AP_GimbalZTurret,AP_NydusWorm_Birth,AP_NydusWorm_DeathCry,AP_Nydus_ConstructionFinish,AP_Nydus_ConstructionStart,AP_Nydus_Unburrow,AP_OmegaRumble,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MechaFlamesLargeBuilding,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodLargeBuilding
+Behavior=AP_makeCreep8x6,AP_makeCreep8x6Enhanced
+Button=AP_BirthAberration,AP_BirthCorpser,AP_BirthDrone,AP_BirthHydralisk,AP_BirthHydraliskImpaler,AP_BirthHydraliskLurker,AP_BirthRaptor,AP_BirthRoach,AP_BirthSwarmling,AP_BirthVile,AP_BirthZergling,AP_BuildCreepTumorPropagate,AP_NydusRecall,AP_NydusWormJormungandrStrain,AP_NydusWormSubterraneanScales,##id##OuroborosStrain,Cancel,CancelBuilding,Rally,RallyEgg
 id=AP_CreepTumor
 Abil=AP_BurrowCreepTumorDown,##id##Used,BuildInProgress
 Actor=##id##,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodTinyBuilding
@@ -35138,6 +35198,11 @@ Actor=AP_GimbalZTurret,##id##,##id##_Death,BlipVisual,CommandUIHarnessAttackProt
 Behavior=AP_HotSRaptorJump,AP_MalignantCreepFix,##id##RespawnDeath
 Button=AP_HotSMetabolicBoost,AP_HotSRedundantMembranes,AP_HotSZerglingFrenzy,AP_RaptorCliffJumper,AP_RaptorPassive,AP_SwarmlingPassive,##id##ArmorShred,Attack,Baneling,BurrowDown,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon=AP_Claws
+id=AP_Drone
+Abil=AP_BurrowDroneDown,##id##Harvest,AP_ZergBuild,attack,move,stop
+Actor=##id##,##id##_Death,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
+Button=AP_AutomatedExtractor,AP_BanelingNest,AP_EvolutionChamber,AP_Extractor,AP_Hatchery,AP_HydraliskDen,AP_InfestationPit,AP_NydusNetwork,AP_RoachWarren,AP_SpawningPool,AP_SpineCrawler,AP_Spire,AP_SporeCrawler,AP_UltraliskCavern,AP_ZergBuild,AP_ZergBuildAdvanced,AttackWorker,BurrowDown,Cancel,GatherZerg,Move,MoveHoldPosition,MovePatrol,ReturnCargo,Stop
+Weapon=AP_Spines
 id=AP_Roach
 Abil=AP_BurrowRoachDown,AP_MorphToRavager,AP_PrimalIgniterMerge,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,##id##_Death,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
@@ -35163,9 +35228,9 @@ Behavior=AP_MakeCreepSwarmHost,AP_MalignantCreepFix,AP_SwarmHostOrganicCarapaceI
 Button=AP_BurrowSwarmHost,AP_EnduringLocusts,AP_HotSPressurizedGlands,AP_LocustAir,AP_LocustFlyingLaunch,AP_LocustGround,AP_LocustLaunch,AP_LocustSpeed,AP_RapidIncubation,AP_SwarmHostDeepBurrow,AP_SwarmHostGenerateCreep,AP_SwarmHostUprootUnburrow,AttackBuilding,Stop
 Weapon=AP_LocustFlyingLaunch,AP_LocustLaunch
 id=AP_NydusWorm
-Abil=##id##Transport,AP_SalvageNydus,BuildinProgressNydusCanal,Rally,stop
-Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MechaFlamesMediumBuilding,NydusRumble,NydusWorm_Birth,NydusWorm_DeathCry,Nydus_ConstructionFinish,Nydus_ConstructionStart,Nydus_Unburrow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodMediumBuilding
-Button=AP_NydusRecall,##id##JormungandrStrain,##id##RavenousAppetite,##id##SubterraneanScales,NydusCanalLoad,NydusCanalUnloadAll,SetRallyPoint,Stop
+Abil=##id##Transport,AP_SalvageNydus,BuildInProgress,Rally,stop
+Actor=AP_GimbalZTurret,AP_NydusRumble,##id##,##id##_Birth,##id##_DeathCry,AP_Nydus_ConstructionFinish,AP_Nydus_ConstructionStart,AP_Nydus_Unburrow,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MechaFlamesMediumBuilding,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodMediumBuilding
+Button=AP_NydusRecall,##id##JormungandrStrain,##id##RavenousAppetite,##id##SubterraneanScales,CancelBuilding,NydusCanalLoad,NydusCanalUnloadAll,SetRallyPoint,Stop
 id=AP_Thor
 Abil=AP_250mmStrikeCannons,AP_330mmBarrageCannons,AP_330mmBarrageCannonsTargetUnit,AP_TacNukeStrikeThor,##id##APMode,##id##Wreckage,BuildInProgress,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
@@ -35841,17 +35906,17 @@ Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUI
 Button=AP_DisablingCloud,AP_FaceEmbrace,AP_ParasiticBomb,##id##AbductImprovedStunPassive,##id##Consumption,##id##ImprovedCastRangePassive,AcquireMove,Attack,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon=##id##Air
 id=AP_PhoenixAiur
-Abil=AP_GravitonBeam,AP_GravitonBeamVoidCampaign,ProgressRally,Warpable,attack,move,stop
+Abil=AP_GravitonBeamVoidCampaign,ProgressRally,Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_CanUseGravitonDoubleBeam,AP_SOAHeroicShieldProcBuff
-Button=AP_AnionPulseCrystals,AP_GravitonBeam,AP_ImprovedIonCannons,##id##GravitonBeam,##id##GravitonBeamPassive,Attack,Cancel,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Button=AP_AnionPulseCrystals,AP_ImprovedIonCannons,##id##GravitonBeam,##id##GravitonBeamPassive,Attack,Cancel,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 Unit=Phoenix
 Weapon=AP_IonCannons
 id=AP_PhoenixPurifier
-Abil=AP_GravitonBeam,AP_GravitonBeamVoidCampaign,ProgressRally,Warpable,attack,move,stop
+Abil=AP_GravitonBeamMirage,ProgressRally,Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_SOAHeroicShieldProcBuff,AP_VoidPhoenixPhasingArmor
-Button=AP_AnionPulseCrystals,AP_GravitonBeam,AP_GravitonBeamVoidCampaign,AP_ImprovedIonCannons,AP_VoidPhoenixPhasingArmor,Attack,Cancel,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Button=AP_AnionPulseCrystals,AP_GravitonBeamVoidCampaign,AP_ImprovedIonCannons,AP_VoidPhoenixPhasingArmor,Attack,Cancel,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 Weapon=AP_IonCannons
 id=AP_CorsairMP
 Abil=##id##DisruptionWeb,##id##DisruptionWebArgusJewel,ProgressRally,Warpable,attack,move,stop
@@ -35938,7 +36003,7 @@ id=AP_PhoenixTaldarim
 Abil=ProgressRally,Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_SOAHeroicShieldProcBuff
-Button=AP_AnionPulseCrystals,AP_ImprovedIonCannons,AP_SkirmisherPeerContempt,Attack,Cancel,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Button=AP_AnionPulseCrystals,AP_ImprovedIonCannons,AP_SkirmisherPeerContempt,Attack,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 Unit=Phoenix
 Weapon=AP_IonCannonsTaldarim
 id=AP_RoboticsFacility
@@ -35975,14 +36040,14 @@ id=AP_ColossusTaldarim
 Abil=ProgressRally,Warpable,attack,move,stop
 Actor=##id##,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_SOAHeroicShieldProcBuff
-Button=AP_AlarakColossusChargedBlastChargeTime,AP_VoidColossusChargedBlast,AP_WrathwalkerLongRangeChargedBlast,Attack,CliffWalk,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Button=AP_AlarakColossusChargedBlastChargeTime,AP_VoidColossusChargedBlast,AP_WrathwalkerAerialTracking,AP_WrathwalkerLongRangeChargedBlast,Attack,CliffWalk,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 Unit=Colossus
 Weapon=##id##ChargedBeam,##id##ChargedBeamFast
 id=AP_ImmortalShakuras
-Abil=##id##ShadowCannon,ProgressRally,Warpable,attack,move,stop
+Abil=##id##ShadowCannon,##id##ShadowCannonAA,ProgressRally,Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_SOAHeroicShieldProcBuff
-Button=AP_DisruptorDispersion,AP_ImmortalAdvancedTargetingMechanics,##id##ShadowCannon,AP_ImmortalSingularityCharge,Attack,Move,MoveHoldPosition,MovePatrol,Stop
+Button=AP_AnnihilatorAerialTracking,AP_DisruptorDispersion,AP_ImmortalAdvancedTargetingMechanics,##id##ShadowCannon,AP_ImmortalSingularityCharge,Attack,Move,MoveHoldPosition,MovePatrol,Stop
 Unit=Immortal
 Weapon=AP_AnnihilatorParticleDisruptors
 id=AP_ImmortalTaldarim
@@ -35996,20 +36061,20 @@ id=AP_Reaver
 Abil=##id##Hangar,HangarQueue5,ProgressRally,Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_SOAHeroicShieldProcBuff
-Button=AP_PassiveReaverIncreasedScarabSplashRadius,##id##Capacity,##id##Scarabs,AP_ScarabDamage,Attack,Move,MoveHoldPosition,MovePatrol,Stop
+Button=AP_PassiveReaverIncreasedScarabSplashRadius,##id##Capacity,##id##KhalaiReplicators,##id##Scarabs,AP_ScarabDamage,Attack,Move,MoveHoldPosition,MovePatrol,Stop
 Weapon=##id##ScarabsLaunch
 id=AP_Disruptor
-Abil=AP_PurificationNovaTargeted,ProgressRally,Warpable,move,stop
+Abil=##id##Blink,AP_PurificationNovaTargeted,ProgressRally,Warpable,move,stop
 Actor=##id##,##id##PurificationNovaTargettedRange,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
-Behavior=AP_SOAHeroicShieldProcBuff
-Button=AP_PurificationNovaTargeted,AcquireMove,Attack,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Behavior=##id##PermanentCloak,AP_SOAHeroicShieldProcBuff
+Button=##id##Blink,AP_PerfectedPower,AP_PermanentlyCloakedDisruptor,AP_PurificationNovaTargeted,AP_RestrainedDestruction,AP_RestructuredThrusters,AcquireMove,Attack,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 id=AP_ImmortalPurifier
 Abil=Warpable,attack,move,stop
 Actor=AP_GimbalZTurret,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Behavior=AP_HardenedShield,AP_SOAHeroicShieldProcBuff
-Button=AP_DisruptorDispersion,AP_HardenedShieldStalwart,AP_ImmortalAdvancedTargetingMechanics,AP_ImmortalSingularityCharge,Attack,Move,MoveHoldPosition,MovePatrol,Stop
+Button=AP_DisruptorDispersion,AP_HardenedShieldStalwart,AP_ImmortalAdvancedTargetingMechanics,AP_ImmortalSingularityCharge,AP_StalwartDualityCharge,Attack,Move,MoveHoldPosition,MovePatrol,Stop
 Unit=AP_Immortal
-Weapon=AP_PhaseDisruptors
+Weapon=AP_StalwartWeapon
 id=AP_PhotonCannon
 Abil=BuildInProgress,attack,stop
 Actor=AP_GimbalZTurret,##id##,##id##Splat,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,ProtossFlamesSmallBuilding,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
@@ -36039,7 +36104,7 @@ Weapon=##id##Explode
 id=AP_DisruptorPhased
 Abil=AP_PurificationNova,AP_PurificationNovaMorphBack,Warpable,move,stop
 Actor=##id##,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
-Button=AP_PurificationNova,AcquireMove,Attack,Move,MoveHoldPosition,MovePatrol,Rally,Stop
+Button=AcquireMove,Attack,Move,MoveHoldPosition,MovePatrol,Rally,Stop
 id=AP_WarpPrismPhasing
 Abil=AP_TransportMode,AP_WarpPrismTransport,attack,stop
 Actor=AP_GimbalZTurret,AP_PhasingMode,##id##,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
@@ -36273,11 +36338,6 @@ id=AP_Egg
 Abil=Rally,que1
 Actor=##id##,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,Egg_Death,FlyerShadow,GroundShadow,LarvaEggBirth,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
 Button=AcquireMove,CancelCocoon,Rally
-id=AP_Drone
-Abil=AP_BurrowDroneDown,##id##Harvest,AP_ZergBuild,attack,move,stop
-Actor=##id##,##id##_Death,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
-Button=AP_AutomatedExtractor,AP_BanelingNest,AP_EvolutionChamber,AP_Extractor,AP_Hatchery,AP_HydraliskDen,AP_InfestationPit,AP_NydusNetwork,AP_RoachWarren,AP_SpawningPool,AP_SpineCrawler,AP_Spire,AP_SporeCrawler,AP_UltraliskCavern,AP_ZergBuild,AP_ZergBuildAdvanced,AttackWorker,BurrowDown,Cancel,GatherZerg,Move,MoveHoldPosition,MovePatrol,ReturnCargo,Stop
-Weapon=AP_Spines
 id=AP_Overlord
 Abil=AP_GenerateCreep,AP_MorphToOverseer,##id##Transport,move,stop
 Actor=AP_GimbalZTurret,##id##,##id##_Death,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
@@ -38779,6 +38839,9 @@ Alert=UpgradeComplete
 id=AP_VoidPhoenixDoubleGraviton
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_MirageGravitonBeam
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_HotSEngorgedAppendages
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
@@ -39211,6 +39274,22 @@ Alert=UpgradeComplete
 id=AP_HotSCampaignLarvaCountHard
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_DisruptorPermanentCloak
+asset=Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_DisruptorRestructuredThrusters
+asset=Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_DisruptorRestrainedDestruction
+asset=Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_DisruptorPerfectedPower
+asset=Assets\Textures\btn-ability-spearofadun-purifierbeam.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_K5Apocalypse
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
@@ -39832,6 +39911,9 @@ Alert=UpgradeComplete
 id=AP_ResourceEfficiencyReaver
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_ReaverKhalaiReplicators
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_AlarakVanguardMovingShot
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
@@ -39855,6 +39937,15 @@ id=AP_ImmortalIncreasedRange
 asset=Assets\Textures\aoe_splatterran1c.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_ImmortalImprovedBarrier
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_AnnihilatorAerialTracking
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+id=AP_StalwartDualityCharge
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_DragoonEnhancedStriderServos
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
@@ -39868,6 +39959,9 @@ Alert=UpgradeComplete
 id=AP_WrathwalkerLongRangeChargedBlast
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
+id=AP_WrathwalkerAerialTracking
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
 id=AP_ShroudOfAdun
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 077f9efd8..e1a4353a8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -88,6 +88,7 @@ Button/Hotkey/AP_Diamondback=B
 Button/Hotkey/AP_DisableBuildingAttack=G
 Button/Hotkey/AP_DisablingCloud=B
 Button/Hotkey/AP_Disruptor=D
+Button/Hotkey/AP_DisruptorBlink=B
 Button/Hotkey/AP_DisruptorHallucination=D
 Button/Hotkey/AP_Drone=D
 Button/Hotkey/AP_EMP=E
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index c1128a3e6..40acbac5c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1009,6 +1009,10 @@ Button/Name/AP_DisableBuildingAttackSplitterling=Disable Structure Attack
 Button/Name/AP_DisablingCloud=Disabling Cloud
 Button/Name/AP_DisplacementField=Displacement Field
 Button/Name/AP_Disruptor=Warp in Disruptor
+Button/Name/AP_DisruptorBlink=Blink
+Button/Name/AP_RestructuredThrusters=Restructured Thrusters
+Button/Name/AP_RestrainedDestruction=Restrained Destruction
+Button/Name/AP_PerfectedPower=Perfected Power
 Button/Name/AP_DisruptorDispersion=Disruptor Dispersion
 Button/Name/AP_DisruptorHallucination=Summon Disruptor Hallucination
 Button/Name/AP_DistortionBlasters=Distortion Blasters
@@ -1376,6 +1380,7 @@ Button/Name/AP_PermanentCloakBanshee=Advanced Cross-Spectrum Dampeners
 Button/Name/AP_PermanentCloakWraith=Unregistered Cloaking System
 Button/Name/AP_PermanentlyCloaked=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedCorsair=Stealth Drive
+Button/Name/AP_PermanentlyCloakedDisruptor=Cloaking Module
 Button/Name/AP_PermanentlyCloakedGhost=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedNova=Permanently Cloaked
 Button/Name/AP_PermanentlyCloakedObserver=Permanently Cloaked
@@ -2115,6 +2120,11 @@ Button/Tooltip/AP_DisableBuildingAttackSplitterling=Prevents Banelings from auto
 Button/Tooltip/AP_DisablingCloud=Creates a cloud that slows movement speed and prevents enemy units and structures from attacking and using energy-based abilities. Lasts for <d ref="(Effect,AP_DisablingCloud,PeriodCount + 1) * Effect,AP_DisablingCloud,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_DisplacementField=A detected Wraith evades 20% of incoming attacks while cloaked.
 Button/Tooltip/AP_Disruptor=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
+Button/Tooltip/AP_Disruptor=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
+Button/Tooltip/AP_DisruptorBlink=Teleports the Disruptor to a nearby target location. This Blink will not teleport alongside other types of Blinks, such as Stalkers and Cloaked Warriors. Ability can only be used once every <d ref="Abil,AP_DisruptorBlink,Cost[0].Cooldown.TimeUse"/> seconds.
+Button/Tooltip/AP_RestructuredThrusters=Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.<n/>This ability does NOT Blink alongside similar casts, such as Stalker or Cloaked Warrior Blinks.
+Button/Tooltip/AP_RestrainedDestruction=Purification Nova does 50% reduced damage to friendly units and structures.
+Button/Tooltip/AP_PerfectedPower=Allows Purification Nova to hit air units. Purification Nova now always deals 200 damage to enemies in the blast, regardless of the target has shields or not.
 Button/Tooltip/AP_DisruptorDispersion=Immortals, Annihilators, and Stalwarts deal <d ref="Effect,AP_ImmortalSplashDamage,Amount"/> (<d ref="(Effect,AP_ImmortalSplashDamage,Amount + Effect,AP_ImmortalSplashDamage,AttributeBonus[Armored])"/> to armored) splash damage.
 Button/Tooltip/AP_DisruptorHallucination=These hallucinated copies function like the original unit, but they cannot use active abilities, deal damage, warp in structures, or gather resources, and they die more easily. Hallucinations last <d time="60"/> before they disappear.
 Button/Tooltip/AP_DisruptorPhased=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
@@ -2537,6 +2547,7 @@ Button/Tooltip/AP_PermanentCloakBanshee=Banshee is permanently cloaked.
 Button/Tooltip/AP_PermanentCloakWraith=Wraith is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloaked=This unit is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedCorsair=Corsair is permanently cloaked.
+Button/Tooltip/AP_PermanentlyCloakedDisruptor=Disruptor is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedGhost=Ghost is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedNova=Nova is permanently cloaked.
 Button/Tooltip/AP_PermanentlyCloakedObserver=The Observer is permanently cloaked.
@@ -2602,6 +2613,7 @@ Button/Tooltip/AP_PsiStrike=Kerrigan dashes through enemies, dealing <d ref="Eff
 Button/Tooltip/AP_PsionicLift=Enemies in target area are stunned for <d ref="Behavior,AP_PsionicLift,Duration"/> seconds and take <d ref="Behavior,AP_PsionicLift,Duration * Effect,AP_PsionicLiftDamage,Amount"/> damage over time.<n/><n/><c val="ffff8a">Does not stun heroic units.</c>
 Button/Tooltip/AP_PurificationNova=Gains <d ref="Behavior,AP_PurificationNovaSpeedBoost,Modification.MoveSpeedBonus/Unit,AP_Disruptor,Speed*100"/>% increased movement speed and then after <d ref="Behavior,AP_PurificationNova,Duration"/> seconds emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage to nearby units.<n/><n/><c val="#ColorAttackInfo">Damages ground units and structures only.</c>
 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 ground units and structures. 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 ground units and structures.
 Button/Tooltip/AP_PurifierFaction=Allows to produce units from Purifier faction
 Button/Tooltip/AP_Pylon=Provides supply.<n/>Supply allows you to warp in more units.<n/>Creates power for nearby structures.
 Button/Tooltip/AP_Queen=Support unit. Can use Spawn Creep Tumor and Rapid Transfusion.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
@@ -4762,6 +4774,7 @@ RequirementNode/Tooltip/AP_CountUpgradeTerranVehicleWeaponsUltraCapacitorsLevel5
 RequirementNode/Tooltip/AP_CountUpgradeVanguardFusionMortarsCompleteOnly=Find Fusion Mortars (Vanguard)
 RequirementNode/Tooltip/AP_CountUpgradeVanguardRapidfireCannonCompleteOnly=Find Rapid-Fire Cannon (Vanguard)
 RequirementNode/Tooltip/AP_CountUpgradeVoidPhoenixDoubleGravitonCompleteOnly=Find Double Graviton Beam (Phoenix)
+RequirementNode/Tooltip/AP_CountUpgradeDisruptorRestructuredThrustersCompleteOnly=Find Restructured Thrusters (Disruptor)
 RequirementNode/Tooltip/AP_CountUpgradeVoidZealotWhirlwindCompleteOnly=Find Whirlwind (Zealot)
 RequirementNode/Tooltip/AP_CountUpgradeWrathwalkerAerialTrackingCompleteOnly=Find Aerial Tracking (Wrathwalker)
 RequirementNode/Tooltip/AP_EnergizerTransformToPhasingMode=Transform to Phasing Mode
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index 3e9fdd170..19c2037a8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -4250,6 +4250,7 @@ Model/Name/HighTemplarShakurasDeathRagdoll=High Templar Shakuras Death Ragdoll
 Model/Name/HighTemplarShakurasPsiStormImpact=High Templar Shakuras Psi Storm Impact
 Model/Name/HighTemplarShakurasPsiStormModel=High Templar Shakuras Psi Storm Model
 Model/Name/HighTemplarShakurasShadow=High Templar Shakuras Shadow
+Model/Name/ImmortalAttackPurifierImpact=AP_ImmortalAttackPurifierImpact
 Model/Name/PurificationNovaModelSwap2=Purification Nova Model Swap
 Model/Name/StasisWardPortrait=Stasis Ward
 Model/Name/SupplicantImpact2=Supplicant Impact
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index efd428782..da3cbc02a 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1523,9 +1523,9 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge3 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
         libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion, // 20
-        ap_triggers_PlayerConsumer_sig, // 21
-        ap_triggers_PlayerConsumer_sig, //22
-        ap_triggers_PlayerConsumer_sig, //23
+        libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak, //21, 
+        libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower, //22
+        libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction, //23
         ap_triggers_PlayerConsumer_sig, //24
         ap_triggers_PlayerConsumer_sig, //25
         ap_triggers_PlayerConsumer_sig, //26
@@ -1569,7 +1569,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         ap_triggers_PlayerConsumer_sig, //24
         libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerAerialTracking, //25
         libABFE498B_gf_AP_Triggers_Protoss_unlockReaverKhalaiReplicators, //26
-        ap_triggers_PlayerConsumer_sig, //27
+        libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters, //27
         ap_triggers_PlayerConsumer_sig, //28
         ap_triggers_PlayerConsumer_sig //29
     );
@@ -7634,6 +7634,30 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SlayerBlink", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorPermanentCloak", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorPerfectedPower", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestrainedDestruction", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestructuredThrusters", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 0acda692e..1409a7ba1 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -799,6 +799,10 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCenturionResourceEfficiency (int l
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_player);
+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_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 c5e61e506..96c3196ba 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 c6b7d961a..f6552c9fc 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 6b25fce56..fa5177bcf 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4503,9 +4503,9 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
                     libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion, // 20
-                    ap_triggers_PlayerConsumer_sig, // 21
-                    ap_triggers_PlayerConsumer_sig, //22
-                    ap_triggers_PlayerConsumer_sig, //23
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak, //21, 
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower, //22
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction, //23
                     ap_triggers_PlayerConsumer_sig, //24
                     ap_triggers_PlayerConsumer_sig, //25
                     ap_triggers_PlayerConsumer_sig, //26
@@ -4576,7 +4576,7 @@
                     ap_triggers_PlayerConsumer_sig, //24
                     libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerAerialTracking, //25
                     libABFE498B_gf_AP_Triggers_Protoss_unlockReaverKhalaiReplicators, //26
-                    ap_triggers_PlayerConsumer_sig, //27
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters, //27
                     ap_triggers_PlayerConsumer_sig, //28
                     ap_triggers_PlayerConsumer_sig //29
                 );
@@ -59425,6 +59425,10 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="9D9CE213"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="545082E3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="7EAB2EE6"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="713252DF"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="64F45D80"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F996C036"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="C5F7A652"/>
         </Element>
         <Element Type="FunctionDef" Id="5941C032">
             <FlagAction/>
@@ -63910,6 +63914,154 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="713252DF">
+            <Identifier>AP_Triggers_Protoss_unlockDisruptorPermanentCloak</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0B8CD3EF"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D55B6CCC"/>
+        </Element>
+        <Element Type="ParamDef" Id="0B8CD3EF">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="C219247B"/>
+        </Element>
+        <Element Type="Param" Id="C219247B">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="D55B6CCC">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1C9D1254"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F13681B2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C50E5AEF"/>
+        </Element>
+        <Element Type="Param" Id="1C9D1254">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0B8CD3EF"/>
+        </Element>
+        <Element Type="Param" Id="F13681B2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DisruptorPermanentCloak</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="C50E5AEF">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="64F45D80">
+            <Identifier>AP_Triggers_Protoss_unlockDisruptorPerfectedPower</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1C6DD54D"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="38CB02EA"/>
+        </Element>
+        <Element Type="ParamDef" Id="1C6DD54D">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="BC23D3C8"/>
+        </Element>
+        <Element Type="Param" Id="BC23D3C8">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="38CB02EA">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="10A111CE"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A01AD5CA"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2E4B7360"/>
+        </Element>
+        <Element Type="Param" Id="10A111CE">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1C6DD54D"/>
+        </Element>
+        <Element Type="Param" Id="A01AD5CA">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DisruptorPerfectedPower</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="2E4B7360">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F996C036">
+            <Identifier>AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="86F314CF"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="656EA52F"/>
+        </Element>
+        <Element Type="ParamDef" Id="86F314CF">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="1517ACAF"/>
+        </Element>
+        <Element Type="Param" Id="1517ACAF">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="656EA52F">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="B2152143"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="666E445C"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F62AE945"/>
+        </Element>
+        <Element Type="Param" Id="B2152143">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="86F314CF"/>
+        </Element>
+        <Element Type="Param" Id="666E445C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DisruptorRestrainedDestruction</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="F62AE945">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="C5F7A652">
+            <Identifier>AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="AB8CF831"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="C159C50B"/>
+        </Element>
+        <Element Type="ParamDef" Id="AB8CF831">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="4A186976"/>
+        </Element>
+        <Element Type="Param" Id="4A186976">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="C159C50B">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3D650312"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="76A3447D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DBDCF443"/>
+        </Element>
+        <Element Type="Param" Id="3D650312">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="AB8CF831"/>
+        </Element>
+        <Element Type="Param" Id="76A3447D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DisruptorRestructuredThrusters</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="DBDCF443">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="13C9DDDF">
             <Item Type="FunctionDef" Library="ABFE498B" Id="592A2375"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="AF79264A"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 263ea91ee..f54cc5b21 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 9a6a86320..32fe373d1 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -376,6 +376,7 @@ FunctionDef/Name/lib_ABFE498B_6445338B=AP_Triggers_Protoss_unlockWarpRay
 FunctionDef/Name/lib_ABFE498B_648B29A7=AP_Triggers_Zerg_HydraliskGroovedSpines
 FunctionDef/Name/lib_ABFE498B_64BCFCC4=AP_Triggers_Protoss_unlockCorsairNeutronShields
 FunctionDef/Name/lib_ABFE498B_64C26431=AP_Triggers_Terran_unlockHERCKineticFoam
+FunctionDef/Name/lib_ABFE498B_64F45D80=AP_Triggers_Protoss_unlockDisruptorPerfectedPower
 FunctionDef/Name/lib_ABFE498B_64F777D3=AP_Triggers_Zerg_BroodLordEvolvedCarapace
 FunctionDef/Name/lib_ABFE498B_651AD4D5=AP_Triggers_unlockTerranArmory7
 FunctionDef/Name/lib_ABFE498B_652B58E3=AP_Triggers_Terran_unlockHERCGrapplePull
@@ -416,6 +417,7 @@ FunctionDef/Name/lib_ABFE498B_70570397=AP_Triggers_Zerg_AberrationResourceEffici
 FunctionDef/Name/lib_ABFE498B_705D4EF3=AP_Triggers_Terran_unlockFirebatKineticFoam
 FunctionDef/Name/lib_ABFE498B_70E8537D=AP_Triggers_Zerg_SIPlaguedMunitions
 FunctionDef/Name/lib_ABFE498B_71223E47=AP_Triggers_Terran_unlockFirebatNanoProjectors
+FunctionDef/Name/lib_ABFE498B_713252DF=AP_Triggers_Protoss_unlockDisruptorPermanentCloak
 FunctionDef/Name/lib_ABFE498B_71802505=AP_Triggers_Zerg_OverlordVentralSacs
 FunctionDef/Name/lib_ABFE498B_71C9C69E=AP_Triggers_Terran_unlockMedivacAfterburners
 FunctionDef/Name/lib_ABFE498B_7228E898=AP_Triggers_Protoss_unlockSkylord
@@ -662,6 +664,7 @@ FunctionDef/Name/lib_ABFE498B_C569BD18=AP_Triggers_Protoss_unlockAdeptResonating
 FunctionDef/Name/lib_ABFE498B_C57373FD=AP_Triggers_Protoss_unlockReconstructionBeam
 FunctionDef/Name/lib_ABFE498B_C5AEEB4F=AP_Triggers_Terran_unlockVikingSmartServos
 FunctionDef/Name/lib_ABFE498B_C5F5E4DF=AP_Triggers_Terran_unlockBanshee
+FunctionDef/Name/lib_ABFE498B_C5F7A652=AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters
 FunctionDef/Name/lib_ABFE498B_C64FCEE6=AP_Triggers_Zerg_unlockLurker
 FunctionDef/Name/lib_ABFE498B_C65635D4=AP_Triggers_Zerg_UltraliskChitinousPlating
 FunctionDef/Name/lib_ABFE498B_C6876757=AP_Triggers_Terran_unlockVultureAutoRepair
@@ -820,6 +823,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_F996C036=AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction
 FunctionDef/Name/lib_ABFE498B_F9AC760F=AP_Triggers_Zerg_VespeneEfficiency
 FunctionDef/Name/lib_ABFE498B_FA0C159C=AP_Triggers_Zerg_MalignantCreep
 FunctionDef/Name/lib_ABFE498B_FA5222B7=AP_Triggers_Protoss_unlockEnhancedTargeting
@@ -878,6 +882,7 @@ ParamDef/Name/lib_ABFE498B_099D5849=player
 ParamDef/Name/lib_ABFE498B_09C47095=player
 ParamDef/Name/lib_ABFE498B_09D076EE=player
 ParamDef/Name/lib_ABFE498B_0A7AF2A1=player
+ParamDef/Name/lib_ABFE498B_0B8CD3EF=player
 ParamDef/Name/lib_ABFE498B_0BB5B13A=player
 ParamDef/Name/lib_ABFE498B_0BEEBA94=player
 ParamDef/Name/lib_ABFE498B_0C4763DB=player
@@ -932,6 +937,7 @@ ParamDef/Name/lib_ABFE498B_1B6670A6=player
 ParamDef/Name/lib_ABFE498B_1BC73CAF=player
 ParamDef/Name/lib_ABFE498B_1BCDE428=player
 ParamDef/Name/lib_ABFE498B_1C214127=player
+ParamDef/Name/lib_ABFE498B_1C6DD54D=player
 ParamDef/Name/lib_ABFE498B_1CA997DE=player
 ParamDef/Name/lib_ABFE498B_1CFCB385=player
 ParamDef/Name/lib_ABFE498B_1D187BC1=player
@@ -1287,6 +1293,7 @@ ParamDef/Name/lib_ABFE498B_8630CFD0=player
 ParamDef/Name/lib_ABFE498B_866517EF=player
 ParamDef/Name/lib_ABFE498B_86D37399=player
 ParamDef/Name/lib_ABFE498B_86F01352=player
+ParamDef/Name/lib_ABFE498B_86F314CF=player
 ParamDef/Name/lib_ABFE498B_870A3EA3=level
 ParamDef/Name/lib_ABFE498B_872176AE=player
 ParamDef/Name/lib_ABFE498B_876B423A=player
@@ -1389,6 +1396,7 @@ ParamDef/Name/lib_ABFE498B_A9BEAEBB=player
 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_ABDB6B3F=player
 ParamDef/Name/lib_ABFE498B_ABF9F03A=player
 ParamDef/Name/lib_ABFE498B_AC58AA9E=player