diff --git a/binaries/data/mods/official/art/actors/props/units/elephant_turret.xml b/binaries/data/mods/official/art/actors/props/units/elephant_turret.xml
new file mode 100644
index 0000000000..bc35fc022b
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/elephant_turret.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/elephant_turret.pmd</mesh>
+      <props>
+        <prop actor="units/carthaginians/hero_hannibal_r.xml" attachpoint="turret1"/>
+      </props>
+      <texture>props/celt_prop_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>basic_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/female_citizen.xml b/binaries/data/mods/official/art/actors/units/carthaginians/female_citizen.xml
index 7f28bfbefc..b1d6bfb854 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/female_citizen.xml
@@ -6,23 +6,15 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_meat" speed="80"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
       <props>
         <prop actor="props/units/heads/head_pers_fem_1.xml" attachpoint="head"/>
@@ -32,7 +24,7 @@
 
   <group>
     <variant frequency="1" name="Peplos-DarkBrown">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/kart_fem_01.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/celts/boudicca.xml b/binaries/data/mods/official/art/actors/units/celts/boudicca.xml
index e351dde13f..33523ed893 100644
--- a/binaries/data/mods/official/art/actors/units/celts/boudicca.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/boudicca.xml
@@ -6,27 +6,32 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation name=""/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_death_01.dae" name="Death" speed="200"/>
+        <animation event=".4" file="female/f_jav_atk_01.dae" load="0" name="melee" speed="100"/>
+        <animation file="female/f_run_01.dae" name="run" speed="5"/>
       </animations>
-      <mesh>skeletal/f_tunic.pmd</mesh>
+      <mesh>skeletal/f_tunic.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_celt_boudicca.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_gold.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="r_hand"/>
         <prop actor="props/units/cape_celt_boudicca.xml" attachpoint="shoulders"/>
       </props>
       <texture>skeletal/celt_boudicca_2.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="loaded-r_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+  </group>
+
   <material>player_trans.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/boudicca_chariot.xml b/binaries/data/mods/official/art/actors/units/celts/boudicca_chariot.xml
index cfe120eb3d..0af3866219 100644
--- a/binaries/data/mods/official/art/actors/units/celts/boudicca_chariot.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/boudicca_chariot.xml
@@ -14,7 +14,7 @@
       <props>
         <prop actor="units/celts/boudicca_chariot_h1.xml" attachpoint="horseright"/>
         <prop actor="units/celts/boudicca_chariot_h2.xml" attachpoint="horseleft"/>
-        <prop actor="units/celts/boudicca_r.xml" attachpoint="rider"/>
+        <prop actor="units/celts/boudicca_r2.xml" attachpoint="rider"/>
         <prop actor="units/celts/super_unit_4_d.xml" attachpoint="driver"/>
       </props>
       <texture>structural/celt_chariot_b.dds</texture>
diff --git a/binaries/data/mods/official/art/actors/units/celts/boudicca_horse.xml b/binaries/data/mods/official/art/actors/units/celts/boudicca_horse.xml
new file mode 100644
index 0000000000..45408ab798
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/units/celts/boudicca_horse.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="100"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="80"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
+        <animation name=""/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/boudicca_r.xml" attachpoint="rider"/>
+      </props>
+      <texture>skeletal/horse_celt_boudicca_a.dds</texture>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/boudicca_r.xml b/binaries/data/mods/official/art/actors/units/celts/boudicca_r.xml
index 8815e8370f..bdec751f61 100644
--- a/binaries/data/mods/official/art/actors/units/celts/boudicca_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/boudicca_r.xml
@@ -6,24 +6,28 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/idle/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/support/idle/fem_01.psa" name="Run" speed="50"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="female/f_cav_idle_01.dae" name="Idle" speed="50"/>
+        <animation file="female/f_cav_idle_01.dae" name="Walk" speed="50"/>
+        <animation file="female/f_cav_run_01.dae" name="Run" speed="8"/>
+        <animation file="female/f_cav_death_01.dae" name="Death" speed="230"/>
+        <animation event=".5" file="female/f_cav_jav_atk_01.dae" load="0" name="melee" speed="50"/>
       </animations>
-      <mesh>skeletal/f_tunic.pmd</mesh>
+      <mesh>skeletal/f_tunic.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_celt_boudicca.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_gold.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/cape_celt_boudicca.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="r_hand"/>
+      </props>
+      <texture>skeletal/celt_boudicca.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="loaded-r_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
-      <texture>skeletal/celt_boudicca_2.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/boudicca_r2.xml b/binaries/data/mods/official/art/actors/units/celts/boudicca_r2.xml
new file mode 100644
index 0000000000..7378866fdf
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/units/celts/boudicca_r2.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="female/f_chariot_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_chariot_idle_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_chariot_run_01.dae" name="Run" speed="50"/>
+        <animation file="female/f_death_01.dae" name="Death" speed="200"/>
+        <animation file="female/f_jav_atk_01.dae" name="melee" speed="200"/>
+      </animations>
+      <mesh>skeletal/f_tunic.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_celt_boudicca.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/cape_celt_boudicca.xml" attachpoint="shoulders"/>
+      </props>
+      <texture>skeletal/celt_boudicca_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="loaded-r_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
index ab70029967..81e6e3c8c8 100644
--- a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
@@ -6,23 +6,17 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_female_celt.xml" attachpoint="head"/>
       </props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
index 9393ff009e..eec2e6d35d 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
@@ -6,23 +6,15 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_meat" speed="80"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
       <props>
         <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
@@ -32,35 +24,35 @@
 
   <group>
     <variant frequency="2" name="Dress-Light Brown">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/hele_fem_a.dds</texture>
     </variant>
     <variant frequency="2" name="Dress-Dark Brown">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/hele_fem_b.dds</texture>
     </variant>
     <variant frequency="2" name="Dress-Gold">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/hele_fem_c.dds</texture>
     </variant>
     <variant frequency="2" name="Dress-Player Tint">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/hele_fem_d.dds</texture>
     </variant>
     <variant frequency="1" name="Dress-linen">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/hele_fem_e.dds</texture>
     </variant>
     <variant frequency="3" name="Dress-Chiton">
-      <mesh>skeletal/f_tunic.pmd</mesh>
+      <mesh>skeletal/f_tunic.dae</mesh>
       <texture>skeletal/hele_fem_chiton.dds</texture>
     </variant>
     <variant frequency="1" name="Dress-Chiton-Linen">
-      <mesh>skeletal/f_tunic.pmd</mesh>
+      <mesh>skeletal/f_tunic.dae</mesh>
       <texture>skeletal/hele_fem_chiton_linen.dds</texture>
     </variant>
     <variant frequency="2" name="Dress-Player Tint2">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/rome_fem_a.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/female_citizen.xml b/binaries/data/mods/official/art/actors/units/iberians/female_citizen.xml
index 46412c2df4..4fccbe3d96 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/female_citizen.xml
@@ -6,22 +6,15 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
       <props>
         <prop actor="props/units/heads/head_pers_fem_1.xml" attachpoint="head"/>
@@ -32,7 +25,7 @@
 
   <group>
     <variant frequency="1" name="Dress-Dark Brown">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/iber_fem_a.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml b/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
index 3e799403ea..9aaa185058 100644
--- a/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
@@ -6,22 +6,15 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
       <props>
         <prop actor="props/units/heads/head_pers_fem_1.xml" attachpoint="head"/>
@@ -31,11 +24,11 @@
 
   <group>
     <variant frequency="1" name="Dress-01">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/pers_fem_1.dds</texture>
     </variant>
     <variant frequency="1" name="Dress-02">
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <texture>skeletal/pers_fem_2.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/romans/female_citizen.xml b/binaries/data/mods/official/art/actors/units/romans/female_citizen.xml
index 60c61593b5..5cfdcba576 100644
--- a/binaries/data/mods/official/art/actors/units/romans/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/female_citizen.xml
@@ -6,23 +6,17 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="10"/>
+        <animation file="female/f_lumber_01.dae" name="gather_wood" speed="100"/>
+        <animation file="female/f_farm_01.dae" name="gather_grain" speed="150"/>
+        <animation file="female/f_gather_01.dae" name="gather_fruit" speed="100"/>
+        <animation file="female/f_mine_01.dae" name="gather_stone" speed="150"/>
+        <animation file="female/f_mine_01.dae" name="gather_metal" speed="150"/>
+        <animation file="female/f_build_01.dae" name="Build" speed="150"/>
+        <animation file="female/f_death_01.dae" name="Corpse" speed="100"/>
       </animations>
-      <mesh>skeletal/f_dress.pmd</mesh>
+      <mesh>skeletal/f_dress.dae</mesh>
       <props>
         <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
       </props>
diff --git a/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.dae b/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.dae
new file mode 100644
index 0000000000..128a0b434c
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c22370d988040208feb09f6d54df54f44b7201d9ce4f8ff6668999d63c5b84e
+size 41107
diff --git a/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.pmd b/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.pmd
deleted file mode 100644
index 6f09a8a812..0000000000
--- a/binaries/data/mods/official/art/meshes/props/helmet/celt_hood.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f04094619f9d600bae565d9c12f6aedd6d2d6449a9d4b20a70c42b718f86abad
-size 4036
diff --git a/binaries/data/mods/official/art/meshes/skeletal/elephant_asian.dae b/binaries/data/mods/official/art/meshes/skeletal/elephant_asian.dae
new file mode 100644
index 0000000000..4785df7f04
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/skeletal/elephant_asian.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c37e26da3601b72bc6bae0347050ac37e74aceb973125631c138d53137feb03
+size 72311
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_dress.dae b/binaries/data/mods/official/art/meshes/skeletal/f_dress.dae
new file mode 100644
index 0000000000..669814d796
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/skeletal/f_dress.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d73417326201c8fa49252a3a882a77b1569db97fd23160dec0e1d24a8eeb713
+size 63043
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_dress.pmd b/binaries/data/mods/official/art/meshes/skeletal/f_dress.pmd
deleted file mode 100644
index f4a5e14d75..0000000000
--- a/binaries/data/mods/official/art/meshes/skeletal/f_dress.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d32b2d625fd26482e0ffcf646ef13ce04068905c1d4dbfc212967a16d68fe718
-size 17247
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_tights.dae b/binaries/data/mods/official/art/meshes/skeletal/f_tights.dae
new file mode 100644
index 0000000000..0475a25462
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/skeletal/f_tights.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc879517c987be84a849699d98b35d2da364e59866014adbe70ce713af976a83
+size 62066
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_tights.pmd b/binaries/data/mods/official/art/meshes/skeletal/f_tights.pmd
deleted file mode 100644
index 3fcc4d3d42..0000000000
--- a/binaries/data/mods/official/art/meshes/skeletal/f_tights.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e82d91c3e47975b29e17386682a71354a0b900a736a9bcfba85972340d957855
-size 18475
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_tunic.dae b/binaries/data/mods/official/art/meshes/skeletal/f_tunic.dae
new file mode 100644
index 0000000000..bd44d9846c
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/skeletal/f_tunic.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7928cf4ec3adf7b726bbb58787bc604b49c2425c425e25d44db9afd5e4e8d05
+size 67790
diff --git a/binaries/data/mods/official/art/meshes/skeletal/f_tunic.pmd b/binaries/data/mods/official/art/meshes/skeletal/f_tunic.pmd
deleted file mode 100644
index 40a7749d54..0000000000
--- a/binaries/data/mods/official/art/meshes/skeletal/f_tunic.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54dfc7bda12a4a01c48fbe901448ac5a5798f11e8b2074824465afb51ccebc35
-size 18723
diff --git a/binaries/data/mods/official/art/skeletons/skeletons.xml b/binaries/data/mods/official/art/skeletons/skeletons.xml
index a7b07b616d..c629ed1aeb 100644
--- a/binaries/data/mods/official/art/skeletons/skeletons.xml
+++ b/binaries/data/mods/official/art/skeletons/skeletons.xml
@@ -533,4 +533,151 @@ This skeleton is for the deer and any other similiar shaped animals with the exa
 		 </bone>	
 	</skeleton>
 	
+	<standard_skeleton title="Elephant Biped" id="Ele01">
+	 <bone name="root">
+		<bone name="pelvis">
+		  <bone name="spine">
+			<bone name="spine1">
+			  <bone name="neck">
+			  	<bone name="neck1">
+				  <bone name="head">
+					<bone name="DUMMY_headnub"/> <!-- kept for binary compatibility with PSA files -->
+					<bone name="trunk">
+					  <bone name="trunk1">
+						<bone name="trunk2">
+						  <bone name="DUMMY_ponytail1nub"/>
+						</bone>
+					  </bone>
+					</bone>
+				  </bone>
+				</bone>
+				<bone name="l_clavicle">
+				  <bone name="l_upperarm">
+					<bone name="l_forearm">
+					  <bone name="l_hand">
+					    <bone name="l_finger">
+					     <bone name="DUMMY_l_finger0nub"/>
+					    </bone>
+					  </bone>
+					</bone>
+				  </bone>
+				</bone>
+				<bone name="r_clavicle">
+				  <bone name="r_upperarm">
+					<bone name="r_forearm">
+					  <bone name="r_hand">
+					    <bone name="r_finger">
+					     <bone name="DUMMY_r_finger0nub"/>
+					    </bone>
+					  </bone>
+					</bone>
+				  </bone>
+				</bone>
+			  </bone>
+			</bone>
+		  </bone>
+		  <bone name="l_thigh">
+			<bone name="l_calf">
+			  <bone name="l_foot">
+			    <bone name="l_toe">
+				  <bone name="DUMMY_l_toe0nub"/>
+			    </bone>
+			  </bone>
+			</bone>
+		  </bone>
+		  <bone name="r_thigh">
+			<bone name="r_calf">
+			  <bone name="r_foot">
+			    <bone name="r_toe">
+				  <bone name="DUMMY_r_toe0nub"/>
+			    </bone>
+			  </bone>
+			</bone>
+		  </bone>
+		  <bone name="tail">
+			<bone name="tail1">
+			  <bone name="tail2">
+				<bone name="DUMMY_tailnub"/>
+			  </bone>
+			</bone>
+		  </bone>
+		</bone>
+	 </bone>
+	</standard_skeleton>
+	
+	<skeleton title="3ds Max Elephant biped" target="Ele01">
+		 <identifier>
+			<root>Ele01</root>
+		 </identifier>
+		 <bone name="Ele01"><target>root</target>
+			<bone name="Ele01_Pelvis"><target>pelvis</target>
+			  <bone name="Ele01_Spine"><target>spine</target>
+				<bone name="Ele01_Spine1"><target>spine1</target>
+				  <bone name="Ele01_Neck"><target>neck</target>
+				  	<bone name="Ele01_Neck1"><target>neck1</target>
+					  <bone name="Ele01_Head"><target>head</target>
+						<bone name="Ele01_HeadNub"/>	
+					    <bone name="Ele01_Ponytail1"><target>trunk</target>
+					      <bone name="Ele01_Ponytail11"><target>trunk1</target>
+						    <bone name="Ele01_Ponytail12"><target>trunk2</target>
+							  <bone name="Ele01_Ponytail1Nub"/>
+						    </bone>
+					      </bone>						
+					    </bone>
+					  </bone>
+					</bone>
+					<bone name="Ele01_L_Clavicle"><target>l_clavicle</target>
+					  <bone name="Ele01_L_UpperArm"><target>l_upperarm</target>
+						<bone name="Ele01_L_Forearm"><target>l_forearm</target>
+						  <bone name="Ele01_L_Hand"><target>l_hand</target>
+						  	 <bone name="Ele01_L_Finger0"><target>l_finger</target>
+								<bone name="Ele01_L_Finger0Nub"/>
+							 </bone>
+						  </bone>
+						</bone>
+					  </bone>
+					</bone>
+					<bone name="Ele01_R_Clavicle"><target>r_clavicle</target>
+					  <bone name="Ele01_R_UpperArm"><target>r_upperarm</target>
+						<bone name="Ele01_R_Forearm"><target>r_forearm</target>
+						  <bone name="Ele01_R_Hand"><target>r_hand</target>
+						    <bone name="Ele01_R_Finger0"><target>r_finger</target>
+								<bone name="Ele01_R_Finger0Nub"/>
+							 </bone>
+						  </bone>
+						</bone>
+					  </bone>
+					</bone>
+				  </bone>
+				</bone>
+			  </bone>
+			  <bone name="Ele01_L_Thigh"><target>l_thigh</target>
+				<bone name="Ele01_L_Calf"><target>l_calf</target>
+				  <bone name="Ele01_L_Foot"><target>l_foot</target>
+					<bone name="Ele01_L_Toe0"><target>l_toe</target>
+					  <bone name="Ele01_L_Toe0Nub"/>
+					</bone>
+				  </bone>
+				</bone>
+			  </bone>
+			  <bone name="Ele01_R_Thigh"><target>r_thigh</target>
+				<bone name="Ele01_R_Calf"><target>r_calf</target>
+				  <bone name="Ele01_R_Foot"><target>r_foot</target>
+					<bone name="Ele01_R_Toe0"><target>r_toe</target>
+					  <bone name="Ele01_R_Toe0Nub"/>
+					</bone>
+				  </bone>
+				</bone>
+			  </bone>
+			  <bone name="Ele01_Tail"><target>tail</target>
+				<bone name="Ele01_Tail1"><target>tail1</target>
+				  <bone name="Ele01_Tail2"><target>tail1</target>
+					<bone name="Ele01_TailNub"/>
+				  </bone>
+				</bone>
+			  </bone>
+			</bone>
+		 </bone>	
+	</skeleton>
+	
 </skeletons>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/celt heroes.pmp b/binaries/data/mods/official/maps/scenarios/celt heroes.pmp
new file mode 100644
index 0000000000..4949a68625
--- /dev/null
+++ b/binaries/data/mods/official/maps/scenarios/celt heroes.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7533815bfd1498027fbfd5d62eacfcaaa4c7bb539c847d9dbafed99b12bd8adf
+size 207988
diff --git a/binaries/data/mods/official/maps/scenarios/celt heroes.xml b/binaries/data/mods/official/maps/scenarios/celt heroes.xml
new file mode 100644
index 0000000000..c90a5ddc45
--- /dev/null
+++ b/binaries/data/mods/official/maps/scenarios/celt heroes.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:604e5a9dd54c08e18db3c0dabeefb36c8e27988b8cb0ea6d2f915b729a29c587
+size 2841