Index: binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_tower_crenellations.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"genericName": "Crenellations",
-	"description": "Crenellations on the battlements allow soldiers wider range of fire in defending a keep.",
-	"cost": {"food": 0, "wood": 0, "stone": 500, "metal": 250},
-	"requirements": {"tech": "phase_town"},
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "crenelations.png",
-	"researchTime": 40,
-	"tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.",
-	"modifications": [{"value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4}],
-	"affects": ["DefenseTower"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_tower_defense.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"genericName": "Sturdy Foundations",
-	"description": "Reinforce the foundations in preparation of an attack.",
-	"cost": {"food": 0, "wood": 500, "stone": 500, "metal": 500},
-	"requirements": {"tech": "phase_city"},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "architecture.png",
-	"researchTime": 40,
-	"tooltip": "Increases armor level of the defense tower by 2 levels.",
-	"modifications": [{"value": "Armour/Hack", "add": 2},
-		{"value": "Armour/Pierce", "add": 2},
-		{"value": "Armour/Crush", "add": 2}],
-	"affects": ["DefenseTower"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"genericName": "Murder Holes",
-	"description": "Murder holes allow hitting enemies at the foot of the tower.",
-	"cost": {"food": 0, "wood": 250, "stone": 100, "metal": 0},
-	"requirements": {"tech": "phase_city"},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "murder_holes.png",
-	"researchTime": 40,
-	"tooltip": "Removes defense tower minimum range.",
-	"modifications": [{"value": "Attack/Ranged/MinRange", "replace": 0}],
-	"affects": ["DefenseTower"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"genericName": "Arrow Shooters",
-	"description": "Arrow shooters increase the maximum range of the fire arrows.",
-	"cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
-	"requirements": {"tech": "phase_town"},
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "arrow.png",
-	"researchTime": 40,
-	"tooltip": "Increases defense tower maximum range by 8 meters.",
-	"modifications": [
-		{ "value": "Attack/Ranged/MaxRange", "add": 8 },
-		{ "value": "Vision/Range","add": 8 }
-	],
-	"affects": ["DefenseTower"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"genericName": "Sentries",
-	"specificName": {
-		"mace": "Nyktophýlakes",
-		"spart": "Nyktophýlakes",
-		"athen": "Nyktophýlakes",
-		"ptol": "Nyktophýlakes",
-		"sele": "Nyktophýlakes",
-		"rome": "Vigiles"
-	},
-	"description": "A night's watch increases vigilance.",
-	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 0},
-	"requirements": {"tech": "phase_village"},
-	"requirementsTooltip": "Unlocked in Village Phase.",
-	"icon": "helmet_corinthian_bronze.png",
-	"researchTime": 40,
-	"tooltip": "Post sentries to add one arrow to towers.",
-	"modifications": [{"value": "BuildingAI/DefaultArrowCount", "add": 1.0}],
-	"affects": ["DefenseTower"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/decay_outpost.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/decay_outpost.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"genericName": "Stone Foundations",
-	"description": "Outposts survive twice as long in neutral territory.",
-	"cost": {"food": 0, "wood": 0, "stone": 100, "metal": 0},
-	"requirements": {"tech": "phase_village"},
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "blocks_three.png",
-	"researchTime": 40,
-	"tooltip": "Territory decay rate -50% for outposts.",
-	"modifications": [{"value": "TerritoryDecay/DecayRate", "multiply": 0.5}],
-	"affects": ["Outpost"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/data/technologies/tower_armour.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_armour.json
@@ -0,0 +1,17 @@
+{
+  "genericName": "Sturdy Foundations",
+  "description": "Reinforce the foundations in preparation of an attack.",
+  "cost": {"food": 0, "wood": 500, "stone": 500, "metal": 500},
+  "requirements": {"tech": "phase_city"},
+  "requirementsTooltip": "Unlocked in City Phase.",
+  "icon": "architecture.png",
+  "researchTime": 40,
+  "tooltip": "Increases armor of defensive towers by 2 levels.",
+  "modifications": [
+    {"value": "Armour/Hack", "add": 2},
+    {"value": "Armour/Pierce", "add": 2},
+    {"value": "Armour/Crush", "add": 2}
+  ],
+  "affects": ["DefenseTower"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json
@@ -0,0 +1,15 @@
+{
+  "genericName": "Crenellations",
+  "description": "Crenellations on the battlements allow soldiers wider range of fire in defending a keep.",
+  "cost": {"food": 0, "wood": 0, "stone": 500, "metal": 250},
+  "requirements": {"tech": "phase_town"},
+  "requirementsTooltip": "Unlocked in Town Phase.",
+  "icon": "crenelations.png",
+  "researchTime": 40,
+  "tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.",
+  "modifications": [
+    {"value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4}
+  ],
+  "affects": ["DefenseTower"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_decay.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_decay.json
@@ -0,0 +1,15 @@
+{
+  "genericName": "Stone Foundations",
+  "description": "Outposts survive twice as long in neutral territory.",
+  "cost": {"food": 0, "wood": 0, "stone": 100, "metal": 0},
+  "requirements": {"tech": "phase_village"},
+  "requirementsTooltip": "Unlocked in Town Phase.",
+  "icon": "blocks_three.png",
+  "researchTime": 40,
+  "tooltip": "Outposts -50% territory decay rate.",
+  "modifications": [
+    {"value": "TerritoryDecay/DecayRate", "multiply": 0.5}
+  ],
+  "affects": ["Outpost"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json
@@ -0,0 +1,15 @@
+{
+  "genericName": "Murder Holes",
+  "description": "Murder holes allow hitting enemies at the foot of the tower.",
+  "cost": {"food": 0, "wood": 250, "stone": 100, "metal": 0},
+  "requirements": {"tech": "phase_city"},
+  "requirementsTooltip": "Unlocked in City Phase.",
+  "icon": "murder_holes.png",
+  "researchTime": 40,
+  "tooltip": "Removes defensive towers' minimum range.",
+  "modifications": [
+    {"value": "Attack/Ranged/MinRange", "replace": 0}
+  ],
+  "affects": ["DefenseTower"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_range.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_range.json
@@ -0,0 +1,16 @@
+{
+  "genericName": "Arrow Shooters",
+  "description": "Arrow shooters increase the maximum range of the fire arrows.",
+  "cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
+  "requirements": {"tech": "phase_town"},
+  "requirementsTooltip": "Unlocked in Town Phase.",
+  "icon": "arrow.png",
+  "researchTime": 40,
+  "tooltip": "Increases defensive towers' maximum range by 8 meters.",
+  "modifications": [
+    { "value": "Attack/Ranged/MaxRange", "add": 8 },
+    { "value": "Vision/Range","add": 8 }
+  ],
+  "affects": ["DefenseTower"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_vision.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_vision.json
@@ -0,0 +1,14 @@
+{
+  "genericName": "Carrier Pigeons",
+  "description": "Outposts gain longer vision for scouting.",
+  "cost": {"food": 100, "wood": 0, "stone": 0, "metal": 0},
+  "requirements": {"tech": "phase_village"},
+  "icon": "pigeon.png",
+  "researchTime": 40,
+  "tooltip": "Outposts +50% vision range.",
+  "modifications": [
+    {"value": "Vision/Range", "multiply": 1.5}
+  ],
+  "affects": ["Outpost"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/tower_watch.json
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/data/technologies/tower_watch.json
@@ -0,0 +1,23 @@
+{
+  "genericName": "Sentries",
+  "specificName": {
+    "mace": "Nyktophýlakes",
+    "spart": "Nyktophýlakes",
+    "athen": "Nyktophýlakes",
+    "ptol": "Nyktophýlakes",
+    "sele": "Nyktophýlakes",
+    "rome": "Vigiles"
+  },
+  "description": "A night's watch increases vigilance.",
+  "cost": {"food": 500, "wood": 0, "stone": 0, "metal": 0},
+  "requirements": {"tech": "phase_village"},
+  "requirementsTooltip": "Unlocked in Village Phase.",
+  "icon": "helmet_corinthian_bronze.png",
+  "researchTime": 40,
+  "tooltip": "Post sentries to add one arrow to defensive towers.",
+  "modifications": [
+    {"value": "BuildingAI/DefaultArrowCount", "add": 1}
+  ],
+  "affects": ["DefenseTower"],
+  "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: binaries/data/mods/public/simulation/data/technologies/vision_outpost.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/vision_outpost.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"genericName": "Carrier Pigeons",
-	"description": "Outposts gain longer vision for scouting.",
-	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 0},
-	"requirements": {"tech": "phase_village"},
-	"icon": "pigeon.png",
-	"researchTime": 40,
-	"tooltip": "Vision Range +50% for Outposts.",
-	"modifications": [{"value": "Vision/Range", "multiply": 1.5}],
-	"affects": ["Outpost"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Capturable disable=""/>
   <Identity>
     <Civ>gaia</Civ>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint replace=""><!-- use iberian footprint -->
     <Circle radius="8.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defense_tower_sentry">
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <SkirmishReplacer>
+    <general>structures/{civ}_sentry_tower</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/wooden_tower.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
@@ -12,8 +12,6 @@
     <Static width="7.0" depth="8.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>athen</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</SpecificName>
   </Identity>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint replace="">
     <Circle radius="6.0"/>
     <Height>10.0</Height>
@@ -11,6 +11,9 @@
   <Obstruction>
     <Static width="7.5" depth="7.5"/>
   </Obstruction>
+  <StatusBars>
+    <HeightOffset>21.0</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>structures/britons/scout_tower.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Brythonic Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>brit</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
@@ -12,8 +12,6 @@
     <Static width="9.0" depth="9.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>20.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Carthaginian Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
@@ -11,6 +11,9 @@
   <Obstruction>
     <Static width="7.5" depth="7.5"/>
   </Obstruction>
+  <StatusBars>
+    <HeightOffset>21.0</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>structures/gauls/scout_tower.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Gallic Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>gaul</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Attack>
     <Ranged>
       <MinRange>12.0</MinRange>
@@ -35,8 +35,6 @@
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>17.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
Index: binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
@@ -12,8 +12,6 @@
     <Static width="7.0" depth="8.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>mace</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>mace</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Udarka</SpecificName>
   </Identity>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Uparaksana</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>maur</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</SpecificName>
   </Identity>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didebani</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
@@ -12,8 +12,6 @@
     <Static width="9.0" depth="9.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>mktr-n-ḫt</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>ptol</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
@@ -12,8 +12,6 @@
     <Static width="7.5" depth="7.5"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Vigilarium</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>rome</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
@@ -12,8 +12,6 @@
     <Static width="7.0" depth="8.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Prophylax</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>sele</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
@@ -12,8 +12,6 @@
     <Static width="7.0" depth="8.0"/>
   </Obstruction>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_outpost">
+<Entity parent="template_structure_defense_tower_outpost">
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_sentry_tower">
+<Entity parent="template_structure_defense_tower_sentry">
   <Identity>
     <Civ>spart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>12.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>76.0</MaxRange>
-      <MinRange>10.0</MinRange>
-      <ElevationBonus>15</ElevationBonus>
-      <ProjectileSpeed>75.0</ProjectileSpeed>
-      <Gravity>9.81</Gravity>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Spread>1.5</Spread>
-      <Delay>0</Delay>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Category>DefenseTower</Category>
-    <Distance>
-      <FromClass>DefenseTower</FromClass>
-      <MinDistance>60</MinDistance>
-    </Distance>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>150</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="10.0" depth="10.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Defense Tower</GenericName>
-    <Tooltip>Shoots arrows. Garrison to provide extra defense. Needs the murder holes tech to protect its foot.</Tooltip>
-    <Classes datatype="tokens">Tower GarrisonTower -ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Town DefenseTower</VisibleClasses>
-    <Icon>structures/defense_tower.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      attack_tower_watch
-      attack_tower_crenellations
-      attack_tower_range
-      attack_tower_murderholes
-      attack_tower_defense
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>21.0</HeightOffset>
-  </StatusBars>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
-  <Armour>
-    <Hack>5</Hack>
-    <Pierce>20</Pierce>
-    <Crush>1</Crush>
-    <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
-    </Foundation>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>16.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>55.0</MaxRange>
-      <MinRange>13.0</MinRange>
-      <ProjectileSpeed>75.0</ProjectileSpeed>
-      <Gravity>9.81</Gravity>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Spread>1.5</Spread>
-      <Delay>0</Delay>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Category>Outpost</Category>
-    <Distance>
-      <FromClass>Outpost</FromClass>
-      <MinDistance>50</MinDistance>
-    </Distance>
-    <Territory>own neutral</Territory>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>80</wood>
-      <stone>0</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>1</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>800</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Outpost</GenericName>
-    <Tooltip>Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
-    <Icon>structures/outpost.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>8</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      vision_outpost
-      decay_outpost
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>18.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay>
-    <DecayRate>2</DecayRate>
-  </TerritoryDecay>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_outpost.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_sentry_tower.xml
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
-  <Armour>
-    <Hack op="add">-5.0</Hack>
-    <Pierce op="add">-5.0</Pierce>
-    <Crush op="add">-2.0</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>9.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>70.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <ElevationBonus>9.0</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <Capturable>
-    <CapturePoints>800</CapturePoints>
-  </Capturable>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <stone>0</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.5" depth="8.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>3</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>250</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Sentry Tower</SpecificName>
-    <GenericName>Sentry Tower</GenericName>
-    <Icon>structures/sentry_tower.png</Icon>
-    <VisibleClasses datatype="tokens">Village -Town SentryTower</VisibleClasses>
-    <RequiredTechnology>phase_village</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-    <stone>0</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="9.0" depth="7.5"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -attack_tower_crenellations
-      -attack_tower_range
-      -attack_tower_murderholes
-      -attack_tower_defense
-    </Technologies>
-  </ProductionQueue>
-  <StatusBars>
-    <HeightOffset>18.0</HeightOffset>
-  </StatusBars>
-  <TerritoryInfluence>
-    <Radius op="mul">0.5</Radius>
-  </TerritoryInfluence>
-  <Upgrade>
-    <Tower>
-      <Entity>structures/{civ}_defense_tower</Entity>
-      <Tooltip>Reinforce with stone and upgrade to a defense tower.</Tooltip>
-      <RequiredTechnology>phase_town</RequiredTechnology>
-      <Cost>
-        <wood>50</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>100</Time>
-    </Tower>
-  </Upgrade>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_fort.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
@@ -2,12 +2,9 @@
 <Entity parent="template_structure_defense">
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>12.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>76.0</MaxRange>
-      <MinRange>10.0</MinRange>
-      <ElevationBonus>15</ElevationBonus>
+      <Hack>0</Hack>
+      <Pierce>0</Pierce>
+      <Crush>0</Crush>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <Gravity>9.81</Gravity>
       <PrepareTime>1200</PrepareTime>
@@ -29,19 +26,7 @@
       <MinDistance>60</MinDistance>
     </Distance>
   </BuildRestrictions>
-  <Cost>
-    <BuildTime>150</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="10.0" depth="10.0"/>
-    <Height>15.0</Height>
-  </Footprint>
   <GarrisonHolder>
-    <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
@@ -53,47 +38,20 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Defense Tower</GenericName>
-    <Tooltip>Shoots arrows. Garrison to provide extra defense. Needs the murder holes tech to protect its foot.</Tooltip>
-    <Classes datatype="tokens">Tower GarrisonTower -ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Town DefenseTower</VisibleClasses>
-    <Icon>structures/defense_tower.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Classes datatype="tokens">Tower -ConquestCritical</Classes>
   </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      attack_tower_watch
-      attack_tower_crenellations
-      attack_tower_range
-      attack_tower_murderholes
-      attack_tower_defense
-    </Technologies>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
+      <select>interface/select/building/sel_tower.xml</select>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
-    <HeightOffset>21.0</HeightOffset>
+    <HeightOffset>18.0</HeightOffset>
   </StatusBars>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
+<Entity parent="template_structure_defense_tower">
   <Armour>
     <Hack>5</Hack>
     <Pierce>20</Pierce>
@@ -12,22 +12,14 @@
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>16.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>55.0</MaxRange>
-      <MinRange>13.0</MinRange>
-      <ProjectileSpeed>75.0</ProjectileSpeed>
-      <Gravity>9.81</Gravity>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Spread>1.5</Spread>
-      <Delay>0</Delay>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+      <Pierce>16</Pierce>
+      <MaxRange>55</MaxRange>
+      <MinRange>13</MinRange>
+      <ElevationBonus>0</ElevationBonus>
     </Ranged>
   </Attack>
   <BuildingAI>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
+    <DefaultArrowCount>0</DefaultArrowCount>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Outpost</Category>
@@ -41,7 +33,6 @@
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>80</wood>
-      <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -50,20 +41,13 @@
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Outpost</GenericName>
     <Tooltip>Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
     <Icon>structures/outpost.png</Icon>
   </Identity>
@@ -76,30 +60,14 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
-      vision_outpost
-      decay_outpost
+      tower_vision
+      tower_decay
     </Technologies>
   </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>18.0</HeightOffset>
-  </StatusBars>
   <TerritoryDecay>
     <DecayRate>2</DecayRate>
   </TerritoryDecay>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
   <VisualActor>
     <Actor>props/special/palisade_rocks_outpost.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_defense_tower">
+<Entity parent="template_structure_defense_tower">
   <Armour>
-    <Hack op="add">-5.0</Hack>
-    <Pierce op="add">-5.0</Pierce>
-    <Crush op="add">-2.0</Crush>
+    <Hack op="add">-5</Hack>
+    <Pierce op="add">-5</Pierce>
+    <Crush op="add">-2</Crush>
   </Armour>
   <Attack>
     <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>9.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>70.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <ElevationBonus>9.0</ElevationBonus>
+      <Pierce>9</Pierce>
+      <MaxRange>70</MaxRange>
+      <MinRange>0</MinRange>
+      <ElevationBonus>9</ElevationBonus>
     </Ranged>
   </Attack>
   <Capturable>
@@ -22,7 +20,6 @@
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>100</wood>
-      <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
@@ -36,32 +33,27 @@
     <Max>250</Max>
   </Health>
   <Identity>
-    <SpecificName>Sentry Tower</SpecificName>
     <GenericName>Sentry Tower</GenericName>
     <Icon>structures/sentry_tower.png</Icon>
-    <VisibleClasses datatype="tokens">Village -Town SentryTower</VisibleClasses>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <Classes datatype="tokens">GarrisonTower</Classes>
+    <VisibleClasses datatype="tokens">Village DefenseTower SentryTower</VisibleClasses>
+    <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. Upgradeable to stone tower.</Tooltip>
   </Identity>
   <Loot>
     <wood>20</wood>
-    <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-      -attack_tower_crenellations
-      -attack_tower_range
-      -attack_tower_murderholes
-      -attack_tower_defense
+      tower_watch
     </Technologies>
   </ProductionQueue>
-  <StatusBars>
-    <HeightOffset>18.0</HeightOffset>
-  </StatusBars>
   <TerritoryInfluence>
-    <Radius op="mul">0.5</Radius>
+    <Root>false</Root>
+    <Radius>16</Radius>
+    <Weight>30000</Weight>
   </TerritoryInfluence>
   <Upgrade>
     <Tower>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_defense_tower">
+  <Attack>
+    <Ranged>
+      <Pierce>12</Pierce>
+      <MaxRange>76</MaxRange>
+      <MinRange>10</MinRange>
+      <ElevationBonus>15</ElevationBonus>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>150</BuildTime>
+    <Resources>
+      <wood>100</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="10.0" depth="10.0"/>
+    <Height>15.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>1000</Max>
+  </Health>
+  <Identity>
+    <GenericName>Defense Tower</GenericName>
+    <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot.</Tooltip>
+    <Classes datatype="tokens">GarrisonTower</Classes>
+    <VisibleClasses datatype="tokens">Town DefenseTower StoneTower</VisibleClasses>
+    <Icon>structures/defense_tower.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <wood>0</wood>
+    <stone>20</stone>
+  </Loot>
+  <Obstruction>
+    <Static width="7.0" depth="7.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Technologies datatype="tokens">
+      tower_watch
+      tower_crenellations
+      tower_range
+      tower_murderholes
+      tower_armour
+    </Technologies>
+  </ProductionQueue>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>32</Radius>
+    <Weight>30000</Weight>
+  </TerritoryInfluence>
+</Entity>