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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_bull">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Taurus</SpecificName>
+    <GenericName>Bull</GenericName>
+    <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_bull.png</Icon>
   </Identity>
   <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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Taurus</SpecificName>
+    <GenericName>Cow</GenericName>
+    <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_cow.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_cattle_cow">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Africanus</SpecificName>
+    <GenericName>Sanga Cattle</GenericName>
+    <SpecificName>Bos taurus africanus</SpecificName>
     <Icon>gaia/fauna_sanga.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_cattle_sanga">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
+<Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Indicus</SpecificName>
+    <GenericName>Zebu</GenericName>
+    <SpecificName>Bos taurus indicus</SpecificName>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_breed.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_lusitano.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_marwari.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <Footprint>
-    <Square width="2.1" depth="4.2"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Horse</GenericName>
-    <SpecificName>Equus ferus caballus</SpecificName>
-    <Icon>gaia/fauna_horse.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <ResourceSupply>
-    <Amount>200</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
+<Entity parent="gaia/fauna_horse">
   <VisualActor>
     <Actor>fauna/horse_persian.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_passive_cattle">
-  <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bos Taurus Indicus</SpecificName>
-    <Icon>gaia/fauna_zebu.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>fauna/zebu_wild.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_zebu">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-  </Visibility>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
@@ -14,6 +14,7 @@
     <Entities datatype="tokens">
       -gaia/fauna_sheep_trainable
       gaia/fauna_pig_trainable
+      gaia/fauna_cattle_cow
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
@@ -13,8 +13,9 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      gaia/fauna_goat_trainable
       -gaia/fauna_sheep_trainable
+      gaia/fauna_goat_trainable
+      gaia/fauna_cattle_sanga
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
@@ -14,7 +14,7 @@
     <Entities datatype="tokens">
       -gaia/fauna_sheep_trainable
       gaia/fauna_goat_trainable
-      gaia/fauna_zebu_trainable
+      gaia/fauna_cattle_zebu
     </Entities>
   </ProductionQueue>
   <VisualActor>
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,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
+<Entity parent="template_unit_fauna_herd_domestic">
+  <Cost>
+    <BuildTime>53</BuildTime>
+    <Resources>
+      <food>75</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="1.9" depth="3.8"/>
     <Height>2.0</Height>
@@ -8,7 +14,7 @@
     <WalkSpeed op="mul">0.4</WalkSpeed>
     <RunMultiplier>1.4</RunMultiplier>
   </UnitMotion>
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
+  <Visibility>
+    <RetainInFog>false</RetainInFog>
+  </Visibility>
 </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
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -15,9 +15,6 @@
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
-  <Identity>
-    <VisibleClasses datatype="tokens">Cattle</VisibleClasses>
-  </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt">
-  <Footprint>
-    <Square width="1.9" depth="3.8"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>1.4</RunMultiplier>
-  </UnitMotion>
-  <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
-  </UnitAI>
-</Entity>