Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_m.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_m.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_m.xml	(revision 26292)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_tessalian.dae</mesh>
+      <props>
+        <prop actor="units/seleucids/cavalry_spearman_b_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/dark_chestnut.xml" frequency="1" name="dark_chestnut"/>
+    <variant file="quadraped/horse/pure_black.xml" frequency="1" name="pure_black"/>
+    <variant file="quadraped/horse/fading_black.xml" frequency="1" name="fading_black"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+    <variant file="quadraped/horse/halflinger.xml" frequency="1" name="halflinger"/>
+    <variant file="quadraped/horse/chestnut_02.xml" frequency="1" name="chestnut-02"/>
+    <variant file="quadraped/horse/chestnut_01.xml" frequency="1" name="chestnut-01"/>
+    <variant file="quadraped/horse/bay_01.xml" frequency="1" name="bay_01"/>
+    <variant file="quadraped/horse/bay_02.xml" frequency="1" name="bay_02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/seleucids/cavalry_spearman_b_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_r.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_r.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_b_r.xml	(revision 26292)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/helmets/hele_kausia_cap.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/spear_lance_cavalry.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/capes/rider/cape_med_player.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="skeletal/ptol_thureophoros_e_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="hele_tunic_hellenistic_elite_1">
+      <textures>
+        <texture file="skeletal/hele_tunic_hellenistic_elite_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="hele_tunic_hellenistic_elite_2">
+      <textures>
+        <texture file="skeletal/hele_tunic_hellenistic_elite_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="hele_tunic_hellenistic_elite_3">
+      <textures>
+        <texture file="skeletal/hele_tunic_hellenistic_elite_3.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="hele_tunic_hellenistic_elite_4">
+      <textures>
+        <texture file="skeletal/hele_tunic_hellenistic_elite_4.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/rider/cavalry/base_spearman_relax_reverse_02.xml" name="Spearman-Relax-Reverse-02" frequency="1"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/attack_slaughter_hele.xml"/>
+    <variant file="biped/rider/promotion.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_m.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_m.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_m.xml	(revision 26292)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant>
       <mesh>skeletal/horse_tessalian.dae</mesh>
       <props>
         <prop actor="units/seleucids/cavalry_spearman_c_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/sele_crest.xml" attachpoint="head"/>
         <prop actor="props/horse/cav_blanket_sele.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_sele.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_front_armor_bronze.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
     <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
     <variant file="quadraped/horse/dark_chestnut.xml" frequency="1" name="dark_chestnut"/>
     <variant file="quadraped/horse/pure_black.xml" frequency="1" name="pure_black"/>
     <variant file="quadraped/horse/fading_black.xml" frequency="1" name="fading_black"/>
     <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
     <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
     <variant file="quadraped/horse/halflinger.xml" frequency="1" name="halflinger"/>
     <variant file="quadraped/horse/chestnut_02.xml" frequency="1" name="chestnut-02"/>
     <variant file="quadraped/horse/chestnut_01.xml" frequency="1" name="chestnut-01"/>
     <variant file="quadraped/horse/bay_01.xml" frequency="1" name="bay_01"/>
     <variant file="quadraped/horse/bay_02.xml" frequency="1" name="bay_02"/>
   </group>
   <group>
-    <variant file="quadraped/base_horse_pace.xml" name="Horse-Pace" frequency="1"/>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
     <variant file="quadraped/base_horse_death.xml"/>
     <variant file="quadraped/base_horse_run.xml"/>
   </group>
   <material>no_trans_parallax_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_r.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_r.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_c_r.xml	(revision 26292)
@@ -1,80 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant>
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_lance_cavalry_reverse.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Helmet-Thracian-01">
+    <variant frequency="1" name="Helmet-hele_thracian_b5">
       <props>
-        <prop actor="props/units/helmets/hele_thracian_romanized_p1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/hele_thracian_b5.xml" attachpoint="helmet"/>
       </props>
     </variant>
-    <variant frequency="1" name="Helmet-Thracian-02">
+    <variant frequency="1" name="Helmet-hele_thracian_b5_crested">
       <props>
-        <prop actor="props/units/helmets/hele_thracian_romanized_p1_crested.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/hele_thracian_b5_crested.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant frequency="2" name="Helmet-hele_thracian_p3">
+      <props>
+        <prop actor="props/units/helmets/hele_thracian_p3.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant frequency="2" name="Helmet-hele_thracian_p3_crested">
+      <props>
+        <prop actor="props/units/helmets/hele_thracian_p3_crested.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant frequency="3" name="hele_thracian_romanized_b2_plume">
+      <props>
+        <prop actor="props/units/helmets/hele_thracian_romanized_b2_plume.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="hele_thracian_romanized_b2_crested">
+      <props>
+        <prop actor="props/units/helmets/hele_thracian_romanized_b2_crested.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Rider-Armour-Linothorax">
       <textures>
         <texture file="skeletal/sele_cataphract_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_a_spec.png" name="specTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="Rider-Armour-Bronze">
-      <textures>
-        <texture file="skeletal/sele_hero_antiochus.png" name="baseTex"/>
-        <texture file="skeletal/sele_hero_antiochus_spec.png" name="specTex"/>
-      </textures>
-    </variant>
     <variant frequency="1" name="cataphract-splint-1-a">
       <textures>
         <texture file="skeletal/sele_cataphract_splint_1_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_splint_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="cataphract-scale-1-a">
       <textures>
         <texture file="skeletal/sele_cataphract_scale_1_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_scale_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="cataphract-lamellar-1-a">
       <textures>
         <texture file="skeletal/sele_cataphract_lamellar_1_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_lamellar_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="cataphract-compound-linothorax-1">
       <textures>
         <texture file="skeletal/sele_cataphract_compound_linothorax_1_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_compound_linothorax_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="cataphract-compound-linothorax-2">
       <textures>
         <texture file="skeletal/sele_cataphract_compound_linothorax_2_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_compound_linothorax_2_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="cataphract-compound-linothorax-3">
       <textures>
         <texture file="skeletal/sele_cataphract_compound_linothorax_3_a.png" name="baseTex"/>
         <texture file="skeletal/sele_cataphract_compound_linothorax_3_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/rider/cavalry/base_spearman_2h_fast_relax.xml" name="Spearman-2h-Fast-Relax" frequency="1"/>
     <variant file="biped/rider/death_2h.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_m.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_m.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_m.xml	(revision 26292)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_tessalian.dae</mesh>
+      <props>
+        <prop actor="units/seleucids/cavalry_spearman_e_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_fur.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/dark_chestnut.xml" frequency="1" name="dark_chestnut"/>
+    <variant file="quadraped/horse/pure_black.xml" frequency="1" name="pure_black"/>
+    <variant file="quadraped/horse/fading_black.xml" frequency="1" name="fading_black"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+    <variant file="quadraped/horse/halflinger.xml" frequency="1" name="halflinger"/>
+    <variant file="quadraped/horse/chestnut_02.xml" frequency="1" name="chestnut-02"/>
+    <variant file="quadraped/horse/chestnut_01.xml" frequency="1" name="chestnut-01"/>
+    <variant file="quadraped/horse/bay_01.xml" frequency="1" name="bay_01"/>
+    <variant file="quadraped/horse/bay_02.xml" frequency="1" name="bay_02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/seleucids/cavalry_spearman_e_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_r.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_r.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/cavalry_spearman_e_r.xml	(revision 26292)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/spear_lance_cavalry.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/shields/sele_cavalry_a.xml" attachpoint="shield_arm"/>
+        <prop actor="props/units/capes/rider/cape_long_player.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Helmet Boeotian Bronze-01">
+      <props>
+        <prop actor="props/units/helmets/hele_boeotian_b2.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="sele-cuirass-1a">
+      <textures>
+        <texture file="skeletal/sele/cuirass_01.png" name="baseTex"/>
+        <texture file="skeletal/hele_cuirass_2_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="sele-cuirass-1b">
+      <textures>
+        <texture file="skeletal/sele/cuirass_02.png" name="baseTex"/>
+        <texture file="skeletal/hele_cuirass_2_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="sele-cuirass-1c">
+      <textures>
+        <texture file="skeletal/sele/cuirass_03.png" name="baseTex"/>
+        <texture file="skeletal/hele_cuirass_2_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="sele-cuirass-1d">
+      <textures>
+        <texture file="skeletal/sele/cuirass_04.png" name="baseTex"/>
+        <texture file="skeletal/hele_cuirass_2_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="compound-linothorax-1">
+      <textures>
+        <texture file="skeletal/mace_compound_linothorax_1_a.png" name="baseTex"/>
+        <texture file="skeletal/mace_compound_linothorax_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="compound-linothorax-2">
+      <textures>
+        <texture file="skeletal/mace_compound_linothorax_2_a.png" name="baseTex"/>
+        <texture file="skeletal/mace_compound_linothorax_2_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="compound-linothorax-3">
+      <textures>
+        <texture file="skeletal/mace_compound_linothorax_3_a.png" name="baseTex"/>
+        <texture file="skeletal/mace_compound_linothorax_3_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="splint-1-a">
+      <textures>
+        <texture file="skeletal/mace_splint_1_a.png" name="baseTex"/>
+        <texture file="skeletal/mace_splint_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="linothorax-1-j">
+      <textures>
+        <texture file="skeletal/mace_linothorax_1_j.png" name="baseTex"/>
+        <texture file="skeletal/hele_linothorax_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/rider/cavalry/base_spearman_relax_shield_aspis_reverse.xml" name="Spearman-Relax-Shield-Aspis-Reverse" frequency="1"/>
+    <variant file="biped/rider/carry_meat.xml"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/attack_slaughter_hele.xml"/>
+    <variant file="biped/rider/promotion.xml"/>
+    <variant file="biped/gather_meat.xml"/>
+    <variant file="biped/rider/death.xml"/>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_spearman_antiochus_the_great_r.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_spearman_antiochus_the_great_r.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/hero_cavalry_spearman_antiochus_the_great_r.xml	(revision 26292)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant>
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/hele_thracian_romanized_b2_plume.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/props/sele_mask_bronze.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/spear_long.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
         <texture file="skeletal/sele_hero_antiochus.png" name="baseTex"/>
         <texture file="skeletal/sele_hero_antiochus_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/rider/cavalry/base_spearman_2h_fast_relax.xml" name="Spearman-2h-Fast-Relax" frequency="1"/>
     <variant file="biped/rider/death_2h.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png	(revision 26292)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_spearman_merc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
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 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml	(revision 26292)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="civ/athen|template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Penteconter</GenericName>
     <SpecificName>Pentēkóntoros</SpecificName>
-    <Icon>units/hele_ship_bireme.png</Icon>
+    <Icon>units/athen_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_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml	(revision 26292)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="civ/athen|template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
     <GenericName>Athenian Trireme</GenericName>
-    <Icon>units/hele_ship_trireme.png</Icon>
+    <Icon>units/athen_ship_trireme.png</Icon>
   </Identity>
   <ProductionQueue/>
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/athen/infantry_marine_archer_b
       units/athen/champion_marine
     </Entities>
   </Trainer>
   <VisualActor>
     <Actor>structures/athenians/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/siege_oxybeles_packed.xml	(revision 26292)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <Icon>units/cart_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
     <Entity>units/cart/siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
     <Actor>units/carthaginians/siege_spear_packed.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_bireme.xml	(revision 26292)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
-    <Icon>units/ptol_ship_bireme.png</Icon>
+    <Icon>units/kush_ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/bireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml	(revision 26292)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <Classes datatype="tokens">KushTrireme</Classes>
     <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ʿȝ</SpecificName>
-    <Icon>units/ptol_ship_trireme.png</Icon>
+    <Icon>units/kush_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/ship_trireme.xml	(revision 26292)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
-    <SpecificName>Triḗrēs Athēnaía</SpecificName>
+    <SpecificName>Triḗrēs Makedonikḗ</SpecificName>
     <GenericName>Macedonian Trireme</GenericName>
-    <Icon>units/hele_ship_trireme.png</Icon>
+    <Icon>units/mace_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_cavalry_archer.xml	(revision 26292)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <GenericName>Bactrian Heavy Cavalry Archer</GenericName>
     <SpecificName>Asabāra Baxtriš</SpecificName>
-    <Icon>units/pers_champion_cavalry.png</Icon>
+    <Icon>units/pers_champion_cavalry_archer.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/cavalry_archer_c_m.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 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml	(revision 26292)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
-    <Icon>units/mace_cavalry_javelinist.png</Icon>
+    <Icon>units/tarentine_cavalry_e.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/cavalry_javelineer_merc_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/cavalry_javelinist_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml	(revision 26292)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
       structures/ptol/lighthouse
       structures/ptol/library
     </Entities>
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_slinger_b</SelectionGroupName>
     <GenericName>Judean Slinger</GenericName>
     <SpecificName>Hebraikós Sphendonḗtēs</SpecificName>
-    <Icon>units/athen_infantry_slinger.png</Icon>
+    <Icon>units/ptol_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol/infantry_slinger_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/infantry_slinger_b.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 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml	(revision 26292)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
-    <Icon>units/mace_cavalry_spearman_merc.png</Icon>
+    <Icon>units/sele_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>
+    <Actor>units/seleucids/cavalry_spearman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_e.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_e.xml	(revision 26292)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele/cavalry_spearman_merc_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/macedonians/cavalry_spearman_e_m.xml</Actor>
+    <Actor>units/seleucids/cavalry_spearman_e_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml	(revision 26291)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml	(revision 26292)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Arab Javelineer</GenericName>
     <SpecificName>Pezakontistès Aravikós</SpecificName>
-    <Icon>units/pers_infantry_javelinist.png</Icon>
+    <Icon>units/sele_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/seleucids/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>