Index: binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit">
+  <Attack>
+    <Slaughter>
+      <Damage>
+        <Hack>100</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>2</MaxRange>
+    </Slaughter>
+  </Attack>
+  <Cost>
+    <Population>1</Population>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <food>200</food>
+      <wood>80</wood>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Circle radius="3.5"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <Classes datatype="tokens">Human CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Soldier Elephant</VisibleClasses>
+    <GenericName>War Elephant</GenericName>
+    <Rank>Basic</Rank>
+    <Formations datatype="tokens">
+      special/formations/wedge
+    </Formations>
+  </Identity>
+  <Loot>
+    <xp>260</xp>
+    <food>25</food>
+    <wood>10</wood>
+    <stone>0</stone>
+    <metal>5</metal>
+  </Loot>
+  <Position>
+    <Anchor>pitch</Anchor>
+  </Position>
+  <Promotion>
+    <RequiredXp>150</RequiredXp>
+  </Promotion>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>circle/256x256.png</MainTexture>
+        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <walk>actor/mounted/movement/walk.xml</walk>
+      <run>actor/mounted/movement/walk.xml</run>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <death>actor/fauna/animal/elephant_death.xml</death>
+      <trained>actor/fauna/animal/elephant_trained.xml</trained>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>6.5</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+  </UnitMotion>
+  <Vision>
+    <Range>92</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_elephant_ranged.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_elephant_ranged.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_elephant">
+  <Armour>
+    <Hack>4</Hack>
+    <Pierce>3</Pierce>
+    <Crush>15</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>9</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>16</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>1500</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>75</Speed>
+        <Spread>3</Spread>
+        <Gravity>9.81</Gravity>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
+    <GenericName>Ranged Elephant</GenericName>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_elephant_ranged_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_elephant_ranged_archer.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_elephant_ranged">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Pierce>10.5</Pierce>
+      </Damage>
+      <MaxRange>72</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>750</RepeatTime>
+      <Projectile>
+        <Gravity>39.81</Gravity>
+      </Projectile>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Archer</VisibleClasses>
+    <GenericName>Elephant Archer</GenericName>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -1,75 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
-  <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
-  </Armour>
-  <Attack>
-    <Capture disable=""/>
-    <Ranged>
-      <Damage>
-        <Hack op="mul">1.5</Hack>
-        <Pierce op="mul">1.5</Pierce>
-        <Crush op="mul">1.5</Crush>
-      </Damage>
-      <RepeatTime op="mul">0.75</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <Resources>
-      <food>200</food>
-      <wood>80</wood>
-      <metal>20</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="3.5"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max op="mul">2.0</Max>
-  </Health>
+<Entity parent="template_unit_elephant_ranged_archer">
   <Identity>
     <Civ>maur</Civ>
-    <VisibleClasses datatype="tokens">-Cavalry Elephant</VisibleClasses>
     <GenericName>Elephant Archer</GenericName>
     <Icon>units/maur_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <SpecificName>Vachii Gaja</SpecificName>
   </Identity>
-  <Loot>
-    <xp>260</xp>
-    <food>25</food>
-    <wood>10</wood>
-    <stone>0</stone>
-    <metal>5</metal>
-  </Loot>
   <Promotion>
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
-  <ResourceGatherer disable=""/>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
-      <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>
   <VisualActor>
     <Actor>units/mauryas/elephantry_archer_b_m.xml</Actor>
   </VisualActor>