Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml	(revision 25239)
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_trader">
+<Entity parent="civ/athen|template_unit_support_trader">
   <Footprint replace="">
     <Square width="5" depth="10"/>
     <Height>4</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SpecificName>Émporos</SpecificName>
     <Icon>units/hele_support_trader.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/trader.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml	(revision 25239)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <Builder merge="">
+    <Entities datatype="tokens">
+      structures/athen/gymnasium
+      structures/athen/prytaneion
+    </Entities>
+  </Builder>
+  <Identity>
+    <Civ>athen</Civ>
+    <Lang>greek</Lang>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/civ/athen.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/catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/catafalque.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/catafalque.xml	(revision 25239)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_catafalque">
+<Entity parent="civ/athen|template_unit_catafalque">
   <Auras datatype="tokens">
     units/catafalques/athen_catafalque_1
     units/catafalques/athen_catafalque_2
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Solon</SpecificName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml	(revision 25239)
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="civ/athen|template_unit_cavalry_ranged_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Pródromos</SpecificName>
     <Icon>units/athen_cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/cavalry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml	(revision 25239)
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="civ/athen|template_unit_cavalry_melee_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
     </Melee>
   </Attack>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/cavalry_swordsman_b</SelectionGroupName>
     <GenericName>Greek Cavalry</GenericName>
     <SpecificName>Hippeús</SpecificName>
     <Icon>units/athen_cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/athen/cavalry_swordsman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/cavalry_swordsman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml	(revision 25239)
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="civ/athen|hoplite|template_unit_champion_infantry_spearman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>City Guard</GenericName>
     <SpecificName>Epílektos</SpecificName>
     <Icon>units/athen_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml	(revision 25239)
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="civ/athen|template_unit_champion_infantry_swordsman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Athenian Marine</GenericName>
     <SpecificName>Epibátēs Athēnaîos</SpecificName>
     <Icon>units/athen_champion_marine.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_swordsman_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml	(revision 25239)
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
+<Entity parent="civ/athen|template_unit_champion_infantry_archer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Scythian Archer</GenericName>
     <SpecificName>Toxótēs Skythikós</SpecificName>
     <Icon>units/athen_champion_ranged.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_archer_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml	(revision 25239)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="civ/athen|template_unit_hero_infantry_javelineer">
   <Auras datatype="tokens">
     units/heroes/athen_hero_iphicrates_1
     units/heroes/athen_hero_iphicrates_2
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Iphicrates</GenericName>
     <SpecificName>Iphikratēs</SpecificName>
     <Icon>units/athen_hero_iphicrates.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_iphicrates.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml	(revision 25239)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_hero_infantry_spearman">
+<Entity parent="civ/athen|hoplite|template_unit_hero_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_pericles_1
     units/heroes/athen_hero_pericles_2
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Pericles</GenericName>
     <SpecificName>Periklēs</SpecificName>
     <Icon>units/athen_hero_pericles.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_spearman_pericles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml	(revision 25239)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="civ/athen|template_unit_hero_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_themistocles_1
     units/heroes/athen_hero_themistocles_2
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Themistocles</GenericName>
     <SpecificName>Themistoklēs</SpecificName>
     <Icon>units/athen_hero_themistocles.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_swordsman_themistocles.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml	(revision 25239)
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="civ/athen|template_unit_hero_infantry_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Xenophon</GenericName>
     <SpecificName>Xenophōn</SpecificName>
     <Icon>units/athen_hero_xenophon.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/hero_infantry_javelinist_xenophon.xml</Actor>
   </VisualActor>
 </Entity>
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 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml	(revision 25239)
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|merc_inf|template_unit_infantry_ranged_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
     <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 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml	(revision 25239)
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|merc_inf|template_unit_infantry_ranged_archer">
   <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>
     <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/athen/infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml	(revision 25239)
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|template_unit_infantry_ranged_slinger">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_slinger_b</SelectionGroupName>
     <GenericName>Athenian Slinger Militia</GenericName>
     <SpecificName>Psilòs Athēnaîos</SpecificName>
     <Icon>units/athen_infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_slinger_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/infantry_slinger_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml	(revision 25239)
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|hoplite|template_unit_infantry_melee_spearman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_spearman_b</SelectionGroupName>
     <GenericName>Athenian Hoplite</GenericName>
     <SpecificName>Hoplítēs Athēnaîos</SpecificName>
     <Icon>units/athen_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml	(revision 25239)
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="civ/athen|template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <GenericName>Penteconter</GenericName>
     <SpecificName>Pentēkóntoros</SpecificName>
     <Icon>units/hele_ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/pentekonter.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml	(revision 25239)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_fishing">
+<Entity parent="civ/athen|template_unit_ship_fishing">
   <Footprint>
     <Square width="4.0" depth="10.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
     <Icon>units/hele_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/fishing_boat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml	(revision 25239)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_merchant">
+<Entity parent="civ/athen|template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/merchant.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml	(revision 25239)
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="civ/athen|template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
     <GenericName>Athenian Trireme</GenericName>
     <Icon>units/hele_ship_trireme.png</Icon>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/athen/infantry_marine_archer_b
       units/athen/champion_marine
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>1.0</stone>
       <metal>1.0</metal>
       <time>1.0</time>
     </TechCostMultiplier>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml	(revision 25239)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_stonethrower">
+<Entity parent="civ/athen|template_unit_siege_stonethrower">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_lithobolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/athenians/siege_rock_packed.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml	(revision 25239)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_boltshooter">
+<Entity parent="civ/athen|template_unit_siege_boltshooter">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/athen/siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/athenians/siege_spear_packed.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml	(revision 25239)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_ram">
+<Entity parent="civ/athen|template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="10.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/spart_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/siege_ram.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml	(revision 25239)
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|template_unit_support_female_citizen">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Gýnē Athēnaía</SpecificName>
     <GenericName>Athenian Woman</GenericName>
     <Icon>units/hele_support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml	(revision 25239)
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_healer">
+<Entity parent="civ/athen|template_unit_support_healer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/athen/support_healer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/athenians/healer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml	(revision 25238)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml	(revision 25239)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_slave">
+<Entity parent="civ/athen|template_unit_support_slave">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Doûlos</SpecificName>
     <Icon>units/global_slave.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/global/slave.xml</Actor>
   </VisualActor>
 </Entity>