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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml	(revision 26680)
@@ -1,67 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
       <MaxRange>45</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>2</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>120</wood>
       <metal>60</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>20</Max>
     <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>80</xp>
     <wood>24</wood>
     <metal>12</metal>
   </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/cartouche.png</MainTexture>
+        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.55</WalkSpeed>
     <Acceleration op="mul">1.55</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/siege_ram.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="7.0" depth="9.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ahariburu</SpecificName>
     <Icon>units/iber_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_fire.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_fire.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fire">
+  <Footprint>
+    <Square depth="16.0" width="8.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Huǒ Chuán</SpecificName>
     <Icon>units/han/ship_fire.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/han/fireship.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square depth="16.0" width="7.0"/>
-    <Height>8.0</Height>
-  </Footprint>
 </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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml	(revision 26680)
@@ -1,55 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
       <AttackName>Fire</AttackName>
       <Damage>
         <Fire>20</Fire>
       </Damage>
       <MaxRange>12</MaxRange>
       <PrepareTime>50</PrepareTime>
       <RepeatTime>100</RepeatTime>
       <RestrictedClasses datatype="tokens">!Ship</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <DeathDamage>
     <Shape>Circular</Shape>
     <Range>30</Range>
     <FriendlyFire>true</FriendlyFire>
     <Damage>
       <Fire>600</Fire>
     </Damage>
   </DeathDamage>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>500</Max>
     <RegenRate>-6</RegenRate>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
       <mediumdamage>0.65</mediumdamage>
       <heavydamage>0.35</heavydamage>
     </DamageVariants>
   </Health>
   <Identity>
     <GenericName>Fire Ship</GenericName>
     <Tooltip>Unrepairable. Gradually loses health. Can only attack Ships.</Tooltip>
     <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot disable=""/>
   <Repairable disable=""/>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/cartouche.png</MainTexture>
+        <MainTextureMask>128x256/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.6</WalkSpeed>
     <Acceleration op="mul">1.6</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>60</Range>
   </Vision>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 26680)
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
     <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <GenericName>Merchantman</GenericName>
     <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
     <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>
     <metal>20</metal>
   </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
     <GarrisonGainMultiplier>0.2</GarrisonGainMultiplier>
   </Trader>
   <TreasureCollector>
     <MaxDistance>12</MaxDistance>
   </TreasureCollector>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.35</WalkSpeed>
     <Acceleration op="mul">1.6</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisionSharing>
     <Bribable>true</Bribable>
   </VisionSharing>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml	(revision 26680)
@@ -1,75 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
         <Crush>150</Crush>
       </Damage>
       <MaxRange>100</MaxRange>
       <MinRange>40</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Projectile>
         <Speed>40</Speed>
         <Spread>6</Spread>
         <Gravity>20</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Structure</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>5</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>600</wood>
       <metal>300</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="14.0" depth="56.0"/>
+    <Height>10.0</Height>
+  </Footprint>
   <GarrisonHolder>
     <Max>50</Max>
     <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>200</xp>
     <wood>120</wood>
     <metal>60</metal>
   </Loot>
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/cartouche.png</MainTexture>
+        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <Acceleration op="mul">1.8</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>110</Range>
   </Vision>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml	(revision 26680)
@@ -1,70 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
       <MaxRange>55</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <MaxArrowCount>13</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
     <BuildTime>25</BuildTime>
     <Resources>
       <wood>200</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>30</Max>
     <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>1400</Max>
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>140</xp>
     <wood>40</wood>
     <metal>20</metal>
   </Loot>
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/cartouche.png</MainTexture>
+        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <Acceleration op="mul">1.8</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_lithobolos_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace/siege_lithobolos_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_lithobolos_med.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/ship_bireme.xml	(revision 26680)
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
   <Footprint>
-    <Square width="8.0" depth="33.0"/>
+    <Square width="14.0" depth="32.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
     <Icon>units/maur_ship_bireme.png</Icon>
   </Identity>
+  <Selectable replace="">
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/mauryas/bireme.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/ship_quinquereme.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?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>
     <Icon>units/ptol_ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/quinquereme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_trireme.xml	(revision 26680)
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Footprint>
-    <Square depth="36.0" width="14.0"/>
+    <Square depth="34.0" width="17.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Lóu Chuán</SpecificName>
     <Icon>units/han/ship_trireme.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/cartouche.png</MainTexture>
+        <MainTextureMask>128x256/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/han/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_ram.xml	(revision 26680)
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square depth="10.0" width="8.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <SpecificName>Gōngchéng Chuí</SpecificName>
     <Icon>units/athen_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_fishing.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
   <Footprint>
-    <Square width="4.0" depth="10.0"/>
+    <Square width="6.0" depth="12.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Arrantza Ontzi</SpecificName>
     <Icon>units/iber_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/fishing_ship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml	(revision 26680)
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
-    <Square width="12.0" depth="36.0"/>
+    <Square width="16.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ponti</SpecificName>
-    <Tooltip>Transport many soldiers across the sea.</Tooltip>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
   </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Acceleration op="mul">0.9</Acceleration>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/iberians/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_merchant.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="10.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_ram.xml	(revision 26680)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
+  <Footprint>
     <Square width="8.0" depth="12.0"/>
-    <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/mace_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/ship_fishing.xml	(revision 26680)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
   <Footprint>
-    <Square width="4.0" depth="10.0"/>
+    <Square width="6.0" depth="12.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SpecificName>Masiyakara</SpecificName>
     <Icon>units/pers_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/fishship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 26680)
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <AttackName>Bolt</AttackName>
       <Damage>
         <Pierce>240</Pierce>
       </Damage>
       <MaxRange>90</MaxRange>
       <MinRange>15</MinRange>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>6000</RepeatTime>
       <Projectile>
         <Speed>150</Speed>
         <Spread>1</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
       <Splash>
         <Shape>Linear</Shape>
         <Range>9</Range>
         <FriendlyFire>false</FriendlyFire>
         <Damage>
           <Pierce>80</Pierce>
         </Damage>
       </Splash>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>250</wood>
       <metal>250</metal>
     </Resources>
     <Population>2</Population>
   </Cost>
   <Footprint replace="">
     <Square width="5.0" depth="12.0"/>
-    <Height>2.0</Height>
+    <Height>3.0</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <GenericName>Bolt Shooter</GenericName>
   </Identity>
   <Loot>
     <xp>200</xp>
     <wood>50</wood>
     <metal>50</metal>
   </Loot>
   <Pack>
     <Time>10000</Time>
   </Pack>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Acceleration op="mul">0.9</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml	(revision 26680)
@@ -1,67 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Melee>
       <AttackName>Ram</AttackName>
       <Damage>
         <Crush>150</Crush>
       </Damage>
       <MaxRange>6.5</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
       <RestrictedClasses datatype="tokens">Field Organic</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>300</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
+  <Footprint replace="">
+    <Square width="8.0" depth="12.0"/>
+    <Height>5.0</Height>
+  </Footprint>
   <GarrisonHolder>
     <Max>10</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>400</Max>
   </Health>
   <Identity>
     <GenericName>Battering Ram</GenericName>
     <Tooltip>Cannot attack Fields or Organic Units.</Tooltip>
     <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
   </Identity>
   <Loot>
     <xp>200</xp>
     <wood>60</wood>
     <metal>30</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce>50</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_attack_order.xml</order_attack>
       <trained>attack/siege/ram_trained.xml</trained>
       <attack_melee>attack/siege/ram_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
     <Acceleration op="mul">0.8</Acceleration>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml	(revision 26680)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="civ/athen|template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="10.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen/siege_lithobolos_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_lithobolos_med.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen/siege_oxybeles_packed">
+  <Footprint>
+    <Square width="5.0" depth="9.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_oxybeles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml	(revision 26680)
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="civ/athen|template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="8.0" depth="10.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <SpecificName>Krios</SpecificName>
     <Icon>units/athen_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_fishing.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
   <Footprint>
-    <Square width="4.0" depth="10.0"/>
+    <Square width="7.0" depth="14.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Longos</SpecificName>
     <Icon>units/celt_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/fishing_boat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml	(revision 26680)
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
-    <Square width="12.0" depth="36.0"/>
+    <Square width="16.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
   </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Acceleration op="mul">0.9</Acceleration>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/siege_ram.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="7.0" depth="10.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Molton</SpecificName>
     <Icon>units/celt_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_bireme.xml	(revision 26680)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
   <Footprint>
-    <Square width="8.0" depth="31.0"/>
+    <Square width="9.0" depth="36.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Bireme</GenericName>
     <SpecificName>Du-Mašōt</SpecificName>
     <Icon>units/cart_ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/bireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml	(revision 26680)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="8.0" depth="31.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Seḥer</SpecificName>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. Carthaginians have +25% sea trading bonus.</Tooltip>
     <Icon>units/cart_ship_merchant.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/ellipse.png</MainTexture>
+        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Trader>
     <GainMultiplier op="mul">1.25</GainMultiplier>
   </Trader>
   <VisualActor>
     <Actor>structures/carthaginians/merchant_ship.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_quinquereme.xml	(revision 26680)
@@ -1,16 +1,12 @@
 <?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>
     <SpecificName>Ḥameš-Mašōt</SpecificName>
     <Icon>units/cart_ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/quinquereme.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/ship_trireme.xml	(revision 26680)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Footprint>
-    <Square width="10.0" depth="40.0"/>
+    <Square width="12.0" depth="48.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Trireme</GenericName>
     <SpecificName>Tlat-Mašōt</SpecificName>
     <Icon>units/cart_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/carthaginians/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ballista_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart/siege_ballista_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/cart_siege_ballista.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_ballista_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/carthaginians/siege_lithobolos_med.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart/siege_oxybeles_packed">
+  <Footprint>
+    <Square width="5.0" depth="9.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/cart_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/carthaginians/siege_oxybeles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_ram.xml	(revision 26680)
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="7.0" depth="9.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <Icon>units/iber_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_fishing.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fishing">
   <Footprint>
-    <Square width="4.0" depth="10.0"/>
+    <Square width="7.0" depth="14.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Longos</SpecificName>
     <Icon>units/celt_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/fishing_boat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml	(revision 26680)
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
-    <Square width="12.0" depth="36.0"/>
+    <Square width="16.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <Loot>
     <xp op="add">20</xp>
   </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Acceleration op="mul">0.9</Acceleration>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/siege_ram.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="7.0" depth="10.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Molton</SpecificName>
     <Icon>units/celt_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_bireme.xml	(revision 26680)
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
+  <Footprint>
+    <Square depth="16.0" width="8.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Zhàn Chuán</SpecificName>
     <Icon>units/han/ship_bireme.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/cartouche.png</MainTexture>
+        <MainTextureMask>128x256/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/han/bireme.xml</Actor>
   </VisualActor>
-  <Footprint>
-    <Square depth="36.0" width="14.0"/>
-    <Height>8.0</Height>
-  </Footprint>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/ship_quinquereme.xml	(revision 26680)
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
   <Footprint>
     <Square depth="46.0" width="20.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Dà Lóu Chuán</SpecificName>
     <Icon>units/han/ship_quinquereme.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/rounded_rectangle.png</MainTexture>
+        <MainTextureMask>128x256/rounded_rectangle_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/han/towership.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_mangonel_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_mangonel_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/siege_mangonel_unpacked.xml	(revision 26680)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_stonethrower">
   <Attack>
     <Ranged>
       <Projectile>
         <LaunchPoint y="5"/>
       </Projectile>
     </Ranged>
   </Attack>
   <Footprint replace="">
-    <Square depth="20.0" width="11.0"/>
+    <Square width="8.0" depth="16.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Tóushí Chē</SpecificName>
     <Icon>units/han/siege_mangonel.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/han/siege_mangonel_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <VisualActor>
     <Actor>units/han/siege_mangonel.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_fire.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_fire">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="10.0" depth="21.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Fire Ship</SpecificName>
     <Icon>units/iber_ship_fire.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/fireship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_merchant.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Merkataritza Itsasontzi</SpecificName>
     <Icon>units/iber_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_merchant.xml	(revision 26680)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Nile Trading Barge</GenericName>
     <SpecificName>Dȝy sbt</SpecificName>
-    <Icon>units/pers_ship_merchant.png</Icon>
+    <Icon>units/ptol_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/persians/merchant.xml</Actor>
+    <Actor>structures/ptolemies/merchant_ship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/siege_oxybeles_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace/siege_oxybeles_packed">
+  <Footprint>
+    <Square width="5.0" depth="9.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/mace/siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_oxybeles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml	(revision 26680)
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
   <Footprint>
-    <Square width="8.0" depth="28.0"/>
+    <Square width="10.0" depth="28.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Mankar Cirya</SpecificName>
     <Icon>units/noldor_ship_bireme.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/ellipse.png</MainTexture>
+        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/elven_bireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_unpacked.xml	(revision 26680)
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol/siege_polybolos_packed">
+  <Footprint>
+    <Square width="6.0" depth="6.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_polybolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
+  <Selectable replace="">
+    <Overlay>
+      <Texture>
+        <MainTexture>128x128/rounded_rectangle.png</MainTexture>
+        <MainTextureMask>128x128/rounded_rectangle_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/ptolemies/siege_polybolos.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_polybolos_packed.xml	(revision 26680)
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_boltshooter">
   <Attack>
     <Ranged>
       <Damage>
         <Pierce>160</Pierce>
       </Damage>
       <PrepareTime>3000</PrepareTime>
       <RepeatTime>4000</RepeatTime>
       <Splash>
         <Damage>
           <Pierce>50</Pierce>
         </Damage>
       </Splash>
     </Ranged>
   </Attack>
-  <Footprint replace="">
-    <Square width="5.0" depth="5.0"/>
-    <Height>2.0</Height>
-  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Polybolos</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_polybolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/ptolemies/siege_spear_packed.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_lithobolos_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol/siege_lithobolos_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/ptol/siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/ptolemies/siege_lithobolos_med.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/ship_quinquereme.xml	(revision 26680)
@@ -1,16 +1,12 @@
 <?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>
     <GenericName>Roman Quinquereme</GenericName>
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/romans/quinquereme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/siege_ram.xml	(revision 26680)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
+  <Footprint>
     <Square width="8.0" depth="12.0"/>
-    <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/mace_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ram.xml	(revision 26680)
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
   <Attack>
     <Melee>
       <Damage>
         <Crush op="mul">1.2</Crush>
       </Damage>
     </Melee>
   </Attack>
-  <Footprint replace="">
-    <Square width="9.0" depth="12.0"/>
-    <Height>3.0</Height>
+  <Footprint>
+    <Square width="10.0" depth="14.0"/>
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ariēs</SpecificName>
     <Icon>units/rome_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_lithobolos_unpacked.xml	(revision 26680)
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele/siege_lithobolos_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/sele/siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_lithobolos_med.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/viking_longship.xml	(revision 26680)
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
   <Footprint>
-    <Square width="8.0" depth="33.0"/>
+    <Square width="14.0" depth="56.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Longship</SpecificName>
     <Icon>units/viking_longship.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/cartouche.png</MainTexture>
+        <MainTextureMask>128x512/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/viking/longship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_unpacked.xml	(revision 26680)
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome/siege_ballista_packed">
+  <Footprint>
+    <Square width="6.0" depth="12.0"/>
+  </Footprint>
   <Identity>
     <Icon>units/rome_siege_ballista.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_ballista_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <Sound>
     <SoundGroups>
       <attack>attack/siege/ballist_rome_attack.xml</attack>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>0.001</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/romans/siege_ballista_med.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/ship_quinquereme.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?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>
     <Icon>units/ptol_ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/quinquereme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/siege_ram.xml	(revision 26680)
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
-    <Square width="8.0" depth="10.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/spart_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/ship_merchant.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="10.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/ship_merchant.xml	(revision 26680)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
-    <Square width="8.0" depth="24.0"/>
+    <Square width="10.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml	(revision 26680)
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_boltshooter">
-  <Footprint replace="">
-    <Square width="5.0" depth="5.0"/>
-    <Height>3.0</Height>
+  <Footprint>
+    <Square width="5.0" depth="9.0"/>
   </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Scorpiō</SpecificName>
     <Icon>units/rome_siege_scorpio_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/rome/siege_scorpio_unpacked</Entity>
     <State>packed</State>
     <Time>5000</Time>
   </Pack>
   <VisualActor>
     <Actor>units/romans/siege_scorpio_packed.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml	(revision 26679)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/siege_ram.xml	(revision 26680)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_ram">
-  <Footprint replace="">
+  <Footprint>
     <Square width="8.0" depth="12.0"/>
-    <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/mace_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>