Index: binaries/data/mods/public/simulation/templates/mixin_champion.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/mixin_champion.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <Armour>
+    <Hack op="add">4</Hack>
+    <Pierce op="add">4</Pierce>
+    <Crush op="add">5</Crush>
+  </Armour>
+  <Attack>
+    <Capture>
+      <Capture>5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+  </Attack>
+  <Cost>
+    <BuildTime op="mul">2</BuildTime>
+    <Resources>
+      <food op="mul">1.3</food>
+      <wood op="mul">1.3</wood>
+      <metal op="add">80</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">1.25</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Soldier Champion</VisibleClasses>
+    <GenericName>Champion Unit</GenericName>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <xp op="mul">1.5</xp>
+  </Loot>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>256x256/arrow.png</MainTexture>
+        <MainTextureMask>256x256/arrow_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/mixin_champion_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/mixin_champion_cavalry.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="mixin_champion">
+  <Cost>
+    <Resources>
+      <food>150</food>
+      <wood>80</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">2.0</Max>
+  </Health>
+  <Identity>
+    <Classes datatype="tokens">-CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">-Citizen</VisibleClasses>
+    <GenericName>Champion Cavalry</GenericName>
+  </Identity>
+  <Loot>
+    <food>15</food>
+    <wood>8</wood>
+    <metal>10</metal>
+  </Loot>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion">
-  <Armour>
-    <Hack>7</Hack>
-    <Pierce>5</Pierce>
-    <Crush>20</Crush>
-  </Armour>
-  <Cost>
-    <Population>1</Population>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <food>150</food>
-      <wood>80</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Health>
-    <Max>240</Max>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">FastMoving</Classes>
-    <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
-    <GenericName>Champion Cavalry</GenericName>
-    <Formations datatype="tokens">
-      special/formations/wedge
-    </Formations>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <food>15</food>
-    <wood>8</wood>
-    <metal>10</metal>
-  </Loot>
-  <Sound>
-    <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.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_melee>attack/weapon/sword_attack.xml</attack_melee>
-      <death>actor/fauna/death/death_horse.xml</death>
-      <trained>interface/alarm/alarm_create_cav.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>6.5</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <WalkSpeed op="mul">2</WalkSpeed>
-  </UnitMotion>
-  <Vision>
-    <Range>96</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -1,37 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry">
+<Entity parent="mixin_champion_cavalry|template_unit_cavalry_ranged_archer">
   <Attack>
     <Ranged>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>14.0</Pierce>
-        <Crush>0</Crush>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Hack>
+        <Crush op="mul">2</Hack>
       </Damage>
-      <MaxRange>76.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Delay>0</Delay>
       <Projectile>
-        <Speed>75.0</Speed>
-        <Spread>1.0</Spread>
-        <Gravity>39.81</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
+        <Spread op="mul">0.33</Spread>
       </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
   </Identity>
-  <Sound>
-    <SoundGroups>
-      <death>actor/fauna/death/death_horse.xml</death>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -1,29 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry">
-  <Armour>
-    <Pierce op="add">2</Pierce>
-  </Armour>
+<Entity parent="mixin_champion_cavalry|template_unit_cavalry_melee_axeman">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>13.8</Hack>
-        <Pierce>0</Pierce>
-        <Crush>4.6</Crush>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Hack>
+        <Crush op="mul">2</Hack>
       </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Health>
-    <Max>300</Max>
-  </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Cavalry Axeman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -1,42 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry">
-  <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
-  </Armour>
+<Entity parent="mixin_champion_cavalry|template_unit_cavalry_melee_spearman">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>8</Hack>
-        <Pierce>6</Pierce>
-        <Crush>0</Crush>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Hack>
+        <Crush op="mul">2</Hack>
       </Damage>
-      <MaxRange>4.5</MaxRange>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Health>
-    <Max>300</Max>
-  </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
-    <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
   </Identity>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -1,30 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry">
-  <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
-  </Armour>
+<Entity parent="mixin_champion_cavalry|template_unit_cavalry_melee_swordsman">
   <Attack>
     <Melee>
       <Damage>
-        <Hack>13.0</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack op="mul">2</Hack>
+        <Pierce op="mul">2</Hack>
+        <Crush op="mul">2</Hack>
       </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Health>
-    <Max>300</Max>
-  </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -1,30 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?use_include?>
 <Entity parent="template_unit">
-  <AttackArmour parent="test_attarm.xml">
-    <Armour>
-      <Hack op="mul">2.2</Hack>
-      <Pierce op="add">1</Pierce>
-      <Crush op="mul_round">1.1</Crush>
-    </Armour>
-    <Attack>
-      <Capture>
-        <Capture disable=""/>
-        <Damage><Fire>5</Fire></Damage>
-        <RestrictedClasses datatype="tokens">-Field Jackson Five</RestrictedClasses>
-      </Capture>
-      <Slaughter>
-        <Damage replace="">
-          <Pierce>10.0</Pierce>
-        </Damage>
-      </Slaughter>
-    </Attack>
-  </AttackArmour>
-  <include>test</include>
-  <Cost parent="test_cost_champ|test_cost">
+  <Armour>
+    <Hack>2</Hack>
+    <Pierce>4</Pierce>
+    <Crush>15</Crush>
+  </Armour>
+  <Attack>
+    <Capture>
+      <Capture>2.5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+    <Slaughter>
+      <Damage>
+        <Hack>50.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
+      <MaxRange>2</MaxRange>
+    </Slaughter>
+  </Attack>
+  <Builder>
+    <Rate>1.0</Rate>
+    <Entities datatype="tokens">
+      structures/{civ}_civil_centre
+      structures/{civ}_crannog
+      structures/{civ}_military_colony
+      structures/{civ}_house
+      structures/{civ}_storehouse
+      structures/{civ}_farmstead
+      structures/{civ}_field
+      structures/{civ}_corral
+      structures/{civ}_outpost
+      structures/wallset_palisade
+      structures/{civ}_sentry_tower
+      structures/{civ}_dock
+      structures/{civ}_barracks
+      structures/{civ}_blacksmith
+      structures/{civ}_temple
+      structures/{civ}_market
+      structures/{civ}_defense_tower
+      structures/{civ}_wallset_stone
+      structures/{civ}_workshop
+      structures/{civ}_fortress
+      structures/{civ}_wonder
+    </Entities>
+  </Builder>
+  <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
-      <wood>10</wood>
+      <food>50</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>