Index: binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
+  <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>Arctic Wolf</GenericName>
     <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_arctic_wolf.png</Icon>
   </Identity>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
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,14 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
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,14 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
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,14 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
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
@@ -3,23 +3,26 @@
   <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>
   </ResourceSupply>
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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_bull">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.4</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,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_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>
     <Icon>gaia/fauna_cow.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
   <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,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_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>
     <Icon>gaia/fauna_sanga.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
   <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,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_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>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
+  </UnitMotion>
   <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">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -3,11 +3,9 @@
   <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>
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,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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">
+  <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>
@@ -21,6 +36,9 @@
   <StatusBars>
     <HeightOffset>10.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.5</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,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
+  <Armour>
+    <Pierce>3</Pierce>
+  </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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
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">
+  <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>
@@ -21,6 +36,9 @@
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.5</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,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
+  <Armour>
+    <Pierce>3</Pierce>
+  </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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
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">
+  <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>
@@ -21,6 +36,10 @@
   <StatusBars>
     <HeightOffset>7.5</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.5</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,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
+  <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>
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,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
+  <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>
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,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
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">
+  <Attack disable=""/>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>13.0</Height>
@@ -12,6 +13,9 @@
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <ResourceSupply>
     <Amount>350</Amount>
   </ResourceSupply>
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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <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>
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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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
@@ -3,11 +3,9 @@
   <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,11 +13,18 @@
     <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>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <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=""/>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.6</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/mastiff.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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
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,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <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>
     <Icon>gaia/fauna_pig.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
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">
+  <Attack disable=""/>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.0</Height>
@@ -12,6 +13,9 @@
     <SpecificName>Oryctolagus cuniculus</SpecificName>
     <Icon>gaia/fauna_rabbit.png</Icon>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+  </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
@@ -3,11 +3,10 @@
   <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,11 +14,17 @@
     <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>
   </ResourceSupply>
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,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_passive">
+  <Attack disable=""/>
   <Footprint>
     <Square width="2.0" depth="8.0"/>
     <Height>2.5</Height>
@@ -26,6 +27,7 @@
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>5.0</TurnRate>
   </Position>
+  <ResourceSupply disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
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,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <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>
     <Icon>gaia/fauna_sheep.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep_select.xml</select>
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
@@ -3,11 +3,10 @@
   <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,11 +14,18 @@
     <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>
+  <Loot>
+    <xp>20</xp>
+  </Loot>
+  <ResourceSupply disable=""/>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
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
@@ -8,39 +8,36 @@
   <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>
   <ResourceSupply>
     <Amount>300</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>256x256/ellipse.png</MainTexture>
-        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+  </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,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
+  <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>
@@ -12,6 +16,13 @@
   <Position>
     <Altitude>-0.5</Altitude>
   </Position>
+  <ResourceSupply>
+    <Amount>2000</Amount>
+  </ResourceSupply>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.8</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,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
+  <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>
@@ -12,6 +16,13 @@
   <Position>
     <Altitude>-4</Altitude>
   </Position>
+  <ResourceSupply>
+    <Amount>2000</Amount>
+  </ResourceSupply>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.8</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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
+  <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>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <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=""/>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.6</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/britons/wolfhound.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,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <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>
   </ResourceSupply>
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,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,6 +22,7 @@
   </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=""/>
@@ -19,6 +33,12 @@
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <ResourceGatherer disable=""/>
+  <ResourceSupply>
+    <KillBeforeGather>true</KillBeforeGather>
+    <Amount>100</Amount>
+    <Type>food.meat</Type>
+    <MaxGatherers>8</MaxGatherers>
+  </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd.xml
@@ -1,14 +1,5 @@
 <?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>
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
@@ -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_fauna_hunt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
@@ -1,18 +1,2 @@
 <?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>
+<Entity parent="template_unit_fauna"/>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
@@ -1,21 +1,5 @@
 <?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>
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,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>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -1,21 +1,5 @@
 <?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>
@@ -26,9 +10,4 @@
       <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,35 +1,18 @@
 <?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>
-      <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>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
-  <Loot>
-    <xp>50</xp>
-  </Loot>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
@@ -40,8 +23,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_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- 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
@@ -1,16 +1,8 @@
 <?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>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
-  <ResourceSupply>
-    <Amount>100</Amount>
-  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
@@ -1,18 +1,5 @@
 <?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>
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,15 +1,11 @@
 <?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>
@@ -20,8 +16,6 @@
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
@@ -49,7 +43,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_wild_aggressive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
@@ -1,21 +1,5 @@
 <?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>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -1,15 +1,5 @@
 <?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>
+<Entity parent="template_unit_fauna_wild_aggressive">
   <Sound>
     <SoundGroups>
       <select>voice/global/civ_dog_bark.xml</select>
@@ -24,7 +14,4 @@
       <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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
@@ -1,14 +1,2 @@
 <?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>
+<Entity parent="template_unit_fauna_wild_aggressive"/>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
-  <Loot>
-    <xp>15</xp>
-  </Loot>
   <UnitAI>
     <NaturalBehaviour>defensive</NaturalBehaviour>
   </UnitAI>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -1,19 +1,2 @@
 <?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>
+<Entity parent="template_unit_fauna_wild_defensive"/>
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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
@@ -1,21 +1,5 @@
 <?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>