Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml	(revision 23802)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <wood>400</wood>
       <stone>200</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="28.0" depth="28.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Embassy</GenericName>
     <Tooltip>Hire mercenaries.</Tooltip>
     <Icon>structures/italian_embassy.png</Icon>
   </Identity>
   <Loot>
     <wood>80</wood>
     <stone>40</stone>
   </Loot>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_gaul_b
-      units/{civ}_cavalry_swordsman_gaul_b
-      units/{civ}_infantry_javelinist_iber_b
-      units/{civ}_infantry_slinger_iber_b
-      units/{civ}_cavalry_swordsman_iber_b
-      units/{civ}_infantry_swordsman_ital_b
-      units/{civ}_cavalry_spearman_ital_b
+      units/{native}_infantry_swordsman_gaul_b
+      units/{native}_cavalry_swordsman_gaul_b
+      units/{native}_infantry_javelinist_iber_b
+      units/{native}_infantry_slinger_iber_b
+      units/{native}_cavalry_swordsman_iber_b
+      units/{native}_infantry_swordsman_ital_b
+      units/{native}_cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml	(revision 23802)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="16.0" depth="13.0"/>
     <Height>11.0</Height>
   </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Celtic Embassy</SpecificName>
     <Tooltip>Hire Celtic mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/celtic_embassy.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
   </Loot>
   <Obstruction>
     <Static width="15.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_gaul_b
-      units/{civ}_cavalry_swordsman_gaul_b
+      units/{native}_infantry_swordsman_gaul_b
+      units/{native}_cavalry_swordsman_gaul_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_celtic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml	(revision 23802)
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <stone>200</stone>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Iberian Embassy</SpecificName>
       <Tooltip>Hire Iberian mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/iberian_embassy.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_javelinist_iber_b
-      units/{civ}_infantry_slinger_iber_b
-      units/{civ}_cavalry_swordsman_iber_b
+      units/{native}_infantry_javelinist_iber_b
+      units/{native}_infantry_slinger_iber_b
+      units/{native}_cavalry_swordsman_iber_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_iberian.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml	(revision 23802)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
     <Resources>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="13" depth="15.5"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Italian Embassy</SpecificName>
     <Tooltip>Hire Italian mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/italian_embassy.png</Icon>
   </Identity>
   <Loot>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="11.0" depth="14.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_ital_b
-      units/{civ}_cavalry_spearman_ital_b
+      units/{native}_infantry_swordsman_ital_b
+      units/{native}_cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_italiote.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml	(revision 23802)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <BuildRestrictions>
     <Territory>own neutral</Territory>
   </BuildRestrictions>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="29.0" depth="29.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Blemmye Camp</GenericName>
     <SpecificName>Blemmye Camp</SpecificName>
     <Tooltip>Train Blemmye Desert Raiders.</Tooltip>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
     <wood>20</wood>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_cavalry_javelinist_merc_b
+      units/{native}_cavalry_javelinist_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/mercenaries/camp_blemmye.xml</Actor>
     <FoundationActor>structures/fndn_8x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml	(revision 23802)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <BuildRestrictions>
     <Territory>own neutral</Territory>
   </BuildRestrictions>
   <Cost>
     <Resources>
       <wood>100</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="35.0" depth="35.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Nuba Village</GenericName>
     <SpecificName>Nuba Village</SpecificName>
     <Tooltip>Train the Nuba Clubman and Nuba Hunter.</Tooltip>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
     <wood>20</wood>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="35.0" depth="35.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_clubman_b
-      units/{civ}_infantry_javelinist_merc_b
+      units/{native}_infantry_clubman_b
+      units/{native}_infantry_javelinist_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/mercenaries/camp_nuba.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml	(revision 23802)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
     <Icon>units/cart_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_javelinist_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 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml	(revision 23802)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Iberian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Balearic Slinger</GenericName>
     <Icon>units/cart_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
   </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 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml	(revision 23802)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Celt</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
   </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 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml	(revision 23802)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Italian</Classes>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Swordsman</GenericName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
   </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_infantry_clubman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml	(revision 23802)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Armour>
     <Hack op="add">-1</Hack>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>3.0</Hack>
         <Crush>2.5</Crush>
       </Damage>
     </Melee>
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/kush_pyramid_small
-      structures/kush_pyramid_large
-      structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/{civ}_pyramid_small
+      structures/{civ}_pyramid_large
+      structures/{civ}_temple_amun
+      structures/{civ}_blemmye_camp
+      structures/{civ}_nuba_village
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
     <GenericName>Nuba Clubman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
     <Icon>units/kush_infantry_clubman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>
   </Promotion>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/kushites/infantry_clubman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml	(revision 23801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml	(revision 23802)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/kush_pyramid_small
-      structures/kush_pyramid_large
-      structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/{civ}_pyramid_small
+      structures/{civ}_pyramid_large
+      structures/{civ}_temple_amun
+      structures/{civ}_blemmye_camp
+      structures/{civ}_nuba_village
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_infantry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Nuba Skirmisher</GenericName>
     <SpecificName>nhw ʿhȝw Noba</SpecificName>
     <Icon>units/kush_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_javelinist_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/kushites/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>