Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json	(nonexistent)
@@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "coins.png",
-	"tooltip": "Non-Champion Mercenaries −60% food cost, no wood or stone costs, −30% training time, and unable to gather resources; Infantry costs 60 metal, Cavalry 80 metal, Elephants 120 metal.",
-	"modifications": [
-		{ "value": "Cost/BuildTime", "multiply": 0.7 },
-		{ "value": "Cost/Resources/food", "multiply": 0.4 },
-		{ "value": "Cost/Resources/wood", "replace": 0 },
-		{ "value": "Cost/Resources/stone", "replace": 0 },
-		{ "value": "Cost/Resources/metal", "replace": 60, "affects": "Infantry" },
-		{ "value": "Cost/Resources/metal", "replace": 80, "affects": "Cavalry" },
-		{ "value": "Cost/Resources/metal", "replace": 120, "affects": "Elephant" },
-		{ "value": "Loot/food", "multiply": 0.4 },
-		{ "value": "Loot/wood", "replace": 0 },
-		{ "value": "Loot/stone", "replace": 0 },
-		{ "value": "Loot/metal", "replace": 6, "affects": "Infantry" },
-		{ "value": "Loot/metal", "replace": 8, "affects": "Cavalry" },
-		{ "value": "Loot/metal", "replace": 12, "affects": "Elephant" },
-		{ "value": "ResourceGatherer/BaseSpeed", "replace": 0 }
-	],
-	"affects": ["Mercenary !Champion"]
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml	(revision 25238)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele/infantry_archer_merc_b</SelectionGroupName>
     <GenericName>Syrian Archer</GenericName>
     <SpecificName>Toxótēs Syrías</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele/infantry_archer_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/seleucids/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml	(revision 25238)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Macedonian Settler Cavalry</GenericName>
     <SpecificName>Hippeús Makedonikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/cavalry_spearman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/cavalry_spearman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml	(revision 25238)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
     </Entities>
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Skirmisher</GenericName>
     <SpecificName>Thureophóros Akrobolistḗs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_infantry_javelinist_merc.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml	(revision 25238)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
     </Entities>
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Gallikós Mistophorós</SpecificName>
     <SelectionGroupName>units/ptol/infantry_swordsman_merc_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_swordsman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/infantry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml	(revision 25238)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_champion_infantry_spearman">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Spearman</GenericName>
     <SpecificName>Samnite Spearman</SpecificName>
     <Icon>units/samnite_spearman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_spearman_c_samnite.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml	(revision 25238)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele/cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hippos Hetairike</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_cavalry_spearman_merc.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele/cavalry_spearman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/cavalry_spearman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml	(revision 25238)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>80</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>8</metal>
+  </Loot>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml	(revision 25238)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>12</metal>
+  </Loot>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml	(revision 25238)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>6</metal>
+  </Loot>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml	(revision 25238)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <BuildTime op="mul">0.7</BuildTime>
+    <Resources>
+      <food op="mul">0.4</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <!-- Metal is specified on a per-class basis in derived templates. -->
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Loot>
+    <food op="mul">0.4</food>
+    <wood>0</wood>
+    <stone>0</stone>
+  </Loot>
+  <ResourceGatherer disable=""/>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml	(revision 25238)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
       structures/athen/gymnasium
       structures/athen/prytaneion
     </Entities>
   </Builder>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/athen_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml	(revision 25238)
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
       structures/athen/gymnasium
       structures/athen/prytaneion
     </Entities>
   </Builder>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_marine_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml	(revision 25238)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Italic Cavalry</GenericName>
     <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_spearman_ital_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/cavalry_spearman_ital_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/carthaginians/cavalry_spearman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml	(revision 25238)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_swordsman">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Gallic Mercenary Cavalry</GenericName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_swordsman_gaul_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_cavalry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/cavalry_swordsman_gaul_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/gauls/cavalry_swordsman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml	(revision 25238)
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
     </Melee>
   </Attack>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Iberian Heavy Cavalry</GenericName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
     <SelectionGroupName>units/cart/cavalry_swordsman_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/cavalry_swordsman_iber_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/iberians/cavalry_swordsman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml	(revision 25238)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}/super_dock
       structures/{civ}/embassy_celtic
       structures/{civ}/embassy_iberian
       structures/{civ}/embassy_italic
     </Entities>
   </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
     <SelectionGroupName>units/cart/infantry_javelineer_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_javelineer_iber_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/iberians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml	(revision 25238)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="merc_inf|template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}/super_dock
       structures/{civ}/embassy_celtic
       structures/{civ}/embassy_iberian
       structures/{civ}/embassy_italic
     </Entities>
   </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Balearic Slinger</GenericName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
     <SelectionGroupName>units/cart/infantry_slinger_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_slinger_iber_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/iberians/infantry_slinger_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml	(revision 25238)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}/super_dock
       structures/{civ}/embassy_celtic
       structures/{civ}/embassy_iberian
       structures/{civ}/embassy_italic
     </Entities>
   </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
     <SelectionGroupName>units/cart/infantry_swordsman_gaul_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_swordsman_gaul_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/gauls/infantry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml	(revision 25238)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}/super_dock
       structures/{civ}/embassy_celtic
       structures/{civ}/embassy_iberian
       structures/{civ}/embassy_italic
     </Entities>
   </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
     <SelectionGroupName>units/cart/infantry_swordsman_ital_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/cart/infantry_swordsman_ital_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/carthaginians/infantry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml	(revision 25238)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
   <Attack>
     <Ranged>
       <Projectile>
         <LaunchPoint y="7"/>
       </Projectile>
     </Ranged>
   </Attack>
   <Footprint>
     <Height>7.5</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
     <SelectionGroupName>units/kush/cavalry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
-    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
+    <VisibleClasses datatype="tokens">Camel</VisibleClasses>
     <Icon>units/kush_camel_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush/cavalry_javelineer_merc_a</Entity>
   </Promotion>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel.xml</select>
       <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>8.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>units/kushites/camel_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml	(revision 25238)
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
       structures/kush/pyramid_small
       structures/kush/pyramid_large
       structures/kush/temple_amun
       structures/kush/camp_blemmye
       structures/kush/camp_noba
     </Entities>
   </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
     <SelectionGroupName>units/kush/infantry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Noba Skirmisher</GenericName>
     <SpecificName>nhw ʿhȝw Noba</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/kush_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush/infantry_javelineer_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/kushites/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml	(revision 25238)
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_maceman">
+<Entity parent="merc_inf|template_unit_infantry_melee_maceman">
   <Builder>
     <Entities datatype="tokens">
       structures/kush/pyramid_small
       structures/kush/pyramid_large
       structures/kush/temple_amun
       structures/kush/camp_blemmye
       structures/kush/camp_noba
     </Entities>
   </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
     <SelectionGroupName>units/kush/infantry_maceman_b</SelectionGroupName>
     <GenericName>Noba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/kush_infantry_maceman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush/infantry_maceman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/kushites/infantry_maceman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml	(revision 25238)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace/cavalry_javelineer_b</SelectionGroupName>
     <GenericName>Odrysian Skirmish Cavalry</GenericName>
     <SpecificName>Hippakontistḕs Odrysós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace/cavalry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml	(revision 25238)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml	(revision 25238)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="merc_inf|template_unit_infantry_ranged_slinger">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace/infantry_slinger_b</SelectionGroupName>
     <GenericName>Rhodian Slinger</GenericName>
     <SpecificName>Sphendonḗtēs Rhódios</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace/infantry_slinger_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/infantry_slinger_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml	(revision 25238)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
     </Melee>
   </Attack>
   <Identity>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiophoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml	(revision 25238)
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
       <Damage>
         <Hack op="add">-2</Hack>
       </Damage>
     </Melee>
   </Attack>
   <Identity>
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thorakites.png</Icon>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">2</Hack>
         <Pierce op="add">2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thorakites.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml	(revision 25238)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
   <Identity>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
     <SpecificName>Thyreophoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thureophoros.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_c_thureophoros.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml	(revision 25238)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Hoplite</GenericName>
     <SpecificName>Hoplites Kardakes</SpecificName>
     <Icon>units/pers_kardakes.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml	(revision 25238)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Skirmisher</GenericName>
     <SpecificName>Peltastes Kardakes</SpecificName>
     <Icon>units/pers_kardakes_skirmisher.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml	(revision 25238)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/cavalry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Tarantine Settler Cavalry</GenericName>
     <SpecificName>Hippeús Tarantînos</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/cavalry_javelineer_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml	(revision 25238)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
     </Entities>
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml	(revision 25238)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_infantry_melee_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
     </Entities>
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Spearman</GenericName>
     <SpecificName>Thureophóros Misthophóros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_infantry_spearman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_spearman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml	(revision 25238)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Skirmisher</GenericName>
     <SpecificName>Samnite Skirmisher</SpecificName>
     <Icon>units/samnite_skirmisher.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_javelinist_c_samnite.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml	(revision 25238)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Samnite Swordsman</SpecificName>
     <Icon>units/samnite_swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/infantry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml	(revision 25237)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml	(revision 25238)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
     </Melee>
   </Attack>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele/infantry_swordsman_merc_b</SelectionGroupName>
     <GenericName>Thracian Mercenary Swordsman</GenericName>
     <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele/infantry_swordsman_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/seleucids/infantry_swordsman_b.xml</Actor>
   </VisualActor>
 </Entity>