Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
@@ -19,7 +19,7 @@
   </GarrisonHolder>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
+    <SelectionGroupName>structures/ptol_wallset_stone</SelectionGroupName>
     <SpecificName>h-n-njwt</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
+    <SelectionGroupName>structures/ptol_wallset_stone</SelectionGroupName>
     <SpecificName>h-n-njwt</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
+    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
+    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <SelectionGroupName>structures/mace_wallset_stone</SelectionGroupName>
+    <SelectionGroupName>structures/sele_wallset_stone</SelectionGroupName>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_b_trireme">
+<Entity parent="units/pers_cavalry_javelinist_a">
   <Identity>
-    <Rank>Advanced</Rank>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_javelinist_e_trireme</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_a.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
+<Entity parent="units/pers_cavalry_javelinist_b">
   <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_javelinist_b</SelectionGroupName>
-    <GenericName>Median Light Cavalry</GenericName>
-    <SpecificName>Mada Asabara</SpecificName>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-    <Icon>units/pers_cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_javelinist_a_trireme</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_b.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_a_trireme">
+<Entity parent="units/pers_cavalry_javelinist_e">
   <Identity>
-    <Rank>Elite</Rank>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_e.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b_trireme">
+<Entity parent="units/pers_cavalry_swordsman_a">
   <Identity>
-    <Rank>Advanced</Rank>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
+<Entity parent="units/pers_cavalry_swordsman_b">
   <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
-    <GenericName>Hyrcanian Cavalry</GenericName>
-    <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
   </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a_trireme">
+<Entity parent="units/pers_cavalry_swordsman_e">
   <Identity>
-    <Rank>Elite</Rank>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml
@@ -2,6 +2,5 @@
 <Entity parent="units/rome_champion_infantry">
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-    <SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
   </Identity>
 </Entity>