From be16ffe802a689980409c3ee892713bba461e9ef Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Mon, 7 Feb 2022 03:02:36 +0000
Subject: [PATCH] - Move Athenian skeletal textures to their own sub-folder (an
 on-going project for all unit textures).

- Renamed them to the new texture naming standards.
- Adjust unit actor refs for these textures.
- Accidentally used the wrong svn move option this time. Will use
correct one moving forward.
- Thanks be to @Stan for his assistance.

This was SVN commit r26310.
---
 .../units/athenians/ballista_infantry_a.xml   |  2 +-
 .../units/athenians/ballista_infantry_b.xml   |  2 +-
 .../athenians/cavalry_javelinist_b_r.xml      |  2 +-
 .../athenians/cavalry_javelinist_e_r.xml      | 12 +++---
 .../units/athenians/cavalry_swordsman_e_r.xml | 37 ++----------------
 .../actors/units/athenians/female_citizen.xml |  2 +-
 .../hero_infantry_javelinist_iphicrates.xml   |  9 ++---
 .../hero_infantry_javelinist_xenophon.xml     |  3 +-
 .../hero_infantry_spearman_pericles.xml       |  6 ++-
 .../hero_infantry_swordsman_themistocles.xml  |  6 +--
 .../units/athenians/infantry_archer_b.xml     |  2 +-
 .../units/athenians/infantry_archer_e.xml     | 37 ++++--------------
 .../units/athenians/infantry_slinger_b.xml    |  2 +-
 .../units/athenians/infantry_slinger_e.xml    |  6 ---
 .../units/athenians/infantry_spearman_a.xml   | 39 ++++++-------------
 .../units/athenians/infantry_spearman_b.xml   | 17 --------
 .../units/athenians/infantry_spearman_c.xml   | 30 ++++++--------
 .../units/athenians/infantry_spearman_e.xml   |  5 ---
 .../units/athenians/infantry_swordsman_c.xml  | 21 +++++-----
 .../units/athenians/oxybeles_infantry_a.xml   |  4 +-
 .../units/athenians/oxybeles_infantry_b.xml   |  4 +-
 .../infantry_javelinist_c_thureophoros.xml    |  8 ++--
 .../units/hellenes/lithobolos_infantry_a.xml  |  2 +-
 .../units/hellenes/lithobolos_infantry_b.xml  |  2 +-
 .../units/hellenes/lithobolos_infantry_c.xml  |  2 +-
 .../units/hellenes/lithobolos_infantry_d.xml  |  2 +-
 .../hellenes/lithobolos_light_infantry_a.xml  |  2 +-
 .../hellenes/lithobolos_light_infantry_b.xml  |  2 +-
 .../hellenes/lithobolos_med_infantry_a.xml    |  2 +-
 .../hellenes/lithobolos_med_infantry_b.xml    |  2 +-
 .../hellenes/lithobolos_med_infantry_c.xml    |  2 +-
 .../units/hellenes/oxybeles_infantry_a.xml    |  2 +-
 .../units/hellenes/oxybeles_infantry_b.xml    |  2 +-
 .../macedonians/infantry_crossbowman_c.xml    | 17 ++++----
 .../units/macedonians/infantry_slinger_e.xml  |  4 +-
 .../actors/units/seleucids/elephantry_c_r.xml |  5 ---
 .../units/spartans/infantry_swordsman_c.xml   | 16 ++++----
 .../athen/cuirass_themistocles_01.png         |  3 ++
 .../cuirass_themistocles_02.dds}              |  0
 .../epilektos_01.png}                         |  0
 .../epilektos_02.png}                         |  0
 .../epilektos_03.png}                         |  0
 .../epilektos_04.png}                         |  0
 .../epilektos_05.png}                         |  0
 .../epilektos_06.png}                         |  0
 .../epilektos_07.png}                         |  0
 .../epilektos_08.png}                         |  0
 .../epilektos_09.png}                         |  0
 .../epilektos_10.png}                         |  0
 .../epilektos_old.png}                        |  0
 .../linothorax_01_01.png}                     |  0
 .../linothorax_01_02.png}                     |  0
 .../linothorax_01_03.png}                     |  0
 .../linothorax_01_04.png}                     |  0
 .../linothorax_01_05.png}                     |  0
 .../linothorax_01_06.png}                     |  0
 .../linothorax_iphicrates_01.png}             |  0
 .../athen/linothorax_iphicrates_01_spec.png   |  3 ++
 .../athen/linothorax_lamellar_01_03.png       |  3 ++
 .../linothorax_lamellar_xenophon.dds}         |  0
 .../padded_marine_01_01.png}                  |  0
 .../skins/skeletal/athen/philosopher_01.png   |  3 ++
 .../skeletal/athen/philosopher_01_spec.png    |  3 ++
 .../tunic_01_01.dds}                          |  0
 .../tunic_marine_01_01.png}                   |  0
 .../tunic_marine_01_02.png}                   |  0
 .../tunic_marine_01_03.png}                   |  0
 .../tunic_marine_01_04.png}                   |  0
 .../skins/skeletal/athen_themistocles.png     |  3 --
 .../hele/support_citizen_female_01.png        |  3 ++
 .../skins/skeletal/hele_fem_f_spec.png        |  4 +-
 71 files changed, 126 insertions(+), 219 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_01.png
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_themistocles.dds => athen/cuirass_themistocles_02.dds} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_1.png => athen/epilektos_01.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_2.png => athen/epilektos_02.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_3.png => athen/epilektos_03.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_4.png => athen/epilektos_04.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_5.png => athen/epilektos_05.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_6.png => athen/epilektos_06.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_7.png => athen/epilektos_07.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_9.png => athen/epilektos_08.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_8.png => athen/epilektos_09.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_epilektoi_10.png => athen/epilektos_10.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_epilektos_1.png => athen/epilektos_old.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_a.png => athen/linothorax_01_01.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_b.png => athen/linothorax_01_02.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_c.png => athen/linothorax_01_03.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_d.png => athen/linothorax_01_04.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_e.png => athen/linothorax_01_05.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_linothorax_1_f.png => athen/linothorax_01_06.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{athen_hero_iphicrates.png => athen/linothorax_iphicrates_01.png} (100%)
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01_spec.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_01_03.png
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_xenophon.dds => athen/linothorax_lamellar_xenophon.dds} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_padded_marine_1_a.png => athen/padded_marine_01_01.png} (100%)
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01_spec.png
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_xenophon_tunic.dds => athen/tunic_01_01.dds} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_tunic_marine_1_a.png => athen/tunic_marine_01_01.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_tunic_marine_1_b.png => athen/tunic_marine_01_02.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_tunic_marine_1_c.png => athen/tunic_marine_01_03.png} (100%)
 rename binaries/data/mods/public/art/textures/skins/skeletal/{hele_tunic_marine_1_d.png => athen/tunic_marine_01_04.png} (100%)
 delete mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/athen_themistocles.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/hele/support_citizen_female_01.png

diff --git a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
index 6c7614e5db..358165fbf5 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_a.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_01.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
index 4760e72138..8f7424769d 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/ballista_infantry_b.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
index 6c7aaf9e67..ef72c19e6c 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_b_r.xml
@@ -11,7 +11,7 @@
         <prop actor="props/units/capes/rider/cape_med_player.xml" attachpoint="root"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_cjv_b_1.dds" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_01_01.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
index 6271dedf26..ed1bd0e007 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/cavalry_javelinist_e_r.xml
@@ -27,19 +27,19 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="athen-linothorax-1a">
+    <variant frequency="1" name="linothorax_01_02">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_a.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="athen-linothorax-1c">
+    <variant frequency="1" name="linothorax_01_03">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_c.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="athen-linothorax-1d">
+    <variant frequency="1" name="linothorax_01_06">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_d.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_06.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml
index 87a59f8a42..3bbd440b75 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml
@@ -55,11 +55,6 @@
     </variant>
   </group>
   <group>
-    <variant frequency="0" name="cuirass-old">
-      <textures>
-        <texture file="skeletal/hele_isp_e_1.dds" name="baseTex"/>
-      </textures>
-    </variant>
     <variant frequency="1" name="cuirass-1a">
       <textures>
         <texture file="skeletal/hele_cuirass_1_a.png" name="baseTex"/>
@@ -108,40 +103,16 @@
         <texture file="skeletal/hele_cuirass_2_spec.png" name="specTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="scale-old">
-      <textures>
-        <texture file="skeletal/hele_linothorax_scale.dds" name="baseTex"/>
-        <texture file="skeletal/hele_scale_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="scale-1-a">
-      <textures>
-        <texture file="skeletal/hele_scale_1_a.png" name="baseTex"/>
-        <texture file="skeletal/hele_scale_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="3" name="scale-5a">
+    <variant frequency="2" name="scale-5a">
       <textures>
         <texture file="skeletal/hele_scale_5_a.png" name="baseTex"/>
         <texture file="skeletal/hele_scale_5_spec.png" name="specTex"/>
       </textures>
     </variant>
-    <variant frequency="3" name="lamellar-1a">
+    <variant frequency="2" name="scale-1a">
       <textures>
-        <texture file="skeletal/hele_lamellar_1_a.png" name="baseTex"/>
-        <texture file="skeletal/hele_lamellar_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="linothorax-lamellar-1a">
-      <textures>
-        <texture file="skeletal/hele_linothorax_lamelar_1_a.png" name="baseTex"/>
-        <texture file="skeletal/hele_linothorax_lamellar_1_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="linothorax-lamellar-1b">
-      <textures>
-        <texture file="skeletal/hele_linothorax_lamelar_1_b.png" name="baseTex"/>
-        <texture file="skeletal/hele_linothorax_lamellar_1_spec.png" name="specTex"/>
+        <texture file="skeletal/hele_scale_1_a.png" name="baseTex"/>
+        <texture file="skeletal/hele_scale_1_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
index b071f1957d..dac60a21cf 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_female_dudette_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_fem_f.png" name="baseTex"/>
+        <texture file="skeletal/hele/support_citizen_female_01.png" name="baseTex"/>
         <texture file="skeletal/hele_fem_f_spec.png" name="specTex"/>
       </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
index 5487e93c50..504d285d0e 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_iphicrates.xml
@@ -11,13 +11,9 @@
         <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath_xiphos.xml" attachpoint="sheath_01_R"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="hero-iphicrates">
       <textures>
-        <texture file="skeletal/athen_hero_iphicrates.png" name="baseTex"/>
-        <texture file="skeletal/hele_linothorax_lamellar_1_spec.png" name="specTex"/>
+        <texture file="skeletal/athen/linothorax_iphicrates_01.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_iphicrates_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -30,6 +26,7 @@
       </props>
     </variant>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
index b37e420e6d..e35469d5cd 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_javelinist_xenophon.xml
@@ -11,7 +11,7 @@
         <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_xenophon.dds" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_lamellar_xenophon.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -20,6 +20,7 @@
     <variant file="biped/attack_ranged_javelinist.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_spearman_pericles.xml b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_spearman_pericles.xml
index 1b21a6297e..8a412bb9da 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_spearman_pericles.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_spearman_pericles.xml
@@ -15,7 +15,8 @@
         <prop actor="props/units/armor/greave_12_bronze_l.xml" attachpoint="leg_L"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_isp_e_f.dds" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_lamellar_01_03.png" name="baseTex"/>
+        <texture file="skeletal/hele_linothorax_lamellar_1_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -27,7 +28,8 @@
       </props>
     </variant>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_cape_long.xml"/>
   </group>
-  <material>playercolor_spec.xml</material>
+  <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_swordsman_themistocles.xml b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_swordsman_themistocles.xml
index 4991296931..5b1aa75f70 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_swordsman_themistocles.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/hero_infantry_swordsman_themistocles.xml
@@ -13,12 +13,8 @@
         <prop actor="props/units/armor/greave_02_bronze_r.xml" attachpoint="leg_R"/>
         <prop actor="props/units/armor/greave_02_bronze_l.xml" attachpoint="leg_L"/>
       </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="cuirass">
       <textures>
-        <texture file="skeletal/athen_themistocles.png" name="baseTex"/>
+        <texture file="skeletal/athen/cuirass_themistocles_01.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
index 83cf8a3111..fc0799cce8 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
@@ -12,7 +12,7 @@
         <prop actor="props/units/quiver_greek_back.xml" attachpoint="back"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_tunic.dds" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_01_01.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
index 662c6d5bfb..51aaf2980d 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml
@@ -66,50 +66,29 @@
     </variant>
   </group>
   <group>
-    <variant name="psiloi-original">
-      <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures>
-        <texture file="skeletal/hele_iar_e.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="psiloi-1">
-      <textures>
-        <texture file="skeletal/hele_psiloi_padded_1_a.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="psiloi-2">
+    <variant name="psiloi_padded_01_02">
       <textures>
         <texture file="skeletal/hele_psiloi_padded_1_b.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="psiloi-3">
+    <variant name="psiloi_padded_01_03">
       <textures>
         <texture file="skeletal/hele_psiloi_padded_1_c.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="psiloi-4">
+    <variant name="epilektos_03">
       <textures>
-        <texture file="skeletal/hele_psiloi_padded_1_d.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="psiloi-5">
+    <variant name="epilektos_08">
       <textures>
-        <texture file="skeletal/hele_epilektoi_7.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="psiloi-6">
+    <variant name="epilektos_09">
       <textures>
-        <texture file="skeletal/hele_epilektoi_4.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="psiloi-7">
-      <textures>
-        <texture file="skeletal/hele_epilektoi_9.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant name="psiloi-8">
-      <textures>
-        <texture file="skeletal/hele_epilektoi_10.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
index 5bc089614a..c7efd01d9e 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/helmets/headband_color.xml" attachpoint="helmet"/>
       </props>
       <textures>
-        <texture file="skeletal/hele_tunic.dds" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_01_01.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
index 16722db372..d44c4a149e 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
@@ -14,12 +14,6 @@
     </variant>
   </group>
   <group>
-    <variant name="psiloi-original">
-      <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures>
-        <texture file="skeletal/hele_iar_e.png" name="baseTex"/>
-      </textures>
-    </variant>
     <variant name="psiloi-padded-1a">
       <textures>
         <texture file="skeletal/hele_psiloi_padded_1_a.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
index 6c04a6ffb9..2b9118f9f5 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
@@ -105,49 +105,34 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Linothorax 1">
+    <variant frequency="1" name="linothorax_01_01">
       <textures>
-        <texture file="skeletal/hele_isp_a_1.dds" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="Linothorax 2">
+    <variant frequency="1" name="linothorax_01_02">
       <textures>
-        <texture file="skeletal/hele_isp_a_2.dds" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="Linothorax 3">
+    <variant frequency="1" name="linothorax_01_03">
       <textures>
-        <texture file="skeletal/hele_isp_a_3.dds" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="athen-linothorax-1a">
+    <variant frequency="1" name="linothorax_01_04">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_a.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_04.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="athen-linothorax-1b">
+    <variant frequency="1" name="linothorax_01_05">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_b.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_05.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="athen-linothorax-1c">
+    <variant frequency="1" name="linothorax_01_06">
       <textures>
-        <texture file="skeletal/athen_linothorax_1_c.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="athen-linothorax-1d">
-      <textures>
-        <texture file="skeletal/athen_linothorax_1_d.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="athen-linothorax-1e">
-      <textures>
-        <texture file="skeletal/athen_linothorax_1_e.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="athen-linothorax-1f">
-      <textures>
-        <texture file="skeletal/athen_linothorax_1_f.png" name="baseTex"/>
+        <texture file="skeletal/athen/linothorax_01_06.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
index ad02508281..d5eadfdc27 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
@@ -13,11 +13,6 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="tunic">
-      <textures>
-        <texture file="skeletal/hele_tunic.dds" name="baseTex"/>
-      </textures>
-    </variant>
     <variant frequency="2" name="hele-tunic-2a">
       <textures>
         <texture file="skeletal/hele_tunic_2_a.png" name="baseTex"/>
@@ -34,33 +29,21 @@
       </textures>
     </variant>
     <variant frequency="2" name="hele-tunic-3a">
-      <props>
-        <prop actor="props/units/armor/greave_11_bronze_l.xml" attachpoint="leg_L"/>
-      </props>
       <textures>
         <texture file="skeletal/hele_tunic_3_a.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="hele-tunic-3b">
-      <props>
-        <prop actor="props/units/armor/greave_11_bronze_l.xml" attachpoint="leg_L"/>
-      </props>
       <textures>
         <texture file="skeletal/hele_tunic_3_b.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="hele-tunic-3c">
-      <props>
-        <prop actor="props/units/armor/greave_11_bronze_l.xml" attachpoint="leg_L"/>
-      </props>
       <textures>
         <texture file="skeletal/hele_tunic_3_c.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="hele-tunic-4a">
-      <props>
-        <prop actor="props/units/armor/greave_11_bronze_l.xml" attachpoint="leg_L"/>
-      </props>
       <textures>
         <texture file="skeletal/hele_tunic_4_a.png" name="baseTex"/>
       </textures>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_c.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_c.xml
index 1cb9931d16..02d772c746 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_c.xml
@@ -9,9 +9,6 @@
         <prop actor="props/units/shields/aspis_athen_c.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
       </props>
-      <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
-      </textures>
     </variant>
   </group>
   <group>
@@ -47,60 +44,54 @@
     </variant>
   </group>
   <group>
-    <variant name="epilektoi-original">
-      <mesh>skeletal/new/m_tunic_long.dae</mesh>
-      <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
-      </textures>
-    </variant>
     <variant name="epilektoi-1">
       <textures>
-        <texture file="skeletal/hele_epilektoi_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-2">
       <textures>
-        <texture file="skeletal/hele_epilektoi_2.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-3">
       <textures>
-        <texture file="skeletal/hele_epilektoi_3.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_03.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-4">
       <textures>
-        <texture file="skeletal/hele_epilektoi_4.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_04.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-5">
       <textures>
-        <texture file="skeletal/hele_epilektoi_5.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_05.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-6">
       <textures>
-        <texture file="skeletal/hele_epilektoi_6.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_06.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-7">
       <textures>
-        <texture file="skeletal/hele_epilektoi_7.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_07.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-8">
       <textures>
-        <texture file="skeletal/hele_epilektoi_8.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-9">
       <textures>
-        <texture file="skeletal/hele_epilektoi_9.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_09.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="epilektoi-10">
       <textures>
-        <texture file="skeletal/hele_epilektoi_10.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_10.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -115,6 +106,7 @@
       </props>
     </variant>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
index 0b9103a1d8..5abd2a5dcf 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
@@ -82,11 +82,6 @@
     </variant>
   </group>
   <group>
-    <variant frequency="0" name="cuirass-old">
-      <textures>
-        <texture file="skeletal/hele_isp_e_1.dds" name="baseTex"/>
-      </textures>
-    </variant>
     <variant frequency="1" name="cuirass-1a">
       <textures>
         <texture file="skeletal/hele_cuirass_1_a.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
index 1f5981a782..5fffe219a7 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
@@ -65,29 +65,29 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="hele-padded-marine-1a">
+    <variant frequency="1" name="padded_marine_01_01">
       <textures>
-        <texture file="skeletal/hele_padded_marine_1_a.png" name="baseTex"/>
+        <texture file="skeletal/athen/padded_marine_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="hele-tunic-marine-1a">
+    <variant frequency="1" name="tunic_marine_01_01">
       <textures>
-        <texture file="skeletal/hele_tunic_marine_1_a.png" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_marine_01_01.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="hele-tunic-marine-1b">
+    <variant frequency="1" name="tunic_marine_01_02">
       <textures>
-        <texture file="skeletal/hele_tunic_marine_1_b.png" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_marine_01_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="hele-tunic-marine-1c">
+    <variant frequency="1" name="tunic_marine_01_03">
       <textures>
-        <texture file="skeletal/hele_tunic_marine_1_c.png" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_marine_01_03.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="hele-tunic-marine-1d">
+    <variant frequency="1" name="tunic_marine_01_04">
       <textures>
-        <texture file="skeletal/hele_tunic_marine_1_d.png" name="baseTex"/>
+        <texture file="skeletal/athen/tunic_marine_01_04.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -95,6 +95,7 @@
     <variant file="biped/base_swordsman_shieldarm_relax.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
index 9b00fa3e99..7de3dfb728 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_a.xml
@@ -57,9 +57,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="epilektos-01">
+    <variant frequency="1" name="epilektos_09">
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
index f154dac7a7..4e2878f957 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/oxybeles_infantry_b.xml
@@ -57,9 +57,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="epilektos-01">
+    <variant frequency="1" name="epilektos_10">
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_10.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_c_thureophoros.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_c_thureophoros.xml
index ad9f2a74f6..a57da3e54d 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_c_thureophoros.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_c_thureophoros.xml
@@ -21,17 +21,17 @@
     </variant>
     <variant name="hele-epilektoi-2">
       <textures>
-        <texture file="skeletal/hele_epilektoi_2.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="hele-epilektoi-6">
       <textures>
-        <texture file="skeletal/hele_epilektoi_6.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_06.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="hele-epilektoi-9">
+    <variant name="hele-epilektoi-8">
       <textures>
-        <texture file="skeletal/hele_epilektoi_9.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_a.xml
index 6834308652..729f9b6f63 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_a.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_b.xml
index eeef2440c2..b3578e4f06 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_b.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_02.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_c.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_c.xml
index f34279c08f..a4531770b7 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_c.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_c.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_01.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_d.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_d.xml
index 77add0ebde..174b8996cb 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_d.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_infantry_d.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_09.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_a.xml
index 45ca06736d..dc21e585c7 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_a.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_b.xml
index c84c401561..9b38c74bbd 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_light_infantry_b.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_L"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_07.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_a.xml
index a4d45b5c9d..0127fee80d 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_a.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_06.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_b.xml
index e3d2b26891..8a183267e6 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_b.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_L"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_05.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_c.xml b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_c.xml
index 31f1e081ce..76ee4de295 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_c.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/lithobolos_med_infantry_c.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_04.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_a.xml
index d68328dcb4..f8093690df 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_a.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_05.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_b.xml
index 2eba14b684..40e3acde67 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/oxybeles_infantry_b.xml
@@ -9,7 +9,7 @@
         <prop actor="props/units/tools/siege_lever.xml" attachpoint="weapon_L"/>
       </props>
       <textures>
-        <texture file="skeletal/athen_epilektos_1.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_01.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml
index 0158fbe84d..c283e04241 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml
@@ -13,24 +13,24 @@
     </variant>
   </group>
   <group>
-    <variant name="Armor-Padded-Linothorax-01">
+    <variant name="epilektoi-4">
       <textures>
-        <texture file="skeletal/hele_epilektoi_8.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_04.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="Armor-Padded-Linothorax-02">
+    <variant name="epilektoi-7">
       <textures>
-        <texture file="skeletal/hele_epilektoi_9.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_07.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="Armor-Padded-Psiloi-01">
+    <variant name="epilektoi-8">
       <textures>
-        <texture file="skeletal/hele_psiloi_padded_1_c.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="Armor-Padded-Psiloi-02">
+    <variant name="epilektoi-10">
       <textures>
-        <texture file="skeletal/hele_psiloi_padded_1_d.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_10.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
@@ -39,6 +39,7 @@
     <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_e.xml
index b6bc63a342..8dc67be04a 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_e.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_e.xml
@@ -12,9 +12,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="3" name="hele-padded-marine-1a">
+    <variant frequency="2" name="padded_marine_01_01">
       <textures>
-        <texture file="skeletal/hele_padded_marine_1_a.png" name="baseTex"/>
+        <texture file="skeletal/athen/padded_marine_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="illy-linothorax-01-a">
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
index f43ca7cee2..28963ea732 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
@@ -63,11 +63,6 @@
         <texture file="skeletal/hele_pezhetairoi_2.dds" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="Armor-8">
-      <textures>
-        <texture file="skeletal/hele_xenophon.dds" name="baseTex"/>
-      </textures>
-    </variant>
     <variant frequency="1" name="Armor-10">
       <textures>
         <texture file="skeletal/spart_phalangite_officer.dds" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
index e76694c9d8..960356e0ee 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
@@ -30,24 +30,24 @@
     </variant>
   </group>
   <group>
-    <variant name="skiritai-1">
+    <variant name="epilektoi-7">
       <textures>
-        <texture file="skeletal/hele_epilektoi_7.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_07.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="skiritai-2">
+    <variant name="epilektoi-8">
       <textures>
-        <texture file="skeletal/hele_epilektoi_4.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_08.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="skiritai-3">
+    <variant name="epilektoi-9">
       <textures>
-        <texture file="skeletal/hele_epilektoi_9.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_09.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="skiritai-4">
+    <variant name="epilektoi-10">
       <textures>
-        <texture file="skeletal/hele_epilektoi_10.png" name="baseTex"/>
+        <texture file="skeletal/athen/epilektos_10.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_01.png
new file mode 100644
index 0000000000..792fbac399
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08f17373115ccdc4ea5659ceea1455c64a9760f770159366c08a1a2dd0196495
+size 125368
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_themistocles.dds b/binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_02.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_themistocles.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/cuirass_themistocles_02.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_1.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_1.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_2.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_2.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_3.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_3.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_4.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_4.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_5.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_5.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_6.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_6.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_7.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_07.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_7.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_07.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_9.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_08.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_9.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_08.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_8.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_09.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_8.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_09.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_10.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_10.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_epilektoi_10.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_10.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_epilektos_1.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_old.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_epilektos_1.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/epilektos_old.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_a.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_a.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_b.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_b.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_c.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_c.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_d.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_d.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_e.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_05.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_e.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_05.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_f.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_06.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_linothorax_1_f.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_01_06.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_hero_iphicrates.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/athen_hero_iphicrates.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01_spec.png
new file mode 100644
index 0000000000..18960ebfb6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_iphicrates_01_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a37aaf093444516853937430b773ddac5743607018df5134d167d4361f529893
+size 31900
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_01_03.png
new file mode 100644
index 0000000000..30c0419fc8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_01_03.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:638cb5b519c5b14bd40e9e9bc5ea07651e60101519a8cee170454a1a2b05db90
+size 111994
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_xenophon.dds b/binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_xenophon.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_xenophon.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/linothorax_lamellar_xenophon.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_padded_marine_1_a.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/padded_marine_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_padded_marine_1_a.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/padded_marine_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01.png
new file mode 100644
index 0000000000..b24fb4204a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a6158981798b5f7cef353cd6b1a6ddac9e57013ba815dedf5524385db4935f4
+size 83885
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01_spec.png
new file mode 100644
index 0000000000..faf288aa22
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/athen/philosopher_01_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e364b5c0758ac68fbb03beeb69998e27d04454dc10e908f156486e9d5b9436b5
+size 43192
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_xenophon_tunic.dds b/binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_01_01.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_xenophon_tunic.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_01_01.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_a.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_01.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_a.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_01.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_b.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_02.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_b.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_02.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_c.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_03.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_c.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_03.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_d.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_04.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/hele_tunic_marine_1_d.png
rename to binaries/data/mods/public/art/textures/skins/skeletal/athen/tunic_marine_01_04.png
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/athen_themistocles.png b/binaries/data/mods/public/art/textures/skins/skeletal/athen_themistocles.png
deleted file mode 100644
index 948860015f..0000000000
--- a/binaries/data/mods/public/art/textures/skins/skeletal/athen_themistocles.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1be6db99a3b1b68b79846b9384b03648081021763f53f3248ab90ad9725358f
-size 136908
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele/support_citizen_female_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/hele/support_citizen_female_01.png
new file mode 100644
index 0000000000..a5b27e101a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/hele/support_citizen_female_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db5e8f8e9fb061150306ac84c5e63345c3197bd11e9f4f578aaf01d18ee7326f
+size 113608
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/hele_fem_f_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/hele_fem_f_spec.png
index 122a4d83b6..1f6c4147b0 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/hele_fem_f_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/hele_fem_f_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c67e89cb59d8496e162e91f609078626aeb4bdbcd4934ceff18cabc10b08b596
-size 29733
+oid sha256:471a71acff597b453f0736a202f166c027e0d0cb594a429eb69e58274e789535
+size 31899