Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -5,16 +5,6 @@
     <Pierce>10</Pierce>
     <Crush>5</Crush>
   </Armour>
-  <Cost>
-    <Population>1</Population>
-    <BuildTime>20</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>50</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
   <Decay>
     <SinkingAnim>true</SinkingAnim>
     <DelayTime>0.0</DelayTime>
@@ -22,27 +12,28 @@
     <SinkAccel>7.0</SinkAccel>
   </Decay>
   <Footprint replace="">
-    <Square width="6.0" depth="30.0"/>
-    <Height>8.0</Height>
+    <Square width="5.0" depth="20.0"/>
+    <Height>10.0</Height>
     <MaxSpawnDistance>10</MaxSpawnDistance>
   </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+    <List datatype="tokens">FemaleCitizen Infantry Healer Dog</List>
+    <EjectHealth>0</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>10</LoadingRange>
+    <Pickup>true</Pickup>
+  </GarrisonHolder>
   <Health>
     <Unhealable>true</Unhealable>
-    <Max>200</Max>
   </Health>
   <Identity>
+    <GenericName>Ship</GenericName>
     <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Ship</VisibleClasses>
-    <GenericName>Ship</GenericName>
     <Formations disable=""/>
   </Identity>
-  <Loot>
-    <xp>60</xp>
-    <food>0</food>
-    <wood>50</wood>
-    <stone>0</stone>
-    <metal>25</metal>
-  </Loot>
   <Position>
     <Anchor>upright</Anchor>
     <Floating>true</Floating>
@@ -52,16 +43,6 @@
   <Repairable>
     <RepairTimeRatio>4.0</RepairTimeRatio>
   </Repairable>
-  <ResourceGatherer>
-    <MaxDistance>4.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
-    <Capacities>
-      <food>40</food>
-      <wood>20</wood>
-      <stone>20</stone>
-      <metal>20</metal>
-    </Capacities>
-  </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
@@ -88,7 +69,4 @@
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
   </UnitMotion>
-  <Vision>
-    <Range>90</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -36,27 +36,18 @@
       <metal>50</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="8.0" depth="33.0"/>
-    <Height>10.0</Height>
-  </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
-    <EjectHealth>0</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry Dog</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>10</LoadingRange>
-    <Pickup>true</Pickup>
+    <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <GenericName>Light Warship</GenericName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>75</xp>
@@ -73,4 +64,7 @@
   <UnitMotion>
     <WalkSpeed op="mul">1.55</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>90</Range>
+  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -28,10 +28,7 @@
       <Crush>300.0</Crush>
     </Damage>
   </DeathDamage>
-  <Footprint>
-    <Square width="8.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
+  <GarrisonHolder disable=""/>
   <Health>
     <Max>500</Max>
     <RegenRate>-6</RegenRate>
@@ -42,9 +39,9 @@
     </DamageVariants>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <GenericName>Fire Ship</GenericName>
     <Tooltip>Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot disable=""/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -18,39 +18,38 @@
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
   </Attack>
-  <Footprint>
-    <Square width="4.0" depth="10.0"/>
-    <Height>6.0</Height>
-  </Footprint>
+  <Cost>
+    <BuildTime>20</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
   <GarrisonHolder>
     <Max>1</Max>
-    <EjectHealth>0</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>10</LoadingRange>
-    <Pickup>true</Pickup>
   </GarrisonHolder>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
-    <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
     <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
   </Identity>
   <Loot>
     <xp>1</xp>
     <wood>10</wood>
-    <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
       <treasure disable=""/>
     </Rates>
+    <Capacities>
+      <food>40</food>
+    </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -6,45 +6,32 @@
     <Crush>2</Crush>
   </Armour>
   <Cost>
+    <BuildTime>20</BuildTime>
     <Resources>
-      <wood>0</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
-    <EjectHealth>0</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry Dog</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>10</LoadingRange>
-    <Pickup>true</Pickup>
+    <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>400</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
-    <Formations disable=""/>
     <GenericName>Merchantman</GenericName>
     <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>25</xp>
     <wood>15</wood>
-    <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
-    <Capacities>
-      <food>75</food>
-      <wood>75</wood>
-      <stone>50</stone>
-      <metal>50</metal>
-    </Capacities>
   </ResourceGatherer>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -47,27 +47,18 @@
       <stone>350</stone>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="12.0" depth="48.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <GarrisonHolder>
     <Max>50</Max>
-    <EjectHealth>0</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>10</LoadingRange>
-    <Pickup>true</Pickup>
+    <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <GenericName>Heavy Warship</GenericName>
-    <RequiredTechnology>phase_city</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
+    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>150</xp>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -36,27 +36,18 @@
       <metal>150</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="10.0" depth="40.0"/>
-    <Height>8.0</Height>
-  </Footprint>
   <GarrisonHolder>
     <Max>30</Max>
-    <EjectHealth>0</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>10</LoadingRange>
-    <Pickup>true</Pickup>
+    <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>1400</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <GenericName>Medium Warship</GenericName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
@@ -73,4 +64,7 @@
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>90</Range>
+  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Penteconter</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Longos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Noon-Mašōt</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Quinquereme</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Trireme</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Longos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fire">
+  <Footprint>
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Fire Ship</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Arrantza Ontzi</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <Icon>units/ptol_ship_bireme.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Fishing Boat</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -6,6 +6,10 @@
       <metal op="add">50</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <Classes datatype="tokens">KushTrireme</Classes>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hemiolos</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
@@ -9,6 +9,10 @@
       <stone>350</stone>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <GarrisonHolder>
     <Max>100</Max>
   </GarrisonHolder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Bireme</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Octḗrēs</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Pentḗrēs</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Liburna</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Nāvicula Piscātōria</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Quīnquerēmis Rōmāna</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <GenericName>Bireme</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
+  <Footprint>
+    <Square width="12.0" depth="48.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Pentères</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Seleukidó̱n Triērēs</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Pentēkóntoros</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
+  <Footprint>
+    <Square width="4.0" depth="10.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
+  <Footprint>
+    <Square width="10.0" depth="40.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/viking_longship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/viking_longship.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/viking_longship.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square width="8.0" depth="33.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Longship</SpecificName>
     <Icon>units/viking_longship.png</Icon>