diff --git a/binaries/data/mods/public/simulation/components/BuildRestrictions.js b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
index 686975af51..ede6019305 100644
--- a/binaries/data/mods/public/simulation/components/BuildRestrictions.js
+++ b/binaries/data/mods/public/simulation/components/BuildRestrictions.js
@@ -6,7 +6,7 @@ BuildRestrictions.prototype.Schema =
 		"<BuildRestrictions>" +
 			"<PlacementType>land</PlacementType>" +
 			"<Territory>own</Territory>" +
-			"<Category>Special</Category>" +
+			"<Category>Structure</Category>" +
 			"<Distance>" +
 				"<FromClass>CivilCentre</FromClass>" +
 				"<MaxDistance>40</MaxDistance>" +
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
index 4bcb069f2c..306dcb05a5 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
@@ -3,18 +3,9 @@
   <Attack>
     <Ranged>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>25.0</Pierce>
-        <Crush>0.0</Crush>
+        <Pierce>25</Pierce>
       </Damage>
       <MaxRange>50.0</MaxRange>
-      <MinRange>1.0</MinRange>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <FriendlyFire>false</FriendlyFire>
-      </Projectile>
     </Ranged>
   </Attack>
   <BuildingAI>
diff --git a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
index f5242caebb..4e4f1ca51a 100644
--- a/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
+++ b/binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
@@ -3,18 +3,9 @@
   <Attack>
     <Ranged>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>25.0</Pierce>
-        <Crush>0.0</Crush>
+        <Pierce>25</Pierce>
       </Damage>
       <MaxRange>50.0</MaxRange>
-      <MinRange>1.0</MinRange>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <FriendlyFire>false</FriendlyFire>
-      </Projectile>
     </Ranged>
   </Attack>
   <BuildingAI>
diff --git a/binaries/data/mods/public/simulation/templates/other/bench.xml b/binaries/data/mods/public/simulation/templates/other/bench.xml
index a21c8a9343..502ba3e73f 100644
--- a/binaries/data/mods/public/simulation/templates/other/bench.xml
+++ b/binaries/data/mods/public/simulation/templates/other/bench.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="1.5" depth="4.25"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml b/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
index 58873ba29c..8a1a345260 100644
--- a/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
+++ b/binaries/data/mods/public/simulation/templates/other/bridge_hele.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Footprint>
     <Square width="62" depth="15.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml b/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
index 227556e3ef..1045359904 100644
--- a/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
+++ b/binaries/data/mods/public/simulation/templates/other/bridge_wooden.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Footprint>
     <Square width="62" depth="15.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric.xml b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
index 74caf69e8e..9f0cd8c206 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Fence</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="2.5" depth="2.5"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
index c7f10f9090..8e37112832 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="2.5" depth="12.5"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
index 21eafa67d3..2b7bcf6fac 100644
--- a/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="2.5" depth="2.5"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_long.xml b/binaries/data/mods/public/simulation/templates/other/fence_long.xml
index 75e84d1650..7db797e0b7 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_long.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_long.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Footprint>
     <Square width="0.8" depth="13.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_short.xml b/binaries/data/mods/public/simulation/templates/other/fence_short.xml
index 88ab9d3b19..ebfea38fec 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_short.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_short.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Footprint>
     <Square width="0.8" depth="6.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/other/fence_stone.xml b/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
index 4dc2b847cf..4dd29eea32 100644
--- a/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/other/fence_stone.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Footprint>
     <Square width="1.5" depth="11.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
index ada2909e75..2942fce3ee 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_propylaea.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>200</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/other/obelisk.xml b/binaries/data/mods/public/simulation/templates/other/obelisk.xml
index 959e28ba54..f36d3241de 100644
--- a/binaries/data/mods/public/simulation/templates/other/obelisk.xml
+++ b/binaries/data/mods/public/simulation/templates/other/obelisk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="4.5" depth="4.5"/>
     <Height>10.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml b/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
index 91786c9222..2ba524a364 100644
--- a/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
+++ b/binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Fence</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="1.6" depth="1.6"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml b/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
index e00b62ed96..6cfbaecdfb 100644
--- a/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
+++ b/binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="4.0" depth="5.25"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/other/table_square.xml b/binaries/data/mods/public/simulation/templates/other/table_square.xml
index 656aa08582..9bf49f1f29 100644
--- a/binaries/data/mods/public/simulation/templates/other/table_square.xml
+++ b/binaries/data/mods/public/simulation/templates/other/table_square.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="4.5" depth="4.5"/>
     <Height>4.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml b/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
index 999d8e5418..62c2af0ce4 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
@@ -51,6 +51,11 @@
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
     </SoundGroups>
   </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/athenians/prytaneion.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
index 12a802d0e4..c7dd80c51c 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_tower">
   <Attack disable=""/>
+  <BuildingAI disable=""/>
   <Footprint>
     <Square width="11" depth="10"/>
     <Height>20</Height>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
index 1287fa338e..a5b71eda56 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_tower">
   <Attack disable=""/>
+  <BuildingAI disable=""/>
   <Footprint>
     <Square width="9" depth="9"/>
     <Height>21.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml b/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
index 133c194439..f237d83d7e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
@@ -50,7 +50,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>1</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml b/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
index 9a9a955371..0c69264667 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
@@ -12,6 +12,9 @@
     <Square width="40.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <Health>
+    <Max>2000</Max>
+  </Health>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Harmya</SpecificName>
@@ -37,6 +40,12 @@
       units/{civ}_hero_ashoka
     </Entities>
   </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
index 39ee25899d..bc03b3368e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
@@ -50,7 +50,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>1</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
index 9cd3c1fa9b..2dc56aa111 100644
--- a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Attack disable=""/>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Distance>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
index edea7951ef..8acc03edce 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -59,9 +59,16 @@
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/apadana.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
index aa4bc0d137..8a38ad046a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -39,6 +39,11 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
index 6c06b2a9ef..7f17a97b43 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
@@ -3,9 +3,6 @@
   <Auras datatype="tokens">
     structures/loyalty_regen
   </Auras>
-  <BuildRestrictions>
-    <Category>IshtarGate</Category>
-  </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>200</BuildTime>
@@ -43,8 +40,16 @@
     </Obstructions>
   </Obstruction>
   <ProductionQueue disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>special/pers_ishtar_gate.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml b/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
index 1893fd2cc8..3b4f95a124 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_tacara.xml
@@ -35,9 +35,16 @@
     <Static width="38.5" depth="22.5"/>
   </Obstruction>
   <ProductionQueue disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/palace.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
index 070ff308d8..143a7d652d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
@@ -17,6 +17,7 @@
     <Height>8.0</Height>
   </Footprint>
   <Health>
+    <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -47,9 +48,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence>
-    <Radius>0</Radius>
-  </TerritoryInfluence>
   <Vision>
     <Range>180</Range>
     <RevealShore>true</RevealShore>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
index da1156d511..c5f1a0b90b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
-  <Attack disable=""/>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Distance>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml b/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
index 1685705b8d..7fde9b6547 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_arch.xml
@@ -40,7 +40,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>1</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
index 8f58e933a6..46fe2ead58 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -30,6 +30,7 @@
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>15</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>neutral enemy</Territory>
@@ -116,12 +117,13 @@
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>37.5</DecayRate>
   </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>60</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml b/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
index 002f8d01b3..7a8ad8068b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
@@ -45,6 +45,11 @@
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
     </SoundGroups>
   </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/spartans/gerousia.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml b/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
index efaf0f8753..2fb36ec781 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -52,6 +52,11 @@
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>38</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/spartans/syssiton.xml</Actor>
     <FoundationActor>structures/fndn_5x8.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index 186175777a..2d0a831d72 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
-  </BuildingAI>
   <BuildRestrictions>
     <PlacementType>land</PlacementType>
     <Territory>own</Territory>
+    <Category>Structure</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>500</CapturePoints>
@@ -142,8 +138,6 @@
       <attacked_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_gaia>
       <attacked_capture>interface/alarm/alarm_attackplayer.xml</attacked_capture>
       <attacked_capture_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_capture_gaia>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <StatusBars>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index c3f47b27c1..cd82bcf4d0 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -36,6 +36,7 @@
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
@@ -128,6 +129,8 @@
       <constructed>interface/complete/building/complete_civ_center.xml</constructed>
       <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
       <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
index c7c3b32e46..bd6eb204a9 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>House</Category>
-  </BuildRestrictions>
   <Capturable>
     <CapturePoints>300</CapturePoints>
     <GarrisonRegenRate>4.0</GarrisonRegenRate>
@@ -61,8 +58,6 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
index 1ab3ad75aa..3a42ffb327 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -3,9 +3,6 @@
   <Auras datatype="tokens">
     structures/temple_heal
   </Auras>
-  <BuildRestrictions>
-    <Category>Temple</Category>
-  </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>200</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
index 0da4552b01..4b89618439 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
@@ -4,12 +4,11 @@
     structures/wall_garrisoned
   </Auras>
   <BuildRestrictions>
-    <Category>Outpost</Category>
+    <Territory>own neutral</Territory>
     <Distance>
       <FromClass>Outpost</FromClass>
       <MinDistance>50</MinDistance>
     </Distance>
-    <Territory>own neutral</Territory>
   </BuildRestrictions>
   <Cost>
     <BuildTime>30</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
index 5a1994d4a0..ea037d5c31 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -56,6 +56,8 @@
     <SoundGroups>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
       <select>interface/select/building/sel_tower.xml</select>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <StatusBars>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
index 88077dae9c..b6fe6f2725 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -77,8 +77,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
index eaa43bf5d3..548d5e1b65 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -63,6 +63,8 @@
     <SoundGroups>
       <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
index 8253f2f344..0e1032fe08 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -6,9 +6,6 @@
     <EndOfAlertRange>100</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
-  <BuildRestrictions>
-    <Category>Farmstead</Category>
-  </BuildRestrictions>
   <Capturable>
     <CapturePoints>300</CapturePoints>
   </Capturable>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
index 8e05d40457..4bb6732b38 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -6,9 +6,6 @@
     <EndOfAlertRange>-1</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
-  <BuildRestrictions>
-    <Category>Market</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
index e677b9feed..b832c850f1 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
@@ -6,9 +6,6 @@
     <EndOfAlertRange>100</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
-  <BuildRestrictions>
-    <Category>Storehouse</Category>
-  </BuildRestrictions>
   <Capturable>
     <CapturePoints>300</CapturePoints>
   </Capturable>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military.xml b/binaries/data/mods/public/simulation/templates/template_structure_military.xml
index b556992c23..928f1e1d07 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Military</Category>
-  </BuildRestrictions>
   <GarrisonHolder>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index b73f4af5bf..59a7c8e0d4 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -30,6 +30,7 @@
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
@@ -98,6 +99,8 @@
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
index 519643f1cf..27d85eb053 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_resource.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Resource</Category>
-  </BuildRestrictions>
   <Identity>
     <GenericName>Resource Structure</GenericName>
     <VisibleClasses datatype="tokens">Resource</VisibleClasses>
@@ -23,7 +20,4 @@
       </Damage>
     </Foundation>
   </Resistance>
-  <Vision>
-    <Range>4</Range>
-  </Vision>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
index 88e5a7730f..eb0b359dcb 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
-  <BuildRestrictions>
-    <Category>Field</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special.xml b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
index 4fd25d7ccd..cab80e0e18 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
-  <BuildRestrictions>
-    <Category>Special</Category>
-  </BuildRestrictions>
   <Footprint>
     <Square width="24.0" depth="24.0"/>
     <Height>8.0</Height>
@@ -16,7 +13,6 @@
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
-    <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -43,17 +39,6 @@
       </Damage>
     </Foundation>
   </Resistance>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_broch.xml</select>
-      <constructed>interface/complete/building/complete_broch.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>38</Radius>
-    <Weight>40000</Weight>
-  </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
index 8a72ec8e8d..e01ea1f016 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Category>Amphitheater</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
@@ -44,7 +41,9 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
+    <Root>false</Root>
     <Radius>100</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
index 0c4a5e8953..9175357db5 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
@@ -18,6 +18,7 @@
     <Height>9.0</Height>
   </Footprint>
   <Health>
+    <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -45,7 +46,9 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
+    <Root>false</Root>
     <Radius>50</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_7x9.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
index e109ea4ffc..ac8e8e9013 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -16,6 +16,9 @@
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
+  <Health>
+    <Max>2000</Max>
+  </Health>
   <Identity>
     <GenericName>Rotary Mill</GenericName>
     <SelectionGroupName>template_structure_special_rotarymill</SelectionGroupName>
@@ -41,7 +44,9 @@
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
+    <Root>false</Root>
     <Radius>32</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
index 2b0d875910..f91738cd36 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml
@@ -41,6 +41,8 @@
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
+    <Root>false</Root>
     <Radius>100</Radius>
+    <Weight>40000</Weight>
   </TerritoryInfluence>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
index 5ce60db03e..e66b834b4a 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -89,11 +89,6 @@
       <constructed>interface/complete/building/complete_wonder.xml</constructed>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>12.0</HeightOffset>
-  </StatusBars>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>100</Radius>