diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index e2383e5f3..2bbcf9191 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -18583,7 +18583,7 @@
         <GroupIcon>
             <Image value="Assets\Textures\btn-unit-protoss-fenix.dds"/>
         </GroupIcon>
-        <HeroIcon value="Assets\Textures\BTN-Unit-Protoss-stonezealot.dds"/>
+        <HeroIcon value="Assets\Textures\btn-hero-fenix.dds"/>
         <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-groundarmorlevel0.dds"/>
         <SoundArray index="Ready" value="AP_Fenix_Ready"/>
         <SoundArray index="Help" value="AP_Fenix_Help"/>
@@ -18592,7 +18592,7 @@
         <SoundArray index="Attack" value="AP_Fenix_Attack"/>
         <SoundArray index="Pissed" value="AP_Fenix_Pissed"/>
         <UnitFlags index="SuppressDefaultStatusBar" value="1"/>
-        <UnitIcon value="Assets\Textures\BTN-Unit-Protoss-stonezealot.dds"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-fenix.dds"/>
         <Wireframe>
             <Image value="Assets\Textures\wireframe-protoss-fenix.dds"/>
         </Wireframe>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index d65adb092..ae12998d7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -813,7 +813,7 @@
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_Irradiate">
         <Alignment value="Negative"/>
-        <InfoIcon value="AP\Assets\Textures\btn-ability-terran-irradiate.dds"/>
+        <InfoIcon value="assets\textures\btn-upgrade-swann-irradiate.dds"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
         <Duration value="30"/>
         <Period value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 06bf053a5..2ddeb90a7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -109,8 +109,8 @@
         <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="AP_HercGrapplePull">
-        <Icon value="AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds"/>
-        <AlertIcon value="AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds"/>
+        <Icon value="assets/textures/btn-ability-tychus-herc-heavyimpact.dds"/>
+        <AlertIcon value="assets/textures/btn-ability-tychus-herc-heavyimpact.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="Move">
@@ -223,11 +223,6 @@
         <Icon value="assets\textures\btn-upgrade-raynor-cerberusmines.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
-    <CButton id="AP_ResearchSpiderMinesSC1">
-        <Icon value="Assets\Textures\btn-unit-terran-spidermine.dds"/>
-        <AlertIcon value="AP\Assets\Textures\btn-unit-terran-spidermine.dds"/>
-        <EditorCategories value="Race:Terran"/>
-    </CButton>
     <CButton id="AP_SpiderMine">
         <Icon value="AP\Assets\Textures\btn-ability-terran-spidermine.dds"/>
         <AlertIcon value="AP\Assets\Textures\btn-ability-terran-spidermine.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index beece523c..749fedcc6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Catalog>
-    <CRequirementCountUpgrade default="1" id="AP_SCBW_UpgradeCount">
-        <?token id="x" type="CUpgradeLink" value="Research"?>
-        <Count Link="##x##" State="CompleteOnly"/>
-    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeHotSHaveRaptorCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_HotSHaveRaptor" State="CompleteOnly"/>
@@ -3215,15 +3211,21 @@
     <CRequirementAnd id="AP_GhostSCBWLockdown@Show">
         <OperandArray value="AP_GhostSCBWLockdownResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_GhostSCBWLockdownResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_GhostSCBWLockdownResearch"/>
+    <CRequirementCountUpgrade id="AP_GhostSCBWLockdownResearch@Count">
+        <Count Link="AP_GhostSCBWLockdownResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_MedicSCBWRestoration@Show">
         <OperandArray value="AP_MedicSCBWRestorationResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_MedicSCBWRestorationResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_MedicSCBWRestorationResearch"/>
+    <CRequirementCountUpgrade id="AP_MedicSCBWRestorationResearch@Count">
+        <Count Link="AP_MedicSCBWRestorationResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_MedicSCBWOpticFlare@Show">
         <OperandArray value="AP_MedicSCBWOpticFlareResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_MedicSCBWOpticFlareResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_MedicSCBWOpticFlareResearch"/>
+    <CRequirementCountUpgrade id="AP_MedicSCBWOpticFlareResearch@Count">
+        <Count Link="AP_MedicSCBWOpticFlareResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeValkyrieEnhancedClusterLaunchersCompleteOnly">
         <Count Link="AP_ValkyrieEnhancedClusterLaunchers" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
@@ -3261,7 +3263,9 @@
     <CRequirementAnd id="AP_ScienceVesselSCBWEMPShockwave@Show">
         <OperandArray value="AP_ScienceVesselSCBWEMPShockwaveResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_ScienceVesselSCBWEMPShockwaveResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_ScienceVesselSCBWEMPShockwaveResearch"/>
+    <CRequirementCountUpgrade id="AP_ScienceVesselSCBWEMPShockwaveResearch@Count">
+        <Count Link="AP_ScienceVesselSCBWEMPShockwaveResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_ScienceVesselSCBWDefensiveMatrix@Show">
         <OperandArray value="AP_CountUpgradeScienceVesselDefensiveMatrixCompleteOnly"/>
     </CRequirementAnd>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 0d086b47f..ae49a1a30 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -1900,7 +1900,7 @@
     <CUpgrade id="AP_JackhammerConcussionGrenades">
         <Flags index="UpgradeCheat" value="0"/>
         <Alert value="ResearchComplete"/>
-        <Race value="Terran"/>
+        <Race value="Terr"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Marauder"/>
         <AffectedUnitArray value="AP_HammerSecurity"/>
@@ -1909,7 +1909,7 @@
     <CUpgrade id="AP_LaserTargetingSystemMarine">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Marine,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Marine,SightBonus[Dawn]" Value="2"/>
@@ -1925,7 +1925,7 @@
     <CUpgrade id="AP_LaserTargetingSystemMarauder">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Marauder,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Marauder,SightBonus[Dawn]" Value="2"/>
@@ -1942,7 +1942,7 @@
     <CUpgrade id="AP_LaserTargetingSystemReaper">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Reaper,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Reaper,SightBonus[Dawn]" Value="2"/>
@@ -3041,7 +3041,7 @@
     </CUpgrade>
     <CUpgrade id="AP_FireSuppressionSystems">
         <Alert value="ResearchComplete"/>
-        <Race value="Terran"/>
+        <Race value="Terr"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <Flags index="UpgradeCheat" value="0"/>
     </CUpgrade>
@@ -5512,7 +5512,7 @@
     <CUpgrade id="AP_NovaArmorPredatorBattlesuit">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Operation="Set" Reference="Unit,AP_NovaHero,LifeArmorName" Value="Unit/LifeArmorName/PredatorBattlesuit"/>
         <EffectArray Reference="Unit,AP_NovaHero,LifeArmorLevel" Value="1"/>
@@ -5536,7 +5536,7 @@
     <CUpgrade id="AP_NovaGadgetFlashBangGrenades">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -5544,7 +5544,7 @@
     <CUpgrade id="AP_NovaGadgetHiveMindAmplifier">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -5568,7 +5568,7 @@
     <CUpgrade id="AP_NovaGadgetPulseGrenades">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -5576,7 +5576,7 @@
     <CUpgrade id="AP_NovaGadgetSwarmGrenade">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -5719,7 +5719,7 @@
     <CUpgrade id="AP_NovaWeaponInvictusLongshot">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -5746,7 +5746,7 @@
     <CUpgrade id="AP_NovaWeaponPsiRifle">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_NovaHero"/>
@@ -6168,7 +6168,7 @@
     <CUpgrade id="AP_HaveCarrier">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Carrier"/>
@@ -6177,7 +6177,7 @@
     <CUpgrade id="AP_HaveCarrierBase">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <!--        <EffectArray Operation="Set" Reference="Actor,TechTreeCarrier,UnitIcon" Value="Assets\Textures\btn-unit-protoss-carrier.dds"/>-->
         <!--        <EffectArray Operation="Set" Reference="Unit,TechTreeCarrier,Name" Value="Unit/Name/Carrier"/>-->
@@ -6353,7 +6353,7 @@
     <CUpgrade id="AP_VoidHighTemplarCloak">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Name" Value="Button/Name/HighTemplarShakuras"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Tooltip" Value="Button/Tooltip/HighTemplarShakuras"/>
@@ -6369,7 +6369,7 @@
     <CUpgrade id="AP_VoidHighTemplarTerazine">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Name" Value="Button/Name/HighTemplarTaldarim"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Tooltip" Value="Button/Tooltip/HighTemplarTaldarim"/>
@@ -6383,7 +6383,7 @@
     <CUpgrade id="AP_VoidHighTemplarTwilightMessiah">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Name" Value="Button/Name/HighTemplarAiur"/>
         <EffectArray Operation="Set" Reference="Button,AP_HighTemplar,Tooltip" Value="Button/Tooltip/HighTemplarAiur"/>
@@ -7140,7 +7140,7 @@
     <CUpgrade id="AP_LaserTargetingSystemBanshee">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Banshee,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Banshee,SightBonus[Dawn]" Value="2"/>
@@ -7163,7 +7163,7 @@
     <CUpgrade id="AP_LaserTargetingSystemSiegeTank">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_SiegeTank,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_SiegeTank,SightBonus[Dawn]" Value="2"/>
@@ -7241,7 +7241,7 @@
     <CUpgrade id="AP_LaserTargetingSystemLiberator">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Liberator,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Liberator,SightBonus[Dawn]" Value="2"/>
@@ -7402,7 +7402,7 @@
     <CUpgrade id="AP_InternalizedTechModuleMarauder">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Marauder"/>
@@ -7411,7 +7411,7 @@
     <CUpgrade id="AP_InternalizedTechModuleSiegeTank">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_SiegeTank"/>
@@ -7439,7 +7439,7 @@
     <CUpgrade id="AP_InternalizedTechModuleBanshee">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Operation="Set" Reference="Abil,AP_StarportTrain,InfoArray[Train2].Button.Requirements"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
@@ -10269,7 +10269,7 @@
     <CUpgrade id="AP_InternalizedTechModuleGoliath">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Goliath"/>
@@ -10284,7 +10284,7 @@
     <CUpgrade id="AP_InternalizedTechModuleCyclone">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Cyclone"/>
@@ -10390,7 +10390,7 @@
     <CUpgrade id="AP_InternalizedTechModuleWraith">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Wraith"/>
@@ -10502,7 +10502,7 @@
     <CUpgrade id="AP_LaserTargetingSystemThor">
         <Flags index="UpgradeCheat" value="0"/>
         <InfoTooltipPriority value="2"/>
-        <Race value="Protoss"/>
+        <Race value="Prot"/>
         <ScoreResult value="BuildOrder"/>
         <EffectArray Reference="Unit,AP_Thor,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_Thor,SightBonus[Dawn]" Value="2"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
index 0bd09af2d..4a419575a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -16771,7 +16771,7 @@ id=AP_HercAcidExplosionImmunity
 asset=Assets\Textures\btn-upgrade-zerg-hydriaticacid.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_HercGrapplePull
-asset=AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds
+asset=Assets\Textures\btn-ability-tychus-herc-heavyimpact.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_StabilizerMedPacks
 asset=Assets\Textures\btn-upgrade-raynor-stabilizermedpacks.dds
@@ -16803,10 +16803,6 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_CerberusMines
 asset=assets\textures\btn-upgrade-raynor-cerberusmines.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_ResearchSpiderMinesSC1
-asset=AP\Assets\Textures\btn-unit-terran-spidermine.dds
-asset=Assets\Textures\btn-unit-terran-spidermine.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_AresClassWeaponsSystem
 asset=assets\textures\btn-upgrade-swann-aresclasstargetingsystem.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 34f9fef17..f928b002b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -303,7 +303,6 @@ Button/Hotkey/AP_Refinery=R
 Button/Hotkey/AP_RepairDrones=E
 Button/Hotkey/AP_ResearchCycloneRapidFireLaunchers=A
 Button/Hotkey/AP_ResearchMagFieldLaunchers=R
-Button/Hotkey/AP_ResearchSpiderMinesSC1=M
 Button/Hotkey/AP_RespawnZergling=Z
 Button/Hotkey/AP_Roach=R
 Button/Hotkey/AP_RoachWarren=R
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 59bc33a15..ef5d6075a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1389,7 +1389,6 @@ Button/Name/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Chaotic
 Button/Name/AP_ResearchCycloneRapidFireLaunchers=Research Rapid Fire Launchers
 Button/Name/AP_ResearchLiberatorAGMode=Research Defender Mode
 Button/Name/AP_ResearchMagFieldLaunchers=Research Mag-Field Launchers
-Button/Name/AP_ResearchSpiderMinesSC1=Research Spider Mines
 Button/Name/AP_RespawnZergling=Zergling Reconstitution
 Button/Name/AP_RetributionField=Lightning Field
 Button/Name/AP_RipwaveMissiles=Ripwave Missiles
@@ -2458,7 +2457,6 @@ Button/Tooltip/AP_RepairDrones=Two repair drones automatically heal friendly mec
 Button/Tooltip/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Increases Psionic Orb's travel distance by 25%.
 Button/Tooltip/AP_ResearchCycloneRapidFireLaunchers=Increases the attack speed of the first 12 shots of the <c val="ffff8a">Cyclone's</c> Lock On.
 Button/Tooltip/AP_ResearchMagFieldLaunchers=Increases <c val="ffff8a">Cyclone's</c> attack range by +<d ref="$UpgradeEffectArrayValue:AP_MagFieldLaunchers:Weapon,AP_TyphoonMissilePod,Range$"/>.
-Button/Tooltip/AP_ResearchSpiderMinesSC1=Enables the Vulture to carry Spider Mines. Spider Mines burrow into the ground and become cloaked unless spotted with a detector or effect. When most types of enemy ground units pass nearby, the Spider Mine will unburrow, chase down the units, and detonate.
 Button/Tooltip/AP_RespawnZergling=Respawns up to <d ref="Effect,ZerglingRespawnTooltipDummy,SpawnCount"/> Zerglings at no cost until all Zerglings have returned to life.
 Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals 20 damage.
 Button/Tooltip/AP_RipwaveMissiles=Viking missiles deal area damage.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index b2e8f2f21..8f2a93bac 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -2703,7 +2703,6 @@ Button/EditorSuffix/AP_QueenStukovSpawnBroodlings=(Stukov)
 Button/EditorSuffix/AP_RapidDeployment=(Hercules)
 Button/EditorSuffix/AP_RapidDeploymentTubes=(Medivac)
 Button/EditorSuffix/AP_ReaverScarabs=
-Button/EditorSuffix/AP_ResearchSpiderMinesSC1=(Vulture)
 Button/EditorSuffix/AP_RuptureUpgrade=Upgrade
 Button/EditorSuffix/AP_SpectreConsumption=(Spectre)
 Button/EditorSuffix/AP_SpectreHoldFire=(Spectre)
diff --git a/schemas/SchemaRequirementData.xsd b/schemas/SchemaRequirementData.xsd
new file mode 100644
index 000000000..c0d29fc86
--- /dev/null
+++ b/schemas/SchemaRequirementData.xsd
@@ -0,0 +1,58 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="Catalog" type="RequirementDataCatalog"/>
+
+    <xs:complexType name="RequirementDataCatalog">
+        <xs:sequence maxOccurs="unbounded">
+            <xs:element name="CRequirement" type="Requirement"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- Seems RedHat's vscode extension doesn't support xsd 1.1, so we have to do some jank for -->
+    <!-- mixed "only once" and "unbounded" elements in an unsequenced list. -->
+    <!-- Based off this SO answer: https://stackoverflow.com/a/12012599 -->
+    <xs:group name="unboundedElements">
+        <xs:choice>
+            <xs:element ref="NodeArray"/>
+            <xs:element ref="CanBeSuppressed"/>
+        </xs:choice>
+    </xs:group>
+    <xs:complexType name="Requirement">
+        <xs:sequence>
+            <xs:group ref="unboundedElements" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="EditorCategories" minOccurs="0" maxOccurs="1"/>
+            <xs:group ref="unboundedElements" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="required" />
+        <xs:attribute name="default" type="ZeroOrOne"/>
+        <xs:attribute name="parent" type="xs:IDREF"/>
+    </xs:complexType>
+
+    <xs:element name="EditorCategories" type="EditorCategories"/>
+    <xs:element name="NodeArray" type="RequirementNodeLink"/>
+    <xs:element name="CanBeSuppressed" type="CanBeSuppressed"/>
+    
+    <xs:complexType name="RequirementNodeLink">
+        <xs:attribute name="index" type="UseOrShow" use="required"/>
+        <xs:attribute name="Link" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="EditorCategories">
+        <xs:attribute name="value" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="CanBeSuppressed">
+        <xs:attribute name="index" type="UseOrShow" use="required"/>
+        <xs:attribute name="value" type="ZeroOrOne" use="required"/>
+    </xs:complexType>
+
+    <xs:simpleType name="ZeroOrOne">
+        <xs:restriction base="xs:int">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UseOrShow">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Use"/>
+            <xs:enumeration value="Show"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema> 
\ No newline at end of file
diff --git a/schemas/SchemaRequirementNodeData.xsd b/schemas/SchemaRequirementNodeData.xsd
new file mode 100644
index 000000000..0bdd7ef1f
--- /dev/null
+++ b/schemas/SchemaRequirementNodeData.xsd
@@ -0,0 +1,179 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="Catalog">
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:group ref="top_level_elements"/>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="ids_within_a_document_must_be_unique">
+            <xs:selector xpath="
+            CRequirementAllowAbil
+            |CRequirementAllowUnit
+            |CRequirementAllowUpgrade
+            |CRequirementCountBehavior
+            |CRequirementCountUnit
+            |CRequirementCountUpgrade
+            |CRequirementNot
+            |CRequirementAnd
+            |CRequirementOr
+            |CRequirementEq
+            |CRequirementLT
+            |CRequirementGT
+            "/>
+            <xs:field xpath="@id"/>
+        </xs:unique>
+    </xs:element>
+    <xs:group name="top_level_elements">
+        <xs:choice>
+            <xs:element name="CRequirementAllowAbil" type="RequirementTypeAllow"/>
+            <xs:element name="CRequirementAllowBehavior" type="RequirementTypeAllow"/>
+            <xs:element name="CRequirementAllowUnit" type="RequirementTypeAllow"/>
+            <xs:element name="CRequirementAllowUpgrade" type="RequirementTypeAllow"/>
+            <xs:element name="CRequirementCountAbil" type="RequirementTypeCount"/>
+            <xs:element name="CRequirementCountBehavior" type="RequirementTypeCount"/>
+            <xs:element name="CRequirementCountUnit" type="RequirementTypeCount"/>
+            <xs:element name="CRequirementCountUpgrade" type="RequirementTypeCount"/>
+            <xs:element name="CRequirementNot" type="RequirementTypeUnaryOp"/>
+            <xs:element name="CRequirementOdd" type="RequirementTypeUnaryOp"/>
+            <xs:element name="CRequirementAnd" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementOr" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementXor" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementEq" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementNE" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementLT" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementGT" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementLTE" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementGTE" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementDiv" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementMod" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementMul" type="RequirementTypeOp"/>
+            <xs:element name="CRequirementConst" type="RequirementTypeConst"/>
+            <xs:element name="CRequirementSum" type="RequirementTypeOp"/>
+        </xs:choice>
+    </xs:group>
+    
+    <xs:complexType name="RequirementType">
+        <xs:attribute name="id" type="xs:string" use="required"/>
+        <xs:attribute name="default" type="ZeroOrOne" use="optional"/>
+        <xs:attribute name="parent" type="xs:string" use="optional"/>
+    </xs:complexType>
+
+    <xs:complexType name="RequirementTypeAllow">
+        <xs:complexContent>
+            <xs:extension base="RequirementType">
+                <xs:all>
+                    <xs:element ref="Link"/>
+                    <xs:element ref="Flags" minOccurs="0"/>
+                    <xs:element ref="Tooltip" minOccurs="0"/>
+                </xs:all>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="RequirementTypeCount">
+        <xs:complexContent>
+            <xs:extension base="RequirementType">
+                <xs:all>
+                    <xs:element ref="Count"/>
+                    <xs:element ref="Flags" minOccurs="0"/>
+                    <xs:element ref="Tooltip" minOccurs="0"/>
+                </xs:all>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="RequirementTypeConst">
+        <xs:complexContent>
+            <xs:extension base="RequirementType">
+                <xs:all>
+                    <xs:element ref="Value"/>
+                    <xs:element ref="Flags" minOccurs="0"/>
+                    <xs:element ref="Tooltip" minOccurs="0"/>
+                </xs:all>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="RequirementTypeUnaryOp">
+        <xs:complexContent>
+            <xs:extension base="RequirementType">
+                <xs:all>
+                    <xs:element ref="OperandArray" minOccurs="0"/>
+                    <xs:element ref="Flags" minOccurs="0"/>
+                    <xs:element ref="Tooltip" minOccurs="0"/>
+                </xs:all>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="RequirementTypeOp">
+        <xs:complexContent>
+            <xs:extension base="RequirementType">
+                <xs:choice>
+                    <xs:sequence>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element ref="Flags" minOccurs="0"/>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element ref="Tooltip" minOccurs="0"/>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                    <xs:sequence>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element ref="Tooltip" minOccurs="0"/>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element ref="Flags" minOccurs="0"/>
+                        <xs:element ref="OperandArray" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="OperandArray">
+        <xs:complexType>
+            <xs:attribute name="index" type="ZeroOrOne"/>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Flags">
+        <xs:complexType>
+            <xs:attribute name="index" type="xs:string" use="required"/>
+            <xs:attribute name="value" type="ZeroOrOne" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Tooltip">
+        <xs:complexType>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Count">
+        <xs:complexType>
+            <xs:attribute name="Link" type="xs:string" use="required"/>
+            <xs:attribute name="State" type="xs:string" use="required"/>
+            <xs:attribute name="Unlock" type="xs:string"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Link">
+        <xs:complexType>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Value">
+        <xs:complexType>
+            <xs:attribute name="value" type="xs:int" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:simpleType name="ZeroOrOne">
+        <xs:restriction base="xs:int">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UseOrShow">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Use"/>
+            <xs:enumeration value="Show"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema> 
\ No newline at end of file
diff --git a/schemas/SchemaUpgradeData.xsd b/schemas/SchemaUpgradeData.xsd
new file mode 100644
index 000000000..2fea50849
--- /dev/null
+++ b/schemas/SchemaUpgradeData.xsd
@@ -0,0 +1,162 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="Catalog">
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element name="CUpgrade" type="CUpgrade"/>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="ids_within_a_document_must_be_unique">
+            <xs:selector xpath="CUpgrade"/>
+            <xs:field xpath="@id"/>
+        </xs:unique>
+    </xs:element>
+    
+    <xs:complexType name="CUpgrade">
+        <xs:sequence minOccurs="0">
+            <xs:group ref="upgrade_elements" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string" use="required"/>
+        <xs:attribute name="default" type="ZeroOrOne"/>
+        <xs:attribute name="parent" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:group name="upgrade_elements">
+        <xs:choice>
+            <!-- Further elements seen elsewhere -->
+            <xs:element name="Name" type="value_string"/>
+            <xs:element name="Race" type="value_race"/>
+            <xs:element name="EditorCategories" type="EditorCategories"/>
+            <xs:element name="LeaderAlias" type="value_string"/>
+            <xs:element name="DataCollection" type="value_string"/>
+            <xs:element name="BonusTimePerLevel" type="value_float"/>
+            <xs:element name="LeaderLevel" type="value_int"/>
+            <xs:element name="Alert" type="value_string"/>
+            <xs:element name="Icon" type="value_string"/>
+            <xs:element name="MaxLevel" type="value_int"/>
+            <xs:element name="WebPriority" type="value_int"/>
+            <xs:element name="InfoTooltipPriority" type="value_string"/>
+            <xs:element name="LeaderAlias" type="value_string"/>
+            <xs:element name="LeaderPriority" type="value_int"/>
+            <xs:element name="ScoreAmount" type="value_int"/>
+            <xs:element name="ScoreCount" type="value_string"/>
+            <xs:element name="ScoreResult" type="value_string"/>
+            <xs:element name="ScoreValue" type="value_string"/>
+            <!-- Flag types -->
+            <xs:element name="Flags" type="binary_flags"/>
+            <xs:element name="EnumExcludedUserFlags" type="user_flags"/>
+            <xs:element name="EnumRequiredUserFlags" type="user_flags"/>
+            <xs:element name="BonusResourcePerLevel" type="resource_type_to_val"/>
+            <!-- Array types -->
+            <xs:element name="EffectArray" type="array_ref_val"/>
+            <xs:element name="EffectArrayTemplate" type="array_ref_val"/>
+            <xs:element name="AffectedUnitArray" type="array_value_string"/>
+            <xs:element name="TechAliasArray" type="array_value_string"/>
+            <xs:element name="LevelButton" type="array_value_string"/>
+            <xs:element name="LevelRequirements" type="array_value_string"/>
+            <xs:element name="UnitAllowed" type="array_value_string"/>
+            <xs:element name="UnitDisallowed" type="array_value_string"/>
+        </xs:choice>
+    </xs:group>
+
+    <xs:complexType name="binary_flags">
+        <xs:attribute name="index" type="xs:string" use="required"/>
+        <xs:attribute name="value" type="ZeroOrOne" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="user_flags">
+        <xs:attribute name="index" type="xs:string" use="required"/>
+        <xs:attribute name="value" type="user_flag_option" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="resource_type_to_val">
+        <xs:attribute name="index" type="resource_type" use="required"/>
+        <xs:attribute name="value" type="xs:int" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="EditorCategories">
+        <xs:attribute name="value" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="value_int">
+        <xs:attribute name="value" type="xs:int" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="value_float">
+        <xs:attribute name="value" type="xs:float" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="value_string">
+        <xs:attribute name="value" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="value_race">
+        <xs:attribute name="value" type="race" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="array_value_string">
+        <xs:attribute name="index" type="xs:string"/>
+        <xs:attribute name="value" type="xs:string" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="array_ref_val">
+        <xs:attribute name="index" type="xs:string" use="optional"/>
+        <xs:attribute name="Operation" type="operation" use="optional"/>
+        <xs:attribute name="Reference" type="xs:string" use="required"/>
+        <xs:attribute name="Value" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:simpleType name="race">
+        <xs:restriction base="xs:string">
+            <!-- Defaults to Add when nothing specified -->
+            <xs:enumeration value="Neut"/>
+            <xs:enumeration value="Prot"/>
+            <xs:enumeration value="Terr"/>
+            <xs:enumeration value="Zerg"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="operation">
+        <xs:restriction base="xs:string">
+            <!-- Defaults to Add when nothing specified -->
+            <xs:enumeration value="AddBaseMultiply"/>
+            <xs:enumeration value="Divide"/>
+            <xs:enumeration value="Multiply"/>
+            <xs:enumeration value="Set"/>
+            <xs:enumeration value="Subtract"/>
+            <xs:enumeration value="SubtractBaseMultiply"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="user_flag_option">
+        <xs:restriction base="xs:string">
+            <!-- Defaults to Add when nothing specified -->
+            <xs:enumeration value="Ancient"/>
+            <xs:enumeration value="ArmyUnit"/>
+            <xs:enumeration value="Bridge"/>
+            <xs:enumeration value="Building"/>
+            <xs:enumeration value="CanSleep"/>
+            <xs:enumeration value="Destructible"/>
+            <xs:enumeration value="Hero"/>
+            <xs:enumeration value="Item"/>
+            <xs:enumeration value="Powerup"/>
+            <xs:enumeration value="Projectile"/>
+            <xs:enumeration value="Tree"/>
+            <xs:enumeration value="Unit"/>
+            <xs:enumeration value="User14"/>
+            <xs:enumeration value="User15"/>
+            <xs:enumeration value="User16"/>
+            <xs:enumeration value="Ward"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="resource_type">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Minerals"/>
+            <xs:enumeration value="Vespene"/>
+            <xs:enumeration value="Terrazine"/>
+            <xs:enumeration value="Custom"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ZeroOrOne">
+        <xs:restriction base="xs:int">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UseOrShow">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Use"/>
+            <xs:enumeration value="Show"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema> 
\ No newline at end of file
diff --git a/schemas/settings.jsonc b/schemas/settings.jsonc
new file mode 100644
index 000000000..cefd61fa8
--- /dev/null
+++ b/schemas/settings.jsonc
@@ -0,0 +1,8 @@
+{
+    // Use this in your .vscode settings to set the .xsd associations with the Red Hat XML extension
+    "xml.fileAssociations": [
+        {"pattern": "RequirementData.xml", "systemId": "./schemas/SchemaRequirementData.xsd"},
+        {"pattern": "RequirementNodeData.xml", "systemId": "./schemas/SchemaRequirementNodeData.xsd"},
+        {"pattern": "UpgradeData.xml", "systemId": "./schemas/SchemaUpgradeData.xsd"}
+    ]
+}
\ No newline at end of file