Index: ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml	(revision 23932)
@@ -1,46 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Armour>
     <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
       <MaxRange>7.0</MaxRange>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Decay>
     <DelayTime>0.0</DelayTime>
     <SinkRate>3.0</SinkRate>
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Footprint>
-    <Circle radius="12.0"/>
+    <Circle radius="8.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <GenericName>Army of Alexander the Great.</GenericName>
     <SpecificName>Army of Alexander the Great</SpecificName>
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
     <Icon>units/mace_hero_alexander.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="16.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>campaigns/units/army_mace_hero_alexander.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml	(revision 23932)
@@ -1,46 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Armour>
     <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
       <MaxRange>7.0</MaxRange>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Decay>
     <DelayTime>0.0</DelayTime>
     <SinkRate>3.0</SinkRate>
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Footprint>
-    <Circle radius="12.0"/>
+    <Circle radius="8.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Army of Leonidas I.</GenericName>
     <SpecificName>Army of Leonidas I</SpecificName>
     <Tooltip>This is what an army would look like on the Strat Map.</Tooltip>
     <Icon>units/spart_hero_leonidas.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="16.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.6</BarHeight>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>campaigns/units/army_spart_hero_leonidas.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 23932)
@@ -1,146 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <PopulationBonus>0</PopulationBonus>
     <BuildTime>1</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <Active>false</Active>
     <SinkingAnim>false</SinkingAnim>
     <DelayTime>30.0</DelayTime>
     <SinkRate>0.01</SinkRate>
     <SinkAccel>0.0</SinkAccel>
   </Decay>
   <Footprint>
     <Circle radius="1.5"/>
-    <Height>2.5</Height>
+    <Height>4.0</Height>
   </Footprint>
   <Garrisonable/>
   <Guard/>
   <Health>
     <DeathType>corpse</DeathType>
     <Max>100</Max>
     <RegenRate>0</RegenRate>
     <IdleRegenRate>0</IdleRegenRate>
     <Unhealable>false</Unhealable>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Unit Organic ConquestCritical</Classes>
     <GenericName>Unit</GenericName>
     <Formations datatype="tokens">
       special/formations/null
       special/formations/box
       special/formations/column_closed
       special/formations/line_closed
       special/formations/column_open
       special/formations/line_open
       special/formations/flank
       special/formations/battle_line
     </Formations>
     <Phenotype datatype="tokens">male</Phenotype>
     <Undeletable>false</Undeletable>
   </Identity>
   <Looter/>
   <Minimap>
     <Type>unit</Type>
   </Minimap>
   <Obstruction>
     <Unit/>
     <Active>true</Active>
     <BlockMovement>true</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <BlockFoundation>false</BlockFoundation>
     <BlockConstruction>true</BlockConstruction>
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>pitch</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>6.0</TurnRate>
   </Position>
   <RangeOverlayManager/>
   <RangeOverlayRenderer/>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <treasure>1</treasure>
     </Rates>
     <Capacities>
       <food>10</food>
       <wood>10</wood>
       <stone>10</stone>
       <metal>10</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x128/ellipse.png</MainTexture>
         <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attacked>interface/alarm/alarm_attackplayer.xml</attacked>
       <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <StatusEffectsReceiver/>
   <UnitAI>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>false</FormationController>
     <CanGuard>true</CanGuard>
     <CanPatrol>true</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
     <PassabilityClass>default</PassabilityClass>
     <WalkSpeed>9.0</WalkSpeed>
     <RunMultiplier>1.67</RunMultiplier>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
   </Visibility>
   <Vision>
     <Range>12</Range>
   </Vision>
   <VisionSharing>
     <Bribable>false</Bribable>
   </VisionSharing>
   <VisualActor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23932)
@@ -1,100 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <Population>1</Population>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Square width="4" depth="6"/>
-    <Height>7.5</Height>
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Classes datatype="tokens">Human FastMoving CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 23932)
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>7</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>150</food>
       <wood>80</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
+  <Footprint replace="">
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FastMoving</Classes>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Champion Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>15</food>
     <wood>8</wood>
     <metal>10</metal>
   </Loot>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 23932)
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <Population>3</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>300</food>
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.5"/>
-    <Height>6.0</Height>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>750</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>War Elephant</GenericName>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>30</food>
     <metal>20</metal>
   </Loot>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>10.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 23932)
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>1</Hack>
     <Pierce>2</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>15</BuildTime>
     <Population>0</Population>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
+  <Footprint replace="">
+    <Square width="1.5" depth="3"/>
+    <Height>1.5</Height>
   </Footprint>
   <Health>
     <Max>110</Max>
   </Health>
   <Identity>
     <GenericName>War Dog</GenericName>
     <Tooltip>Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <Classes datatype="tokens">Human FastMoving</Classes>
     <VisibleClasses datatype="tokens">Dog Melee</VisibleClasses>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>10</food>
   </Loot>
   <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/global/civ_dog_bark.xml</select>
       <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
       <order_gather>voice/global/civ_dog_move.xml</order_gather>
       <order_repair>voice/global/civ_dog_move.xml</order_repair>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/fauna/death/death_animal_gen.xml</death>
       <trained>interface/complete/building/complete_kennel.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <TrainingRestrictions>
     <Category>WarDog</Category>
   </TrainingRestrictions>
   <UnitMotion>
     <WalkSpeed op="mul">1.5</WalkSpeed>
     <RunMultiplier>2</RunMultiplier>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 23932)
@@ -1,45 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>300</food>
       <wood>200</wood>
       <metal>250</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
+  <Footprint replace="">
+    <Square width="3.0" depth="6.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FastMoving</Classes>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Hero Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="3.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/death/death_horse.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 23932)
@@ -1,45 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>60.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>62.5</Speed>
         <Spread>0.5</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Footprint>
-    <Circle radius="3.0"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <GenericName>Hero Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 23932)
@@ -1,56 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Attack replace="">
     <Melee>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0</Pierce>
         <Crush>50.0</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
     <Population>3</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>500</food>
       <metal>500</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="3.0"/>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml	(revision 23932)
@@ -1,45 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>4</Hack>
     <Pierce>8</Pierce>
     <Crush>4</Crush>
   </Armour>
   <Attack disable=""/>
   <Cost>
     <Resources>
       <food>200</food>
       <wood>150</wood>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Heal>
     <Range>20</Range>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
     <Health>6</Health>
     <Interval>2000</Interval>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Selectable>
     <Overlay>
+      <Shape>
+        <Circle radius="2.0"/>
+      </Shape>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 23932)
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>8</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>200</food>
       <wood>200</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Hero</GenericName>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Selectable>
     <Overlay>
+      <Shape>
+        <Circle radius="2.0"/>
+      </Shape>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23932)
@@ -1,127 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>2</Hack>
     <Pierce>4</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
       structures/{civ}_crannog
       structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
       structures/wallset_palisade
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
       structures/{civ}_workshop
       structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.75</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.5</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.5</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml	(revision 23932)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
+    <Square width="5.0" depth="10.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Essedon</SpecificName>
     <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/britons/chariot_javelinist_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(revision 23932)
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
   <Footprint replace="">
-    <Square width="4.5" depth="9.0"/>
-    <Height>5.0</Height>
+    <Square width="5.0" depth="10.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Phenotype>female</Phenotype>
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
-    <Phenotype>female</Phenotype>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/britons/hero_chariot_javelinist_boudicca_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml	(revision 23932)
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_javelinist">
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
+  <Footprint>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_cavalry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
     <Icon>units/kush_camel_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush_cavalry_javelinist_merc_a</Entity>
   </Promotion>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel.xml</select>
       <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>8.5</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml	(revision 23932)
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
+  <Footprint replace="">
+    <Square width="6.0" depth="14.0"/>
+    <Height>6.0</Height>
+  </Footprint>
   <Identity>
     <Civ>kush</Civ>
+    <Phenotype>female</Phenotype>
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
-    <Phenotype>female</Phenotype>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/kush_hero_amanirenas.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/kushites/hero_chariot_archer_amanirenas_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml	(revision 23932)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="5.5" depth="10.0"/>
-    <Height>5.0</Height>
+    <Square width="8.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>War Chariot</GenericName>
     <SpecificName>Rath</SpecificName>
     <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/chariot_archer_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(revision 23932)
@@ -1,74 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Capture disable=""/>
     <Ranged>
       <Damage>
         <Hack op="mul">1.5</Hack>
         <Pierce op="mul">1.5</Pierce>
         <Crush op="mul">1.5</Crush>
       </Damage>
       <RepeatTime op="mul">0.75</RepeatTime>
     </Ranged>
   </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>175</food>
       <wood>75</wood>
     </Resources>
   </Cost>
   <Footprint replace="">
-    <Circle radius="3.5"/>
-    <Height>8.0</Height>
+    <Square width="4.5" depth="9.0"/>
+    <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max op="mul">2</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <VisibleClasses datatype="tokens">-Cavalry Elephant</VisibleClasses>
     <GenericName>Elephant Archer</GenericName>
     <Icon>units/maur_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <SpecificName>Vachii Gaja</SpecificName>
   </Identity>
   <Loot>
     <xp>260</xp>
     <food>18</food>
     <wood>7</wood>
   </Loot>
   <Promotion>
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
   <ResourceGatherer disable=""/>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>256x256/ellipse.png</MainTexture>
-        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>10.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/mauryas/elephantry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml	(revision 23932)
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_ashoka
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="8.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <Classes datatype="tokens">Ashoka</Classes>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Ashoka the Great</GenericName>
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
+    <Classes datatype="tokens">Ashoka</Classes>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_hero_ashoka.png</Icon>
-    <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/mauryas/hero_chariot_archer_ashoka_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml	(revision 23932)
@@ -1,78 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Armour>
     <Hack>5</Hack>
     <Pierce>8</Pierce>
     <Crush>10</Crush>
   </Armour>
   <Auras datatype="tokens">
     units/elephant_worker
   </Auras>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>150</food>
     </Resources>
   </Cost>
-  <Footprint>
-    <Circle radius="4.0"/>
-    <Height>6.0</Height>
+  <Footprint replace="">
+    <Square width="4.5" depth="9.0"/>
+    <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>Worker Elephant</GenericName>
     <SpecificName>Karmākara Gaja</SpecificName>
     <Icon>units/maur_support_elephant.png</Icon>
     <Tooltip>Mobile dropsite for food, wood, stone, and metal.</Tooltip>
     <Formations disable=""/>
   </Identity>
   <Loot>
     <xp>50</xp>
     <food>25</food>
     <wood>10</wood>
     <stone>10</stone>
     <metal>10</metal>
   </Loot>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>false</Sharable>
   </ResourceDropsite>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>256x256/ellipse.png</MainTexture>
-        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>9.0</HeightOffset>
+  </StatusBars>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisualActor>
     <Actor>units/mauryas/support_elephant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml	(revision 23932)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="8" depth="16"/>
-    <Height>6</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_chariot_archer.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/chariot_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(revision 23932)
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_darius
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_darius.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(revision 23932)
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_xerxes
   </Auras>
   <Footprint replace="">
-    <Square width="6.0" depth="12.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_xerxes.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml	(revision 23932)
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
+  <Footprint>
+    <Height>7.5</Height>
+  </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Camel</VisibleClasses>
     <SelectionGroupName>units/ptol_cavalry_archer</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
     <Icon>units/ptol_camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_cavalry_archer_a</Entity>
   </Promotion>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel_select.xml</select>
       <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <HeightOffset>8.5</HeightOffset>
+  </StatusBars>
   <VisualActor>
     <Actor>units/ptolemies/camelry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml	(revision 23931)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml	(revision 23932)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
-    <Square width="7.5" depth="15.0"/>
-    <Height>5.0</Height>
+    <Square width="11.0" depth="11.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/sele_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/chariot_archer_c_m.xml</Actor>
   </VisualActor>
 </Entity>