diff --git a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date.xml b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date.xml
index 421a97e487..2bab0fe9c7 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date.xml
@@ -29,11 +29,33 @@
   </group>
   <group>
     <variant frequency="1" name="Palm Fronds-a">
-      <textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-b">
-      <textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Palm Fronds-c">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Palm Fronds-d">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_patch.xml b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_patch.xml
index b027bba2eb..7ccc8563d0 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_patch.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_patch.xml
@@ -11,17 +11,33 @@
   </group>
   <group>
     <variant frequency="1" name="Palm Fronds-a">
-      <textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-b">
-      <textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-c">
-      <textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-d">
-      <textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_short.xml b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_short.xml
index 2568d617c5..00b5921e99 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_short.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_short.xml
@@ -17,17 +17,33 @@
   </group>
   <group>
     <variant frequency="1" name="Palm Fronds-a">
-      <textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-b">
-      <textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
-    <variant frequency="1" name="Palm-Fronds-c">
-      <textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
+    <variant frequency="1" name="Palm Fronds-c">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
-    <variant frequency="1" name="Palm-Fronds-d">
-      <textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
+    <variant frequency="1" name="Palm Fronds-d">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_tall.xml b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_tall.xml
index a6a4fc5bc1..ec961eccf0 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_tall.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/palm_cretan_date_tall.xml
@@ -20,17 +20,33 @@
   </group>
   <group>
     <variant frequency="1" name="Palm Fronds-a">
-      <textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-b">
-      <textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-c">
-      <textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Palm Fronds-d">
-      <textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml b/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
index b6cb3474a2..0f7e702fba 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
@@ -31,7 +31,6 @@
         <prop actor="props/structures/hellenes/barracks_props_a.xml" attachpoint="root"/>
         <prop actor="props/structures/athenians/barracks_props_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/barracks_tile_c.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
index 365dd97386..2ac5f50ac5 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
@@ -23,7 +23,6 @@
         <prop actor="props/structures/hellenes/corral_ceiling.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml b/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
index b33c53bbc9..d2d17151fc 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
@@ -22,7 +22,6 @@
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/farmstead_hay.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/farmstead_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/farmstead_roof.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
index 8c5e35451b..484496c919 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
@@ -30,7 +30,6 @@
         <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
index 9a3daff0e4..e5196f7626 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
@@ -30,7 +30,6 @@
         <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
index 25e21fcb82..8f18ec953f 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
@@ -27,7 +27,6 @@
         <prop actor="props/structures/athenians/gym_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/gym_props.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/gym_tiles.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/gym_trees.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/market.xml b/binaries/data/mods/public/art/actors/structures/athenians/market.xml
index 941851d8ab..d386112cec 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/market.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/market.xml
@@ -20,7 +20,6 @@
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/market.xml" attachpoint="props_main"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml b/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
index 6760d051d2..4396d7dcf3 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
@@ -25,7 +25,6 @@
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
index 5b9a97d0b5..3b123d8ace 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
@@ -32,7 +32,6 @@
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/scout_tower_fancy.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/scout_tower_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_1x1.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/theatron.xml b/binaries/data/mods/public/art/actors/structures/athenians/theatron.xml
index abedda7e98..8c2918b675 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/theatron.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/theatron.xml
@@ -19,7 +19,6 @@
         <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/special_theatre.xml" attachpoint="props_main"/>
-        <prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml b/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml
index 81be4332ab..ac4a2898a9 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml
@@ -7,6 +7,7 @@
       <props>
         <prop actor="props/structures/mauryans/farmstead_prop_a.xml" attachpoint="root"/>
         <prop actor="props/structures/mauryans/farmstead_prop_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
         <prop actor="props/special/eyecandy/hay_cart.xml" attachpoint="cart"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml b/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
index 8cab8da804..7164099eb1 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
@@ -16,6 +16,7 @@
 		<prop actor="props/structures/mauryans/fort_shield_tall_round.xml" attachpoint="root"/>
 		<prop actor="props/structures/mauryans/fort_struct_b.xml" attachpoint="root"/>
 		<prop actor="props/structures/mauryans/fort_weapons.xml" attachpoint="root"/>
+		<prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/mill.xml b/binaries/data/mods/public/art/actors/structures/mauryans/mill.xml
index fab791c331..4bbd0ce404 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/mill.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/mill.xml
@@ -6,13 +6,25 @@
       <mesh>structural/maur_mill.dae</mesh>
       <props>
         <prop actor="props/structures/mauryans/mill_props.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
       </props>
       <textures>
-		<texture file="structural/maur_struct_b.png" name="baseTex"/>
-		<texture file="structural/maur_struct_b_spec.png" name="specTex"/>
-		<texture file="structural/maur_struct_b_norm.png" name="normTex"/>
-		<texture file="structural/ao/maur_mill_ao.png" name="aoTex"/>
-	  </textures>
+        <texture file="structural/maur_struct_b.png" name="baseTex"/>
+        <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/ao/maur_mill_ao.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="death">
+      <props>
+        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/mauryans/mill_props.xml" attachpoint="root"/>
+      </props>
     </variant>
   </group>
   <material>player_trans_ao_parallax_spec.xml</material>
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_lakebed_dry.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_lakebed_dry.xml
index a9696f7ae2..dd8a68d7f8 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_lakebed_dry.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_lakebed_dry.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_lakebed_dry.dds"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_lakebed_dry.dds"/>
+		<texture name="normTex" file="types/desert_lakebed_dry_norm.png"/>
+		<texture name="specTex" file="types/desert_lakebed_dry_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough.xml
index e5884cca5f..09153b6bb8 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_pebbles_rough.png"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_pebbles_rough.png"/>
+		<texture name="normTex" file="types/desert_pebbles_rough_norm.png"/>
+		<texture name="specTex" file="types/desert_pebbles_rough_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough_wet.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough_wet.xml
index ea349bdf09..e8dd2570f9 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough_wet.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_pebbles_rough_wet.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_pebbles_rough_wet.png"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_pebbles_rough_wet.png"/>
+		<texture name="normTex" file="types/desert_pebbles_rough_norm.png"/>
+		<texture name="specTex" file="types/desert_pebbles_rough_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_smooth.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_smooth.xml
index f3ab09350f..565a969dd0 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_smooth.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_smooth.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_sand_smooth.dds"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_sand_smooth.dds"/>
+		<texture name="normTex" file="types/desert_sand_smooth_norm.png"/>
+		<texture name="specTex" file="types/desert_sand_smooth_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_stones.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_stones.xml
index abd98fb3c0..35dbcaffc1 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_stones.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_sand_stones.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_sand_stones.dds"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_sand_stones.dds"/>
+		<texture name="normTex" file="types/desert_sand_stones_norm.png"/>
+		<texture name="specTex" file="types/desert_sand_stones_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones.xml
index 23bf1b378f..26e24b4c58 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_shore_stones.dds"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_shore_stones.dds"/>
+		<texture name="normTex" file="types/desert_shore_stones_norm.png"/>
+		<texture name="specTex" file="types/desert_shore_stones_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones_wet.xml b/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones_wet.xml
index fc0cf4cb5b..326bf5338a 100644
--- a/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones_wet.xml
+++ b/binaries/data/mods/public/art/terrains/biome-desert/desert_shore_stones_wet.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/desert_shore_stones_wet.dds"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/desert_shore_stones_wet.dds"/>
+		<texture name="normTex" file="types/desert_shore_stones_norm.png"/>
+		<texture name="specTex" file="types/desert_shore_stones_spec.png"/>
+    </textures>
+    <material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants.xml b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants.xml
index 3042c49ed1..179770ac02 100644
--- a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants.xml
+++ b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/tropic_plants.png"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/tropic_plants.png"/>
+		<texture name="normTex" file="types/tropic_plants_norm.png"/>
+		<texture name="specTex" file="types/tropic_plants_spec.png"/>
+	</textures>
+	<material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_b.xml b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_b.xml
index 252baa03d5..34bb319d96 100644
--- a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_b.xml
+++ b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_b.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/tropic_plants_b.png"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/tropic_plants_b.png"/>
+		<texture name="normTex" file="types/tropic_plants_norm.png"/>
+		<texture name="specTex" file="types/tropic_plants_spec.png"/>
+	</textures>
+	<material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_c.xml b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_c.xml
index 4d4f1fede0..0acdfc75c8 100644
--- a/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_c.xml
+++ b/binaries/data/mods/public/art/terrains/biome-tropic/tropic_plants_c.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/tropic_plants_c.png"/>  </textures> <material>terrain_base.xml</material> </terrain>
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+	<textures>
+		<texture name="baseTex" file="types/tropic_plants_c.png"/>
+		<texture name="normTex" file="types/tropic_plants_norm.png"/>
+		<texture name="specTex" file="types/tropic_plants_spec.png"/>
+	</textures>
+	<material>terrain_norm_spec.xml</material>
+</terrain>
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_spec.png
index 023726b1b6..df217ee4a0 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e632609aa886857e672aa440f21ea8f67fb24049c6074ced823e1cde0f30c284
-size 121137
+oid sha256:32f40ff88fbb8a3dbac517d5e38d2dbba5ae1db3c14df2398c15a9295e3e1e42
+size 118911
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_spec.png
index 3abb6e9a4d..381df1ca53 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84cc71534f9180e56ef82ed5ae70194765d815f9a4ed74b84e06a7cc7f5be1f3
-size 129476
+oid sha256:b9e4a0e8891ac68480998dfd10134245f798cf969ea0f8fd406e42638c63afc3
+size 129303
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_01_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_01_spec.png
index c76f6cb0a7..f3708c1bd1 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_01_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_01_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6baf1ee0344b987554b039c1d4438725c9cddb4bf5b034c991a0853e012c2e3
-size 120049
+oid sha256:464d7ce9db21485117fa3ebfe9b32d53ef54afc11b1cf7d4e31366833f9fb9ab
+size 133352
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_02_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_02_spec.png
index 517d0af7d6..9262a32a3c 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_02_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_02_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd0eae700b9a874cc44803cd057e979349c1ab7f0bea6e062358cfc5265548ab
-size 118329
+oid sha256:ee1b8d82d38bba473764821a983d28c346a7ce8b0cdd1d26af343617023a2881
+size 132396
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_spec.png
index c47a6a8abd..ab0c96b0f4 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46e635732249a93c88dc9f20347a635cf4c285ce19f6e5ca1ee34e23eebd4b89
-size 485589
+oid sha256:46c165bb4d004a57cc6f5c6ca3204e567d6a6ad401272dd2d063bf86655eb959
+size 451140
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_spec.png
index 661e69089d..3f9591b40d 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b83b780656763e47a3be74a1be21657d00bf1d6b660c405aa66b18b320fee02
-size 526686
+oid sha256:b6d903838e29e7164cead357af9f3c337e3e7924b466b868fcc0346372d0bd08
+size 492277
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_norm.png
new file mode 100644
index 0000000000..52cede8a9d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed2a6b44641def7b5ec04ba49ce95e8279b43935c4a0f5a82bbc9df150255a15
+size 139878
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_spec.png
new file mode 100644
index 0000000000..5422e62ec6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_palm_senegal_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f060075612158b308b079686b9025370c1dd754ee916131dd7dd0fc6f76b62f3
+size 61069
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png
index fdabfaa24d..ec94a12cff 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18675f1dfa6e21da548c0bf11ed515837da7d9739c821aba3facc772c403f039
-size 783235
+oid sha256:f8032e7644a4834513957b5d60c1333a087cc9f0c99cd5cc1899c7244312471e
+size 830964
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png
index 254f18e342..2fdace5d5e 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_plaza_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39401c3a77e601ebdadaaa02426822bca9c582a0aea555b0bcbbb7f5be3fef31
-size 246423
+oid sha256:61767d7770970686651373405817b652f56480bccf74de01df516b561abc38fd
+size 170197
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png
index b837fa7507..d671296abc 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_city_tile_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbba5efbb480d916c629062219d6e547d6acf07a3efe54e4cd5c08990a661a54
-size 271116
+oid sha256:5a1ab60ae179ab6de3b41992a632be053455814c2ffc2a8a3d85a32fabc1e65e
+size 179478
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_norm.png
new file mode 100644
index 0000000000..39395390a0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d70b294e5254791b0ae9aa4f9b7dccdd497d3ff63b2d84d3226699379dba5151
+size 3017636
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_spec.png
new file mode 100644
index 0000000000..932a5abecc
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_lakebed_dry_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5e8c8c7c9358c25c6dc140d21c1769e857496627d41fddf8c0323f8c22d19f4
+size 226982
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_norm.png
new file mode 100644
index 0000000000..99fd396409
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ad41134363eb05aad90cd5d112c4ea9b2c659419ceac8bb2b7c29c7bb44ed3a
+size 2987703
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_spec.png
new file mode 100644
index 0000000000..3504438c73
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_pebbles_rough_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b841df4b2d694b5a2db60c1246cbd8caf58382f5044b1c0f13583176eda160a5
+size 941850
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_norm.png
new file mode 100644
index 0000000000..c1950860f3
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1983fb1835ad6b7676655b1f38a55e573cb66e5ec2c2e5654d2c95a097e21e6a
+size 603668
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_spec.png
new file mode 100644
index 0000000000..2eeb829e34
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_smooth_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:575456795e66715ece34c0ae598ee0a67b07ebc3fb230b2dd46d728b6e8cac72
+size 171259
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_norm.png
new file mode 100644
index 0000000000..b8bd9f9996
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fe5f8d56de65ef1c83c0ea9fbb08ee157ed5c80596600dec75586fb73d87106
+size 750953
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_spec.png
new file mode 100644
index 0000000000..794d7bded6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_sand_stones_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2a54119cf8075ab5079119dbbf0c1a9d4a7863b5440eda7c281d7913aea2836
+size 260739
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_norm.png b/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_norm.png
new file mode 100644
index 0000000000..158c22231f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:661d03c2eb81033f07cd058118d7f10f977e6d500728509549cb85b924c44259
+size 720448
diff --git a/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_spec.png b/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_spec.png
new file mode 100644
index 0000000000..c9e52492f6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/desert_shore_stones_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dee0b907509fafd2915a4738c48e4293bff1b3b767aa19a212f00dc2eb5dbc2
+size 184542
diff --git a/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_norm.png b/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_norm.png
new file mode 100644
index 0000000000..36aa5326f0
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_norm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31425d3db6af51c7bfda3cfb0ef31ca8b4655c3413bdf6e036ff5156521e5ae9
+size 3023071
diff --git a/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_spec.png b/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_spec.png
new file mode 100644
index 0000000000..8696e50607
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/tropic_plants_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3611db8af59d3253c393ccd41d3801d0a26b50220d5678f43c00a4164ed54b80
+size 310823
diff --git a/binaries/data/mods/public/civs/athen.json b/binaries/data/mods/public/civs/athen.json
index 896ade15f2..ed00279389 100644
--- a/binaries/data/mods/public/civs/athen.json
+++ b/binaries/data/mods/public/civs/athen.json
@@ -74,7 +74,7 @@
 	"TeamBonuses":
 	[
 		{
-			"Name":"Silver Coinage",
+			"Name":"Silver Drachma",
 			"History":"The mines at Laureion in Attica provided Athens with a wealth of silver from which to mint her famous and highly prized coin, The Athenian Owl.",
 			"Description":"For allies only, metal mining gathering rates increased by 10% for each passing age."
 		}
diff --git a/binaries/data/mods/public/civs/maur.json b/binaries/data/mods/public/civs/maur.json
index f49e829d0e..6b4296cc1f 100644
--- a/binaries/data/mods/public/civs/maur.json
+++ b/binaries/data/mods/public/civs/maur.json
@@ -15,9 +15,9 @@
 			"Technologies":
 			[
 				{
-					"Name":"Unknown",
+					"Name":"Elephant Roundup",
 					"History":"Unknown",
-					"Description":"Unknown"
+					"Description":"Capture up to 5 Gaia elephants and garrison them in the Elephant Stables to gain up to a 25% bonus in cost and train time of elephant units."
 				},
 				{
 					"Name":"Unknown",
diff --git a/binaries/data/mods/public/maps/scenarios/Median Oasis 01.pmp b/binaries/data/mods/public/maps/scenarios/Median Oasis 01.pmp
index d3d446b2a7..d1e56a7a3b 100644
--- a/binaries/data/mods/public/maps/scenarios/Median Oasis 01.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Median Oasis 01.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfd93eca69e33bcaeb9e749c5ecdef7f6d9dc4c9c510ca40a696e5fb698023fc
-size 657329
+oid sha256:f5e28fe9315f13a04cec11f4ffc09967f897a475318d47ef42940d9471ff78df
+size 657341
diff --git a/binaries/data/mods/public/maps/scenarios/Median Oasis 01.xml b/binaries/data/mods/public/maps/scenarios/Median Oasis 01.xml
index 43c351cce9..4b7876e41f 100644
--- a/binaries/data/mods/public/maps/scenarios/Median Oasis 01.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Median Oasis 01.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:551ccdba8b79576c37c2a88680114b8161a61f192f3070312951731045a1b006
-size 483389
+oid sha256:177cf63cdb65845f546b913a1bf5cc82ae1a306d88e4087ff29c59e871b97060
+size 484481
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
index 7115e9abb4..daa189fbc7 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588a856b6c51767a557650bea7febe0de46c1fdb1a31672758f870f4ca27650a
-size 941389
+oid sha256:3568e015ce8e5d7b96d52484dbff515e39d1d6042ad5af04466010ebce9ecb8a
+size 941598
diff --git a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearfighting.json b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearfighting.json
index ec9c2c0612..fccb12c4c7 100644
--- a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearfighting.json
+++ b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearfighting.json
@@ -14,7 +14,7 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "spear.png",
 	"researchTime": 20,
-	"tooltip": "Spearmen +2 pierce attack.",
-	"modifications": [{"value": "Attack/Melee/Pierce", "add": 2.0}],
+	"tooltip": "Spearmen +2 hack attack.",
+	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
 	"affects": ["Infantry Spear"]
 }
\ No newline at end of file
diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town.json b/binaries/data/mods/public/simulation/data/technologies/phase_town.json
index fe7bf2354a..e240a9ec4c 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_town.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_town.json
@@ -1,7 +1,7 @@
 {
 	"genericName": "Town Phase",
 	"description": "Advances from a small village to a bustling town, ready to expand rapidly.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 },
+	"cost": { "food": 1000, "wood": 1000, "stone": 0, "metal": 0 },
 	"requirements": { "class": "Village", "number": 6 },
 	"requirementsTooltip": "Requires 5 Village Phase structures (except Palisades and Farm Fields).",
 	"supersedes": "phase_village",
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
index 3f7fcb1468..0d20bf03fb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
@@ -16,7 +16,7 @@
   <GarrisonHolder disable=""/>
   <Health>
     <Max>1000</Max>
-    <SpawnEntityOnDeath>rubble/rubble_2x2</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>maur</Civ>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
index 7d371ef3b9..c168d6d735 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral_slabs.xml
@@ -12,7 +12,7 @@
   </Position>
   <ResourceSupply>
     <Amount>5000</Amount>
-	<MaxGatherers>16</MaxGatherers>
+	<MaxGatherers>22</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
index 8a5adf7ecb..fbf39a9464 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock_slabs.xml
@@ -12,7 +12,7 @@
   </Position>
   <ResourceSupply>
     <Amount>5000</Amount>
-	<MaxGatherers>16</MaxGatherers>
+	<MaxGatherers>22</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
index 4886c53ac5..bbe75d7d91 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -14,7 +14,7 @@
   <GarrisonHolder disable=""/>
   <Health>
     <Max>2000</Max>
-    <SpawnEntityOnDeath>rubble/rubble_3x3</SpawnEntityOnDeath>
+    <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>cart</Civ>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
index 6e34df03f9..c6a32f2316 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_cavalry">
   <Attack>
     <Melee>
-      <Hack>5.0</Hack>
-      <Pierce>10.0</Pierce>
+      <Hack>10.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
@@ -25,8 +25,8 @@
       <RestrictedClasses datatype="tokens">StoneWall</RestrictedClasses>
     </Melee>
     <Charge>
-      <Hack>15.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Hack>30.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <MinRange>0.0</MinRange>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index db73141f29..7d3b388b2b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -7,8 +7,8 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>8.0</Hack>
-      <Pierce>15.0</Pierce>
+      <Hack>15.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
@@ -38,8 +38,8 @@
       <RestrictedClasses datatype="tokens">StoneWall</RestrictedClasses>
     </Melee>
     <Charge>
-      <Hack>24.0</Hack>
-      <Pierce>45.0</Pierce>
+      <Hack>45.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
index 06d47ebba2..db5424de2e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
     <Hack>10.0</Hack>
-    <Pierce>10.0</Pierce>
+    <Pierce>22.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Cost>
@@ -47,9 +47,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>5.0</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
+      <Speed>16.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 1a3fdb80c2..ef07c65d5e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -7,8 +7,8 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>10.0</Hack>
-      <Pierce>15.0</Pierce>
+      <Hack>15.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
@@ -20,8 +20,8 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>30.0</Pierce>
+      <Hack>30.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index e3d71e28a4..ffee82c0d7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -6,8 +6,8 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
-      <Pierce>25.0</Pierce>
+      <Hack>30.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
@@ -36,8 +36,8 @@
       <PreferredClasses datatype="tokens">Organic Siege</PreferredClasses>
     </Melee>
     <Charge>
-      <Hack>30.0</Hack>
-      <Pierce>60.0</Pierce>
+      <Hack>90.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
 	  <Bonuses>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index c2e7766415..cc1c93b752 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
-      <Hack>15.0</Hack>
-      <Pierce>25.0</Pierce>
+      <Hack>30.0</Hack>
+      <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
 	  <Bonuses>
 		<BonusCavMelee>
@@ -13,8 +13,8 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>24.0</Hack>
-      <Pierce>40.0</Pierce>
+      <Hack>60.0</Hack>
+      <Pierce>0.0</Pierce>
 	  <Bonuses>
 		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index cf232bdfa0..b98271fd03 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -7,8 +7,8 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>5.0</Hack>
-      <Pierce>10.0</Pierce>
+      <Hack>10.0</Hack>
+      <Pierce>0.0</Pierce>
 	  <Bonuses>
 		<BonusCavMelee>
 		  <Classes>Cavalry</Classes>
@@ -17,8 +17,8 @@
 	  </Bonuses>
     </Melee>
     <Charge>
-      <Hack>10.0</Hack>
-      <Pierce>20.0</Pierce>
+      <Hack>20.0</Hack>
+      <Pierce>0.0</Pierce>
 	  <Bonuses>
 		<BonusCharge>
 		  <Classes>Cavalry</Classes>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index b4642c1710..2f3aed0e7b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -67,7 +67,7 @@
     <Rates>
       <food.fish>1</food.fish>
       <food.fruit>2</food.fruit>
-      <food.grain>0.65</food.grain>
+      <food.grain>0.5</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.7</wood.tree>
       <wood.ruins>5</wood.ruins>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_a.xml
index 1efff8405d..72f0b6b079 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_e.xml
index 0aa15e103b..570ab6fff5 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_e.xml
@@ -7,24 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_a.xml
index 3587b003be..e3dbf2ac2f 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_e.xml
index 74a7fe0672..c049c35e82 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
index b54ada5b2c..70ceb6c62e 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>36.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
index bca0a00953..a714e87d59 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>17.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>42.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
index 92fd88c693..bf946cb02d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
index 1e711f8cec..0120783260 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
index 8bd4543960..89e56174ad 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
index 46a6777121..542bdc1c1a 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_a.xml
index 104e18958e..c2b01ea021 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_e.xml
index 76dce09235..713104e1b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
index 452ab75c99..70fb3fe219 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
index 53fa83599e..8f563883e1 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
@@ -7,24 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
index 191b0987fd..c84d0678a5 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>36.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
index 6ac6706665..350773da70 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>17.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>21.0</Hack>
-      <Pierce>51.0</Pierce>
+      <Hack>42.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
index 91de5bc811..2863580937 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
index 07bb8e62ea..0b832d3c14 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
index 01e102482a..4463257f50 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>36.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
index 4c05f15997..5699e145e7 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>17.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>42.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_a.xml
index d70e5cf39c..1d5d35c427 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_e.xml
index 8ec521b01d..4472752bc3 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_spearman_e.xml
@@ -7,20 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_a.xml
index 10da81a214..c1c3353006 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_e.xml
index ab3d2eb06a..2e381ecddb 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
index d83f268de4..c9dfd80973 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>36.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
index 4cf8e31f80..36624fd392 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>17.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>21.0</Hack>
-      <Pierce>51.0</Pierce>
+      <Hack>42.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
index c328f47a46..f1329ed021 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
index 191f17bb72..f0107d9e1f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
index 29e3e55744..073ed2b741 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>16.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>36.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
index 3823d2b5c4..83023b4acf 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>17.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>48.0</Pierce>
+      <Hack>42.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_a.xml
index e57e76220f..7b505ece9a 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_e.xml
index 6e09771b9a..f8f56d3525 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_e.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_a.xml
index 4e12c49683..f522e60341 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_a.xml
@@ -7,12 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>6.0</Hack>
-      <Pierce>11.0</Pierce>
+      <Hack>12.0</Hack>
     </Melee>
     <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>22.0</Pierce>
+      <Hack>24.0</Hack>
     </Charge>
   </Attack>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_e.xml
index 1994b5ff3b..3fe65a715d 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_e.xml
@@ -7,24 +7,10 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>7.0</Hack>
-      <Pierce>12.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>14.0</Hack>
     </Melee>
     <Charge>
-      <Hack>14.0</Hack>
-      <Pierce>24.0</Pierce>
-	  <Bonuses>
-		<BonusInfMelee>
-		  <Classes>Infantry Melee</Classes>
-		  <Multiplier>1.25</Multiplier>
-		</BonusInfMelee>
-	  </Bonuses>
+      <Hack>28.0</Hack>
     </Charge>
   </Attack>
   <Health>