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,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Arctic Wolf</GenericName>
-    <SpecificName>Canis lupus</SpecificName>
-    <Icon>gaia/fauna_arctic_wolf.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/arctic_wolf.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_arctic_wolf">
-  <Identity>
-    <Classes datatype="tokens">Domestic</Classes>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
-</Entity>
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
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>8.0</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Footprint>
-    <Square width="3.0" depth="12.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Nile Crocodile</GenericName>
-    <SpecificName>Crocodylus niloticus</SpecificName>
-    <Icon>gaia/fauna_crocodile.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch-roll</Anchor>
-  </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/ellipse.png</MainTexture>
-        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
-      </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>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.3</WalkSpeed>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>fauna/crocodile.xml</Actor>
-  </VisualActor>
-</Entity>
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,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Mastiff</GenericName>
-    <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>gaia/fauna_dog.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/mastiff.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_horse">
-  <Footprint>
-    <Square width="2.5" depth="5.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Pony</GenericName>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>4.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/pony.xml</Actor>
-  </VisualActor>
-</Entity>
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
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>20.0</Crush>
-      </Damage>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Footprint>
-    <Square width="3.0" depth="6.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>White Rhinoceros</GenericName>
-    <SpecificName>Ceratotherium simum</SpecificName>
-    <Icon>gaia/fauna_rhino.png</Icon>
-  </Identity>
-  <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>
-  <StatusBars>
-    <HeightOffset>4.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/rhino.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
+<Entity parent="gaia/fauna_wolf">
   <Identity>
     <GenericName>Arctic Wolf</GenericName>
-    <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_arctic_wolf.png</Icon>
   </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
   <VisualActor>
     <Actor>fauna/arctic_wolf.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_arctic_wolf">
+<Entity parent="gaia/fauna_wolf_arctic">
   <Identity>
     <Classes datatype="tokens">Domestic</Classes>
   </Identity>
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,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Wolfhound</GenericName>
-    <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>units/brit_wolfhound.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>units/britons/wolfhound.xml</Actor>
-  </VisualActor>
-</Entity>