diff --git a/binaries/data/mods/internal/civs/theb.json b/binaries/data/mods/internal/civs/theb.json
deleted file mode 100644
index f4cb201ec3..0000000000
--- a/binaries/data/mods/internal/civs/theb.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-	"Code":"theb",
-	"Name":"Thebans",
-	"Emblem":"session/portraits/emblems/emblem_spartans.png",
-	"History":"Sparta, or Lacedaemon, was a prominent city-state in ancient Greece, situated on the banks of the River Eurotas in Laconia, in south-eastern Peloponnese. It emerged as a political entity around the 10th century BC, when the invading Dorians subjugated the local, non-Dorian population. From c. 650 BC it rose to become the dominant military land-power in ancient Greece. Given its military pre-eminence, Sparta was recognized as the overall leader of the combined Greek forces during the Greco-Persian Wars. Between 431 and 404 BC, Sparta was the principal enemy of Athens during the Peloponnesian Wars, from which it emerged victorious, though at great cost. Sparta's defeat by Thebes in the Battle of Leuctra in 371 BC ended Sparta's prominent role in Greece. However, it maintained its political independence until the Roman conquest of Greece in 146 BC.",
-	"Music":[
-			{"File":"hellenes_peace_1.ogg", "Type":"peace"},
-			{"File":"hellenic_battle_2.ogg", "Type":"battle"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Thebans",
-			"Description":"",
-			"Technologies":
-			[
-				{
-					"Name":"Feminine Mystique",
-					"History":"Spartan women were some of the freest in the ancient world. They could own land and slaves and even exercise naked like Spartan men. It is said that only Spartan women gave birth to real men. Such tough as nails women more than once helped save their city from disaster, for example when after a lost battle against Pyrrhus of Epirus they overnight built an earthen rampart to protect the city while their men slept in preparation for the next day's siege.",
-					"Description":"Spartan female citizens cannot be captured and will doggedly fight back against any attackers."
-				},
-				{
-					"Name":"Tyrtean Paeans",
-					"History":"Shortly after the great naval victories at Salamis and Mykale, the Greek city-states instituted the so-called Delian League in 478 B.C., whose purpose was to push the Persians out of the Aegean region. The allied states contributed ships and money, while the Athenians offered their entire navy.",
-					"Description":"Units move faster in formation."
-				}
-			],
-			"Heroes":
-			[
-				{
-					"Name":"Leonidas I",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"The king of Sparta, whom fought and died at the battle of Thermopylae in 480 B.C. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw."
-				},
-				{
-					"Name":"Brasidas",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Because of Brasidas' unorthodox use of light-armed troops, Helot Skirmishers have a greater attack and speed while he lives."
-				},
-				{
-					"Name":"Agis III",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"."
-				}
-			]
-		}
-	],
-	"CivBonuses":
-	[
-		{
-			"Name":"Othismos",
-			"History":"The Spartans were undisputed masters of phalanx warfare. The Spartans were so feared for their discipline that the enemy army would sometimes break up and run away before a single shield clashed. 'Othismos' refers to the point in a phalanx battle where both sides try to shove each other out of formation, attempting to breaking up the enemy lines and routing them.",
-			"Description":"Spartans can make use of the Phalanx formation without researching a technology."
-		},
-		{
-			"Name":"Laws of Lycurgus",
-			"History":"Under the Constitution written by the mythical law-giver Lycurgus, the institution of The Agoge was established, where Spartans were trained from the age of 6 to be superior warriors in defense of the Spartan state.",
-			"Description":"All citizen-soldiers trained in the City Phase start life at the Elite rank, but the population cap is reduced by 10%."
-		}
-	],
-	"TeamBonuses":
-	[
-		{
-			"Name":"Peloponnesian League",
-			"History":"Much of the Peloponnese was subject to Sparta in one way or another. This loose confederation, with Sparta as its leader, was later dubbed the Peloponnesian League by historians, but in ancient times was called 'The Lacedaemonians and their allies.'",
-			"Description":"Allied team members can train Spartiates from their fortresses."
-		}
-	],
-	"Structures":
-	[
-		{
-			"Name":"Syssiton",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Syssiton was the Mess Hall for full-blooded Spartiates. Every Spartan peer, even kings, belonged to one.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Train heroes and champion units and research technologies related to them."
-		}
-	],
-	"StartEntities":
-	[
-		{
-			"Template": "structures/spart_civil_centre"
-		},
-		{
-			"Template": "units/spart_support_female_citizen",
-			"Count": 4
-		},
-		{
-			"Template": "units/spart_infantry_spearman_b",
-			"Count": 4
-		},
-		{
-			"Template": "units/spart_cavalry_javelinist_b"
-		}
-	],
-	"Formations":
-	[
-		"Scatter",
-		"Box",
-		"Column Closed",
-		"Line Closed",
-		"Column Open",
-		"Line Open",
-		"Flank",
-		"Skirmish",
-		"Wedge",
-		"Battle Line",
-		"Phalanx"
-	],
-	"SelectableInGameSetup": false
-}
diff --git a/binaries/data/mods/internal/maps/scenarios/The Persian Gates.pmp b/binaries/data/mods/internal/maps/scenarios/The Persian Gates.pmp
index ecd7e941c2..141b502bcb 100644
--- a/binaries/data/mods/internal/maps/scenarios/The Persian Gates.pmp	
+++ b/binaries/data/mods/internal/maps/scenarios/The Persian Gates.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b957616a13c09b527c2b9777e3c917b0ed1c63c2b11310904d1a9a931e22a8e
-size 1476671
+oid sha256:ea58306e5895ae1f697930a07421f99b675c9f64e678280330882d2658bdd8fd
+size 1476648
diff --git a/binaries/data/mods/internal/maps/scenarios/The Persian Gates.xml b/binaries/data/mods/internal/maps/scenarios/The Persian Gates.xml
index 12fe7203aa..1363283e59 100644
--- a/binaries/data/mods/internal/maps/scenarios/The Persian Gates.xml	
+++ b/binaries/data/mods/internal/maps/scenarios/The Persian Gates.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb7d03a0802aadbb402ca69eaaef3fb9e051965b4ddd0429d975668e79dd375f
-size 153112
+oid sha256:2b07714defe911f2b4da04e99934b32ae0fd0225fd4a57072c0ff58062730fa4
+size 211820
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_female_maur_champ.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_female_maur_champ.xml
new file mode 100644
index 0000000000..8eca045145
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_female_maur_champ.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="short-haired female head">
+      <mesh>props/head_female_shorthair.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/maur_earrings_1.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="props/head/maur_fem_b.png" name="baseTex"/>
+        <texture file="props/head/maur_fem_b_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_indian_a.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_indian_a.xml
index 590628a2bd..42314ea31a 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_indian_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_indian_a.xml
@@ -3,7 +3,9 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="Indian face b">
-      <textures><texture file="props/head/indian_face_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/head/indian_face_b.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -17,5 +19,17 @@
       <mesh>props/helmet/head_indian_3.dae</mesh>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="No earrings">
+      <props>
+        <prop attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Earrings">
+      <props>
+        <prop actor="props/units/heads/maur_earrings_1.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/misc_head_ninja_fem.xml b/binaries/data/mods/public/art/actors/props/units/heads/misc_head_ninja_fem.xml
index 90b8bc855d..d9d0c0127b 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/misc_head_ninja_fem.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/misc_head_ninja_fem.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/dudette_head.dae</mesh>
+      <mesh>props/head_female_shorthair.dae</mesh>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Female-Face-01">
-      <textures><texture file="props/head/misc_fem_ninja.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/head/misc_fem_ninja.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/knife.xml b/binaries/data/mods/public/art/actors/props/units/weapons/knife.xml
new file mode 100644
index 0000000000..62d40bbd8f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/knife.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="knife">
+      <mesh>props/knife.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
index f0a2d902c8..c745ddc0e8 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,31 +31,45 @@
   <group>
     <variant frequency="2" name="Dress-Light Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Dark Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Gold">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_c.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Player Tint">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_d.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Dress-linen">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_e.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_e.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="3" name="Dress-Chiton">
       <mesh>skeletal/f_tunic.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_chiton.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_chiton.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Dress-Chiton-Linen">
       <mesh>skeletal/f_tunic.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_chiton_linen.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_chiton_linen.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -64,6 +79,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
index 41374616d0..9e87a7f19b 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,7 +31,9 @@
   <group>
     <variant frequency="1" name="Peplos-DarkBrown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/kart_fem_01.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/kart_fem_01.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -40,6 +43,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
index 1945e99b8c..be28553773 100644
--- a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -26,7 +27,9 @@
       <props>
         <prop actor="props/units/heads/head_female_celt.xml" attachpoint="head"/>
       </props>
-      <textures><texture file="skeletal/celt_fem.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/celt_fem.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -36,6 +39,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/global/ninja_female.xml b/binaries/data/mods/public/art/actors/units/global/ninja_female.xml
index 520817909a..17c0be56be 100644
--- a/binaries/data/mods/public/art/actors/units/global/ninja_female.xml
+++ b/binaries/data/mods/public/art/actors/units/global/ninja_female.xml
@@ -7,7 +7,11 @@
       <props>
         <prop actor="props/units/heads/misc_head_ninja_fem.xml" attachpoint="head"/>
       </props>
-      <textures><texture file="skeletal/ninja_female.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/ninja_female.png" name="baseTex"/>
+        <texture file="skeletal/ninja_female_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
+  <material>basic_specmap.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
index f0a2d902c8..c745ddc0e8 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,31 +31,45 @@
   <group>
     <variant frequency="2" name="Dress-Light Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Dark Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Gold">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_c.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Player Tint">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_d.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Dress-linen">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_e.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_e.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="3" name="Dress-Chiton">
       <mesh>skeletal/f_tunic.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_chiton.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_chiton.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Dress-Chiton-Linen">
       <mesh>skeletal/f_tunic.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_chiton_linen.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_chiton_linen.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -64,6 +79,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_gorgo.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_gorgo.xml
index 60e237ceda..8eef95bbaa 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/female_gorgo.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/female_gorgo.xml
@@ -7,6 +7,7 @@
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
         <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -36,6 +37,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
index a35b6b4338..19b465be4f 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -31,7 +32,9 @@
   <group>
     <variant frequency="1" name="Dress-Dark Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/iber_fem_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/iber_fem_a.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -41,6 +44,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/macedonians/female_citizen.xml
index 7671b30e3f..260f1ef297 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,19 +31,27 @@
   <group>
     <variant frequency="2" name="Dress-Light Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Dark Brown">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_b.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Gold">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_c.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="2" name="Dress-Player Tint">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/hele_fem_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/hele_fem_d.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -52,6 +61,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant.xml b/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant.xml
new file mode 100644
index 0000000000..d237a262b2
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="elephant_african_forest [adult]">
+      <animations>
+        <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
+        <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
+        <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
+        <animation file="quadraped/elephant_african_idle_02.dae" name="Idle" speed="85"/>
+        <animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="75"/>
+        <animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="75"/>
+        <animation file="quadraped/elephant_african_walk.dae" name="Walk" speed="30"/>
+        <animation file="quadraped/elephant_african_walk.dae" name="Run" speed="20"/>
+        <animation file="quadraped/elephant_african_attack.dae" name="Attack" speed="75"/>
+        <animation file="quadraped/elephant_african_death.dae" name="Death" speed="100"/>
+      </animations>
+      <mesh>skeletal/elephant_african_forest.dae</mesh>
+      <props>
+        <prop actor="units/mauryans/champion_elephant_driver.xml" attachpoint="rider"/>
+      </props>
+      <textures>
+        <texture file="skeletal/animal-elephant-base.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Run">
+      <props>
+        <prop actor="particle/dust_cav.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant_driver.xml b/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant_driver.xml
new file mode 100644
index 0000000000..eb0c76843b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/mauryans/champion_elephant_driver.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="melee" speed="50"/>
+      </animations>
+      <mesh>skeletal/m_tights.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_indian_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/maur_straight_a.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Mahout-Texture-1">
+      <textures>
+        <texture file="skeletal/maur_iar_e.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/champion_maceman.xml b/binaries/data/mods/public/art/actors/units/mauryans/champion_maceman.xml
index 8b4f94bd3b..2cebbf2c20 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/champion_maceman.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/champion_maceman.xml
@@ -43,7 +43,7 @@
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="288"/>
       </animations>
-      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/shields/maur_tall_curved_a.xml" attachpoint="shield"/>
         <prop actor="props/units/heads/head_indian_a.xml" attachpoint="head"/>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard.xml b/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard.xml
index dfc2881f40..fe8734e1c9 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard.xml
@@ -13,7 +13,7 @@
         <animation file="female/f_death_01.dae" name="Death" speed="130"/>
       </animations>
       <props>
-        <prop actor="props/units/heads/head_maur_fem.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_female_maur_champ.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/longsword_mauryan.xml" attachpoint="r_hand"/>
         <prop actor="props/units/shields/maur_bell_a.xml" attachpoint="shield"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard_archer.xml b/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard_archer.xml
index 933f4dce01..057bac36c8 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard_archer.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/champion_maiden_guard_archer.xml
@@ -11,7 +11,7 @@
         <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="melee" speed="250"/>
       </animations>
       <props>
-        <prop actor="props/units/heads/head_maur_fem.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_female_maur_champ.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
         <prop actor="props/units/weapons/bow_bamboo_long.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/mauryans/female_citizen.xml b/binaries/data/mods/public/art/actors/units/mauryans/female_citizen.xml
index 45979684fb..3aa24fc08a 100644
--- a/binaries/data/mods/public/art/actors/units/mauryans/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryans/female_citizen.xml
@@ -7,6 +7,7 @@
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
         <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -50,6 +51,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
index caa285175e..89b5f65433 100644
--- a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,11 +31,15 @@
   <group>
     <variant frequency="1" name="Dress-01">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/pers_fem_1.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/pers_fem_1.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="Dress-02">
       <mesh>skeletal/f_dress.dae</mesh>
-      <textures><texture file="skeletal/pers_fem_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/pers_fem_2.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -44,6 +49,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml b/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
index d018c9d3d5..7445053795 100644
--- a/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -30,7 +31,9 @@
   </group>
   <group>
     <variant frequency="1" name="Dress-playercolor">
-      <textures><texture file="skeletal/rome_fem_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/rome_fem_a.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -40,6 +43,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/female_citizen.xml b/binaries/data/mods/public/art/actors/units/spartans/female_citizen.xml
index fe4221cabf..a0cabe4609 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/female_citizen.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -26,7 +27,9 @@
       <props>
         <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
       </props>
-      <textures><texture file="skeletal/spart_female_1.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/spart_female_1.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -36,6 +39,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/female_gorgo.xml b/binaries/data/mods/public/art/actors/units/spartans/female_gorgo.xml
index c7eb8db93b..f3d044cf51 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/female_gorgo.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/female_gorgo.xml
@@ -6,7 +6,8 @@
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
         <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="25"/>
+        <animation file="female/f_run_01.dae" name="Run" speed="6"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="250"/>
         <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
         <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
@@ -26,7 +27,9 @@
       <props>
         <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
       </props>
-      <textures><texture file="skeletal/gown_green.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/gown_green.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -36,6 +39,16 @@
         <prop attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="melee">
+      <props>
+        <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/meshes/props/head_female_shorthair.dae b/binaries/data/mods/public/art/meshes/props/head_female_shorthair.dae
new file mode 100644
index 0000000000..c3a78d5b15
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/head_female_shorthair.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9173d7a4b63d78ba85667b4c1d3c02e7f82f3bb45fc55fbf4d29b08887417a95
+size 11190
diff --git a/binaries/data/mods/public/art/meshes/props/knife.dae b/binaries/data/mods/public/art/meshes/props/knife.dae
new file mode 100644
index 0000000000..34eb99a17e
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/knife.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81d100658b3249ad5836529f1d27876b912474ee75aac62a3d73b444e1322531
+size 17585
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b.png b/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b.png
new file mode 100644
index 0000000000..1a4d05d8a2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70059c644506390d3dad5df1a0b57ddd2b6c00387333fdc7cbca2944fc13671d
+size 18093
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b_spec.png b/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b_spec.png
new file mode 100644
index 0000000000..4e9ba3f03b
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/head/maur_fem_b_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ff51c0ced166ecbeb9a7b5974a242dea3926f7687f7ab11357749427b96fbb5
+size 7668
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/ninja_female_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/ninja_female_spec.png
new file mode 100644
index 0000000000..d1ea08d964
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/ninja_female_spec.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3fef3c0a1d3470e76a25a53ffa9dd243fef25552f2c83da5b006eebdc60bcbb
+size 12342
diff --git a/binaries/data/mods/public/maps/scenarios/Height Map 03.png b/binaries/data/mods/public/maps/scenarios/Height Map 03.png
new file mode 100644
index 0000000000..592f20de97
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Height Map 03.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a62ce7d5f7801986a902a164fb13cc33dff629eb62fe589bc53ce29fba7c5411
+size 104093
diff --git a/binaries/data/mods/public/maps/scenarios/Height Map Import - Oasis 12.png b/binaries/data/mods/public/maps/scenarios/Height Map Import - Oasis 12.png
new file mode 100644
index 0000000000..63f2b9e80a
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Height Map Import - Oasis 12.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e76327c3af0de4a322a40001787f6ad436b3885584d1e6fc4a48de13fecb1e8
+size 33765
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 dfc9a55031..ca0b902dfd 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
@@ -15,7 +15,7 @@
       <RestrictedClasses datatype="tokens">Infantry Cavalry Champion Structure CitizenSoldier</RestrictedClasses>
     </Melee>
     <Slaughter>
-      <Hack>1000.0</Hack>
+      <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
index 9093652f82..1f0a8f00eb 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -84,6 +84,6 @@ Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Sw
     <Range>80</Range>
   </Vision>
   <VisualActor>
-    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
+    <Actor>units/mauryans/champion_elephant.xml</Actor>
   </VisualActor>
 </Entity>