diff --git a/binaries/data/mods/public/art/variants/biped/approach_fruit.xml b/binaries/data/mods/public/art/variants/biped/approach_fruit.xml
index fc6e137597..4e7fa19298 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_fruit.xml
@@ -8,9 +8,9 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_grain.xml b/binaries/data/mods/public/art/variants/biped/approach_grain.xml
index d555e5b722..85c7fc9f81 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_grain.xml
@@ -6,12 +6,12 @@
     <animation file="biped/gatherer/walk_hoe.dae" name="Run" speed="20"/>
   </animations>
   <props>
-    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
     <prop attachpoint="back"/>
+    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_meat.xml b/binaries/data/mods/public/art/variants/biped/approach_meat.xml
index 833c4e8054..3dcc280426 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_meat.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/weapons/dagger.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_ore.xml b/binaries/data/mods/public/art/variants/biped/approach_ore.xml
index 2fa84a433e..b2eb5a703a 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_ore.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_praise.xml b/binaries/data/mods/public/art/variants/biped/approach_praise.xml
index c23eb55c94..443188b1e6 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_praise.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_praise.xml
@@ -6,11 +6,11 @@
     <animation file="biped/citizen/walk_relax_m.dae" name="Run" speed="20"/>
   </animations>
   <props>
-    <prop actor="" attachpoint="shield"/>
     <prop actor="" attachpoint="weapon_R"/>
     <prop actor="" attachpoint="weapon_L"/>
-    <prop actor="" attachpoint="ammo"/>
-    <prop actor="" attachpoint="shield_arm"/>
     <prop actor="" attachpoint="weapon_bow"/>
+    <prop actor="" attachpoint="shield_arm"/>
+    <prop actor="" attachpoint="shield"/>
+    <prop actor="" attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_rock.xml b/binaries/data/mods/public/art/variants/biped/approach_rock.xml
index 08f99fb279..425d01c401 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_rock.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_ruins.xml b/binaries/data/mods/public/art/variants/biped/approach_ruins.xml
index a006ed9751..5d31700628 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_ruins.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_tree.xml b/binaries/data/mods/public/art/variants/biped/approach_tree.xml
index c4e341dfa2..8aba204260 100644
--- a/binaries/data/mods/public/art/variants/biped/approach_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/approach_tree.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/tools/axe.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/attack_melee_minister.xml b/binaries/data/mods/public/art/variants/biped/attack_melee_minister.xml
index 723bba24af..deb1e65c10 100644
--- a/binaries/data/mods/public/art/variants/biped/attack_melee_minister.xml
+++ b/binaries/data/mods/public/art/variants/biped/attack_melee_minister.xml
@@ -5,6 +5,6 @@
   </animations>
   <props>
     <prop actor="props/units/weapons/sword/han_duan_ma_jian_01.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a_e.xml" attachpoint="sheath_L"/>
+    <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a_e.xml" attachpoint="sheath_L"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_build.xml b/binaries/data/mods/public/art/variants/biped/cape_build.xml
index 2c9745feea..945aa66e18 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_build.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_build.xml
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="Build">
-  <animations>
-    <animation event="0.5" file="biped/citizen/build.dae" name="Build" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="weapon_R"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Build">
+  <animations>
+    <animation event="0.5" file="biped/citizen/build.dae" name="Build" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_build_farm.xml b/binaries/data/mods/public/art/variants/biped/cape_build_farm.xml
index 49998a6f8b..905259957f 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_build_farm.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_build_farm.xml
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="Build_farm">
-  <animations>
-    <animation event="0.5" file="biped/citizen/build.dae" name="Build_farm" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="weapon_R"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Build_farm">
+  <animations>
+    <animation event="0.5" file="biped/citizen/build.dae" name="Build_farm" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_carry_food.xml b/binaries/data/mods/public/art/variants/biped/cape_carry_food.xml
index 28faa52776..688ca7bae5 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_carry_food.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_carry_food.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="carry_food">
-  <animations>
-    <animation file="biped/gatherer/idle_carry_grain_m.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/carry_grain_m.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/carry_grain_m.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="carry_food">
+  <animations>
+    <animation file="biped/gatherer/idle_carry_grain_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_grain_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_grain_m.dae" name="Run" speed="20"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_carry_meat.xml b/binaries/data/mods/public/art/variants/biped/cape_carry_meat.xml
index e994cfdb15..5d0701596b 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_carry_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_carry_meat.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="carry_meat">
-  <animations>
-    <animation file="biped/gatherer/idle_carry_meat_m.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/carry_meat_m.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/carry_meat_m.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="carry_meat">
+  <animations>
+    <animation file="biped/gatherer/idle_carry_meat_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_meat_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_meat_m.dae" name="Run" speed="20"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_carry_metal.xml b/binaries/data/mods/public/art/variants/biped/cape_carry_metal.xml
index ee36f08c4d..774aa0b73e 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_carry_metal.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_carry_metal.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="carry_metal">
-  <animations>
-    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="carry_metal">
+  <animations>
+    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_carry_stone.xml b/binaries/data/mods/public/art/variants/biped/cape_carry_stone.xml
index 38971d9126..016b8bd424 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_carry_stone.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_carry_stone.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="carry_stone">
-  <animations>
-    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="carry_stone">
+  <animations>
+    <animation file="biped/gatherer/idle_carry_ore_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_ore_m.dae" name="Run" speed="20"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_carry_wood.xml b/binaries/data/mods/public/art/variants/biped/cape_carry_wood.xml
index 5e77ebef20..7efdafb374 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_carry_wood.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_carry_wood.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="carry_wood">
-  <animations>
-    <animation file="biped/gatherer/idle_carry_wood_m.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/carry_wood_m.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/carry_wood_m.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="carry_wood">
+  <animations>
+    <animation file="biped/gatherer/idle_carry_wood_m.dae" name="Idle" speed="20"/>
+    <animation file="biped/gatherer/carry_wood_m.dae" name="Walk" speed="20"/>
+    <animation file="biped/gatherer/carry_wood_m.dae" name="Run" speed="20"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_fruit.xml
index 5ef4afde36..e814003644 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_fruit.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_fruit">
-  <animations>
-    <animation file="biped/gatherer/gather_fruit_m.dae" name="gather_fruit" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_fruit">
+  <animations>
+    <animation file="biped/gatherer/gather_fruit_m.dae" name="gather_fruit" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_grain.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_grain.xml
index bdf08365a5..e2c2c72b4b 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_grain.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_grain">
-  <animations>
-    <animation file="biped/gatherer/farming.dae" name="gather_grain" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_grain">
+  <animations>
+    <animation file="biped/gatherer/farming.dae" name="gather_grain" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_meat.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_meat.xml
index 22de7c4323..c32d231e32 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_meat.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_meat">
-  <animations>
-    <animation file="biped/gatherer/gather_meat.dae" name="gather_meat" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_meat">
+  <animations>
+    <animation file="biped/gatherer/gather_meat.dae" name="gather_meat" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_ore.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_ore.xml
index b4832477f4..1445fb0080 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_ore.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_ore">
-  <animations>
-    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="120"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_ore">
+  <animations>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="120"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_praise.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_praise.xml
index 4e29ad213f..547c1385e9 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_praise.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_praise.xml
@@ -6,11 +6,11 @@
     <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise3" speed="50"/>
   </animations>
   <props>
-    <prop attachpoint="shield"/>
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
-    <prop attachpoint="ammo"/>
-    <prop attachpoint="shield_arm"/>
     <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_rock.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_rock.xml
index 8f954c3f63..9ae688c654 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_rock.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_rock">
-  <animations>
-    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="120"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_rock">
+  <animations>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="120"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_ruins.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_ruins.xml
index 93461956c8..1b1f845d22 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_ruins.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_ruins">
-  <animations>
-    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ruins" speed="100"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_ruins">
+  <animations>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ruins" speed="100"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/cape_gather_tree.xml b/binaries/data/mods/public/art/variants/biped/cape_gather_tree.xml
index e4fbc46295..f386a7dac1 100644
--- a/binaries/data/mods/public/art/variants/biped/cape_gather_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/cape_gather_tree.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="gather_tree">
-  <animations>
-    <animation event="0.25" file="biped/gatherer/gather_wood.dae" name="gather_tree" speed="120"/>
-  </animations>
-  <props>
-    <prop attachpoint="weapon_R"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
-    <prop attachpoint="ammo"/>
-  </props>
-</variant>
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="gather_tree">
+  <animations>
+    <animation event="0.25" file="biped/gatherer/gather_wood.dae" name="gather_tree" speed="120"/>
+  </animations>
+  <props>
+    <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
+    <prop attachpoint="shield"/>
+    <prop attachpoint="shield_arm"/>
+    <prop attachpoint="helmet"/>
+    <prop attachpoint="ammo"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_food.xml b/binaries/data/mods/public/art/variants/biped/carry_food.xml
index e6288cc453..1290b7e2b4 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_food.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_food.xml
@@ -9,9 +9,9 @@
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_meat.xml b/binaries/data/mods/public/art/variants/biped/carry_meat.xml
index 1ebca33009..fc9cd5f1db 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_meat.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_meat_male_R.xml" attachpoint="weapon_R"/>
     <prop actor="props/units/shuttle_meat_male_L.xml" attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_metal.xml b/binaries/data/mods/public/art/variants/biped/carry_metal.xml
index 169c9d28a2..19915dc0ee 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_metal.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_metal.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_metal.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_stone.xml b/binaries/data/mods/public/art/variants/biped/carry_stone.xml
index 3cb6486ace..e21acbc683 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_stone.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_stone.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_stone.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_wood.xml b/binaries/data/mods/public/art/variants/biped/carry_wood.xml
index 35622efe9d..a2461cb3a8 100644
--- a/binaries/data/mods/public/art/variants/biped/carry_wood.xml
+++ b/binaries/data/mods/public/art/variants/biped/carry_wood.xml
@@ -8,9 +8,9 @@
   <props>
     <prop actor="props/units/shuttle_wood.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_build.xml b/binaries/data/mods/public/art/variants/biped/female_build.xml
index 451108fbaf..b554ece87a 100644
--- a/binaries/data/mods/public/art/variants/biped/female_build.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_build.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_build_farm.xml b/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
index 14162d8878..ba775ec4da 100644
--- a/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_build_farm.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/mallet.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_food.xml b/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
index 8be4a1312e..e7a28d59eb 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_food.xml
@@ -9,5 +9,6 @@
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml b/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
index 9c265c5f28..451a3cc589 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml
@@ -8,5 +8,6 @@
   <props>
     <prop actor="props/units/shuttle_meat_female.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml b/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
index 3cd110bd48..ec37002d84 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml
@@ -8,5 +8,6 @@
   <props>
     <prop actor="props/units/shuttle_metal.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml b/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
index e5d6d1df39..1baed41bee 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml
@@ -8,5 +8,6 @@
   <props>
     <prop actor="props/units/shuttle_stone.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml b/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
index 5a5e06764e..53207bab1f 100644
--- a/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml
@@ -8,5 +8,6 @@
   <props>
     <prop actor="props/units/shuttle_wood.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
index f95383a158..e6c8985c57 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml
@@ -7,5 +7,6 @@
     <prop actor="props/units/shuttle_basket_back.xml" attachpoint="back"/>
     <prop attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml b/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
index 8dc9897c67..f846ebfba3 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_grain.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml b/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
index b7d871fa92..f494295ad4 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_meat.xml
@@ -7,5 +7,6 @@
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
     <prop actor="props/units/weapons/dagger.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml b/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
index 667ce62743..84270a90d8 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_ore.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml b/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
index 0df4e5c65f..d122649f4a 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_rock.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml b/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
index 79cd60de8b..39e05698bf 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_ruins.xml
@@ -6,5 +6,6 @@
   <props>
     <prop attachpoint="weapon_L"/>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml b/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
index 6d0aeb355b..eb7756ea28 100644
--- a/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_tree.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/tools/axe.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
-    <prop attachpoint="helmet"/>
     <prop attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
index fbc1c5365e..e1b87fcef4 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml
@@ -7,9 +7,9 @@
     <prop actor="props/units/tools/basket_berries.xml" attachpoint="root"/>
     <prop attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_grain.xml b/binaries/data/mods/public/art/variants/biped/gather_grain.xml
index e4a32233ba..fefad1702e 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_grain.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_grain.xml
@@ -7,9 +7,9 @@
     <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
     <prop attachpoint="back"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_meat.xml b/binaries/data/mods/public/art/variants/biped/gather_meat.xml
index 93d8b612d7..e831199a4b 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_meat.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_meat.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/weapons/dagger.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_ore.xml b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
index f64b2da828..1a4ede255d 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_praise.xml b/binaries/data/mods/public/art/variants/biped/gather_praise.xml
index dfb1a8074d..0e05501968 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_praise.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_praise.xml
@@ -6,11 +6,11 @@
     <animation file="biped/citizen/pray.dae" name="gather_praise" id="praise3" speed="50"/>
   </animations>
   <props>
-    <prop actor="" attachpoint="shield"/>
     <prop actor="" attachpoint="weapon_R"/>
     <prop actor="" attachpoint="weapon_L"/>
-    <prop actor="" attachpoint="ammo"/>
-    <prop actor="" attachpoint="shield_arm"/>
     <prop actor="" attachpoint="weapon_bow"/>
+    <prop actor="" attachpoint="shield"/>
+    <prop actor="" attachpoint="shield_arm"/>
+    <prop actor="" attachpoint="ammo"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_rock.xml b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
index 7d01ac1e73..b6ada5f6a8 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_ruins.xml b/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
index 3be90179f3..5d60cda4f3 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_ruins.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
     <prop attachpoint="weapon_L"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_tree.xml b/binaries/data/mods/public/art/variants/biped/gather_tree.xml
index b9156396da..eb7756ea28 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_tree.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_tree.xml
@@ -6,9 +6,9 @@
   <props>
     <prop actor="props/units/tools/axe.xml" attachpoint="weapon_L"/>
     <prop attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_bow"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
   </props>
 </variant>