Index: binaries/data/mods/public/simulation/data/auras/fauna_horse_captured.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/fauna_horse_captured.json
+++ binaries/data/mods/public/simulation/data/auras/fauna_horse_captured.json
@@ -0,0 +1,11 @@
+{
+	"type": "global",
+	"affects": ["Cavalry"],
+	"modifications": [
+		{"value": "Health/Max", "add": 10},
+		{"value": "Cost/BuildTime", "multiply": 0.95}
+	],
+	"auraName": "Horse Roundup",
+	"auraDescription": "All Cavalry units -5% train time and +10 health for each wild horse captured.",
+	"stackable": true
+}
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,36 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_skittish">
-  <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>
-  <ResourceSupply>
-    <Max>200</Max>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/horse_select.xml</select>
-      <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <death>actor/fauna/animal/horse_death.xml</death>
-      <trained>actor/fauna/animal/horse_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-    <Acceleration op="mul">0.8</Acceleration>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>fauna/horse.xml</Actor>
-  </VisualActor>
-</Entity>
+<Entity parent="template_unit_fauna_hunt_passive_horse"/>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_horse">
-  <UnitAI>
-    <DefaultStance>passive</DefaultStance>
-  </UnitAI>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -16,7 +16,7 @@
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
-    <List datatype="tokens">Cavalry</List>
+    <List datatype="tokens">Cavalry Horse</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -10,6 +10,14 @@
     <Square width="18.0" depth="17.0"/>
     <Height>5.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>8</Max>
+    <EjectHealth>0.5</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Animal</EjectClassesOnDestroy>
+    <List datatype="tokens">Animal</List>
+    <BuffHeal>1</BuffHeal>
+    <LoadingRange>4</LoadingRange>
+  </GarrisonHolder>
   <Health>
     <Max>500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_horse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_horse.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_horse.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_passive">
+  <Auras datatype="tokens">
+    fauna_horse_captured
+  </Auras>
+  <Capturable>
+    <CapturePoints>30</CapturePoints>
+    <RegenRate>0</RegenRate>
+    <GarrisonRegenRate>3</GarrisonRegenRate>
+  </Capturable>
+  <Footprint replace="">
+    <Square width="3.5" depth="6"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <DeathType>corpse</DeathType>
+  </Health>
+  <Identity>
+    <Civ>gaia</Civ>
+	<GenericName>Horse</GenericName>
+    <SpecificName>Equus ferus caballus</SpecificName>
+    <VisibleClasses datatype="tokens">Horse Capturable</VisibleClasses>
+	<SelectionGroupName>gaia/fauna_horse</SelectionGroupName>
+    <Tooltip>Kill for food or capture this animal to gain an advantage for your Cavalry. Can garrison into a Corral or Stable for safe keeping.</Tooltip>
+    <Icon>gaia/fauna_horse.png</Icon>
+  </Identity>
+  <Position>
+    <Anchor>pitch</Anchor>
+  </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/horse_select.xml</select>
+      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
+      <order_garrison>actor/fauna/animal/horse_attack_order.xml</order_garrison>
+      <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">1.25</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>8</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>fauna/horse.xml</Actor>
+  </VisualActor>
+</Entity>