Index: binaries/data/mods/public/art/actors/structures/carthaginians/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/carthaginians/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/carthaginians/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_kart.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/celts/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/celts/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/celts/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/hellenes/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/iberians/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/iberians/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/iberians/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/kushites/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/kushites/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/kushites/outpost.xml
@@ -18,14 +18,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_kush.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/mauryas/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/mauryas/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/mauryas/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_maur.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/persians/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/persians/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/persians/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/romans/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/romans/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/romans/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_rome.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
Index: binaries/data/mods/public/art/actors/structures/seleucids/outpost.xml
===================================================================
--- binaries/data/mods/public/art/actors/structures/seleucids/outpost.xml
+++ binaries/data/mods/public/art/actors/structures/seleucids/outpost.xml
@@ -16,14 +16,6 @@
     </variant>
   </group>
   <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
     <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
@@ -35,4 +27,4 @@
       </props>
     </variant>
   </group>
-</actor>
+</actor>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Prophylagma</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Antosolicon</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Antosolicon</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>trtr</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Prophylagma</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Uparaksana</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didebani</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Prophylagma</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Vigilārium</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Prophylagma</SpecificName>
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_defensive_tower_outpost">
+<Entity parent="template_structure_defensive_outpost">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Prophylagma</SpecificName>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Pierce>8</Pierce>
-      </Damage>
-      <MaxRange>50</MaxRange>
-      <MinRange>10</MinRange>
-      <ElevationBonus>8</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-  </BuildingAI>
+<Entity parent="template_structure_defensive">
+  <Auras datatype="tokens">
+    structures/wall_garrisoned
+  </Auras>
   <BuildRestrictions>
     <Category>Outpost</Category>
     <Distance>
@@ -28,27 +18,33 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>15.0</Height>
+    <Square width="7.0" depth="7.0"/>
+    <Height>13.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Infantry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>400</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Outpost</GenericName>
-    <SelectionGroupName>template_structure_defensive_tower_outpost</SelectionGroupName>
+    <SelectionGroupName>template_structure_defensive_outpost</SelectionGroupName>
     <Tooltip>Build in own or neutral territory. Slowly converts to Gaia while in neutral territory.</Tooltip>
-    <VisibleClasses datatype="tokens">-Tower Outpost</VisibleClasses>
+    <VisibleClasses datatype="tokens">Outpost</VisibleClasses>
     <Icon>structures/outpost.png</Icon>
   </Identity>
   <Loot>
     <wood>12</wood>
   </Loot>
   <Obstruction>
-    <Static width="6.5" depth="6.5"/>
+    <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ProductionQueue disable=""/>
   <Resistance>
@@ -67,10 +63,31 @@
       </Damage>
     </Foundation>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <constructed>interface/complete/building/complete_tower.xml</constructed>
+      <select>interface/select/building/sel_tower.xml</select>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>14.0</HeightOffset>
+  </StatusBars>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>8</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <Vision>
-    <Range>100</Range>
+    <Range>1</Range>
   </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -59,8 +59,6 @@
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
     <HeightOffset>18.0</HeightOffset>
   </StatusBars>
   <Vision>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Pierce>8</Pierce>
-      </Damage>
-      <MaxRange>50</MaxRange>
-      <MinRange>10</MinRange>
-      <ElevationBonus>8</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Category>Outpost</Category>
-    <Distance>
-      <FromClass>Outpost</FromClass>
-      <MinDistance>50</MinDistance>
-    </Distance>
-    <Territory>own neutral</Territory>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <wood>60</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>1</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>400</Max>
-  </Health>
-  <Identity>
-    <GenericName>Outpost</GenericName>
-    <SelectionGroupName>template_structure_defensive_tower_outpost</SelectionGroupName>
-    <Tooltip>Build in own or neutral territory. Slowly converts to Gaia while in neutral territory.</Tooltip>
-    <VisibleClasses datatype="tokens">-Tower Outpost</VisibleClasses>
-    <Icon>structures/outpost.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>12</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>10</Hack>
-        <Pierce>20</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-    <Foundation>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>5</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Foundation>
-  </Resistance>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
-</Entity>