Index: binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Epiteíkhisma</SpecificName>
-    <Tooltip>Build siege engines. Garrison soldiers inside for stout defense.</Tooltip>
+    <Tooltip>Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/fortress.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -13,7 +13,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Brythonic Broch</SpecificName>
-    <Tooltip>Train Brythonic heroes and champions. Construct siege rams.</Tooltip>
+    <Tooltip>Train Brythonic heroes and champions.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
@@ -23,15 +23,9 @@
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
-      units/{civ}_champion_cavalry
       units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -17,15 +17,7 @@
       units/{civ}_hero_hamilcar
       units/{civ}_hero_hannibal
       units/{civ}_hero_maharbal
-      units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_fortress.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -6,22 +6,16 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Gallic Dun</SpecificName>
-    <Tooltip>Train Gallic heroes and champions. Construct siege rams.</Tooltip>
+    <Tooltip>Train Gallic heroes and champions.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
-      units/{civ}_champion_cavalry
       units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -25,12 +25,6 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
@@ -15,7 +15,6 @@
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
       units/{civ}_hero_nastasen
       units/{civ}_hero_amanirenas
       units/{civ}_hero_arakamani
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -19,12 +19,6 @@
       units/{civ}_hero_demetrius
       units/{civ}_champion_infantry_a
       units/{civ}_champion_cavalry
-      -units/{civ}_mechanical_siege_ballista_packed
-      -units/{civ}_mechanical_siege_scorpio_packed
-      -units/{civ}_mechanical_siege_oxybeles_packed
-      -units/{civ}_mechanical_siege_lithobolos_packed
-      -units/{civ}_mechanical_siege_ram
-      -units/{civ}_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -13,16 +13,7 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
       units/{civ}_champion_chariot
-      -units/{civ}_mechanical_siege_ballista_packed
-      -units/{civ}_mechanical_siege_scorpio_packed
-      -units/{civ}_mechanical_siege_oxybeles_packed
-      -units/{civ}_mechanical_siege_lithobolos_packed
-      -units/{civ}_mechanical_siege_ram
-      -units/{civ}_mechanical_siege_tower
     </Entities>
-    <Technologies datatype="tokens">
-      attack_soldiers_will
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryans/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -3,18 +3,12 @@
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
-    <Tooltip>Train Champion Cavalry and Construct Siege Rams.</Tooltip>
+    <Tooltip>Train Champion Cavalry.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -15,15 +15,7 @@
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_pikeman
       units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -12,13 +12,6 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Build siege engines and train Champions. Garrison soldiers inside for stout defense.</Tooltip>
+    <Tooltip>Train Champions. Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
@@ -18,14 +18,9 @@
       units/{civ}_champion_chariot
       units/{civ}_champion_infantry_swordsman
       units/{civ}_champion_cavalry
-      units/{civ}_champion_elephant
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
       successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
Index: binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Teíkhisma</SpecificName>
-    <Tooltip>Build siege engines. Garrison up to 20 soldiers inside for stout defense.</Tooltip>
+    <Tooltip>Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/fortress.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -17,7 +17,7 @@
     <Max>10</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Infantry Cavalry</List>
+    <List datatype="tokens">Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
@@ -27,7 +27,7 @@
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
-    <Tooltip>Train citizen-soldiers. Research training improvements.</Tooltip>
+    <Tooltip>Train citizen-soldier infantry. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
@@ -48,10 +48,6 @@
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
-      units/{civ}_cavalry_swordsman_b
-      units/{civ}_cavalry_spearman_b
-      units/{civ}_cavalry_javelinist_b
-      units/{civ}_cavalry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
@@ -14,6 +14,9 @@
       -units/{civ}_infantry_spearman_b
       -units/{civ}_infantry_pikeman_b
       -units/{civ}_infantry_swordsman_b
+      -units/{civ}_infantry_javelinist_b
+      -units/{civ}_infantry_slinger_b
+      -units/{civ}_infantry_archer_b
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -57,7 +57,7 @@
     <Max>20</Max>
     <EjectHealth>0.075</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry Siege</List>
+    <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
@@ -67,7 +67,7 @@
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
-    <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements.</Tooltip>
+    <Tooltip>Train heroes and champions.</Tooltip>
     <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
@@ -83,15 +83,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_polybolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
-    </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
@@ -104,7 +95,7 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
+    <Root>true</Root>
     <Radius>100</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -32,6 +32,9 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
+      structures/{civ}_stable
+      structures/{civ}_elephant_stables
+      structures/{civ}_workshop
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -10,8 +10,12 @@
       structures/{civ}_corral
       structures/{civ}_outpost
       other/wallset_palisade
+      structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
+      structures/{civ}_stable
+      structures/{civ}_elephant_stables
+      structures/{civ}_workshop
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
@@ -19,6 +23,7 @@
       structures/{civ}_wallset_stone
       structures/{civ}_civil_centre
       structures/{civ}_fortress
+      structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_workshop
       structures/mace_theatron
       structures/mace_library
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur_elephant_stables
       structures/maur_pillar_ashoka
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur_elephant_stables
       structures/maur_pillar_ashoka
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur_elephant_stables
       structures/maur_pillar_ashoka
     </Entities>
   </Builder>