diff --git a/binaries/data/mods/official/art/actors/props/flora/farming_wheat_harvest_b.xml b/binaries/data/mods/official/art/actors/props/flora/farming_wheat_harvest_b.xml
index 3bc31fed1f..b24f702d84 100644
--- a/binaries/data/mods/official/art/actors/props/flora/farming_wheat_harvest_b.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/farming_wheat_harvest_b.xml
@@ -14,7 +14,7 @@
 
   <group>
     <variant>
-      <texture>gaia/farming_wheat_harvest_b.dds</texture>
+      <texture>gaia/farming_wheat_harvest_a.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_field_lush_tall.xml b/binaries/data/mods/official/art/actors/props/flora/grass_field_lush_tall.xml
index c23f3c1e10..adaeb9bc6e 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_field_lush_tall.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_field_lush_tall.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large.xml
index d3230cd29d..ab62601b3d 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large_tall.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large_tall.xml
index a054ff8eac..8dcabb0ed8 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large_tall.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_large_tall.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small.xml
index bfd9f9800c..377c4ac064 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small_tall.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small_tall.xml
index 6cede94619..0159cb0eae 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small_tall.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_dry_small_tall.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_large.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_large.xml
index 44fad698f6..3ac93d0051 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_large.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_large.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_large_tall.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_large_tall.xml
index a76706729d..8d71e1a6d3 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_large_tall.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_large_tall.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_small.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_small.xml
index 20b3c7706f..d4e99fa34a 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_small.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_small.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/flora/grass_soft_small_tall.xml b/binaries/data/mods/official/art/actors/props/flora/grass_soft_small_tall.xml
index ffa28f3774..887a5a41d8 100644
--- a/binaries/data/mods/official/art/actors/props/flora/grass_soft_small_tall.xml
+++ b/binaries/data/mods/official/art/actors/props/flora/grass_soft_small_tall.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
-  <castshadow/>
+  
 
   <group>
     <variant name="a">
diff --git a/binaries/data/mods/official/art/actors/props/temp/common/waypoint_flag.xml b/binaries/data/mods/official/art/actors/props/special/common/waypoint_flag.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/common/waypoint_flag.xml
rename to binaries/data/mods/official/art/actors/props/special/common/waypoint_flag.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/anvil.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/anvil.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/anvil.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/anvil.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/barrel_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/barrel_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/barrel_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/barrel_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_celt_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_celt_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_hele_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_hele_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_iber_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_iber_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/basket_rome_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/basket_rome_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/bench_1.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/bench_1.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/bench_1.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/bench_1.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/block_granite.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/block_granite.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/block_granite.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/block_granite.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/block_limestone.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/block_limestone.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/block_limestone.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/block_limestone.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/block_sandstone.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/block_sandstone.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/block_sandstone.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/block_sandstone.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_granite_pile_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_granite_pile_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_granite_pile_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_granite_pile_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_granite_pile_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_granite_pile_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_granite_pile_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_granite_pile_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_limestone_pile_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_limestone_pile_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_limestone_pile_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_limestone_pile_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_limestone_pile_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_limestone_pile_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_limestone_pile_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_limestone_pile_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_sandstone_pile_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_sandstone_pile_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_sandstone_pile_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_sandstone_pile_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_sandstone_pile_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_sandstone_pile_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/blocks_sandstone_pile_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/blocks_sandstone_pile_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/crate_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/crate_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/crate_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/crate_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_large.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_large.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_large.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_large.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_potted_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_potted_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_potted_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_potted_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_potted_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_potted_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_potted_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_potted_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_row_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_row_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_row_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_row_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_small.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_small.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/cypress_small.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/cypress_small.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/dummy_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/dummy_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/dummy_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/dummy_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/handcart_1.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/handcart_1.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/handcart_1.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/handcart_1.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/handcart_1_broken.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/handcart_1_broken.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/handcart_1_broken.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/handcart_1_broken.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/hay_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/hay_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_large.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/hay_large.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_large.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/hay_large.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_small.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/hay_small.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/hay_small.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/hay_small.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/produce_bin_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/produce_bin_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/rome_basket_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/rome_basket_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/sack_1.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/sack_1.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/sack_1.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/sack_1.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/sack_1_rough.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/sack_1_rough.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/sack_1_rough.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/sack_1_rough.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/table1_long.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/table1_long.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/table1_long.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/table1_long.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/table1_short.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/table1_short.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/table1_short.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/table1_short.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_e.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_e.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_e.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_e.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_f.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_f.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/vase_rome_f.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/vase_rome_f.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/waterbin_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/waterbin_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/waterbin_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/waterbin_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_1_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_1_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_water.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_water.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_water.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_water.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/well_woodbit.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/well_woodbit.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/well_woodbit.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/well_woodbit.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wheel_laying.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wheel_laying.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wheel_laying.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wheel_laying.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_d.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_d.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_1_d.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_1_d.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_pile_1_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_pile_1_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_sm_pile_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_sm_pile_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_sm_pile_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_sm_pile_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_sm_pile_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_sm_pile_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_sm_pile_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_sm_pile_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_a.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_a.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_b.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_b.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_c.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_c.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/wood_small_1_c.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/wood_small_1_c.xml
diff --git a/binaries/data/mods/official/art/actors/props/temp/eyecandy/woodcord.xml b/binaries/data/mods/official/art/actors/props/special/eyecandy/woodcord.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/temp/eyecandy/woodcord.xml
rename to binaries/data/mods/official/art/actors/props/special/eyecandy/woodcord.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/handaxe.xml b/binaries/data/mods/official/art/actors/props/units/tools/axe.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/handaxe.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/axe.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_handscythe.xml b/binaries/data/mods/official/art/actors/props/units/tools/basket.xml
similarity index 56%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_handscythe.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/basket.xml
index d1095795ba..f63252311b 100644
--- a/binaries/data/mods/official/art/actors/props/units/tools/prop_handscythe.xml
+++ b/binaries/data/mods/official/art/actors/props/units/tools/basket.xml
@@ -3,10 +3,8 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>props/tool_handscythe.pmd</mesh>
-      <props/>
-      <texture>props/prop_tools.dds</texture>
+      <mesh>props/tool_basket.pmd</mesh>
+      <texture>props/celt_prop_1.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/hoe.xml b/binaries/data/mods/official/art/actors/props/units/tools/hoe.xml
new file mode 100644
index 0000000000..6a1cabdbdb
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/tools/hoe.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tool_hoe.pmd</mesh>
+      <texture>props/prop_weap.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_mallet.xml b/binaries/data/mods/official/art/actors/props/units/tools/mallet.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_mallet.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/mallet.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_pick.xml b/binaries/data/mods/official/art/actors/props/units/tools/pick.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_pick.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/pick.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_pitchfork.xml b/binaries/data/mods/official/art/actors/props/units/tools/pitchfork.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_pitchfork.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/pitchfork.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_scythe.xml b/binaries/data/mods/official/art/actors/props/units/tools/scythe.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_scythe.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/scythe.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_shovel_a.xml b/binaries/data/mods/official/art/actors/props/units/tools/shovel_a.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_shovel_a.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/shovel_a.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_shovel_b.xml b/binaries/data/mods/official/art/actors/props/units/tools/shovel_b.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_shovel_b.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/shovel_b.xml
diff --git a/binaries/data/mods/official/art/actors/props/units/tools/prop_spade.xml b/binaries/data/mods/official/art/actors/props/units/tools/spade.xml
similarity index 100%
rename from binaries/data/mods/official/art/actors/props/units/tools/prop_spade.xml
rename to binaries/data/mods/official/art/actors/props/units/tools/spade.xml
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/Copy of infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/Copy of infantry_javelinist_b.xml
new file mode 100644
index 0000000000..0da75e7158
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/units/hellenes/Copy of infantry_javelinist_b.xml	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
+        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Attack" speed="100"/>
+      </animations>
+      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/thrac_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+      </props>
+      <texture>skeletal/hele_ijv_b.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
index 6cc086cf1f..44f340ae39 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
@@ -73,7 +73,7 @@
         <animation file="biped/chop.psa" name="Chop" speed="150"/>
       </animations>
       <props>
-        <prop actor="props/units/tools/handaxe.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
@@ -84,7 +84,7 @@
         <animation file="biped/hoe.psa" name="Hoe" speed="150"/>
       </animations>
       <props>
-        <prop actor="props/units/tools/prop_mallet.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
       </props>
     </variant>
   </group>
@@ -94,6 +94,9 @@
       <animations>
         <animation file="biped/forage.psa" name="Forage" speed="5"/>
       </animations>
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
     </variant>
   </group>
 
@@ -103,7 +106,7 @@
         <animation file="biped/mine.psa" name="Mine" speed="150"/>
       </animations>
       <props>
-        <prop actor="props/units/tools/prop_pick.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
@@ -114,7 +117,7 @@
         <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
       </animations>
       <props>
-        <prop actor="props/units/tools/prop_mallet.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/animation/biped/forage.psa b/binaries/data/mods/official/art/animation/biped/forage.psa
index 77a03f77d4..823929212e 100644
--- a/binaries/data/mods/official/art/animation/biped/forage.psa
+++ b/binaries/data/mods/official/art/animation/biped/forage.psa
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58b275048783bd88c6ca9507664b0862646788ee7900afbc6f27aabf87c290fb
+oid sha256:1372d1c4aac6d868318273674629d004deea1b3404a7b92a0b3e159056d917a0
 size 118589
diff --git a/binaries/data/mods/official/art/animation/biped/hoe.psa b/binaries/data/mods/official/art/animation/biped/hoe.psa
index 233d071857..4bde3cb06a 100644
--- a/binaries/data/mods/official/art/animation/biped/hoe.psa
+++ b/binaries/data/mods/official/art/animation/biped/hoe.psa
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac20260ad5203260da41ece652385e226b95e68a6a0ac3235fdbab852adb99e2
+oid sha256:0123c13f8c7708b0aeb149e7884e898f54ccc042d6c6f2cf02be7722092e437c
 size 114529
diff --git a/binaries/data/mods/official/art/meshes/props/prop_axe_basic.pmd b/binaries/data/mods/official/art/meshes/props/prop_axe_basic.pmd
deleted file mode 100644
index dbe516cf66..0000000000
--- a/binaries/data/mods/official/art/meshes/props/prop_axe_basic.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b58695ad548f584a33fa03a9d1c47c59824f82ba25f5fa4fff8b934ae8915489
-size 1612
diff --git a/binaries/data/mods/official/art/meshes/props/prop_pick.pmd b/binaries/data/mods/official/art/meshes/props/prop_pick.pmd
deleted file mode 100644
index 9aae9475cb..0000000000
--- a/binaries/data/mods/official/art/meshes/props/prop_pick.pmd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae8b7c4271447433ba0e2d797b80e4cd02931ed23f01a028bf14519e741202eb
-size 1760
diff --git a/binaries/data/mods/official/art/meshes/props/tool_axe.pmd b/binaries/data/mods/official/art/meshes/props/tool_axe.pmd
index f11498e626..dbe516cf66 100644
--- a/binaries/data/mods/official/art/meshes/props/tool_axe.pmd
+++ b/binaries/data/mods/official/art/meshes/props/tool_axe.pmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2060d8caa757de905c511c5a46baf2c99f97f4e3992571b38de502c882d43560
-size 1632
+oid sha256:b58695ad548f584a33fa03a9d1c47c59824f82ba25f5fa4fff8b934ae8915489
+size 1612
diff --git a/binaries/data/mods/official/art/meshes/props/tool_basket.pmd b/binaries/data/mods/official/art/meshes/props/tool_basket.pmd
new file mode 100644
index 0000000000..e944b55b19
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/props/tool_basket.pmd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05402b3a0fce3b2945a4459c6daead583b8f75751cefe9122e13378e35efc1fe
+size 2860
diff --git a/binaries/data/mods/official/art/meshes/props/tool_hoe.pmd b/binaries/data/mods/official/art/meshes/props/tool_hoe.pmd
index a988487576..8ee002138a 100644
--- a/binaries/data/mods/official/art/meshes/props/tool_hoe.pmd
+++ b/binaries/data/mods/official/art/meshes/props/tool_hoe.pmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1617c373f7bed2dc471a8c2969626ae6c6fc7dfeabf6824548e86e10ffee6fc5
-size 2924
+oid sha256:18923814f9177f8be623b34b49d3314845e604b82c154d332275e8ba30a801c1
+size 3092
diff --git a/binaries/data/mods/official/art/meshes/props/tool_pick.pmd b/binaries/data/mods/official/art/meshes/props/tool_pick.pmd
index 98a361f5fb..9aae9475cb 100644
--- a/binaries/data/mods/official/art/meshes/props/tool_pick.pmd
+++ b/binaries/data/mods/official/art/meshes/props/tool_pick.pmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77e18e0d5434e7af790375b7ceb377cbb3cf9eb2dd84bfbea5e3d5ea138e0e48
-size 2404
+oid sha256:ae8b7c4271447433ba0e2d797b80e4cd02931ed23f01a028bf14519e741202eb
+size 1760