diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a.xml
new file mode 100644
index 0000000000..3163089110
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="shield-C">
+      <mesh>props/shield/pict_b_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_b_back.xml" attachpoint="back"/>
+      </props>
+      <texture>props/shield/pict_c.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-D">
+      <mesh>props/shield/pict_a_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_a_back.xml" attachpoint="back"/>
+      </props>
+      <texture>props/shield/pict_d.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a_back.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a_back.xml
new file mode 100644
index 0000000000..5768c0b64c
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_a_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/shield/pict_a_b.pmd</mesh>
+      <texture>props/shield/pict_back.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b.xml
new file mode 100644
index 0000000000..83728d9257
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/pict_b_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_b_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-C">
+      <texture>props/shield/pict_c.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b_back.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b_back.xml
new file mode 100644
index 0000000000..4cbebd504f
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_b_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/shield/pict_b_b.pmd</mesh>
+      <texture>props/shield/square_back.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c.xml
new file mode 100644
index 0000000000..24b34281d4
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_t_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_c_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-A">
+      <texture>props/shield/pict_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-B">
+      <texture>props/shield/pict_b.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c_back.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c_back.xml
new file mode 100644
index 0000000000..83eaf932d6
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_buckler_c_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/shield/round_t_b.pmd</mesh>
+      <texture>props/shield/celt_round_back.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_adv.xml b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_adv.xml
new file mode 100644
index 0000000000..6f7d8a31aa
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_adv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_t_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_c_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-C">
+      <texture>props/shield/iber_round_c.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-D">
+      <texture>props/shield/iber_round_d.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-E">
+      <texture>props/shield/iber_round_e.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_basic.xml b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_basic.xml
new file mode 100644
index 0000000000..ce8a76743a
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_basic.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_t_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_c_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-A">
+      <texture>props/shield/iber_round_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-B">
+      <texture>props/shield/iber_round_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-G">
+      <texture>props/shield/iber_round_g.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_elite.xml b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_elite.xml
new file mode 100644
index 0000000000..e256958eb8
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/iberian_buckler_elite.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_t_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/celt_buckler_c_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-H">
+      <texture>props/shield/iber_round_h.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-K">
+      <texture>props/shield/iber_round_k.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_a.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_a.xml
index 1d72fb9ea4..b61dbd4fc5 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_a.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_a.xml
@@ -5,7 +5,7 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/shield/round_s_f.pmd</mesh>
+      <mesh>props/shield/round_b_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/kart_csw_round_b_back.xml" attachpoint="back"/>
       </props>
@@ -13,18 +13,15 @@
   </group>
 
   <group>
-    <variant name="Shield-A">
-      <texture>props/shield/iber_round_a.dds</texture>
-    </variant>
-    <variant name="Shield-B">
-      <texture>props/shield/iber_round_b.dds</texture>
-    </variant>
     <variant name="Shield-C">
       <texture>props/shield/iber_round_c.dds</texture>
     </variant>
     <variant name="Shield-D">
       <texture>props/shield/iber_round_d.dds</texture>
     </variant>
+    <variant name="Shield-E">
+      <texture>props/shield/iber_round_e.dds</texture>
+    </variant>
   </group>
 
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_b.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_b.xml
index 1d72fb9ea4..321bc776be 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_b.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_b.xml
@@ -5,7 +5,7 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/shield/round_s_f.pmd</mesh>
+      <mesh>props/shield/round_b_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/kart_csw_round_b_back.xml" attachpoint="back"/>
       </props>
@@ -19,11 +19,8 @@
     <variant name="Shield-B">
       <texture>props/shield/iber_round_b.dds</texture>
     </variant>
-    <variant name="Shield-C">
-      <texture>props/shield/iber_round_c.dds</texture>
-    </variant>
-    <variant name="Shield-D">
-      <texture>props/shield/iber_round_d.dds</texture>
+    <variant name="Shield-G">
+      <texture>props/shield/iber_round_g.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_e.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_e.xml
index 1d72fb9ea4..5f2022227c 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_e.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_csw_round_e.xml
@@ -5,7 +5,7 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/shield/round_s_f.pmd</mesh>
+      <mesh>props/shield/round_b_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/kart_csw_round_b_back.xml" attachpoint="back"/>
       </props>
@@ -13,17 +13,11 @@
   </group>
 
   <group>
-    <variant name="Shield-A">
-      <texture>props/shield/iber_round_a.dds</texture>
+    <variant name="Shield-H">
+      <texture>props/shield/iber_round_h.dds</texture>
     </variant>
-    <variant name="Shield-B">
-      <texture>props/shield/iber_round_b.dds</texture>
-    </variant>
-    <variant name="Shield-C">
-      <texture>props/shield/iber_round_c.dds</texture>
-    </variant>
-    <variant name="Shield-D">
-      <texture>props/shield/iber_round_d.dds</texture>
+    <variant name="Shield-K">
+      <texture>props/shield/iber_round_k.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_adv.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_adv.xml
new file mode 100644
index 0000000000..8e595966d1
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_adv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_m_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="kart-shield-o">
+      <texture>props/shield/kart_round_o.dds</texture>
+    </variant>
+    <variant frequency="1" name="kart-shield-k">
+      <texture>props/shield/kart_round_k.dds</texture>
+    </variant>
+    <variant frequency="1" name="kart-shield-l">
+      <texture>props/shield/kart_round_l.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_basic.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_basic.xml
new file mode 100644
index 0000000000..f9200a9a83
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_basic.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_m_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="kart-shield-d">
+      <texture>props/shield/kart_round_d.dds</texture>
+    </variant>
+    <variant frequency="1" name="kart-shield-i">
+      <texture>props/shield/kart_round_i.dds</texture>
+    </variant>
+    <variant frequency="1" name="kart-shield-j">
+      <texture>props/shield/kart_round_j.dds</texture>
+    </variant>
+    <variant frequency="1" name="kart-shield-p">
+      <texture>props/shield/kart_round_p.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_e.xml b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_e.xml
index d3e24b0fa8..c3c2f8e301 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_e.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/kart_round_isp_e.xml
@@ -19,15 +19,6 @@
     <variant frequency="1" name="kart-shield-h">
       <texture>props/shield/kart_round_h.dds</texture>
     </variant>
-    <variant frequency="1" name="kart-shield-k">
-      <texture>props/shield/kart_round_k.dds</texture>
-    </variant>
-    <variant frequency="1" name="kart-shield-l">
-      <texture>props/shield/kart_round_l.dds</texture>
-    </variant>
-    <variant frequency="1" name="kart-shield-o">
-      <texture>props/shield/kart_round_o.dds</texture>
-    </variant>
   </group>
 
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_a.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_a.xml
index 2ca8760496..4f815409f3 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_a.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_a.xml
@@ -3,7 +3,6 @@
 
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/round_s_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/round_back.xml" attachpoint="back"/>
       </props>
@@ -12,9 +11,11 @@
 
   <group>
     <variant frequency="1" name="Shield-Parma-B">
+      <mesh>props/shield/round_s_f.pmd</mesh>
       <texture>props/shield/rome_parma_b.dds</texture>
     </variant>
     <variant frequency="1" name="Shield-Parma-D">
+      <mesh>props/shield/round_b_f.pmd</mesh>
       <texture>props/shield/rome_parma_d.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_b.xml b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_b.xml
index 57d3218521..8a879372b3 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_b.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/rome_parma_b.xml
@@ -3,7 +3,7 @@
 
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/round_s_f.pmd</mesh>
+      <mesh>props/shield/round_b_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/round_back.xml" attachpoint="back"/>
       </props>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
index 9f8fc71eb6..be449bd376 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
@@ -16,7 +16,7 @@
       <props>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/shields/kart_csw_round_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/kart_csw_round_e.xml" attachpoint="shield"/>
         <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/celts/super_unit_1.xml b/binaries/data/mods/official/art/actors/units/celts/super_unit_1.xml
index 03d66a6a66..7095ecafb2 100644
--- a/binaries/data/mods/official/art/actors/units/celts/super_unit_1.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/super_unit_1.xml
@@ -8,10 +8,8 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <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/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <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="infantry/sword/attack/isw_s_def_01.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_02.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_03.psa" name="Attack" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/celts/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/celts/super_unit_2.xml
index c4cef6a102..62aaeebf35 100644
--- a/binaries/data/mods/official/art/actors/units/celts/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/super_unit_2.xml
@@ -4,11 +4,13 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="10"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Melee" speed="95"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Melee" speed="110"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
@@ -18,46 +20,46 @@
   </group>
 
   <group>
-    <variant frequency="7" name="feet">
+    <variant frequency="7" name="hide-feet">
       <texture>skeletal/horse_celt_feet_a.dds</texture>
     </variant>
-    <variant frequency="5" name="blaze">
+    <variant frequency="5" name="hide-blaze">
       <texture>skeletal/horse_celt_blaze_a.dds</texture>
     </variant>
-    <variant frequency="5" name="face">
+    <variant frequency="5" name="hide-face">
       <texture>skeletal/horse_celt_face_a.dds</texture>
     </variant>
-    <variant frequency="7" name="star">
+    <variant frequency="7" name="hide-star">
       <texture>skeletal/horse_celt_star_a.dds</texture>
     </variant>
-    <variant frequency="3" name="dapple">
+    <variant frequency="3" name="hide-dapple">
       <texture>skeletal/horse_celt_dapple_a.dds</texture>
     </variant>
-    <variant frequency="2" name="snip">
+    <variant frequency="2" name="hide-snip">
       <texture>skeletal/horse_celt_snip_a.dds</texture>
     </variant>
-    <variant frequency="5" name="stripe">
+    <variant frequency="5" name="hide-stripe">
       <texture>skeletal/horse_celt_stripe_a.dds</texture>
     </variant>
   </group>
 
   <group>
-    <variant frequency="2" name="black">
+    <variant frequency="1" name="horse-color-black">
       <colour>81 81 85</colour>
     </variant>
-    <variant frequency="2" name="chocolate">
+    <variant frequency="1" name="horse-color-chocolate">
       <colour>98 68 58</colour>
     </variant>
-    <variant frequency="2" name="chestnut">
+    <variant frequency="1" name="horse-color-chestnut">
       <colour>248 132 86</colour>
     </variant>
-    <variant frequency="2" name="roan">
+    <variant frequency="1" name="horse-color-roan">
       <colour>242 219 164</colour>
     </variant>
-    <variant frequency="2" name="liver">
+    <variant frequency="1" name="horse-color-liver">
       <colour>172 95 68</colour>
     </variant>
-    <variant frequency="2" name="brown">
+    <variant frequency="1" name="horse-color-brown">
       <colour>255 148 89</colour>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/celts/super_unit_2_r.xml b/binaries/data/mods/official/art/actors/units/celts/super_unit_2_r.xml
index a1051212c4..baf64a7a5f 100644
--- a/binaries/data/mods/official/art/actors/units/celts/super_unit_2_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/super_unit_2_r.xml
@@ -8,7 +8,8 @@
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
-        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="10"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml b/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml
index 5e79aae686..80bf8b8bf1 100644
--- a/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/super_unit_3.xml
@@ -8,15 +8,16 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation event="0.5" file="biped/not used/inf_2sword_attack_a.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/not used/inf_2sword_attack_b.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/not used/inf_2sword_attack_c.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/not used/inf_2sword_attack_d.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/not used/inf_2sword_attack_e.psa" name="Attack" speed="100"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="8"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_02.psa" name="Attack" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_03.psa" name="Attack" 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_02.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -24,7 +25,7 @@
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
         <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
         <prop actor="props/units/weapons/spatha.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/spatha.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/celt_buckler_c.xml" attachpoint="shield"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/celts/vercingetorix_r.xml b/binaries/data/mods/official/art/actors/units/celts/vercingetorix_r.xml
index cf67edef1b..055d8f7fb7 100644
--- a/binaries/data/mods/official/art/actors/units/celts/vercingetorix_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/vercingetorix_r.xml
@@ -8,7 +8,7 @@
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="25"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="25"/>
-        <animation file="cavalry/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/rider_gallop.psa" name="Run" speed="10"/>
         <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/celt_hex_e.dds b/binaries/data/mods/official/art/textures/skins/props/shield/celt_hex_e.dds
index 0e53929aaf..7d67a86cac 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/celt_hex_e.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/celt_hex_e.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c81fc28122d20e6fd1294190bcc120280ddf585700b9795ac471751541a0a82
+oid sha256:10e29364c61bb1f4a9a1fcfe9fc0e8e8a6949525540d0c50ab7a511c047b2e28
 size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_c.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_c.dds
index 1e01c85f4b..2d55e4d587 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_c.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_c.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67fa1bbc5cff50792225c7c46abd5c4035aeb5462edf9f88ca029f4429e70429
-size 8320
+oid sha256:d8fd3cbdea407bc8aed50d1fcbc42b09ef64c1f044d4a5019278b74117e40b37
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_d.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_d.dds
index b7fa3ea401..80c1d811ef 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_d.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_d.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fba6fad43a49850eb2704f1dff8245de807af2312c075de9195969781801c19
-size 8320
+oid sha256:964f9f92ae0312b898a3e85562e84a3b67578cc1a92a0fb05507e2a24f9007fb
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_e.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_e.dds
index 81660354a8..23f23bf763 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_e.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_e.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9452022fc3c00140ea25917eb9a40c02e9579cbf88adb7eea5769c2a5b6a829c
-size 8320
+oid sha256:6a7ac89024d93f76477e2e8fcd4fd942b50c79690ce72e9d5e70e826f589367b
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_f.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_f.dds
index 02a29d1cb4..94ebcb83c3 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_f.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_f.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad7086d3f47ffd09008bcaca9fd0b5b44ad877924ce66fbaf5b46f86325d6fc2
-size 8320
+oid sha256:f7b1b078db3f7c7ac645ab734d7f06b1719841b8992bab04c7d98174ba870457
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_k.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_k.dds
index ed041adb23..70f801723c 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_k.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_k.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49c4355e41b71a55157bc415b14565c090bf7f005e9554dfd39bba314e6aa415
-size 8320
+oid sha256:7592af546e6a7c4c7465ca1d5a99e6d437d46bf3a2ae9d070ea1cddbc5a33b13
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_a.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_a.dds
index a2e577f28f..94b12e0847 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_a.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_a.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e24be5bd100db1be6113ce76b4d20fa4f8a6f575c813718cc7fb04266be7a8ee
-size 4224
+oid sha256:db6a534400a42a9a37c9b2e5563a36216bcae40288d851216992898b1a9f461a
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_b.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_b.dds
index bcac98c9b2..2a2f185274 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_b.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_b.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2ee0c3c9af3d7253b3463f422547ee678fa5c213bf26666b5911c414cb557de
-size 4224
+oid sha256:309b809721ad193b24d002771b8172f0fe8fe81810447a7e4ac64c585ea9534b
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_c.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_c.dds
index a30a791601..db33ca7141 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_c.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_c.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba04fdee81e0409dbd2fa08bab53e8a29a85dcdb9a440df583049aa8cb47936d
-size 4224
+oid sha256:59a6183051afb980c1c6ce0332f26247febb7878ee4af85479aa5f6aa06d05c3
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_d.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_d.dds
index f4eb90a563..86a8e45745 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_d.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_d.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3445633f1e7eb5d568c4c8516cc1074009603ff7b3c62570346357b99ce8f178
-size 4224
+oid sha256:220b621e427f99fc983b04e94c4504d2eca03575a246807318af40d6df2b475a
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_e.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_e.dds
index 241690e30d..72b498fb71 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_e.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_e.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb9a37ed905bb6ed3b9e30eda16a8486a7fd9244cb069e3f99ec87f0ae27b149
-size 4224
+oid sha256:872853fcbb9df9a5449c673688ac04dc8207ecbfbdd9255c78c0501292c8d2f9
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_g.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_g.dds
index febead17c4..eb9d7e8e5a 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_g.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_g.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:811ca97a6d661a43cfdfe3ce8c603da83a1fdbd8f05d85f5987698b13554b9fc
-size 4224
+oid sha256:77854d58e6899f47d8d77eeec5c819176acaa53e4a7ad53c1c82c95b84eaa5bc
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_h.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_h.dds
index f01e1c0aa6..dc8256ffb3 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_h.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_h.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c026c2ff4e339200c0d7c65424f8e97599407ac5121e22c952895ccb9b7e36d4
-size 4224
+oid sha256:82328dbdec99c90b2481323340a6c0e430bad80164f0294703d0064df1ea74ea
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_k.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_k.dds
new file mode 100644
index 0000000000..95ed357d7a
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_round_k.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22b48811eb8bb97ff2ecbe1e48119e155884d88affdf10c7e7d351f04692cc2b
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/kart_round_p.dds b/binaries/data/mods/official/art/textures/skins/props/shield/kart_round_p.dds
index 9a972e8d63..d8c98e0c1f 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/kart_round_p.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/kart_round_p.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92ced50affaf6b2660c7ce612364f69f8ebeff67ba12c6f1a47f2542b4176b14
+oid sha256:0e19b656f3fbadc871c654dbc5eb4bb7c5539ae90acab504cbd21506c50d4193
 size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pict_a.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pict_a.dds
index f8b3b6fb6e..66f8a5f4de 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pict_a.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pict_a.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7802f718638500fd59e7b8b43b4459ca799de34f63af01b56bb343f1d86e4419
-size 4224
+oid sha256:06c979edf1e1b36ebb2bf84ac162439abdda1a3b7058fe867cb8af0f302d92fc
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pict_b.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pict_b.dds
index 3b386ff821..aebf575eb6 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pict_b.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pict_b.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:122b698ac2f8cc80d7733e9160828dd8baa9cc64fc67b8028e112a62c8ce5fd3
-size 4224
+oid sha256:b8b11fd8fe4b577c9415b9146105d2bbe5c896bbe7b8b06f3860a3cbb0c3b0f7
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pict_back.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pict_back.dds
new file mode 100644
index 0000000000..ab8166d9d1
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pict_back.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3233812416e826e5adff5cc5b668a9f53fb8dbc5fc66b8f297f590ee4e705665
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pict_c.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pict_c.dds
index 3e06faa18f..d3ffc21075 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pict_c.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pict_c.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:161e4d349772e53825ad7010189b8cba3b3c5beec2687a684d1e590684ac1fcf
-size 4224
+oid sha256:d8419b0f57c80b86308f009af2e612b9cf17380492fbba4bca69427ca85e73d7
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pict_d.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pict_d.dds
index c63794ba8b..d36ddcb2df 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pict_d.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pict_d.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e9d1f0d1896c758052800364d23616e787f1981640cec6bda7192bf65d160c7
-size 4224
+oid sha256:84edb0da466e47db3f39141b9a4268974777c76f8d4c53945060ee9aa515bc05
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/rome_parma_f.dds b/binaries/data/mods/official/art/textures/skins/props/shield/rome_parma_f.dds
index 1f023d839e..0d528aab33 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/rome_parma_f.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/rome_parma_f.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45d14131da559616e9558f2f9229bdc31eb8620a23d4bedba445dad3fdab1b5f
+oid sha256:f8d2f98bed892fe329713533f90f3009cd578da791d8f861fb1137e521b6da34
 size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/square_back.dds b/binaries/data/mods/official/art/textures/skins/props/shield/square_back.dds
new file mode 100644
index 0000000000..1b83785f62
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/square_back.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ca7548f1236522faf1ca5329bd836427bcad7dcb210ddddce4e32ec56f86543
+size 5616
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
index be8e3b2434..6b24bbfadd 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
@@ -3,5 +3,5 @@
 <Entity	Parent="cart_cavalry_swordsman_a">
 
 
-	<Actor>units/carthaginians/cavalry_swordsman_b.xml</Actor>
+	<Actor>units/carthaginians/cavalry_swordsman_e.xml</Actor>
 </Entity>
\ No newline at end of file