Index: binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
@@ -1,17 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_animal_lion">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Black Bear</GenericName>
     <SpecificName>Ursus americanus</SpecificName>
     <Icon>gaia/fauna_bear_black.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/bear_black.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
@@ -1,17 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_animal_lion">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Brown Bear</GenericName>
     <SpecificName>Ursus arctos</SpecificName>
     <Icon>gaia/fauna_bear_brown.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/bear_brown.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
@@ -1,17 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_animal_lion">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Polar Bear</GenericName>
     <SpecificName>Ursus maritimus</SpecificName>
     <Icon>gaia/fauna_bear_polar.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/bear_white.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -1,31 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_animal">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>12.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>12</Hack>
       </Damage>
-      <MaxRange>1.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
+      <MaxRange>1</MaxRange>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Wild Boar</GenericName>
     <SpecificName>Sus scrofa</SpecificName>
     <Icon>gaia/fauna_boar.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>150</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>5.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Dromedary</GenericName>
     <SpecificName>Camelus dromedarius</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>200</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
@@ -22,8 +30,11 @@
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
@@ -1,17 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_bull">
+<Entity parent="template_unit_animal_cattle">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+      <MaxRange>1.5</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Bull</GenericName>
     <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_bull.png</Icon>
   </Identity>
+  <Loot>
+    <xp>50</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <RunMultiplier>2.0</RunMultiplier>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/bull.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_animal_cattle">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Cow</GenericName>
     <SpecificName>Bos taurus taurus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_cow.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/cow.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_animal_cattle">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Sanga Cattle</GenericName>
     <SpecificName>Bos taurus africanus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_sanga.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/sanga_cattle.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic_cattle">
+<Entity parent="template_unit_animal_cattle">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Zebu</GenericName>
     <SpecificName>Bos taurus indicus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/zebu_wild.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
@@ -10,6 +11,7 @@
   <Identity>
     <GenericName>Chicken</GenericName>
     <SpecificName>Gallus gallus domesticus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_chicken.png</Icon>
   </Identity>
   <Obstruction>
@@ -33,6 +35,7 @@
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
@@ -41,8 +44,11 @@
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.15</WalkSpeed>
+    <WalkSpeed op="mul">0.1</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/chicken.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
+<Entity parent="template_unit_animal_lion">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>30</Hack>
       </Damage>
-      <MaxRange>8.0</MaxRange>
+      <MaxRange>8</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
@@ -15,6 +13,9 @@
     <Square width="3.0" depth="12.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Nile Crocodile</GenericName>
     <SpecificName>Crocodylus niloticus</SpecificName>
@@ -23,6 +24,10 @@
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
@@ -31,19 +36,18 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <WalkSpeed op="mul">0.2</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/crocodile.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
@@ -1,17 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Red Deer</GenericName>
     <SpecificName>Cervus elaphus</SpecificName>
     <Icon>gaia/fauna_deer.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/deer.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
@@ -1,17 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
+<Entity parent="template_unit_animal">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
+      <MaxRange>4</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Mastiff</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>gaia/fauna_dog.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>voice/global/civ_dog_bark.xml</select>
+      <order_walk>voice/global/civ_dog_move.xml</order_walk>
+      <death>actor/fauna/death/death_animal_gen.xml</death>
+      <trained>interface/complete/building/complete_kennel.xml</trained>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/mastiff.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
@@ -1,17 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
+<Entity parent="template_unit_animal">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
+      <MaxRange>4</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Wolfhound</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>units/brit_wolfhound.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>voice/global/civ_dog_bark.xml</select>
+      <order_walk>voice/global/civ_dog_move.xml</order_walk>
+      <death>actor/fauna/death/death_animal_gen.xml</death>
+      <trained>interface/complete/building/complete_kennel.xml</trained>
+    </SoundGroups>
+  </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>units/britons/wolfhound.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Donkey</GenericName>
     <SpecificName>Equus africanus asinus</SpecificName>
     <Icon>gaia/fauna_donkey.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>200</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
@@ -25,8 +33,11 @@
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
+    <WalkSpeed op="mul">0.55</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/donkey.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_animal_elephant">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="5.0" depth="10.0"/>
     <Height>9.0</Height>
@@ -15,12 +30,29 @@
   <Loot>
     <xp>75</xp>
   </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>4</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
   <ResourceSupply>
     <Amount>800</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>10.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.35</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_bush.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
+<Entity parent="template_unit_animal_elephant">
+  <Armour>
+    <Hack>1</Hack>
+    <Pierce>3</Pierce>
+    <Crush>1</Crush>
+  </Armour>
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>African Bush Elephant Calf</GenericName>
     <SpecificName>Loxodonta africana</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_animal_elephant">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="4.0" depth="8.0"/>
     <Height>7.0</Height>
@@ -15,12 +30,29 @@
   <Loot>
     <xp>60</xp>
   </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>4</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
   <ResourceSupply>
     <Amount>650</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.35</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_asian.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
+<Entity parent="template_unit_animal_elephant">
+  <Armour>
+    <Hack>1</Hack>
+    <Pierce>3</Pierce>
+    <Crush>1</Crush>
+  </Armour>
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Asian Elephant Calf</GenericName>
     <SpecificName>Elephas maximus</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_animal_elephant">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>6.5</Height>
@@ -15,12 +30,29 @@
   <Loot>
     <xp>50</xp>
   </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>4</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Entity>
+  </Resistance>
   <ResourceSupply>
     <Amount>500</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>7.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.35</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/elephant_african_forest.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_defensive_fox">
+<Entity parent="template_unit_animal">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>2.5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+      <MaxRange>3</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Arctic Fox</GenericName>
     <SpecificName>Vulpes lagopus</SpecificName>
     <Icon>gaia/fauna_fox_arctic.png</Icon>
   </Identity>
+  <Loot>
+    <xp>15</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/fox_arctic.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_defensive_fox">
+<Entity parent="template_unit_animal">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>2.5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+      <MaxRange>3</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Red Fox</GenericName>
     <SpecificName>Vulpes vulpes</SpecificName>
     <Icon>gaia/fauna_fox_red.png</Icon>
   </Identity>
+  <Loot>
+    <xp>15</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/fox_red.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
@@ -1,17 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Thomson's Gazelle</GenericName>
     <SpecificName>Eudorcas thomsonii</SpecificName>
     <Icon>gaia/fauna_gazelle.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/gazelle.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>13.0</Height>
@@ -12,14 +13,21 @@
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>350</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>14.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.6</WalkSpeed>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>7.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Juvenile Giraffe</GenericName>
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>150</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>8.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.6</WalkSpeed>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_baby.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Goat</GenericName>
     <SpecificName>Capra aegagrus hircus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <ResourceSupply>
@@ -24,9 +29,15 @@
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_animal">
   <Attack>
     <Melee>
       <Damage>
@@ -35,17 +35,20 @@
   </Resistance>
   <ResourceSupply>
     <Amount>400</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/hippopotamus.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>4.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Horse</GenericName>
     <SpecificName>Equus ferus caballus</SpecificName>
     <Icon>gaia/fauna_horse.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>200</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
@@ -25,8 +33,11 @@
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
+    <WalkSpeed op="mul">0.55</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/horse.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_violent">
+<Entity parent="template_unit_animal">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>20</Hack>
       </Damage>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>4</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
@@ -15,24 +13,30 @@
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Lion</GenericName>
     <SpecificName>Panthera leo</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>violent</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/lion.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Muskox</GenericName>
     <SpecificName>Ovibos moschatus</SpecificName>
     <Icon>gaia/fauna_muskox.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>200</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
@@ -10,6 +11,7 @@
   <Identity>
     <GenericName>Peacock</GenericName>
     <SpecificName>Pavo cristatus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_peacock.png</Icon>
   </Identity>
   <Position>
@@ -40,8 +42,11 @@
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.3</WalkSpeed>
+    <WalkSpeed op="mul">0.2</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/peacock.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Pig</GenericName>
     <SpecificName>Sus scrofa domesticus</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_pig.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
@@ -20,9 +29,15 @@
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/pig1.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
@@ -30,7 +30,6 @@
   <UnitMotion>
     <WalkSpeed op="mul">3.5</WalkSpeed>
   </UnitMotion>
-  <Upgrade disable=""/>
   <VisualActor>
     <Actor>fauna/pig_flaming.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.0</Height>
@@ -12,15 +13,25 @@
     <SpecificName>Oryctolagus cuniculus</SpecificName>
     <Icon>gaia/fauna_rabbit.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <ResourceSupply>
     <Amount>50</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>2.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_animal_lion">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>20.0</Crush>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
       </Damage>
-      <MaxRange>6.0</MaxRange>
+      <MaxRange>6</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
@@ -15,24 +14,33 @@
     <Square width="3.0" depth="6.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>White Rhinoceros</GenericName>
     <SpecificName>Ceratotherium simum</SpecificName>
     <Icon>gaia/fauna_rhino.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>300</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/rhino.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
@@ -1,51 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_passive">
+<Entity parent="template_unit_animal_marine">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="8.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
-    <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <GenericName>Great White Shark</GenericName>
     <SpecificName>Carcharodon carcharias</SpecificName>
-    <Classes datatype="tokens">SeaCreature</Classes>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Minimap disable=""/>
-  <Obstruction>
-    <BlockMovement>false</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-  </Obstruction>
   <Position>
     <Altitude>-1</Altitude>
-    <Anchor>upright</Anchor>
-    <Floating>true</Floating>
-    <FloatDepth>0.0</FloatDepth>
     <TurnRate>5.0</TurnRate>
   </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/ellipse.png</MainTexture>
-        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
+  <ResourceSupply disable=""/>
   <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 op="mul">0.6</WalkSpeed>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Sheep</GenericName>
     <SpecificName>Ovis aries</SpecificName>
+    <Classes datatype="tokens">Domestic</Classes>
     <Icon>gaia/fauna_sheep.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep_select.xml</select>
@@ -20,9 +29,15 @@
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
+  <Vision>
+    <Range>6</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/sheep3.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_violent">
+<Entity parent="template_unit_animal_lion">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>20.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>30</Hack>
+        <Pierce>20</Pierce>
       </Damage>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>4</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
@@ -15,21 +14,30 @@
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Tiger</GenericName>
     <SpecificName>Panthera tigris</SpecificName>
     <Icon>gaia/fauna_tiger.png</Icon>
   </Identity>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>violent</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/tiger.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
+<Entity parent="template_unit_animal">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>15.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>15</Hack>
+        <Pierce>10</Pierce>
       </Damage>
-      <MaxRange>4.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+      <MaxRange>4</MaxRange>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="8.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Walrus</GenericName>
     <SpecificName>Odobenus rosmarus</SpecificName>
     <Icon>gaia/fauna_walrus.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Resistance>
     <Entity>
       <Damage>
@@ -33,6 +35,7 @@
   </Resistance>
   <ResourceSupply>
     <Amount>300</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
@@ -45,6 +48,13 @@
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>defensive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
@@ -1,17 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_whale">
+<Entity parent="template_unit_animal_marine">
+  <Attack disable=""/>
   <Footprint>
     <Square width="5.0" depth="20.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <GenericName>Fin Whale</GenericName>
     <SpecificName>Balaenoptera physalus</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Position>
     <Altitude>-0.5</Altitude>
   </Position>
+  <ResourceSupply>
+    <Amount>2000</Amount>
+    <MaxGatherers>5</MaxGatherers>
+  </ResourceSupply>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.25</WalkSpeed>
+    <RunMultiplier>1</RunMultiplier>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/whale_fin.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
@@ -1,17 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_whale">
+<Entity parent="template_unit_animal_marine">
+  <Attack disable=""/>
   <Footprint>
     <Square width="4.0" depth="16.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <GenericName>Humpback Whale</GenericName>
     <SpecificName>Megaptera novaeangliae</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Position>
     <Altitude>-4</Altitude>
   </Position>
+  <ResourceSupply>
+    <Amount>2000</Amount>
+    <MaxGatherers>5</MaxGatherers>
+  </ResourceSupply>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.25</WalkSpeed>
+    <RunMultiplier>1</RunMultiplier>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/whale.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Blue Wildebeest</GenericName>
     <SpecificName>Connochaetes taurinus</SpecificName>
     <Icon>gaia/fauna_wildebeest.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>150</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.65</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/wildebeest.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
+<Entity parent="template_unit_animal">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+      </Damage>
+      <MaxRange>4</MaxRange>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Wolf</GenericName>
     <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_wolf.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>aggressive</NaturalBehaviour>
+  </UnitAI>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>10</Range>
+  </Vision>
   <VisualActor>
     <Actor>fauna/wolf.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
+<Entity parent="template_unit_animal">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Common Zebra</GenericName>
     <SpecificName>Equus quagga</SpecificName>
     <Icon>gaia/fauna_zebra.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>150</Amount>
+    <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+  </UnitAI>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.65</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/template_unit_animal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_animal.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_animal.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Cost>
     <Population>0</Population>
   </Cost>
@@ -9,8 +22,8 @@
   </Footprint>
   <Guard disable=""/>
   <Identity>
+    <Tooltip>Kill to gather meat for food.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical Animal</Classes>
-    <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
@@ -19,6 +32,12 @@
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <ResourceGatherer disable=""/>
+  <ResourceSupply>
+    <KillBeforeGather>true</KillBeforeGather>
+    <Amount>1</Amount>
+    <Type>food.meat</Type>
+    <MaxGatherers>1</MaxGatherers>
+  </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
@@ -37,9 +56,6 @@
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.7</WalkSpeed>
-  </UnitMotion>
   <Visibility>
     <RetainInFog>true</RetainInFog>
   </Visibility>
Index: binaries/data/mods/public/simulation/templates/template_unit_animal_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_animal_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_animal_cattle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_animal">
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>
@@ -10,8 +10,4 @@
       <trained>actor/fauna/animal/cattle_trained.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>1.4</RunMultiplier>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_animal_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_animal_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_animal_elephant.xml
@@ -1,40 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
+<Entity parent="template_unit_animal">
   <Attack>
     <Melee>
-      <Damage>
-        <Hack>25.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>20.0</Crush>
-      </Damage>
-      <MaxRange>6.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCav>
           <Classes>Cavalry</Classes>
           <Multiplier>1.5</Multiplier>
         </BonusCav>
       </Bonuses>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
     <Tooltip>Counters: 1.5× vs Cavalry. Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
-  <Loot>
-    <xp>50</xp>
-  </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>4</Pierce>
-        <Crush>5</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
@@ -45,8 +24,4 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.5</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_animal_lion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_animal_lion.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_animal_lion.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>20</Hack>
-        <Pierce>0</Pierce>
-        <Crush>20</Crush>
-      </Damage>
-      <MaxRange>6</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <ResourceSupply>
-    <Amount>300</Amount>
-  </ResourceSupply>
+<Entity parent="template_unit_animal">
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/template_unit_animal_marine.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_animal_marine.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_animal_marine.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
+<Entity parent="template_unit_animal">
   <Health>
-    <Max>200</Max>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Tooltip>Kill to butcher for food.</Tooltip>
+    <Classes datatype="tokens">SeaCreature</Classes>
   </Identity>
-  <Loot>
-    <xp>10</xp>
-  </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
@@ -20,10 +17,7 @@
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
     <Type>food.fish</Type>
-    <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
@@ -39,7 +33,6 @@
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
-    <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
@@ -49,7 +42,5 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed op="mul">1.8</WalkSpeed>
-    <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
-  <Cost>
-    <Population>0</Population>
-  </Cost>
-  <Footprint replace="">
-    <Square width="2.0" depth="4.0"/>
-    <Height>4.0</Height>
-  </Footprint>
-  <Guard disable=""/>
-  <Identity>
-    <Classes datatype="tokens">-ConquestCritical Animal</Classes>
-    <Icon>gaia/fauna_generic.png</Icon>
-    <Formations disable=""/>
-  </Identity>
-  <Loot disable=""/>
-  <Minimap>
-    <Type>food</Type>
-    <Color r="227" g="130" b="141"/>
-  </Minimap>
-  <ResourceGatherer disable=""/>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x256/ellipse.png</MainTexture>
-        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <UnitAI>
-    <CanGuard>false</CanGuard>
-    <CanPatrol>false</CanPatrol>
-    <RoamDistance>8.0</RoamDistance>
-    <FleeDistance>24.0</FleeDistance>
-    <RoamTimeMin>2000</RoamTimeMin>
-    <RoamTimeMax>8000</RoamTimeMax>
-    <FeedTimeMin>15000</FeedTimeMin>
-    <FeedTimeMax>60000</FeedTimeMax>
-  </UnitAI>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.7</WalkSpeed>
-  </UnitMotion>
-  <Visibility>
-    <RetainInFog>true</RetainInFog>
-  </Visibility>
-  <Vision>
-    <Range>0</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_breed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_breed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_breed">
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Identity>
-    <Tooltip>Kill to gather meat for food.</Tooltip>
-  </Identity>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>100</Amount>
-    <Type>food.meat</Type>
-    <MaxGatherers>8</MaxGatherers>
-  </ResourceSupply>
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd">
-  <Identity>
-    <Classes datatype="tokens">Domestic</Classes>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>domestic</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>6</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/cattle_select.xml</select>
-      <order_attack>actor/fauna/animal/cattle_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
-      <death>actor/fauna/animal/cattle_death.xml</death>
-      <trained>actor/fauna/animal/cattle_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>1.4</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Health>
-    <Max>50</Max>
-  </Health>
-  <Identity>
-    <Tooltip>Kill to gather meat for food.</Tooltip>
-  </Identity>
-  <Loot>
-    <xp>10</xp>
-  </Loot>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>100</Amount>
-    <Type>food.meat</Type>
-    <MaxGatherers>8</MaxGatherers>
-  </ResourceSupply>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Loot>
-    <xp>20</xp>
-  </Loot>
-  <UnitAI>
-    <NaturalBehaviour>aggressive</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>20</Hack>
-        <Pierce>0</Pierce>
-        <Crush>20</Crush>
-      </Damage>
-      <MaxRange>6</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <ResourceSupply>
-    <Amount>300</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <UnitAI>
-    <NaturalBehaviour>defensive</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-      <MaxRange>1.5</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Loot>
-    <xp>50</xp>
-  </Loot>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/cattle_select.xml</select>
-      <order_attack>actor/fauna/animal/cattle_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
-      <death>actor/fauna/animal/cattle_death.xml</death>
-      <trained>actor/fauna/animal/cattle_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>2.0</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>25.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>20.0</Crush>
-      </Damage>
-      <MaxRange>6.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Bonuses>
-        <BonusCav>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCav>
-      </Bonuses>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Identity>
-    <Tooltip>Counters: 1.5× vs Cavalry. Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
-    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
-  </Identity>
-  <Loot>
-    <xp>50</xp>
-  </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>4</Pierce>
-        <Crush>5</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <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>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.5</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <UnitAI>
-    <NaturalBehaviour>skittish</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Identity>
-    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>3</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <ResourceSupply>
-    <Amount>100</Amount>
-  </ResourceSupply>
-  <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>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Health>
-    <Max>200</Max>
-    <Unhealable>true</Unhealable>
-  </Health>
-  <Identity>
-    <Tooltip>Kill to butcher for food.</Tooltip>
-  </Identity>
-  <Loot>
-    <xp>10</xp>
-  </Loot>
-  <Obstruction>
-    <BlockMovement>false</BlockMovement>
-    <BlockPathfinding>false</BlockPathfinding>
-  </Obstruction>
-  <Position>
-    <Anchor>upright</Anchor>
-    <Floating>true</Floating>
-    <FloatDepth>0.0</FloatDepth>
-  </Position>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
-    <Type>food.fish</Type>
-    <MaxGatherers>5</MaxGatherers>
-  </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/ellipse.png</MainTexture>
-        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <StatusBars>
-    <BarWidth>4.0</BarWidth>
-    <BarHeight>0.666</BarHeight>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <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 op="mul">1.8</WalkSpeed>
-    <RunMultiplier>1</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna"/>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Loot>
-    <xp>20</xp>
-  </Loot>
-  <UnitAI>
-    <NaturalBehaviour>aggressive</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>7</Hack>
-        <Pierce>2</Pierce>
-      </Damage>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
-  <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>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.6</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>10.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild">
-  <Loot>
-    <xp>15</xp>
-  </Loot>
-  <UnitAI>
-    <NaturalBehaviour>defensive</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_defensive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>2.5</Hack>
-        <Pierce>5.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>3.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Health>
-    <Max>50</Max>
-  </Health>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild">
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
-  <Loot>
-    <xp>20</xp>
-  </Loot>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
-  <Vision>
-    <Range>10</Range>
-  </Vision>
-</Entity>