diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_a.xml b/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_a.xml
index 4f815409f3..ae676ec80b 100644
--- a/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_a.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_a.xml
@@ -17,6 +17,10 @@
     <variant frequency="1" name="Shield-Parma-D">
       <mesh>props/shield/round_b_f.pmd</mesh>
       <texture>props/shield/rome_parma_d.dds</texture>
+    </variant>
+	<variant frequency="1" name="Shield-Parma-L">
+      <mesh>props/shield/round_b_f.pmd</mesh>
+      <texture>props/shield/rome_parma_l.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_e.xml b/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_e.xml
index 9ba0a6c643..6b262843c4 100644
--- a/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_e.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/rome_parma_e.xml
@@ -20,6 +20,9 @@
     <variant frequency="1" name="Shield-Parma-G">
       <texture>props/shield/rome_parma_g.dds</texture>
     </variant>
+    <variant frequency="1" name="Shield-Parma-M">
+      <texture>props/shield/rome_parma_m.dds</texture>
+    </variant>
   </group>
 
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_l.dds b/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_l.dds
new file mode 100644
index 0000000000..61978af6d5
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_l.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90addb392fc8714a31172f1e2dbae8cf4a5b51daaa99d598c7cdff5a9baa6e7c
+size 5616
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_m.dds b/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_m.dds
new file mode 100644
index 0000000000..d6f48fcdcd
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/rome_parma_m.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02502849c282bc77c54503bf9c01cf7525f48c9cd999d7a580ce8ba4a7330cd0
+size 5616
diff --git a/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_1.dds b/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_1.dds
index 550f4dd2e2..17b252a99e 100644
--- a/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_1.dds
+++ b/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:842188bd8ca28f5e37ad2c5b854743ec8337a67d6eb8a9e030d8ab3d97c3bee4
+oid sha256:bb1f0f37c2e3c806aa4e67d0930e78a84bb8f32a52f2ea315b4cd0d239e0d378
 size 87536
diff --git a/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_2.dds b/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_2.dds
new file mode 100644
index 0000000000..30a9c6b3e4
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/skeletal/horse_iber_csp_e_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ea7741b1063b3445bff1dc82732b54a5ec46bf5f7f33c8a20c82ef81aae62cf
+size 87536
diff --git a/binaries/data/mods/internal/art/textures/terrain/types/test/dirty_sand.dds b/binaries/data/mods/internal/art/textures/terrain/types/test/dirty_sand.dds
new file mode 100644
index 0000000000..911be28853
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/terrain/types/test/dirty_sand.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5e790302063df15c0c27a1a3a975c7b34f31715125dca526e9223c5d39b75f5
+size 349680
diff --git a/binaries/data/mods/internal/entities/unit-stats-spreadsheet.xls b/binaries/data/mods/internal/entities/unit-stats-spreadsheet.xls
index b64e6306f7..d1d1fc9252 100644
Binary files a/binaries/data/mods/internal/entities/unit-stats-spreadsheet.xls and b/binaries/data/mods/internal/entities/unit-stats-spreadsheet.xls differ
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_female_celt.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_female_celt.xml
index a77522482f..9f3b0995ea 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_female_celt.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_female_celt.xml
@@ -4,31 +4,34 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Hair-Bun">
       <mesh>props/dudette_head.pmd</mesh>
     </variant>
+    <variant frequency="1" name="Hair-Long">
+      <mesh>props/head_boudicca.pmd</mesh>
+    </variant>
   </group>
 
   <group>
-    <variant frequency="1" name="Female-Face-01">
+    <variant frequency="1" name="Face-01">
       <texture>props/head/celt_fem_b.dds</texture>
     </variant>
-    <variant frequency="1" name="Female-Face-02">
+    <variant frequency="1" name="Face-02">
       <texture>props/head/celt_fem_boudicca_1.dds</texture>
     </variant>
-    <variant frequency="1" name="Female-Face-03">
+    <variant frequency="1" name="Face-03">
       <texture>props/head/celt_fem_c.dds</texture>
     </variant>
   </group>
 
   <group>
-    <variant frequency="1" name="blonde">
+    <variant frequency="1" name="color-blonde">
       <colour>232 205 123</colour>
     </variant>
-    <variant frequency="1" name="red">
+    <variant frequency="1" name="color-red">
       <colour>224 120 16</colour>
     </variant>
-    <variant frequency="3" name="brown">
+    <variant frequency="3" name="color-brown">
       <colour>120 114 35</colour>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_hele_healer.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_hele_healer.xml
index 58518b0a23..2b788491a6 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_hele_healer.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_hele_healer.xml
@@ -10,10 +10,10 @@
   </group>
 
   <group>
-    <variant frequency="1" name="healer-face-a">
+    <variant frequency="1" name="head-bare">
       <texture>props/head/hele_healer_a.dds</texture>
     </variant>
-    <variant frequency="1" name="healer-face-b">
+    <variant frequency="1" name="head-wreath">
       <texture>props/head/hele_healer_b.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/celts/brennus.xml b/binaries/data/mods/public/art/actors/units/celts/brennus.xml
index f88c547e39..e4d166d497 100644
--- a/binaries/data/mods/public/art/actors/units/celts/brennus.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/brennus.xml
@@ -27,7 +27,7 @@
         <prop actor="props/units/shields/celt_brennus.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
         <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
-        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_celt_brennus.xml" attachpoint="head"/>
       </props>
       <texture>skeletal/celt_brennus.dds</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_a.xml
index 889fb0ae26..7318c81bd2 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_a.xml
@@ -7,7 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/mastiff_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="20"/>
+        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/mastiff_run.psa" name="run" speed="25"/>
       </animations>
       <mesh>skeletal/mastiff.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_b.xml
index fa58b5146c..b5ca9b8d12 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_b.xml
@@ -7,7 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/mastiff_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="20"/>
+        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/mastiff_run.psa" name="run" speed="25"/>
       </animations>
       <mesh>skeletal/mastiff.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_e.xml
index 5e1e2bbea2..2a09cbb741 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_spearman_e.xml
@@ -7,8 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/mastiff_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="12"/>
-        <animation file="quadraped/mastiff_run.psa" name="run" speed="20"/>
+        <animation file="quadraped/mastiff_run.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/mastiff_run.psa" name="run" speed="25"/>
       </animations>
       <mesh>skeletal/mastiff.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
index 80ae799373..8cf0ffdcfa 100644
--- a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
@@ -11,6 +11,7 @@
         <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_gather_01.dae" name="gather_meat" 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"/>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
index a2238ae693..c7e75a12c7 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
@@ -30,9 +30,7 @@
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
         <prop actor="props/units/shields/celt_round_a.xml" attachpoint="shield"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
index d333149915..c2e983dd82 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
@@ -29,9 +29,7 @@
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
index f9a700e1d8..44a3401206 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
@@ -1,114 +1,112 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-        <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 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/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"/>
-      </animations>
-      <mesh>skeletal/m_tights.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
-        <prop actor="props/units/shields/celt_dip.xml" attachpoint="shield"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Tattoos-1">
-      <texture>skeletal/celt_ijv_e_01.dds</texture>
-    </variant>
-    <variant frequency="1" name="Tattoos-2">
-      <texture>skeletal/celt_ijv_e_02.dds</texture>
-    </variant>
-    <variant frequency="1" name="Tattoos-3">
-      <texture>skeletal/kart_isw_a_01.dds</texture>
-    </variant>
-    <variant frequency="1" name="Tattoos-4">
-      <texture>skeletal/kart_isw_a_02.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle">
-      <props>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </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="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </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="100" name="Base">
+      <animations>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <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 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/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"/>
+      </animations>
+      <mesh>skeletal/m_tights.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/celt_dip.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Tattoos-1">
+      <texture>skeletal/celt_ijv_e_01.dds</texture>
+    </variant>
+    <variant frequency="1" name="Tattoos-2">
+      <texture>skeletal/celt_ijv_e_02.dds</texture>
+    </variant>
+    <variant frequency="1" name="Tattoos-3">
+      <texture>skeletal/kart_isw_a_01.dds</texture>
+    </variant>
+    <variant frequency="1" name="Tattoos-4">
+      <texture>skeletal/kart_isw_a_02.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </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="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/super_unit_3.xml b/binaries/data/mods/public/art/actors/units/celts/super_unit_3.xml
index c3dfd18994..c18867160c 100644
--- a/binaries/data/mods/public/art/actors/units/celts/super_unit_3.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/super_unit_3.xml
@@ -34,6 +34,9 @@
     <variant frequency="1" name="chainmail-1">
       <texture>skeletal/celt_su3_soldurii_1.dds</texture>
     </variant>
+    <variant frequency="1" name="chainmail-2">
+      <texture>skeletal/celt_su3_soldurii_2.dds</texture>
+    </variant>
   </group>
 
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
index 9509811516..0a79c7a264 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
@@ -11,6 +11,7 @@
         <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_gather_01.dae" name="gather_meat" 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"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml
index 7c6c995c98..8d58869f8d 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml
@@ -1,104 +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_arch_atk_a.psa" name="Idle" speed="1"/>
-        <animation event="0.8" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="15"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
-        <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"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="back"/>
-        <prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Tunic-Sleeves">
-      <texture>skeletal/hele_isp_b.dds</texture>
-    </variant>
-    <variant frequency="1" name="Tunic-Sleeveless">
-      <texture>skeletal/hele_isp_b_2.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </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="100" name="Base">
+      <animations>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
+        <animation event="0.8" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="15"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
+        <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"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
+        <prop actor="props/temp/quiver.xml" attachpoint="back"/>
+        <prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Tunic-Sleeves">
+      <texture>skeletal/hele_isp_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="Tunic-Sleeveless">
+      <texture>skeletal/hele_isp_b_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
index e68ed9be23..639c2aac13 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
-        <animation event="0.6" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="250"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" 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="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"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="back"/>
-      </props>
-      <texture>skeletal/hele_tunic.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_metal">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </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="100" name="Base">
+      <animations>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
+        <animation event="0.6" file="biped/inf_arch_atk_a.psa" load="0.2" name="Melee" speed="90"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" 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="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"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
+        <prop actor="props/temp/quiver.xml" attachpoint="back"/>
+      </props>
+      <texture>skeletal/hele_tunic.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml
index f5d07f2f41..a33dd00e89 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml
@@ -6,7 +6,7 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
         <animation event="0.6" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
index e2f7354395..52bccdb59c 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
@@ -7,7 +7,7 @@
     <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 file="biped/inf_hoplite_walk.psa" name="Walk" speed="18"/>
         <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="melee" speed="200"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="350"/>
@@ -15,7 +15,7 @@
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="14"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="12"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
index 13d48a6a5f..21bb3992a8 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/xenophon.xml
@@ -1,42 +1,44 @@
-<?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_shield_run_a.psa" name="Walk" speed="12"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="run" speed="14"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="Attack" speed="100"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="220"/>
-        <animation file="infantry/general/death/inf_03.psa" name="death" speed="220"/>
-        <animation file="infantry/general/death/inf_06.psa" name="death" speed="220"/>
-        <animation file="infantry/general/death/inf_07.psa" name="death" speed="220"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/hele_xenophon.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/hele_round_xenophon.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </props>
-      <texture>skeletal/hele_xenophon.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="projectile"/>
-        <prop attachpoint="r_hand"/>
-      </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="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="80"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="walk" speed="12"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="9"/>
+        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="melee" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="death" speed="220"/>
+        <animation file="infantry/general/death/inf_03.psa" name="death" speed="220"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="220"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="220"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/hele_xenophon.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_round_xenophon.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+      </props>
+      <texture>skeletal/hele_xenophon.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="projectile"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/celt_brennus.dds b/binaries/data/mods/public/art/textures/skins/props/head/celt_brennus.dds
new file mode 100644
index 0000000000..ff38292189
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/head/celt_brennus.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b942efdd4ba0145acf28a9e8d335220911b297045868239a2166f7a93c6e9e5f
+size 5616
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.dds b/binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.dds
index 9f4f3f36f1..af66272f40 100644
--- a/binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.dds
+++ b/binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4afdfca0d9aee9a95a602c7bab1f69efa1061480ed09dd2e545e672540deb36
+oid sha256:456f05c4a91d355d3b61d78046ef6a2f5e0dc15083da5b9ac1397b02e5ef6edc
 size 5616
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds b/binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds
index 68a1def8b9..263b1cf33c 100644
--- a/binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds
+++ b/binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6125cd9a8515e4781f0cb6e996a5dd3fe5cfbe97f582d7aba522d2639c0bd03
+oid sha256:a415f96fd09801124b9638d0e230355f1bb9eabed9922890f6a5983944708cdb
 size 5616
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/celt_su3_soldurii_2.dds b/binaries/data/mods/public/art/textures/skins/skeletal/celt_su3_soldurii_2.dds
new file mode 100644
index 0000000000..e89d6888e7
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/celt_su3_soldurii_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:885ac153b77e610cb0d2b05be6fb74b6888f8928da2859a048b70d16656a7369
+size 22000
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile.dds
new file mode 100644
index 0000000000..cc802f8a58
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6378464a4a859cf822579200ca019ef165e46d8a6dec508808ba589bf4d154f5
+size 349680
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile_dirt.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile_dirt.dds
new file mode 100644
index 0000000000..af55ea4c29
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_tile_dirt.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:919bfc97193212ebbf249d3d4efd85ff7c90fee259d86c74f3e8714121dcb133
+size 349680
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/celt.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/celt.dds
index 636b5c70c9..081071cc02 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/celt.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/celt.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d68c21a8e9277d6b50aa94f3ab93f8d8e17f499d3ef685352f9bf2223a65412
-size 131200
+oid sha256:4d5d2ae940298673b83a8ed836c0da21011007b1ae27d384cffbaca4085b5a52
+size 349680
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/hele.dds b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/hele.dds
index a2e3dd64e6..4f215186ed 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/hele.dds
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/sheets/hele.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2dbfb2662e8dbdb1831cb309a9997d6e69c4e5c240b2460f81a8a8719e804b8
+oid sha256:c8a79769900ef8ce1e1ea9b665b1d9d71473b33085b7dd7b12ef828da282f708
 size 349680
diff --git a/binaries/data/mods/public/entities/structures/celt_dock.xml b/binaries/data/mods/public/entities/structures/celt_dock.xml
index 48b474a23d..9a5e2d8130 100644
--- a/binaries/data/mods/public/entities/structures/celt_dock.xml
+++ b/binaries/data/mods/public/entities/structures/celt_dock.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military_dock"
->
+<Entity	Parent="template_structure_military_dock">
 	<Traits>
-	
 		<Id>
-
 			<Specific>Crannog</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History>A crannog (or crannoge) is the name given in Scotland and Ireland to an artificial island or natural island, used for a settlement. The name can also be used to refer to wooden platforms erected on shallow loch floors, although understandably few remains of this sort have been found. The choice of an island as a home is thought to have been for defence as well as the availability of food in the form of fish nearby.</History>
-		
 		</Id>
-
 		<Population>
 			<Add>2</Add>
 		</Population>
-
 	</Traits>
-
+	<Actions>
+		<Create>
+			<List>
+				<Train>
+					<Ship_Trireme />
+					<Ship_Merchant />
+				</Train>
+				<Research />
+			</List>
+		</Create>
+	</Actions>
 	<Actor>structures/celts/dock.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/structures/celt_fortress_b.xml b/binaries/data/mods/public/entities/structures/celt_fortress_b.xml
index e60fad03c3..2c45a5289e 100644
--- a/binaries/data/mods/public/entities/structures/celt_fortress_b.xml
+++ b/binaries/data/mods/public/entities/structures/celt_fortress_b.xml
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military_fortress"
->
+<Entity	Parent="template_structure_military_fortress">
 	<Traits>
-	
 		<Id>
-
-			<Specific>Broch</Specific>
-
+			<Icon_Cell>62</Icon_Cell>
+			<Specific>Brythonic Broch</Specific>
 			<Civ>Celts</Civ>
-
 			<History>The Broch is an Iron Age round tower fortification type unique to Scotland.  The origin of brochs remains a mystery. Some archaeologists believed the brochs were built by an influx of broch builders who had been displaced and pushed northward during the Roman invasion of Britain. However, this theory has been largely disproven and current thought is that they were built by itinerant (travelling) craftsmen since so many were built to almost the same exact design. </History>
-		
+			<Tooltip>Trains Brythonic Heroes, Super Units, and Siege Ram.</Tooltip>		
 		</Id>
-
 		<Footprint>
 			<Radius>8.0</Radius>
 			<Height>16.0</Height>
 		</Footprint>	
-		
 		<Population>
 			<Add>22</Add>
 		</Population>
-
 	</Traits>
 	<Actions>
 		<Create>
@@ -40,7 +32,5 @@
 			</List>
 		</Create>
 	</Actions>
-
 	<Actor>structures/celts/fortress_briton.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/structures/celt_fortress_g.xml b/binaries/data/mods/public/entities/structures/celt_fortress_g.xml
index 154ccdc42f..e763bc6c9a 100644
--- a/binaries/data/mods/public/entities/structures/celt_fortress_g.xml
+++ b/binaries/data/mods/public/entities/structures/celt_fortress_g.xml
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military_fortress"
->
+<Entity	Parent="template_structure_military_fortress">
+	<Actor>structures/celts/fortress_gallic.xml</Actor>
 	<Traits>
-	
 		<Id>
-
-			<Specific>Dun</Specific>
-
+			<Specific>Gallic Dun</Specific>
 			<Civ>Celts</Civ>
-
 			<History>Dun comes from the Brythonic Din and Gaelic Dun, meaning fort, and is now used as a general term for small stone built strongholds. Duns appear to have arrived with the Brythonic Celts in about the 7th century BC, associated with their Iron age culture of warrior tribes and petty chieftains. Early Duns had near vertical ramparts constructed of stone laced with timber, and where this was set on fire (accidentally or on purpose) it forms the vitrified forts where stones have been partly melted, an effect that is still clearly visible. Use of Duns continued in some cases into the medieval period.</History>
-		
+			<Tooltip>Trains Gallic Heroes, Super Units, and Siege Ram.</Tooltip>		
 		</Id>
-
 		<Population>
 			<Add>22</Add>
 		</Population>
-
 	</Traits>
-
 	<Actions>
 		<Create>
 			<List>
@@ -36,7 +28,4 @@
 			</List>
 		</Create>
 	</Actions>
-
-	<Actor>structures/celts/fortress_gallic.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/structures/celt_sb1.xml b/binaries/data/mods/public/entities/structures/celt_sb1.xml
index b182759a10..e313ca3dbb 100644
--- a/binaries/data/mods/public/entities/structures/celt_sb1.xml
+++ b/binaries/data/mods/public/entities/structures/celt_sb1.xml
@@ -1,31 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_special"
->
+<Entity	Parent="template_structure_special">
 	<Traits>
-	
 		<Id>
-
+			<Icon_Cell>63</Icon_Cell>
 			<Specific>Ffactri</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History>The Celts developed the first rotary flour mill.</History>
-			<Tooltip>Increases Farm output +10%.</Tooltip>
-		
+			<Tooltip>Increases Farm output +15% per Territory.</Tooltip>
 		</Id>
-
 		<Population>
 			<Add>2</Add>
 		</Population>
-		
 		<Footprint>
 			<Radius>8.0</Radius>
 			<Height>6.0</Height>
 		</Footprint>
 	</Traits>
-
 	<Actor>structures/celts/special.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/structures/hele_dock.xml b/binaries/data/mods/public/entities/structures/hele_dock.xml
index 12a0a36b65..d28b31e941 100644
--- a/binaries/data/mods/public/entities/structures/hele_dock.xml
+++ b/binaries/data/mods/public/entities/structures/hele_dock.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military_dock"
->
+<Entity	Parent="template_structure_military_dock">
+<Actor>structures/hellenes/dock.xml</Actor>
 	<Traits>
-	
 		<Id>
-
 			<Specific>Limenos</Specific>
-
 			<Civ>Hellenes</Civ>
-
 			<History>Greece is a sea country, which is why some of the greatest Hellenic and Hellenistic cities like Ephesus, Corinth, Alexandria and Antioch were built by the sea. It should also be noted that all colonies during the Great Colonisation were thriving port centres, which traded with the local population.</History>
-		
 		</Id>
-
 	</Traits>
-
-	<Actor>structures/hellenes/dock.xml</Actor>
-
 	<Actions>
 		<Create>
 			<List>
@@ -34,5 +24,4 @@
 			</List>
 		</Create>
 	</Actions>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/structures/hele_gymnasion.xml b/binaries/data/mods/public/entities/structures/hele_gymnasion.xml
index c0ec1024ce..bd27687a85 100644
--- a/binaries/data/mods/public/entities/structures/hele_gymnasion.xml
+++ b/binaries/data/mods/public/entities/structures/hele_gymnasion.xml
@@ -3,10 +3,11 @@
 <Entity	Parent="template_structure_special">
 	<Traits>
 		<Id>
+			<Icon_Cell>63</Icon_Cell>
 			<Specific>Gymnasion</Specific>
 			<Civ>Hellenes</Civ>
 			<History>The gymnasion was a vital place in Hellenistic polises, where physical exercises were performed and social contacts established.</History>
-			<Tooltip>Train Super Units and researches Osthimos technology.</Tooltip>
+			<Tooltip>Train Super Units and research Osthimos technology.</Tooltip>
 		</Id>
  		<Footprint>
  			<Width>22.0</Width>
diff --git a/binaries/data/mods/public/entities/structures/hele_theatron.xml b/binaries/data/mods/public/entities/structures/hele_theatron.xml
index 6e84c83610..76e0dced5f 100644
--- a/binaries/data/mods/public/entities/structures/hele_theatron.xml
+++ b/binaries/data/mods/public/entities/structures/hele_theatron.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
 <Entity	Parent="template_structure_special">
-
 	<Traits>
-	
 		<Id>
-
 			<Specific>Theatron</Specific>
-
 			<Civ>Hellenes</Civ>
-
 			<History>Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.</History>
 			<Tooltip>Build one of these to take advantage of the Hellenisation civ bonus.</Tooltip>
-		
 		</Id>
-		
 		<Creation>
 			<Foundation>foundation_5x5</Foundation>
 			<Resource>
@@ -22,14 +15,10 @@
 				<Stone>500</Stone>
  			</Resource>
 		</Creation>
-		
 		<Footprint>
 			<Radius>26.0</Radius>
 			<Height>8.0</Height>
 		</Footprint>
-
 	</Traits>
-
 <Actor>structures/hellenes/special_theatre.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_gaia_flora_tree.xml b/binaries/data/mods/public/entities/template_gaia_flora_tree.xml
index 84c2be6db9..cf9b30af6a 100644
--- a/binaries/data/mods/public/entities/template_gaia_flora_tree.xml
+++ b/binaries/data/mods/public/entities/template_gaia_flora_tree.xml
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_gaia_flora"
->
+<Entity Parent="template_gaia_flora">
 	<Traits>
-	
 		<Id>
-		
 			<Internal_Only />
-
 			<Generic>Tree</Generic>
-
  			<Icon>PortraitSheetTree</Icon>
 			<Icon_Cell>0</Icon_Cell>			
-			
 			<Classes>Tree, Resource</Classes>
-
  			<Rollover>Chop these down to accumulate Wood.</Rollover>
-
 		</Id>
-
  		<MiniMap>
  			<Type>Wood</Type>
  			<Red>0</Red>
  			<Green>64</Green>
  			<Blue>0</Blue>
  		</MiniMap>
-
  		<Supply>
  			<Max>100</Max>
  			<Type>wood</Type>
  		</Supply>
-
 	</Traits>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_unit_infantry.xml b/binaries/data/mods/public/entities/template_unit_infantry.xml
index fa05700580..903b8bd9fd 100644
--- a/binaries/data/mods/public/entities/template_unit_infantry.xml
+++ b/binaries/data/mods/public/entities/template_unit_infantry.xml
@@ -2,23 +2,18 @@
 
 <Entity	Parent="template_unit">
 	<Traits>
-	
 		<Id>
 			<Generic>Infantry</Generic>
-
 			<Classes>Military, Foot, Organic, CitizenSoldier, Worker</Classes>
 		</Id>
-		
 		<Armour>
 			<Hack>2.0</Hack>
 			<Pierce>2.0</Pierce>
 			<Crush>2.0</Crush>
 		</Armour>
-		
 		<Health>
 			<RegenRate>0.1</RegenRate>
 		</Health>		
-
 		<Loot>
 			<Xp>200</Xp>
 			<Food>1</Food>
@@ -26,19 +21,14 @@
 			<Stone>1</Stone>
 			<Metal>1</Metal>
 		</Loot>		
-
 		<Population>
 			<Rem>1</Rem>
 		</Population>
-
 		<Promotion>
 			<Req>600</Req>
 		</Promotion>
-
 	</Traits>
-
 	<Actions>
-
 		<Create>
 			<List>
 				<StructCiv>
@@ -62,20 +52,18 @@
 				</StructMil>
 			</List>
 		</Create>
-		
 		<Explore />
-
  		<Gather>
 			<Resource>
 				<Food>
-					<Fruit>4</Fruit>
-					<Grain>4</Grain>
+					<Fruit>2</Fruit>
+					<Grain>2</Grain>
 					<Meat>3</Meat>
-					<Fish>6</Fish>
+					<Fish>3</Fish>
 				</Food>
-				<Wood>8</Wood>
-				<Stone>9</Stone>
-				<Metal>9</Metal>
+				<Wood>4</Wood>
+				<Stone>5</Stone>
+				<Metal>5</Metal>
 			</Resource>
 			<AffectedByAllure>true</AffectedByAllure>
  			<Range>1.2</Range>
@@ -86,19 +74,15 @@
 			<Resources />
 			<Xp />
 		</Loot>
-
 		<Repair>
 			<Rate>1.0</Rate>
 			<Speed>1000</Speed>
 		</Repair>
-		
 		<Build>
 			<Rate>1.0</Rate>
 			<Speed>1000</Speed>
 		</Build>
-		
 	</Actions>
-
 	<SoundGroups>
 		<Walk>audio/actor/human/movement/walk.xml</Walk>
 		<Run>audio/actor/human/movement/walk.xml</Run>
@@ -111,7 +95,6 @@
 		<Gather_Stone>audio/resource/mining/pickaxe.xml</Gather_Stone>
 		<Gather_Metal>audio/resource/mining/mining.xml</Gather_Metal>
 	</SoundGroups>
-	
 	<Script File="scripts/entity_functions.js" />
 	<Event On="StartConstruction" Function="entityStartConstruction" />
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/entities/template_unit_mechanical_ship_bireme.xml
index 6d8daa6188..0bc39dee72 100644
--- a/binaries/data/mods/public/entities/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/entities/template_unit_mechanical_ship_bireme.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship"
->
+<Entity	Parent="template_unit_mechanical_ship">
 	<Traits>
-	
 		<Id>
-		
 			<Generic>Bireme</Generic>
-
 			<Icon_Cell>39</Icon_Cell>
-		
+			<Tooltip>Warship. </Tooltip>
 		</Id>
-		
 		<Creation>
 			<Resource>
  				<Wood>250</Wood>
@@ -25,8 +19,4 @@
 			<Crush>250.0</Crush>
 		</Armour>
 	</Traits>
-
-
-
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/public/entities/template_unit_mechanical_ship_merchant.xml
index c8235e333a..44877d07a1 100644
--- a/binaries/data/mods/public/entities/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/public/entities/template_unit_mechanical_ship_merchant.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship"
->
+<Entity	Parent="template_unit_mechanical_ship">
 	<Traits>
-	
 		<Id>
 			<Generic>Merchantman</Generic>
-
 			<Icon_Cell>38</Icon_Cell>
-
 			<Classes>-Military, -WarShip, Trade</Classes>
-		
+			<Tooltip>Trades resources between allied docks. Garrison a Trader inside to increase trade profit.</Tooltip>
 		</Id>
 		<Creation>
 			<Resource>
- 				<Wood>250</Wood>
+ 				<Metal>100</Metal>
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>200.0</Hack>
-			<Pierce>130.0</Pierce>
-			<Crush>70.0</Crush>
+			<Hack>10.0</Hack>
+			<Pierce>10.0</Pierce>
+			<Crush>1.0</Crush>
 		</Armour>
 	</Traits>
-
-
-
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/public/entities/template_unit_support_female_citizen.xml
index d9431b56d0..16a295ac3a 100644
--- a/binaries/data/mods/public/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/entities/template_unit_support_female_citizen.xml
@@ -62,14 +62,14 @@
 		<Gather>
 			<Resource>
 				<Food>
-					<Fruit>8</Fruit>
-					<Grain>8</Grain>
-					<Meat>2.5</Meat>
-					<Fish>6</Fish>
+					<Fruit>5</Fruit>
+					<Grain>4</Grain>
+					<Meat>1</Meat>
+					<Fish>2</Fish>
 				</Food>
-				<Wood>4</Wood>
-				<Metal>2</Metal>
-				<Stone>2</Stone>
+				<Wood>2</Wood>
+				<Metal>1</Metal>
+				<Stone>1</Stone>
 			</Resource>
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml b/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
index 96e3bee045..5a21511d4d 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
@@ -3,6 +3,7 @@
 <Entity	Parent="template_unit_hero_ranged">
 	<Traits>
 		<Id>
+			<Icon_Cell>44</Icon_Cell>
 			<Specific>Boudicca</Specific>
 			<Civ>Celts</Civ>
 			<History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_brennus.xml b/binaries/data/mods/public/entities/units/celt_hero_brennus.xml
index f61142ad61..bc048b1a53 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_brennus.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_brennus.xml
@@ -3,6 +3,7 @@
 <Entity	Parent="template_unit_hero">
 	<Traits>
 		<Id>
+			<Icon_Cell>29</Icon_Cell>
 			<Specific>Brennus</Specific>
 			<Civ>Celts</Civ>
 			<History>Brennus is the name which the Roman historians give to the famous leader of the Gauls who took Rome in the time of Camillus. According to Geoffrey, the brothers invaded Gaul and sacked Rome in 390 B.C., "proving" that Britons had conquered Rome, the greatest civilization in the world, long before Rome conquered the Britons. We know from many ancient sources which predate Geoffrey that Rome was indeed sacked in 390 B.C., and that the raid was led by a man named Brennus, but he and his invading horde were Gallic, not British. In this episode several features of Geoffrey's editing method can be seen: he modified the historical Brennus, created the brother Belinus, borrowed the Gallic invasion, but omitted the parts where the Gauls seemed weak or foolish. His technique is both additive and subtractive. Like the tale of Trojan origin, the story of the sack of Rome is not pure fabrication; it is a creative rearrangement of the available facts, with details added as necessary. By virtue of their historical association, Beli and Bran are often muddled with the earlier brothers Belinus and Brennus (the sons of Porrex) who contended for power in northern Britain in around 390 BC, and were regarded as gods in old Celtic tradition.</History>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_britomartus.xml b/binaries/data/mods/public/entities/units/celt_hero_britomartus.xml
index 0977b5a282..d56d521e3c 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_britomartus.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_britomartus.xml
@@ -2,13 +2,10 @@
 
 <Entity	Parent="template_unit_hero">
 	<Traits>
-	
 		<Id>
-		
+			<Icon_Cell>30</Icon_Cell>		
 			<Specific>Britomartus</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History> The story of how Marcus Claudius Marcellus killed a Gallic leader at Clastidium (222 BC) is typical of such encounters. Advancing with a smallish army, Marcellus met a combined force of Insubrian Gauls and Gaesatae at Clastidium. The Gallic army advanced with the usual rush and terrifying cries, and their king, Britomartus, picking out Marcellus by means of his badges of rank, made for him, shouting a challenge and brandishing his spear. Britomartus was an outstanding figure not only for his size but also for his adornments; for he was resplendent in bright colours and his armour shone with gold and silver. This armour, thought Marcellus, would be a fitting offering to the gods. He charged the Gaul, pierced his bright breastplate and cast him to the ground. It was an easy task to kill Britomartus and strip him of his armour.</History>
 			<Tooltip>Hero Aura: Gathering rates increased during his lifetime.</Tooltip>		
 		</Id>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_caratacos.xml b/binaries/data/mods/public/entities/units/celt_hero_caratacos.xml
index be5652a24c..7c7945b1b1 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_caratacos.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_caratacos.xml
@@ -3,6 +3,7 @@
 <Entity	Parent="template_unit_hero">
 	<Traits>
 		<Id>
+			<Icon_Cell>45</Icon_Cell>
 			<Specific>Caratacos</Specific>
 			<Civ>Celts</Civ>
 			<History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cynvelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml b/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
index 19be542ba8..64936d31ea 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
@@ -3,10 +3,9 @@
 <Entity	Parent="template_unit_hero">
 	<Traits>
 		<Id>
+			<Icon_Cell>46</Icon_Cell>
 			<Specific>Cynvelin</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History>Cynvelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cynvelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos’s capture. According to legend, the Apostle Paul baptized Cynvelin into Christianity before he died in Italy.</History>
 			<Tooltip>Hero Aura: Has a large and powerful Healing Aura, only useful when idle.</Tooltip>		
 		</Id>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_vercingetorix.xml b/binaries/data/mods/public/entities/units/celt_hero_vercingetorix.xml
index a6a80bda9d..6f69f190d4 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_vercingetorix.xml
@@ -3,6 +3,7 @@
 <Entity	Parent="template_unit_hero_cavalry">
 	<Traits>
 		<Id>
+			<Icon_Cell>31</Icon_Cell>
 			<Specific>Vercingetorix</Specific>
 			<Civ>Celts</Civ>
 			<History>The most famous of all Celts, Vercingetorix lead the rebelling Gallic tribes against the might of Rome and Julius Caesar’s veteran army in 54 BC. Although successful in defeating several Roman forces, Vercingetorix was unable to defeat Caesar, who eventually surrounded the Celtic leaders in the town of Alesia along with 100,000 men. When a relief army arrived to lift the epic siege, the Romans were out numbered 7 to 1 but still defeated the Celts. Vercingetorix surrendered and was executed.</History>
diff --git a/binaries/data/mods/public/entities/units/celt_ship_merchant.xml b/binaries/data/mods/public/entities/units/celt_ship_merchant.xml
index 0c46b82846..c9985b6399 100644
--- a/binaries/data/mods/public/entities/units/celt_ship_merchant.xml
+++ b/binaries/data/mods/public/entities/units/celt_ship_merchant.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship_merchant"
->
+<Entity	Parent="template_unit_mechanical_ship_merchant">
 	<Traits>
 		<Id>
-		
 			<Specific>Currach</Specific>
-			
 			<Civ>Celts</Civ>
-
 			<History>These very small boats were used mainly for fishing, but they were also used to transport goods and personnel. The shell is wickerwork, covered with animal hides. Now they are exclusive to Ireland. They do not have a keel, but are able to ride large ocean waves and navigate up shallow rivers. First written account was by Julius Caesar in 100 BC. There were rumours of larger hide boats, but they were not documented with any solid proof.</History>
-			
 		</Id>
-	
+ 		<Footprint>
+ 			<Width>6.0</Width>
+ 			<Depth>12.0</Depth>
+ 			<Height>6.0</Height>
+ 		</Footprint>
 	</Traits>
-
 	<Actor>structures/celts/merchant.xml</Actor>
 </Entity>
diff --git a/binaries/data/mods/public/entities/units/celt_ship_trireme.xml b/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
index 32a629d7a6..b73d29d5c3 100644
--- a/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
+++ b/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
@@ -3,13 +3,17 @@
 <Entity	Parent="template_unit_mechanical_ship_trireme">
 	<Traits>
 		<Id>
+			<Icon_Cell>39</Icon_Cell>
 			<Specific>Venetic Ponti</Specific>
 			<Civ>Celts</Civ>
 			<History>The ships of Gaul were described by Julias Caesar as:  flat bottoms to ride the shallows, exceptionally high bows and sterns, hulls were made entirely of oak, the foot wide cross-timbers were fastened with iron bolts as thick as a man’s thumb, sails of raw hides or thin leather, adapted for sailing treacherous and stormy waters of the north atlantic.  Caesar could not injure them by ramming because they were so solidly built, and their height made it difficult to reach them with missiles or board them with grappling irons.</History>
-			<Tooltip>Massive ship that can transport soldiers far across the sea.</Tooltip>
+			<Tooltip>A massive ship that can transport soldiers far across the sea.</Tooltip>
 		</Id>
-
+ 		<Footprint>
+ 			<Width>7.0</Width>
+ 			<Depth>18.0</Depth>
+ 			<Height>8.0</Height>
+ 		</Footprint>
 	</Traits>
-
 	<Actor>structures/celts/trireme.xml</Actor>
 </Entity>
diff --git a/binaries/data/mods/public/entities/units/celt_super_cavalry_brit.xml b/binaries/data/mods/public/entities/units/celt_super_cavalry_brit.xml
index b7bf493973..731ead12ee 100644
--- a/binaries/data/mods/public/entities/units/celt_super_cavalry_brit.xml
+++ b/binaries/data/mods/public/entities/units/celt_super_cavalry_brit.xml
@@ -3,7 +3,8 @@
 <Entity	Parent="template_unit_super_ranged">
 	<Traits>
 		<Id>
-			<Specific>Briton Carbanto</Specific>
+			<Icon_Cell>41</Icon_Cell>
+			<Specific>Brythonic Carbanto</Specific>
 			<Civ>Celts</Civ>
 			<History>The Britons were one of the last European peoples to use two-horse chariots in combat. They had two iron-rimmed wheels and a flat riding platform that typically carried a driver and a warrior. Useless as shock weapons against tightly packed troops, they were useful for running down individual soldiers and as a stable mount to launch javelins from. The heads of defeated opponents often adorned the chassis to show the warrior’s prowess.</History>
 			<Tooltip>Bonus vs. Infantry. High trample damage.</Tooltip>
@@ -16,7 +17,7 @@
 		</Health>
 	 	<Footprint>
  			<Width>1.0</Width>
- 			<Depth>8.0</Depth>
+ 			<Depth>7.0</Depth>
  			<Height>5.0</Height>
  		</Footprint>
 		<Stamina>
@@ -24,8 +25,8 @@
 		</Stamina>
 		<Auras>
 			<Trample>
-				<Radius>4</Radius>
-				<Speed>800</Speed>
+				<Radius>5</Radius>
+				<Speed>500</Speed>
 				<Duration>1</Duration>
 				<Crush>20.0</Crush>
 				<Hack>25.0</Hack>
@@ -33,7 +34,7 @@
 				<r>1.0</r>
 				<g>0.1</g>
 				<b>0.2</b>
-				<a>0.05</a>
+				<a>0.1</a>
 			</Trample>
 		</Auras>		
 		<Creation>
diff --git a/binaries/data/mods/public/entities/units/celt_super_cavalry_gaul.xml b/binaries/data/mods/public/entities/units/celt_super_cavalry_gaul.xml
index 0e29d488f8..6c8452f6d1 100644
--- a/binaries/data/mods/public/entities/units/celt_super_cavalry_gaul.xml
+++ b/binaries/data/mods/public/entities/units/celt_super_cavalry_gaul.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_super_cavalry"
->
+<Entity	Parent="template_unit_super_cavalry">
 	<Traits>
-	
 		<Id>
-
 			<Specific>Gallic Brihent</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History>In Gaul we know of heavy cavalry, possibly predecessors to later knights. They used a Celtic lance overhand, a good shield, and wore good armor. Vercingetorix was famous for having a number of them, but their use long precedes him. Heavy Celtic horsemen are found in graves as early as the 600s, with scale coats. Later, with the advent of mail, their armor would largely change to this. They would be experienced, aristocratic or noblemen, or their retainers equipped in kind. Each man would probably have several personal attendants. Some would be powerful noblemen, such as chiefs and kings. In battle, they would be on par with much of the best heavy cavalry in western Europe, due to superior armor, such as mail armor with additional layers of mail over the vital organs, weapons such as high-quality iron spearheads, swords, and a thong of javelins, giving them versatility, and years of experience and training. Their historical use saw them capable of breaking even well-defended positions, or acting to great effect in flanking manuevers.</History>
 			<Tooltip>Bonus vs. Ranged Units.</Tooltip>		
 		</Id>
@@ -28,7 +22,5 @@
 			</Run>
 		</Move>
 	</Actions>
-
 	<Actor>units/celts/super_unit_2.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/units/celt_super_infantry_brit.xml b/binaries/data/mods/public/entities/units/celt_super_infantry_brit.xml
index 6f86dc94f1..46a7eb5f6a 100644
--- a/binaries/data/mods/public/entities/units/celt_super_infantry_brit.xml
+++ b/binaries/data/mods/public/entities/units/celt_super_infantry_brit.xml
@@ -3,10 +3,11 @@
 <Entity	Parent="template_unit_super_infantry">
 	<Traits>
 		<Id>
-			<Specific>Delamokludda</Specific>
+			<Icon_Cell>40</Icon_Cell>
+			<Specific>Brythonic Delamokludda</Specific>
 			<Civ>Celts</Civ>
-			<History>Two-handed swordsmen from Briton.</History>
-			<Tooltip>Bonus vs. Spear Units.</Tooltip>		
+			<History>Two-handed swordsmen from Briton. These men are veteran soldiers who offer their lives in service to their Brythonic lords.</History>
+			<Tooltip>Bonus vs. All Spear Units (infantry and cavalry).</Tooltip>		
 		</Id>
 		<Creation>
 			<Resource>
diff --git a/binaries/data/mods/public/entities/units/celt_super_infantry_gaul.xml b/binaries/data/mods/public/entities/units/celt_super_infantry_gaul.xml
index 5fded69f50..c5294ec25d 100644
--- a/binaries/data/mods/public/entities/units/celt_super_infantry_gaul.xml
+++ b/binaries/data/mods/public/entities/units/celt_super_infantry_gaul.xml
@@ -3,8 +3,8 @@
 <Entity	Parent="template_unit_super_infantry">
 	<Traits>
 		<Id>
-			<Specific></Specific>
-			<Civ>Celts</Civ>
+			<Specific>Gallic Neitos</Specific>
+			<Civ>Gallic Celts</Civ>
 			<History>The sword among Celts varies in reputation and commonality. Shortswords, essentially truly just long, broad-bladed daggers, were common, but cheaply made, and most likely the swords refered to as bending after a hard strike, and needing bent back into place. The iron construction of longswords, such as used here, was greatly superior, but also much more expensive. The longsword was primarily a weapon of aristocracy and experienced professional soldiers, who could either afford the weapon, have it made for them by their lord as a reward for service, passed down to them by family, or looted from the field.</History>
 			<Tooltip>Bonus vs. Spearmen and Cavalry.</Tooltip>		
 		</Id>
@@ -34,6 +34,5 @@
 			</Run>
 		</Move>
 	</Actions>
-
 	<Actor>units/celts/super_unit_1.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/entities/units/hele_hero_alexander.xml b/binaries/data/mods/public/entities/units/hele_hero_alexander.xml
index 5331f4a209..5d64b57261 100644
--- a/binaries/data/mods/public/entities/units/hele_hero_alexander.xml
+++ b/binaries/data/mods/public/entities/units/hele_hero_alexander.xml
@@ -3,8 +3,8 @@
 <Entity Parent="template_unit_hero_cavalry">
 	<Traits>
 		<Id>
-		<Icon_Cell>30</Icon_Cell>
-		<Specific>Alexander</Specific>
+			<Icon_Cell>30</Icon_Cell>
+			<Specific>Alexander</Specific>
 			<Civ>Hellenes</Civ>
 			<History>The most powerful hero of them all - son of Philip II, king of Macedonia (336 BC - 323 BC). After conquering the rest of the Thracians and quelling the unrest of the Greeks, Alexander embarked on a world-conquest march. Defeating the Persian forces at Granicus (334 BC), Issus (333 BC) and Gaugamela (331 BC), he became master of the Persian Empire. Entering India, he defeated king Porus at Hydaspes (326 BC), but his weary troops made him halt. Died in Babylon at the age of 33 while planning a campaign against Arabia.</History>
 			<Tooltip>Hero Aura: Increased Cavalry and Super Cavalry Attack and Speed. "Herocide" attack bonus vs. enemy Heroes.</Tooltip> 
diff --git a/binaries/data/mods/public/entities/units/hele_hero_philip.xml b/binaries/data/mods/public/entities/units/hele_hero_philip.xml
index 0ba4eafb5c..d34c6ff631 100644
--- a/binaries/data/mods/public/entities/units/hele_hero_philip.xml
+++ b/binaries/data/mods/public/entities/units/hele_hero_philip.xml
@@ -3,7 +3,7 @@
 <Entity	Parent="template_unit_hero_cavalry">
 	<Traits>
 		<Id>
-		<Icon_Cell>31</Icon_Cell>
+			<Icon_Cell>31</Icon_Cell>
 			<Specific>Philip II</Specific>
 			<Civ>Hellenes</Civ>
 			<History>The king of Macedonia (359 BC - 336 BC), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia.</History>
diff --git a/binaries/data/mods/public/entities/units/hele_ship_bireme.xml b/binaries/data/mods/public/entities/units/hele_ship_bireme.xml
index 567b9eb77a..fc9bb6fe97 100644
--- a/binaries/data/mods/public/entities/units/hele_ship_bireme.xml
+++ b/binaries/data/mods/public/entities/units/hele_ship_bireme.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship_bireme"
->
+<Entity	Parent="template_unit_mechanical_ship_bireme">
 	<Traits>
-	
 		<Id>
-		
 			<Specific>Pentekontor</Specific>
-			
 			<Civ>Hellenes</Civ>
-			
 			<History>Pentekontors were employed from 800 BC, mostly as a light support unit in the Greek navy. After 600 BC, they were only seen in battle in very limited numbers. They were still in use by small states which could not afford a sufficient number of triremes for their navy.</History>
-			
 		</Id>
  		<Footprint>
  			<Width>6.0</Width>
@@ -20,23 +13,16 @@
  			<Height>8.0</Height>
  		</Footprint>
 	</Traits>
-	
 	<Actions>
-
 		<Move>
 			<Speed>20.0</Speed>
 			<TurningRadius>10.0</TurningRadius>
-			
 			<Run>
 				<Speed>30.0</Speed>
 				<Range>1200.0</Range>
 				<RangeMin>20.0</RangeMin>
 			</Run>
-			
 		</Move>
-
 	</Actions>
-
 	<Actor>structures/hellenes/bireme.xml</Actor>
-
 </Entity>
diff --git a/binaries/data/mods/public/entities/units/hele_ship_trireme.xml b/binaries/data/mods/public/entities/units/hele_ship_trireme.xml
index 0f6693e2e8..75e4ae45f8 100644
--- a/binaries/data/mods/public/entities/units/hele_ship_trireme.xml
+++ b/binaries/data/mods/public/entities/units/hele_ship_trireme.xml
@@ -1,38 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship_trireme"
->
+<Entity	Parent="template_unit_mechanical_ship_trireme">
 	<Traits>
-	
 		<Id>
-		
 			<Specific>Trireme</Specific>
-			
 			<Civ>Hellenes</Civ>
-			
 			<History>The first Triremes were built circa 650BC, and by 500BC the Trireme was the most widely used heavy warship of the Greek city-states. In the Trireme the outriggers were now an integral part of the ship's hull. The Trireme also had a partial or full fighting deck above the rowers. The length of the Trireme remained approximately 35-38 meters, and the beam was approximately 3.5 metres. A Trireme carried 170 oarsmen, plus twenty sailors and fourteen marines in Greek navies. The top speed of a Trireme was approximately 11.5 knots. Some Triremes may have been able to reach higher speeds in short bursts. A Trireme travelling from Athens to Mitylene in 427BC made the 350 kilometre trip in only 24 hours, averaging eight knots (14.6 km/h). The Trireme could accelerate much faster than a Bireme or Penteconter, and was much more manoeuvrable. This gave the Trireme an advantage in combat, where higher speed and manoeuvrability meant a better chance of victory.</History>
-			
 		</Id>
-	
 	</Traits>
-
 	<Actions>
-
 		<Move>
 			<Speed>18.0</Speed>
 			<TurningRadius>12.0</TurningRadius>
-			
 			<Run>
 				<Speed>35.0</Speed>
 				<Range>1200.0</Range>
 				<RangeMin>20.0</RangeMin>
 			</Run>
-			
 		</Move>
-
 	</Actions>
-
 	<Actor>structures/hellenes/trireme.xml</Actor>
-
 </Entity>
diff --git a/binaries/data/mods/public/maps/scenarios/Latium.pmp b/binaries/data/mods/public/maps/scenarios/Latium.pmp
index 716ee4935a..b741ba8219 100644
--- a/binaries/data/mods/public/maps/scenarios/Latium.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Latium.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6476c8c2b5106cef481a51bc3088420ff5652c6ad19c413b08cffd68b6784db
-size 208560
+oid sha256:ec069caa9b6fec9112c00496cebbf48d90ec4824d43d9594a99db6d58378d18b
+size 208575
diff --git a/binaries/data/mods/public/maps/scenarios/Latium.xml b/binaries/data/mods/public/maps/scenarios/Latium.xml
index aa3630a568..9944a528f3 100644
--- a/binaries/data/mods/public/maps/scenarios/Latium.xml
+++ b/binaries/data/mods/public/maps/scenarios/Latium.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d296ff98315c7a55942cd7285a97b8e4d0407ee3840376163c188ce817b6aba
-size 180686
+oid sha256:552e4d4d296f24945c3a0e448b3189d66bdf33445e53bcdb64477f82455b61af
+size 209366
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis.pmp b/binaries/data/mods/public/maps/scenarios/Oasis.pmp
index 07f1279a50..a89dfe97c6 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Oasis.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:daf2663d31977967f4e370dbd8e67950fd278ad298f4f21825d28b49a711378b
+oid sha256:d820c70fec6abc753798eb5a300bc92ce52e4d4609108836076c3b9b2edc8af4
 size 208594
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis.xml b/binaries/data/mods/public/maps/scenarios/Oasis.xml
index 189fd25ead..2465998823 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/Oasis.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:329bd1344337d9da3478547a44fb703510b4121e4aa2838c64a5c0df62987c24
+oid sha256:1828abd21588235bb5b34fbe8dd634eb88ec692cecb1f1ebcb37d5626c8fb20b
 size 231397
diff --git a/binaries/data/mods/public/technologies/techtree/techtree-spreadsheet.xls b/binaries/data/mods/public/technologies/techtree/techtree-spreadsheet.xls
index 1287b3ad4a..b9d1cac7a1 100644
Binary files a/binaries/data/mods/public/technologies/techtree/techtree-spreadsheet.xls and b/binaries/data/mods/public/technologies/techtree/techtree-spreadsheet.xls differ
diff --git a/binaries/data/mods/public/temp/players.xml b/binaries/data/mods/public/temp/players.xml
index 23177bb091..48a596b6b1 100644
--- a/binaries/data/mods/public/temp/players.xml
+++ b/binaries/data/mods/public/temp/players.xml
@@ -11,6 +11,6 @@
   <player name="Hyborian"                 rgb="50 170 170"/> <!-- turquoise -->
   <player name="Ykkrosh"                  rgb="160 80 200"/> <!-- purple    -->
   <player name="Pyrolink"                 rgb="235 120 20"/> <!-- orange    -->
-  <player name="Vaevictus_Music"          rgb="2 2 2"/> <!-- black      -->
+  <player name="Vaevictus_Music"          rgb="64 64 64"/> <!-- charcoal      -->
 
 </players>
\ No newline at end of file