diff --git a/binaries/data/mods/official/art/actors/flora/trees/carob_top.xml b/binaries/data/mods/official/art/actors/flora/trees/carob_top.xml
index 58b43405ed..9b61cbaab2 100644
--- a/binaries/data/mods/official/art/actors/flora/trees/carob_top.xml
+++ b/binaries/data/mods/official/art/actors/flora/trees/carob_top.xml
@@ -25,13 +25,13 @@
   </group>
 
   <group>
-    <variant frequency="1" name="carob-leaves-a">
+    <variant frequency="1" name="leaf-texture-a">
       <texture>gaia/tree_carob_a.dds</texture>
     </variant>
-    <variant frequency="1" name="carob-leaves-b">
+    <variant frequency="1" name="leaf-texture-b">
       <texture>gaia/tree_carob_b.dds</texture>
     </variant>
-    <variant frequency="1" name="carob-leaves-c">
+    <variant frequency="1" name="leaf-texture-c">
       <texture>gaia/tree_carob_c.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/flora/trees/orchard_top.xml b/binaries/data/mods/official/art/actors/flora/trees/orchard_top.xml
new file mode 100644
index 0000000000..86255b987d
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/flora/trees/orchard_top.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="foliage-mesh-a">
+      <mesh>gaia/tree_carob_top_a.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="foliage-mesh-b">
+      <mesh>gaia/tree_carob_top_b.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="foliage-mesh-c">
+      <mesh>gaia/tree_carob_top_c.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="foliage-mesh-d">
+      <mesh>gaia/tree_carob_top_d.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="foliage-mesh-e">
+      <mesh>gaia/tree_carob_top_e.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="foliage-mesh-f">
+      <mesh>gaia/tree_carob_top_f.pmd</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="foliage-texture-apple">
+      <texture>gaia/orchard_apple_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="foliage-texture-pear">
+      <texture>gaia/orchard_pear_a.dds</texture>
+    </variant>
+  </group>
+
+  <material>basic_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/flora/trees/orchard_tree.xml b/binaries/data/mods/official/art/actors/flora/trees/orchard_tree.xml
new file mode 100644
index 0000000000..202404f300
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/flora/trees/orchard_tree.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="trunk-mesh-a">
+      <mesh>gaia/tree_carob_a.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-b">
+      <mesh>gaia/tree_carob_b.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-c">
+      <mesh>gaia/tree_carob_c.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-d">
+      <mesh>gaia/tree_carob_d.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-e">
+      <mesh>gaia/tree_carob_e.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-f">
+      <mesh>gaia/tree_carob_f.pmd</mesh>
+      <props>
+        <prop actor="flora/trees/orchard_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="trunk-texture-a">
+      <texture>gaia/trunk_deciduous_a.dds</texture>
+    </variant>
+    <variant name="trunk-texture-b">
+      <texture>gaia/trunk_deciduous_b.dds</texture>
+    </variant>
+  </group>
+
+  <material>basic_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/weapons/spear.xml b/binaries/data/mods/official/art/actors/props/units/weapons/spear.xml
index 46a973d0b6..8a9f992f7d 100644
--- a/binaries/data/mods/official/art/actors/props/units/weapons/spear.xml
+++ b/binaries/data/mods/official/art/actors/props/units/weapons/spear.xml
@@ -10,16 +10,16 @@
   </group>
 
   <group>
-    <variant>
+    <variant name="spear-a">
       <mesh>props/weap_spear_a.pmd</mesh>
     </variant>
-    <variant>
+    <variant name="spear-b">
       <mesh>props/weap_spear_b.pmd</mesh>
     </variant>
-    <variant>
+    <variant name="spear-d">
       <mesh>props/weap_spear_d.pmd</mesh>
     </variant>
-    <variant>
+    <variant name="spear-e">
       <mesh>props/weap_spear_e.pmd</mesh>
     </variant>
   </group>
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 925fcfa5c7..f1c39a6a9c 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
@@ -53,8 +53,8 @@
     </variant>
     <variant name="gather_wood">
       <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_grain">
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_a.xml
index 9bfeb812f3..509c80dc59 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_a.xml
@@ -1,97 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="300"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="15"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="70"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_tunic_a.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/hele_hoplite_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/hele_round_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant name="texture-a">
-      <texture>skeletal/hele_isp_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="17"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/hele_hoplite_a.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_round_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="texture-a">
+      <texture>skeletal/hele_isp_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_b.xml
index ce9cbbd0c7..c35de56fdf 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_b.xml
@@ -4,17 +4,18 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="100"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="15"/>
-        <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="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="17"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
         <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"/>
@@ -41,7 +42,7 @@
   </group>
 
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant frequency="1" name="Idle"/>
     <variant name="Melee">
       <props>
         <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
@@ -76,7 +77,7 @@
         <prop attachpoint="shield"/>
       </props>
     </variant>
-    <variant name="gather_ore">
+    <variant name="gather_metal">
       <props>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_e.xml
index b3ee310ad9..7cbb7821dc 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_spearman_e.xml
@@ -1,103 +1,104 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="100"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="15"/>
-        <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="35"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_tunic_a.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="armour-var-a">
-      <texture>skeletal/hele_isp_e_a.dds</texture>
-    </variant>
-    <variant frequency="1" name="armour-var-b">
-      <texture>skeletal/hele_isp_e_b.dds</texture>
-    </variant>
-    <variant frequency="1" name="armour-var-c">
-      <texture>skeletal/hele_isp_e_c.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="gather_ore">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="shield"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="17"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="armour-var-a">
+      <texture>skeletal/hele_isp_e_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="armour-var-b">
+      <texture>skeletal/hele_isp_e_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="armour-var-c">
+      <texture>skeletal/hele_isp_e_c.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/philip.xml b/binaries/data/mods/official/art/actors/units/hellenes/philip.xml
index cf665a1259..09385ff8ec 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/philip.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/philip.xml
@@ -4,21 +4,21 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/inf_phalanx_c.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="20"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
         <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="melee" speed="400"/>
       </animations>
       <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
         <prop actor="props/units/heads/head_philip.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/spear_long.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_round_demetrius.xml" attachpoint="shield"/>
       </props>
-      <texture>skeletal/hele_philip.dds</texture>
+      <texture>skeletal/hele_philip_2.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_1.xml b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_1.xml
index b04e9b8c2e..411505efb7 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_1.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_1.xml
@@ -8,13 +8,7 @@
       <animations>
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Attack" speed="100"/>
-        <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="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="melee" speed="100"/>
         <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"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
index 31b8a69719..7a4819e222 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
@@ -4,15 +4,15 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
-        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="400"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="18"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="18"/>
         <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"/>
@@ -33,13 +33,13 @@
   </group>
 
   <group>
-    <variant name="Body-Chiton-01">
+    <variant frequency="1" name="Body-Chiton-01">
       <texture>skeletal/hele_su1_01.dds</texture>
     </variant>
-    <variant name="Body-Chiton-02">
+    <variant frequency="1" name="Body-Chiton-02">
       <texture>skeletal/hele_su1_02.dds</texture>
     </variant>
-    <variant name="Body-Chiton-03">
+    <variant frequency="1" name="Body-Chiton-03">
       <texture>skeletal/hele_su1_03.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
index af5c4ae53e..72f138c99f 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
@@ -7,8 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="28"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="112"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
index 61eb3ed96e..c8bb2e6ef4 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
@@ -7,8 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="28"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="112"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
index 964b2c2e5f..4f87f63629 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
@@ -8,13 +8,13 @@
       <animations>
         <animation file="biped/inf_spear_shield_atk_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_spear_shield_atk_b.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="28"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="112"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
         <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="melee" speed="400"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_swordsman_b.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_swordsman_b.xml
index dfe140da78..d391ae0bce 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_swordsman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_swordsman_b.xml
@@ -4,7 +4,7 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="28"/>
@@ -27,6 +27,11 @@
         <prop actor="props/units/shields/rome_scutum_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/gladus.xml" attachpoint="r_hand"/>
       </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="texture-1">
       <texture>skeletal/rome_isw_b.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/textures/skins/gaia/orchard_apple_a.dds b/binaries/data/mods/official/art/textures/skins/gaia/orchard_apple_a.dds
index 3704e7412c..bf6999eeaa 100644
--- a/binaries/data/mods/official/art/textures/skins/gaia/orchard_apple_a.dds
+++ b/binaries/data/mods/official/art/textures/skins/gaia/orchard_apple_a.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1330025c8f30b3c6e0980e7d939a99e9fba2ecb25a2fa0ae9a1ab6fba9fc8c5f
-size 16512
+oid sha256:6876d68f60045a8b3e51348bb2f6f6d1bca29be0f68d88cc1e680308d59ffd4a
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/hele_philip_2.dds b/binaries/data/mods/official/art/textures/skins/skeletal/hele_philip_2.dds
new file mode 100644
index 0000000000..1ffee96fdc
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/hele_philip_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b3c7d38fa04dd416bada3b2524699b8f77842cf2fd15cf0f575cfddeca3b25e
+size 87536
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
index 53267b03e2..55ec16d8e8 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
@@ -40,7 +40,7 @@
 				<Hack>0.5</Hack>
 				<Pierce>0.5</Pierce>
 				<Range>2.0</Range>
-				<Speed>1500</Speed>
+				<Speed>2500</Speed>
 			</Charge>	
 	
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
index e94102fee8..5e242256c6 100644
--- a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
@@ -54,14 +54,14 @@
 		<Gather>
 			<Resource>
 				<Food>
-					<Fruit>5</Fruit>
-					<Grain>5</Grain>
-					<Fish>5</Fish>
-					<Milk>5</Milk>
+					<Fruit>20</Fruit>
+					<Grain>20</Grain>
+					<Fish>20</Fish>
+					<Milk>20</Milk>
 				</Food>
-				<Wood>5</Wood>
-				<Metal>5</Metal>
-				<Stone>5</Stone>
+				<Wood>15</Wood>
+				<Metal>15</Metal>
+				<Stone>15</Stone>
 			</Resource>
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
diff --git a/binaries/data/mods/official/maps/scenarios/Latium 256x256.xml b/binaries/data/mods/official/maps/scenarios/Latium 256x256.xml
index c8b42db05a..c91bfb38f2 100644
--- a/binaries/data/mods/official/maps/scenarios/Latium 256x256.xml	
+++ b/binaries/data/mods/official/maps/scenarios/Latium 256x256.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8487447fe72f84b49e862852c6aace1d581d8bf96818b1cd862c78fb52b704f4
-size 962566
+oid sha256:18b1c44b249326626bf065d9fdde1ee289beb3d765a199b507742fe1339aaf5f
+size 963604