Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml	(revision 18014)
@@ -1,38 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="1.3"/>
-    <Height>3.5</Height>
+    <Square width="2.8" depth="5.6"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Rhinoceros</SpecificName>
     <Icon>gaia/fauna_bear.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/rhino.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml	(revision 18014)
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="1.4" depth="2.8"/>
+    <Height>1.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Sheep</SpecificName>
     <Icon>gaia/fauna_sheep.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep.xml</select>
       <order_walk>actor/fauna/animal/sheep.xml</order_walk>
       <death>actor/fauna/animal/sheep.xml</death>
       <trained>actor/fauna/animal/sheep.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/sheep1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 18014)
@@ -1,36 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="2.3"/>
-    <Height>2.5</Height>
+    <Square width="3.2" depth="6.4"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Walrus</SpecificName>
     <Icon>gaia/fauna_walrus.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml	(revision 18014)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
   <Footprint>
-    <Circle radius="10.0"/>
+    <Square width="4.0" depth="16.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Identity>
     <SpecificName>Humpback Whale</SpecificName>
   </Identity>
   <Position>
     <Altitude>-4</Altitude>
   </Position>
   <VisualActor>
     <Actor>fauna/whale.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml	(revision 18014)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
+    <Square width="1.4" depth="2.8"/>
+    <Height>1.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Wolf</SpecificName>
     <Icon>gaia/fauna_wolf.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <VisualActor>
     <Actor>fauna/wolf.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 18014)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Cost>
     <Population>0</Population>
   </Cost>
-  <Footprint>
-    <Circle radius="1.5"/>
+  <Footprint replace="">
+    <Square width="1.75" depth="3.5"/>
     <Height>2.25</Height>
   </Footprint>
   <Identity>
     <GenericName>Fauna</GenericName>
     <Classes datatype="tokens">Animal Organic -ConquestCritical</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
   <Minimap>
     <Type>food</Type>
     <Color b="30" g="70" r="115"/>
   </Minimap>
   <ResourceGatherer disable=""/>
   <UnitAI>
     <AlertReactiveLevel>99</AlertReactiveLevel>
     <CanGuard>false</CanGuard>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>24.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
   <Guard disable=""/>
   <UnitMotion>
     <WalkSpeed>6.5</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
   <Visibility>
     <RetainInFog>true</RetainInFog>
   </Visibility>
   <Vision>
     <Range>0</Range>
   </Vision>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml	(revision 18014)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
   <Identity>
   </Identity>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
   </UnitAI>
-</Entity>
\ No newline at end of file
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_snow.xml	(revision 18014)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="1.0"/>
-    <Height>2.5</Height>
+    <Square width="1.4" depth="2.8"/>
+    <Height>1.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Snow Wolf</SpecificName>
     <Icon>gaia/fauna_wolf_snow.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <VisualActor>
     <Actor>fauna/wolf_snow.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml	(revision 18014)
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Footprint>
+  <Footprint replace="">
     <Circle radius="10.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Health disable=""/>
   <Identity>
     <GenericName>Fish</GenericName>
     <Classes datatype="tokens">SeaCreature</Classes>
   </Identity>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Altitude>-2.0</Altitude>
     <Floating>true</Floating>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>food.fish</Type>
-	<MaxGatherers>4</MaxGatherers>
+    <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
-	  <Texture disable=""/>
+      <Texture disable=""/>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.4</LineThickness>
+        <LineThickness>0.2</LineThickness>
       </Outline>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI disable=""/>
   <UnitMotion disable=""/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml	(revision 18014)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
   <Attack>
     <Melee>
       <Hack>1</Hack>
       <Pierce>1</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
+      <Crush>0</Crush>
+      <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
   </Identity>
   <UnitAI>
     <NaturalBehaviour>violent</NaturalBehaviour>
   </UnitAI>
   <Vision>
     <Range>10</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml	(revision 18014)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="1.3"/>
-    <Height>3.5</Height>
+    <Square width="2.0" depth="4.0"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Bear</SpecificName>
     <Icon>gaia/fauna_bear.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/bear.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 18014)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="1.0"/>
-    <Height>3.5</Height>
+    <Square width="1.5" depth="3.0"/>
+    <Height>1.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Boar</SpecificName>
     <Icon>gaia/fauna_boar.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 18014)
@@ -1,36 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="2.5"/>
+    <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Camel</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel.xml</select>
       <order_walk>actor/fauna/movement/camel.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
     <Run>
       <Speed>9.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml	(revision 18014)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
-    <Circle radius="0.75"/>
-    <Height>1.5</Height>
+    <Square width="0.9" depth="1.8"/>
+    <Height>1.0</Height>
   </Footprint>
   <Health>
     <Max>5</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Chicken</SpecificName>
     <Icon>gaia/fauna_chicken.png</Icon>
   </Identity>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <ResourceSupply>
     <Amount>40</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <panic>actor/fauna/animal/chickens.xml</panic>
       <select>actor/fauna/animal/chickens.xml</select>
       <death>actor/fauna/animal/chickens.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>10000</FeedTimeMin>
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed>1.0</WalkSpeed>
     <Run>
       <Speed>6.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/chicken.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml	(revision 18014)
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <Hack>30.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
-  <Footprint replace="">
-    <Square width="5" depth="8"/>
-    <Height>7.5</Height>
+  <Footprint>
+    <Square width="3.5" depth="7.0"/>
+    <Height>1.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Crocodylus niloticus</SpecificName>
-	<GenericName>Nile Crocodile</GenericName>
+    <GenericName>Nile Crocodile</GenericName>
     <Icon>gaia/fauna_crocodile.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>2.0</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
-	  <Range>20</Range>
+    <Range>20</Range>
   </Vision>
   <VisualActor>
     <Actor>fauna/crocodile.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml	(revision 18014)
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Square width="1.7" depth="3.4"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Deer</SpecificName>
     <Icon>gaia/fauna_deer.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <UnitMotion>
     <WalkSpeed>2.0</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/deer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml	(revision 18014)
@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>25.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
-	  <Bonuses>
-		<BonusCav>
-		  <Classes>Cavalry</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusCav>
-	  </Bonuses>
+      <Bonuses>
+        <BonusCav>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.5</Multiplier>
+        </BonusCav>
+      </Bonuses>
     </Melee>
     <Charge>
       <Hack>30.0</Hack>
       <Pierce>30.0</Pierce>
       <Crush>30.0</Crush>
       <MaxRange>6.0</MaxRange>
       <MinRange>0.0</MinRange>
-	  <Bonuses>
-		<BonusCav>
-		  <Classes>Cavalry</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusCav>
-	  </Bonuses>
+      <Bonuses>
+        <BonusCav>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.5</Multiplier>
+        </BonusCav>
+      </Bonuses>
     </Charge>
   </Attack>
   <Footprint>
-    <Circle radius="3.65"/>
-    <Height>3.0</Height>
+    <Square width="4.6" depth="9.2"/>
+    <Height>4.0</Height>
   </Footprint>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
     <SpecificName>African Bush Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_african_bush.png</Icon>
   </Identity>
   <Loot>
     <xp>75</xp>
   </Loot>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>800</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_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.xml</order_attack>
       <attack>actor/fauna/animal/elephant_attack.xml</attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_bush.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 18014)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Armour>
     <Hack>1</Hack>
     <Pierce>3</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Footprint>
-    <Circle radius="1.5"/>
+    <Square width="1.7" depth="3.4"/>
     <Height>1.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
     <SpecificName>African Elephant (Infant)</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <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.xml</order_attack>
       <attack>actor/fauna/animal/elephant_attack.xml</attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml	(revision 18014)
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>18.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
-	  <Bonuses>
-		<BonusCav>
-		  <Classes>Cavalry</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusCav>
-	  </Bonuses>
+      <Bonuses>
+        <BonusCav>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.5</Multiplier>
+        </BonusCav>
+      </Bonuses>
     </Melee>
     <Charge>
       <Hack>28.0</Hack>
       <Pierce>28.0</Pierce>
       <Crush>28.0</Crush>
       <MaxRange>6.0</MaxRange>
       <MinRange>0.0</MinRange>
-	  <Bonuses>
-		<BonusCav>
-		  <Classes>Cavalry</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusCav>
-	  </Bonuses>
+      <Bonuses>
+        <BonusCav>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.5</Multiplier>
+        </BonusCav>
+      </Bonuses>
     </Charge>
   </Attack>
   <Footprint>
-    <Circle radius="2.8"/>
-    <Height>3.0</Height>
+    <Square width="4.0" depth="8.0"/>
+    <Height>3.5</Height>
   </Footprint>
   <Health>
     <Max>250</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
     <SpecificName>Asian Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_asian.png</Icon>
   </Identity>
   <Loot>
     <xp>60</xp>
   </Loot>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>650</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_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.xml</order_attack>
       <attack>actor/fauna/animal/elephant_attack.xml</attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>fauna/elephant_asian.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml	(revision 18014)
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
-	  <Bonuses>
-		<BonusCav>
-		  <Classes>Cavalry</Classes>
-		  <Multiplier>1.5</Multiplier>
-		</BonusCav>
-	  </Bonuses>
+        <Bonuses>
+          <BonusCav>
+            <Classes>Cavalry</Classes>
+            <Multiplier>1.5</Multiplier>
+          </BonusCav>
+        </Bonuses>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="2.6"/>
-    <Height>2.7</Height>
+    <Square width="3.5" depth="7.0"/>
+    <Height>3.0</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Elephant</Classes>
     <SpecificName>North African Elephant</SpecificName>
     <Icon>gaia/fauna_elephant_north_african.png</Icon>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_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.xml</order_attack>
       <attack>actor/fauna/animal/elephant_attack.xml</attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_forest.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml	(revision 18014)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Tuna Fish</SpecificName>
-	<Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
+    <Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml	(revision 18014)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Tilapia Fish</SpecificName>
-	<Tooltip>Collect food from this bountiful riparian resource.</Tooltip>
+    <Tooltip>Collect food from this bountiful riparian resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml	(revision 18014)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Tuna Fish</SpecificName>
-	<Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
+    <Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml	(revision 18014)
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Footprint>
+    <Square width="1.5" depth="3.0"/>
+    <Height>2.0</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Gazelle</SpecificName>
     <Icon>gaia/fauna_gazelle.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <UnitMotion>
     <Run>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/gazelle.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 18014)
@@ -1,36 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="2.75"/>
-    <Height>4.0</Height>
+    <Square width="3.3" depth="6.6"/>
+    <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Giraffe (Adult)</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>350</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>4.0</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml	(revision 18014)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="2.0"/>
-    <Height>2.0</Height>
+    <Square width="1.9" depth="3.8"/>
+    <Height>3.5</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Giraffe (Juvenile)</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>4.0</WalkSpeed>
     <Run>
       <Speed>10.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_baby.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 18014)
@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="1.3" depth="2.6"/>
+    <Height>1.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Goat</SpecificName>
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>6</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/goat.xml</select>
       <order_walk>actor/fauna/animal/goat.xml</order_walk>
       <death>actor/fauna/animal/goat.xml</death>
       <trained>actor/fauna/animal/goat.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hawk.xml	(revision 18014)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_decorative">
-	<Position>
-		<Altitude>0</Altitude>
-		<Anchor>upright</Anchor>
-		<Floating>false</Floating>
-		<TurnRate>1.0</TurnRate>
-	</Position>
-	<VisualActor>
-		<Actor>fauna/hawk.xml</Actor>
-	</VisualActor>
-	<UnitAI>
-		<RoamDistance>1000.0</RoamDistance>
-	</UnitAI>
-	<UnitMotion disable="" />
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <TurnRate>1.0</TurnRate>
+  </Position>
+  <VisualActor>
+    <Actor>fauna/hawk.xml</Actor>
+  </VisualActor>
+  <UnitAI>
+    <RoamDistance>1000.0</RoamDistance>
+  </UnitAI>
+  <UnitMotion disable="" />
   <UnitMotionFlying>
     <MaxSpeed>15.0</MaxSpeed>
     <TakeoffSpeed>1.0</TakeoffSpeed>
     <LandingSpeed>5.0</LandingSpeed>
     <AccelRate>5.0</AccelRate>
     <SlowingRate>5.0</SlowingRate>
     <BrakingRate>5.0</BrakingRate>
     <TurnRate>0.5</TurnRate>
     <OvershootTime>2.0</OvershootTime>
     <FlyingHeight>40.0</FlyingHeight>
     <ClimbRate>4.0</ClimbRate>
     <DiesInWater>false</DiesInWater>
   </UnitMotionFlying>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml	(revision 18014)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="1.65"/>
+    <Square width="2.1" depth="4.2"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Horse</SpecificName>
     <Icon>gaia/fauna_horse.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
       <order_attack>actor/fauna/animal/horse_attack.xml</order_attack>
       <attack>actor/fauna/animal/horse_attack.xml</attack>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>5.0</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/horse_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml	(revision 18014)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="2.0"/>
-    <Height>1.5</Height>
+    <Square width="2.0" depth="4.0"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Lion</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/lion.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml	(revision 18014)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="2.0"/>
-    <Height>1.5</Height>
+    <Square width="2.0" depth="4.0"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Lioness</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/lioness.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 18014)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>2.5</Height>
+  <Footprint replace="">
+    <Square width="2.1" depth="4.2"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Muskox</SpecificName>
     <Icon>gaia/fauna_muskox.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>200</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml	(revision 18014)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_passive">
+  <Footprint>
+    <Square width="1.1" depth="2.2"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Health>
     <Max>5</Max>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Peacock</SpecificName>
     <Icon>gaia/fauna_peacock.png</Icon>
   </Identity>
   <UnitMotion>
     <WalkSpeed>2.0</WalkSpeed>
     <Run>
       <Speed>5.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
-  <!--<UnitAI>
-    <Feeds>true</Feeds>
-    <FeedingTransitionTime>1300</FeedingTransitionTime>
-  </UnitAI>-->
   <VisualActor>
     <Actor>fauna/peacock.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml	(revision 18014)
@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>35</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="1.4" depth="2.8"/>
+    <Height>1.5</Height>
+  </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Pig</SpecificName>
     <Icon>gaia/fauna_pig.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig.xml</select>
       <order_walk>actor/fauna/animal/pig.xml</order_walk>
       <death>actor/fauna/animal/pig.xml</death>
       <trained>actor/fauna/animal/pig.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>3.0</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/pig1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 18014)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="0.75"/>
+    <Square width="0.8" depth="1.6"/>
     <Height>1.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Rabbit</SpecificName>
     <Icon>gaia/fauna_rabbit.png</Icon>
   </Identity>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>50</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml	(revision 18014)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_passive">
-  <Footprint replace="">
-    <Square width="5" depth="8"/>
-    <Height>7.5</Height>
+  <Footprint>
+    <Square width="2.0" depth="8.0"/>
+    <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Great White</SpecificName>
     <GenericName>Shark</GenericName>
     <Classes datatype="tokens">SeaCreature</Classes>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Minimap disable=""/>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <Position>
     <Altitude>-1</Altitude>
     <Floating>true</Floating>
     <TurnRate>5.0</TurnRate>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
   <Vision>
     <Range>100</Range>
   </Vision>
   <VisualActor>
     <Actor>fauna/shark.xml</Actor>
   </VisualActor>
   <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <RoamDistance>100.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed>4.0</WalkSpeed>
     <Run>
       <Speed>35.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml	(revision 18014)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <Hack>30.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
-    <Circle radius="2.0"/>
+    <Square width="2.1" depth="4.2"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Tiger</SpecificName>
     <Icon>gaia/fauna_tiger.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack>actor/fauna/animal/lion_attack.xml</attack>
       <death>actor/fauna/animal/lion_select.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>fauna/tiger.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml	(revision 18014)
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
+  <Footprint>
+    <Square width="5.0" depth="20.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Identity>
     <SpecificName>Fin Whale</SpecificName>
   </Identity>
   <Position>
     <Altitude>-0.5</Altitude>
   </Position>
   <VisualActor>
     <Actor>fauna/whale_fin.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml	(revision 18014)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="1.8"/>
-    <Height>1.8</Height>
+    <Square width="2.1" depth="4.2"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Wildebeest</SpecificName>
     <History>The wildebeest (plural wildebeest, wildebeests or wildebai), also called the gnu, is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. Wildebeest are well known for their annual migration to new pastures in which vast numbers of wildebeest can be seen crossing rivers, such as the Mara River and dying in large numbers as they attempt to reach the other side. Many of them are eaten by crocodiles while others simply drown. Herds of wildebeest possesses what is known as "swarm intelligence", whereby the animals systematically explore and overcome obstacles as one when, for instance, crossing a river or defending against predator attacks.</History>
     <Icon>gaia/fauna_wildebeest.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/wildebeest.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 18014)
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
-    <Circle radius="1.8"/>
-    <Height>1.8</Height>
+    <Square width="1.9" depth="3.8"/>
+    <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Zebra</SpecificName>
     <Icon>gaia/fauna_zebra.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml	(revision 18014)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
   <Attack>
     <Melee>
       <Hack>1</Hack>
       <Pierce>1</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
+      <Crush>0</Crush>
+      <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
   </Identity>
   <Loot>
     <xp>20</xp>
   </Loot>
   <UnitAI>
     <NaturalBehaviour>aggressive</NaturalBehaviour>
   </UnitAI>
   <Vision>
     <Range>10</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml	(revision 18014)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
   <Attack>
     <Melee>
       <Hack>1</Hack>
       <Pierce>1</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
+      <Crush>0</Crush>
+      <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
   </Identity>
   <Loot>
     <xp>20</xp>
   </Loot>
   <UnitAI>
     <NaturalBehaviour>violent</NaturalBehaviour>
   </UnitAI>
   <Vision>
     <Range>10</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml	(revision 18014)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
   <Attack>
     <Melee>
       <Hack>1</Hack>
       <Pierce>1</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
+      <Crush>0</Crush>
+      <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
   </Identity>
   <Loot>
     <xp>20</xp>
   </Loot>
   <UnitAI>
     <NaturalBehaviour>aggressive</NaturalBehaviour>
   </UnitAI>
   <Vision>
     <Range>10</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 18013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 18014)
@@ -1,60 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>2.5</Height>
-  </Footprint>
   <Health>
     <Max>200</Max>
     <DeathType>remain</DeathType>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Classes datatype="tokens">SeaCreature</Classes>
     <Civ>gaia</Civ>
     <GenericName>Cetacean</GenericName>
     <Tooltip>Kill, then collect food from this bountiful oceanic resource.</Tooltip>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Position>
     <Floating>true</Floating>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/512x512.png</MainTexture>
         <MainTextureMask>circle/512x512_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <Loot>
     <xp>10</xp>
   </Loot>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed>11.5</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>