Merge pull request #311 from mekolat/gender2

3rd gender, new races

198 files changed, 89 insertions, 84 deletions

diff --git a/graphics/sprites/equipment/chest/assassin-male.png b/graphics/sprites/equipment/chest/assassin.png
index aff8e6a9..aff8e6a9 100644
--- a/graphics/sprites/equipment/chest/assassin-male.png
+++ b/graphics/sprites/equipment/chest/assassin.png
diff --git a/graphics/sprites/equipment/chest/assassin-male.xml b/graphics/sprites/equipment/chest/assassin.xml
index f999087e..00fd7f1a 100644
--- a/graphics/sprites/equipment/chest/assassin-male.xml
+++ b/graphics/sprites/equipment/chest/assassin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/assassin-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/assassin.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/bromenalchest-male.png b/graphics/sprites/equipment/chest/bromenalchest.png
index 2d84c1c6..2d84c1c6 100644
--- a/graphics/sprites/equipment/chest/bromenalchest-male.png
+++ b/graphics/sprites/equipment/chest/bromenalchest.png
diff --git a/graphics/sprites/equipment/chest/bromenalchest-male.xml b/graphics/sprites/equipment/chest/bromenalchest.xml
index 2444c7d6..5d6e5d7b 100644
--- a/graphics/sprites/equipment/chest/bromenalchest-male.xml
+++ b/graphics/sprites/equipment/chest/bromenalchest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/chainmail-male.png b/graphics/sprites/equipment/chest/chainmail.png
index c3817650..c3817650 100644
--- a/graphics/sprites/equipment/chest/chainmail-male.png
+++ b/graphics/sprites/equipment/chest/chainmail.png
diff --git a/graphics/sprites/equipment/chest/chainmail-male.xml b/graphics/sprites/equipment/chest/chainmail.xml
index a1f466f6..98e16e14 100644
--- a/graphics/sprites/equipment/chest/chainmail-male.xml
+++ b/graphics/sprites/equipment/chest/chainmail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/contributor-male.png b/graphics/sprites/equipment/chest/contributor.png
index a5ee1adb..a5ee1adb 100644
--- a/graphics/sprites/equipment/chest/contributor-male.png
+++ b/graphics/sprites/equipment/chest/contributor.png
diff --git a/graphics/sprites/equipment/chest/contributor-male.xml b/graphics/sprites/equipment/chest/contributor.xml
index 6c5003f4..50320c4f 100644
--- a/graphics/sprites/equipment/chest/contributor-male.xml
+++ b/graphics/sprites/equipment/chest/contributor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/contributor-male.png|W;R" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/contributor.png|W;R" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/cotton-male.png b/graphics/sprites/equipment/chest/cotton.png
index 588bc7f8..588bc7f8 100644
--- a/graphics/sprites/equipment/chest/cotton-male.png
+++ b/graphics/sprites/equipment/chest/cotton.png
diff --git a/graphics/sprites/equipment/chest/cotton-male.xml b/graphics/sprites/equipment/chest/cotton.xml
index 4263a7fb..690acf54 100644
--- a/graphics/sprites/equipment/chest/cotton-male.xml
+++ b/graphics/sprites/equipment/chest/cotton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/cotton-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/cotton.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/demonwarlordplate-male.png b/graphics/sprites/equipment/chest/demonwarlordplate.png
index 04be8582..04be8582 100644
--- a/graphics/sprites/equipment/chest/demonwarlordplate-male.png
+++ b/graphics/sprites/equipment/chest/demonwarlordplate.png
diff --git a/graphics/sprites/equipment/chest/demonwarlordplate-male.xml b/graphics/sprites/equipment/chest/demonwarlordplate.xml
index a2ecc56f..5d4a0de7 100644
--- a/graphics/sprites/equipment/chest/demonwarlordplate-male.xml
+++ b/graphics/sprites/equipment/chest/demonwarlordplate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/demonwarlordplate-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/demonwarlordplate.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/fine-dress-male.png b/graphics/sprites/equipment/chest/fine-dress.png
index 68e9ea68..68e9ea68 100644
--- a/graphics/sprites/equipment/chest/fine-dress-male.png
+++ b/graphics/sprites/equipment/chest/fine-dress.png
diff --git a/graphics/sprites/equipment/chest/fine-dress-male.xml b/graphics/sprites/equipment/chest/fine-dress.xml
index f0952e95..2c5980f9 100644
--- a/graphics/sprites/equipment/chest/fine-dress-male.xml
+++ b/graphics/sprites/equipment/chest/fine-dress.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/fine-dress-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/fine-dress.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/forest-armor-male.png b/graphics/sprites/equipment/chest/forest-armor.png
index e804e012..e804e012 100644
--- a/graphics/sprites/equipment/chest/forest-armor-male.png
+++ b/graphics/sprites/equipment/chest/forest-armor.png
diff --git a/graphics/sprites/equipment/chest/forest-armor-male.xml b/graphics/sprites/equipment/chest/forest-armor.xml
index 602708d1..2e8abe82 100644
--- a/graphics/sprites/equipment/chest/forest-armor-male.xml
+++ b/graphics/sprites/equipment/chest/forest-armor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/forest-armor-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/forest-armor.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/leather-male.png b/graphics/sprites/equipment/chest/leather.png
index a1899fc7..a1899fc7 100644
--- a/graphics/sprites/equipment/chest/leather-male.png
+++ b/graphics/sprites/equipment/chest/leather.png
diff --git a/graphics/sprites/equipment/chest/leather-male.xml b/graphics/sprites/equipment/chest/leather.xml
index f6805f9c..28a78fb8 100644
--- a/graphics/sprites/equipment/chest/leather-male.xml
+++ b/graphics/sprites/equipment/chest/leather.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/leather-male.png|W;R" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/leather.png|W;R" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/lightplatemail-male.png b/graphics/sprites/equipment/chest/lightplatemail.png
index 66878079..66878079 100644
--- a/graphics/sprites/equipment/chest/lightplatemail-male.png
+++ b/graphics/sprites/equipment/chest/lightplatemail.png
diff --git a/graphics/sprites/equipment/chest/lightplatemail-male.xml b/graphics/sprites/equipment/chest/lightplatemail.xml
index 06225689..b3a11638 100644
--- a/graphics/sprites/equipment/chest/lightplatemail-male.xml
+++ b/graphics/sprites/equipment/chest/lightplatemail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/lightplatemail-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/lightplatemail.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/robe-male.png b/graphics/sprites/equipment/chest/robe.png
index c06474df..c06474df 100644
--- a/graphics/sprites/equipment/chest/robe-male.png
+++ b/graphics/sprites/equipment/chest/robe.png
diff --git a/graphics/sprites/equipment/chest/robe-male.xml b/graphics/sprites/equipment/chest/robe.xml
index 4e767e3b..2889638d 100644
--- a/graphics/sprites/equipment/chest/robe-male.xml
+++ b/graphics/sprites/equipment/chest/robe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/robe-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/robe.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/shorttanktop-male.png b/graphics/sprites/equipment/chest/shorttanktop.png
index 26e9d7d2..26e9d7d2 100644
--- a/graphics/sprites/equipment/chest/shorttanktop-male.png
+++ b/graphics/sprites/equipment/chest/shorttanktop.png
diff --git a/graphics/sprites/equipment/chest/shorttanktop-male.xml b/graphics/sprites/equipment/chest/shorttanktop.xml
index 3de4a880..7288c876 100644
--- a/graphics/sprites/equipment/chest/shorttanktop-male.xml
+++ b/graphics/sprites/equipment/chest/shorttanktop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/shorttanktop-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/shorttanktop.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/sorcerer-robe-male.png b/graphics/sprites/equipment/chest/sorcerer-robe.png
index 9114f0f0..9114f0f0 100644
--- a/graphics/sprites/equipment/chest/sorcerer-robe-male.png
+++ b/graphics/sprites/equipment/chest/sorcerer-robe.png
diff --git a/graphics/sprites/equipment/chest/sorcerer-robe-male.xml b/graphics/sprites/equipment/chest/sorcerer-robe.xml
index 0450525b..eaf34fca 100644
--- a/graphics/sprites/equipment/chest/sorcerer-robe-male.xml
+++ b/graphics/sprites/equipment/chest/sorcerer-robe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/sorcerer-robe-male.png|W;R" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/sorcerer-robe.png|W;R" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/tanktop-male.png b/graphics/sprites/equipment/chest/tanktop.png
index bda08a2e..bda08a2e 100644
--- a/graphics/sprites/equipment/chest/tanktop-male.png
+++ b/graphics/sprites/equipment/chest/tanktop.png
diff --git a/graphics/sprites/equipment/chest/tanktop-male.xml b/graphics/sprites/equipment/chest/tanktop.xml
index c309ca29..c83b9500 100644
--- a/graphics/sprites/equipment/chest/tanktop-male.xml
+++ b/graphics/sprites/equipment/chest/tanktop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/tanktop-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/tanktop.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/terranite-male.png b/graphics/sprites/equipment/chest/terranite.png
index 431b413f..431b413f 100644
--- a/graphics/sprites/equipment/chest/terranite-male.png
+++ b/graphics/sprites/equipment/chest/terranite.png
diff --git a/graphics/sprites/equipment/chest/terranite-male.xml b/graphics/sprites/equipment/chest/terranite.xml
index 03b9944d..1825b4e6 100644
--- a/graphics/sprites/equipment/chest/terranite-male.xml
+++ b/graphics/sprites/equipment/chest/terranite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/terranite-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/terranite.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/tnecksweater-male.png b/graphics/sprites/equipment/chest/tnecksweater.png
index aab1b252..aab1b252 100644
--- a/graphics/sprites/equipment/chest/tnecksweater-male.png
+++ b/graphics/sprites/equipment/chest/tnecksweater.png
diff --git a/graphics/sprites/equipment/chest/tnecksweater-male.xml b/graphics/sprites/equipment/chest/tnecksweater.xml
index 7fce38d5..d3643412 100644
--- a/graphics/sprites/equipment/chest/tnecksweater-male.xml
+++ b/graphics/sprites/equipment/chest/tnecksweater.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/tnecksweater-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/tnecksweater.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/ugly-sweater-male.png b/graphics/sprites/equipment/chest/ugly-sweater.png
index 8e7c41da..8e7c41da 100644
--- a/graphics/sprites/equipment/chest/ugly-sweater-male.png
+++ b/graphics/sprites/equipment/chest/ugly-sweater.png
diff --git a/graphics/sprites/equipment/chest/ugly-sweater-male.xml b/graphics/sprites/equipment/chest/ugly-sweater.xml
index 921f06e8..ddda5318 100644
--- a/graphics/sprites/equipment/chest/ugly-sweater-male.xml
+++ b/graphics/sprites/equipment/chest/ugly-sweater.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/ugly-sweater-male.png|W;Y;G;C" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/ugly-sweater.png|W;Y;G;C" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/valentine-dress.png b/graphics/sprites/equipment/chest/valentine-dress.png
deleted file mode 100644
index 236c9223..00000000
--- a/graphics/sprites/equipment/chest/valentine-dress.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/chest/valentine-dress.xml b/graphics/sprites/equipment/chest/valentine-dress.xml
deleted file mode 100644
index 86fe6aa5..00000000
--- a/graphics/sprites/equipment/chest/valentine-dress.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/valentine-dress.png|R" width="64" height="64"/>
-  <include file="model/male.xml"/>
-</sprite>
diff --git a/graphics/sprites/equipment/chest/vnecksweater-male.png b/graphics/sprites/equipment/chest/vnecksweater.png
index 6b35de11..6b35de11 100644
--- a/graphics/sprites/equipment/chest/vnecksweater-male.png
+++ b/graphics/sprites/equipment/chest/vnecksweater.png
diff --git a/graphics/sprites/equipment/chest/vnecksweater-male.xml b/graphics/sprites/equipment/chest/vnecksweater.xml
index 14fe6a41..54356c1b 100644
--- a/graphics/sprites/equipment/chest/vnecksweater-male.xml
+++ b/graphics/sprites/equipment/chest/vnecksweater.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/vnecksweater-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/vnecksweater.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/warlordplate-male.png b/graphics/sprites/equipment/chest/warlordplate.png
index 7feeb650..7feeb650 100644
--- a/graphics/sprites/equipment/chest/warlordplate-male.png
+++ b/graphics/sprites/equipment/chest/warlordplate.png
diff --git a/graphics/sprites/equipment/chest/warlordplate-male.xml b/graphics/sprites/equipment/chest/warlordplate.xml
index 839e889c..936c621a 100644
--- a/graphics/sprites/equipment/chest/warlordplate-male.xml
+++ b/graphics/sprites/equipment/chest/warlordplate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/warlordplate-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/warlordplate.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/assassin-boots-male.png b/graphics/sprites/equipment/feet/assassin-boots.png
index 46131c9f..46131c9f 100644
--- a/graphics/sprites/equipment/feet/assassin-boots-male.png
+++ b/graphics/sprites/equipment/feet/assassin-boots.png
diff --git a/graphics/sprites/equipment/feet/assassin-boots-male.xml b/graphics/sprites/equipment/feet/assassin-boots.xml
index 0edfde33..5f96be25 100644
--- a/graphics/sprites/equipment/feet/assassin-boots-male.xml
+++ b/graphics/sprites/equipment/feet/assassin-boots.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/boots-male.png b/graphics/sprites/equipment/feet/boots.png
index ec18ecac..ec18ecac 100644
--- a/graphics/sprites/equipment/feet/boots-male.png
+++ b/graphics/sprites/equipment/feet/boots.png
diff --git a/graphics/sprites/equipment/feet/boots-male.xml b/graphics/sprites/equipment/feet/boots.xml
index d9d0f40d..c07ec3ec 100644
--- a/graphics/sprites/equipment/feet/boots-male.xml
+++ b/graphics/sprites/equipment/feet/boots.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/boots-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/boots.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/bromenalboots-male.png b/graphics/sprites/equipment/feet/bromenalboots.png
index 880ddf1c..880ddf1c 100644
--- a/graphics/sprites/equipment/feet/bromenalboots-male.png
+++ b/graphics/sprites/equipment/feet/bromenalboots.png
diff --git a/graphics/sprites/equipment/feet/bromenalboots-male.xml b/graphics/sprites/equipment/feet/bromenalboots.xml
index bbe8d97f..220f2919 100644
--- a/graphics/sprites/equipment/feet/bromenalboots-male.xml
+++ b/graphics/sprites/equipment/feet/bromenalboots.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/furboots-male.png b/graphics/sprites/equipment/feet/furboots.png
index 0092f399..0092f399 100644
--- a/graphics/sprites/equipment/feet/furboots-male.png
+++ b/graphics/sprites/equipment/feet/furboots.png
diff --git a/graphics/sprites/equipment/feet/furboots-male.xml b/graphics/sprites/equipment/feet/furboots.xml
index 0a7d7f1e..246dd4b4 100644
--- a/graphics/sprites/equipment/feet/furboots-male.xml
+++ b/graphics/sprites/equipment/feet/furboots.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/furboots-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/furboots.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/warlordboots-male.png b/graphics/sprites/equipment/feet/warlordboots.png
index 77c233a9..77c233a9 100644
--- a/graphics/sprites/equipment/feet/warlordboots-male.png
+++ b/graphics/sprites/equipment/feet/warlordboots.png
diff --git a/graphics/sprites/equipment/feet/warlordboots-male.xml b/graphics/sprites/equipment/feet/warlordboots.xml
index fa942eef..9dde07aa 100644
--- a/graphics/sprites/equipment/feet/warlordboots-male.xml
+++ b/graphics/sprites/equipment/feet/warlordboots.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/warlordboots-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/warlordboots.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/hands/assassin-male.png b/graphics/sprites/equipment/hands/assassin.png
index b890d8f2..b890d8f2 100644
--- a/graphics/sprites/equipment/hands/assassin-male.png
+++ b/graphics/sprites/equipment/hands/assassin.png
diff --git a/graphics/sprites/equipment/hands/assassin-male.xml b/graphics/sprites/equipment/hands/assassin.xml
index 77dc4cf0..f1d33451 100644
--- a/graphics/sprites/equipment/hands/assassin-male.xml
+++ b/graphics/sprites/equipment/hands/assassin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/hands/assassin-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/hands/assassin.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-male.png b/graphics/sprites/equipment/hands/bromenalgloves.png
index 86e75c6b..86e75c6b 100644
--- a/graphics/sprites/equipment/hands/bromenalgloves-male.png
+++ b/graphics/sprites/equipment/hands/bromenalgloves.png
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-male.xml b/graphics/sprites/equipment/hands/bromenalgloves.xml
index a94a734f..85f9f3fa 100644
--- a/graphics/sprites/equipment/hands/bromenalgloves-male.xml
+++ b/graphics/sprites/equipment/hands/bromenalgloves.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/hands/generic-male.png b/graphics/sprites/equipment/hands/generic.png
index 6f1becaa..6f1becaa 100644
--- a/graphics/sprites/equipment/hands/generic-male.png
+++ b/graphics/sprites/equipment/hands/generic.png
diff --git a/graphics/sprites/equipment/hands/generic-male.xml b/graphics/sprites/equipment/hands/generic.xml
index c314f575..a5fea111 100644
--- a/graphics/sprites/equipment/hands/generic-male.xml
+++ b/graphics/sprites/equipment/hands/generic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/hands/generic-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/hands/generic.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/antlerhat-male.xml b/graphics/sprites/equipment/head/antlerhat.xml
index 9180e69c..9180e69c 100644
--- a/graphics/sprites/equipment/head/antlerhat-male.xml
+++ b/graphics/sprites/equipment/head/antlerhat.xml
diff --git a/graphics/sprites/equipment/head/autumn-mask-male.xml b/graphics/sprites/equipment/head/autumn-mask.xml
index 0a786dbf..0a786dbf 100644
--- a/graphics/sprites/equipment/head/autumn-mask-male.xml
+++ b/graphics/sprites/equipment/head/autumn-mask.xml
diff --git a/graphics/sprites/equipment/head/axehat-male.xml b/graphics/sprites/equipment/head/axehat.xml
index 5c9f320b..5c9f320b 100644
--- a/graphics/sprites/equipment/head/axehat-male.xml
+++ b/graphics/sprites/equipment/head/axehat.xml
diff --git a/graphics/sprites/equipment/head/bandana-male.xml b/graphics/sprites/equipment/head/bandana.xml
index 33347c9d..33347c9d 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana.xml
diff --git a/graphics/sprites/equipment/head/beaniecopter-male.xml b/graphics/sprites/equipment/head/beaniecopter.xml
index 62a4dc83..62a4dc83 100644
--- a/graphics/sprites/equipment/head/beaniecopter-male.xml
+++ b/graphics/sprites/equipment/head/beaniecopter.xml
diff --git a/graphics/sprites/equipment/head/beard-male.xml b/graphics/sprites/equipment/head/beard.xml
index 5a28c319..abd9e928 100644
--- a/graphics/sprites/equipment/head/beard-male.xml
+++ b/graphics/sprites/equipment/head/beard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/beard.png|W" width="40" height="40"/>
-  <include file="equipment/head/mustache-male.xml"/>
+  <include file="equipment/head/mustache.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/beret-male.xml b/graphics/sprites/equipment/head/beret.xml
index 43a55414..43a55414 100644
--- a/graphics/sprites/equipment/head/beret-male.xml
+++ b/graphics/sprites/equipment/head/beret.xml
diff --git a/graphics/sprites/equipment/head/bowler-hat-brown-male.xml b/graphics/sprites/equipment/head/bowler-hat-brown.xml
index 5056f66b..5056f66b 100644
--- a/graphics/sprites/equipment/head/bowler-hat-brown-male.xml
+++ b/graphics/sprites/equipment/head/bowler-hat-brown.xml
diff --git a/graphics/sprites/equipment/head/bowler-hat-male.xml b/graphics/sprites/equipment/head/bowler-hat.xml
index 782da0e9..782da0e9 100644
--- a/graphics/sprites/equipment/head/bowler-hat-male.xml
+++ b/graphics/sprites/equipment/head/bowler-hat.xml
diff --git a/graphics/sprites/equipment/head/bromenalhelmet-male.xml b/graphics/sprites/equipment/head/bromenalhelmet.xml
index 5ff122dc..5ff122dc 100644
--- a/graphics/sprites/equipment/head/bromenalhelmet-male.xml
+++ b/graphics/sprites/equipment/head/bromenalhelmet.xml
diff --git a/graphics/sprites/equipment/head/bucket-male.xml b/graphics/sprites/equipment/head/bucket.xml
index 21ee9f4a..21ee9f4a 100644
--- a/graphics/sprites/equipment/head/bucket-male.xml
+++ b/graphics/sprites/equipment/head/bucket.xml
diff --git a/graphics/sprites/equipment/head/bull-male.xml b/graphics/sprites/equipment/head/bull.xml
index 986be1e4..986be1e4 100644
--- a/graphics/sprites/equipment/head/bull-male.xml
+++ b/graphics/sprites/equipment/head/bull.xml
diff --git a/graphics/sprites/equipment/head/bunnyears-male.xml b/graphics/sprites/equipment/head/bunnyears.xml
index ae5ec96e..ae5ec96e 100644
--- a/graphics/sprites/equipment/head/bunnyears-male.xml
+++ b/graphics/sprites/equipment/head/bunnyears.xml
diff --git a/graphics/sprites/equipment/head/candlehelmet-male.xml b/graphics/sprites/equipment/head/candlehelmet.xml
index 9d676b03..9d676b03 100644
--- a/graphics/sprites/equipment/head/candlehelmet-male.xml
+++ b/graphics/sprites/equipment/head/candlehelmet.xml
diff --git a/graphics/sprites/equipment/head/cap-male.xml b/graphics/sprites/equipment/head/cap.xml
index 8662c9d8..8662c9d8 100644
--- a/graphics/sprites/equipment/head/cap-male.xml
+++ b/graphics/sprites/equipment/head/cap.xml
diff --git a/graphics/sprites/equipment/head/captain-hat-male.xml b/graphics/sprites/equipment/head/captain-hat.xml
index f1f319c2..f1f319c2 100644
--- a/graphics/sprites/equipment/head/captain-hat-male.xml
+++ b/graphics/sprites/equipment/head/captain-hat.xml
diff --git a/graphics/sprites/equipment/head/cashiershade-male.xml b/graphics/sprites/equipment/head/cashiershade.xml
index b0ab17ab..b0ab17ab 100644
--- a/graphics/sprites/equipment/head/cashiershade-male.xml
+++ b/graphics/sprites/equipment/head/cashiershade.xml
diff --git a/graphics/sprites/equipment/head/catears-male.xml b/graphics/sprites/equipment/head/catears.xml
index 491bada4..491bada4 100644
--- a/graphics/sprites/equipment/head/catears-male.xml
+++ b/graphics/sprites/equipment/head/catears.xml
diff --git a/graphics/sprites/equipment/head/chefhat-male.xml b/graphics/sprites/equipment/head/chefhat.xml
index 14444f57..14444f57 100644
--- a/graphics/sprites/equipment/head/chefhat-male.xml
+++ b/graphics/sprites/equipment/head/chefhat.xml
diff --git a/graphics/sprites/equipment/head/christmastree-male.xml b/graphics/sprites/equipment/head/christmastree.xml
index 239f7a9b..239f7a9b 100644
--- a/graphics/sprites/equipment/head/christmastree-male.xml
+++ b/graphics/sprites/equipment/head/christmastree.xml
diff --git a/graphics/sprites/equipment/head/circlet-male.xml b/graphics/sprites/equipment/head/circlet.xml
index 88a05045..88a05045 100644
--- a/graphics/sprites/equipment/head/circlet-male.xml
+++ b/graphics/sprites/equipment/head/circlet.xml
diff --git a/graphics/sprites/equipment/head/cowboyblack-male.xml b/graphics/sprites/equipment/head/cowboyblack.xml
index 11e37163..11e37163 100644
--- a/graphics/sprites/equipment/head/cowboyblack-male.xml
+++ b/graphics/sprites/equipment/head/cowboyblack.xml
diff --git a/graphics/sprites/equipment/head/cowboywhite-male.xml b/graphics/sprites/equipment/head/cowboywhite.xml
index 4f43c65b..4f43c65b 100644
--- a/graphics/sprites/equipment/head/cowboywhite-male.xml
+++ b/graphics/sprites/equipment/head/cowboywhite.xml
diff --git a/graphics/sprites/equipment/head/crown-male.xml b/graphics/sprites/equipment/head/crown.xml
index 74099c44..74099c44 100644
--- a/graphics/sprites/equipment/head/crown-male.xml
+++ b/graphics/sprites/equipment/head/crown.xml
diff --git a/graphics/sprites/equipment/head/crusadehelm-male.xml b/graphics/sprites/equipment/head/crusadehelm.xml
index 3b155eb4..3b155eb4 100644
--- a/graphics/sprites/equipment/head/crusadehelm-male.xml
+++ b/graphics/sprites/equipment/head/crusadehelm.xml
diff --git a/graphics/sprites/equipment/head/dark-helm-male.xml b/graphics/sprites/equipment/head/dark-helm.xml
index 5586fa30..5586fa30 100644
--- a/graphics/sprites/equipment/head/dark-helm-male.xml
+++ b/graphics/sprites/equipment/head/dark-helm.xml
diff --git a/graphics/sprites/equipment/head/demonmask-male.xml b/graphics/sprites/equipment/head/demonmask.xml
index faef3474..faef3474 100644
--- a/graphics/sprites/equipment/head/demonmask-male.xml
+++ b/graphics/sprites/equipment/head/demonmask.xml
diff --git a/graphics/sprites/equipment/head/desert-helmet-male.xml b/graphics/sprites/equipment/head/desert-helmet.xml
index 62b85325..62b85325 100644
--- a/graphics/sprites/equipment/head/desert-helmet-male.xml
+++ b/graphics/sprites/equipment/head/desert-helmet.xml
diff --git a/graphics/sprites/equipment/head/deserthat-male.xml b/graphics/sprites/equipment/head/deserthat.xml
index 7682f625..7682f625 100644
--- a/graphics/sprites/equipment/head/deserthat-male.xml
+++ b/graphics/sprites/equipment/head/deserthat.xml
diff --git a/graphics/sprites/equipment/head/devcap-male.xml b/graphics/sprites/equipment/head/devcap.xml
index 5bc2fe8b..5bc2fe8b 100644
--- a/graphics/sprites/equipment/head/devcap-male.xml
+++ b/graphics/sprites/equipment/head/devcap.xml
diff --git a/graphics/sprites/equipment/head/earmuffs-male.xml b/graphics/sprites/equipment/head/earmuffs.xml
index 1de35980..1de35980 100644
--- a/graphics/sprites/equipment/head/earmuffs-male.xml
+++ b/graphics/sprites/equipment/head/earmuffs.xml
diff --git a/graphics/sprites/equipment/head/eggshell-male.xml b/graphics/sprites/equipment/head/eggshell.xml
index f7418672..f7418672 100644
--- a/graphics/sprites/equipment/head/eggshell-male.xml
+++ b/graphics/sprites/equipment/head/eggshell.xml
diff --git a/graphics/sprites/equipment/head/elf-nightcap-male.xml b/graphics/sprites/equipment/head/elf-nightcap.xml
index d6c905e2..d6c905e2 100644
--- a/graphics/sprites/equipment/head/elf-nightcap-male.xml
+++ b/graphics/sprites/equipment/head/elf-nightcap.xml
diff --git a/graphics/sprites/equipment/head/eskimohat-male.xml b/graphics/sprites/equipment/head/eskimohat.xml
index 820b6438..820b6438 100644
--- a/graphics/sprites/equipment/head/eskimohat-male.xml
+++ b/graphics/sprites/equipment/head/eskimohat.xml
diff --git a/graphics/sprites/equipment/head/eyepatch-male.xml b/graphics/sprites/equipment/head/eyepatch.xml
index f2e607a8..f2e607a8 100644
--- a/graphics/sprites/equipment/head/eyepatch-male.xml
+++ b/graphics/sprites/equipment/head/eyepatch.xml
diff --git a/graphics/sprites/equipment/head/fairy_hat-male.xml b/graphics/sprites/equipment/head/fairy_hat.xml
index 360cff1b..360cff1b 100644
--- a/graphics/sprites/equipment/head/fairy_hat-male.xml
+++ b/graphics/sprites/equipment/head/fairy_hat.xml
diff --git a/graphics/sprites/equipment/head/fancyhat-male.xml b/graphics/sprites/equipment/head/fancyhat.xml
index 6f3e00e4..6f3e00e4 100644
--- a/graphics/sprites/equipment/head/fancyhat-male.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
diff --git a/graphics/sprites/equipment/head/fluffyhat-male.xml b/graphics/sprites/equipment/head/fluffyhat.xml
index fe583925..fe583925 100644
--- a/graphics/sprites/equipment/head/fluffyhat-male.xml
+++ b/graphics/sprites/equipment/head/fluffyhat.xml
diff --git a/graphics/sprites/equipment/head/funkywinter-male.xml b/graphics/sprites/equipment/head/funkywinter.xml
index 2f533344..2f533344 100644
--- a/graphics/sprites/equipment/head/funkywinter-male.xml
+++ b/graphics/sprites/equipment/head/funkywinter.xml
diff --git a/graphics/sprites/equipment/head/gas-carbon-male.xml b/graphics/sprites/equipment/head/gas-carbon.xml
index 978aab5f..978aab5f 100644
--- a/graphics/sprites/equipment/head/gas-carbon-male.xml
+++ b/graphics/sprites/equipment/head/gas-carbon.xml
diff --git a/graphics/sprites/equipment/head/gasmask-male.xml b/graphics/sprites/equipment/head/gasmask.xml
index a722fae1..a722fae1 100644
--- a/graphics/sprites/equipment/head/gasmask-male.xml
+++ b/graphics/sprites/equipment/head/gasmask.xml
diff --git a/graphics/sprites/equipment/head/glasses-male.xml b/graphics/sprites/equipment/head/glasses.xml
index e338fac3..e338fac3 100644
--- a/graphics/sprites/equipment/head/glasses-male.xml
+++ b/graphics/sprites/equipment/head/glasses.xml
diff --git a/graphics/sprites/equipment/head/gmcap-male.xml b/graphics/sprites/equipment/head/gmcap.xml
index 79cac04e..79cac04e 100644
--- a/graphics/sprites/equipment/head/gmcap-male.xml
+++ b/graphics/sprites/equipment/head/gmcap.xml
diff --git a/graphics/sprites/equipment/head/goatee-male.xml b/graphics/sprites/equipment/head/goatee.xml
index b36603f7..44d2ee6e 100644
--- a/graphics/sprites/equipment/head/goatee-male.xml
+++ b/graphics/sprites/equipment/head/goatee.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/goatee.png|W" width="40" height="40"/>
-  <include file="equipment/head/mustache-male.xml"/>
+  <include file="equipment/head/mustache.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/goblin-mask-male.xml b/graphics/sprites/equipment/head/goblin-mask.xml
index c2f39fab..c2f39fab 100644
--- a/graphics/sprites/equipment/head/goblin-mask-male.xml
+++ b/graphics/sprites/equipment/head/goblin-mask.xml
diff --git a/graphics/sprites/equipment/head/goggles-male.xml b/graphics/sprites/equipment/head/goggles.xml
index 2738320b..2738320b 100644
--- a/graphics/sprites/equipment/head/goggles-male.xml
+++ b/graphics/sprites/equipment/head/goggles.xml
diff --git a/graphics/sprites/equipment/head/gradcap-male.xml b/graphics/sprites/equipment/head/gradcap.xml
index 6fab9707..6fab9707 100644
--- a/graphics/sprites/equipment/head/gradcap-male.xml
+++ b/graphics/sprites/equipment/head/gradcap.xml
diff --git a/graphics/sprites/equipment/head/guyfawkes-male.xml b/graphics/sprites/equipment/head/guyfawkes.xml
index 3cf880e9..3cf880e9 100644
--- a/graphics/sprites/equipment/head/guyfawkes-male.xml
+++ b/graphics/sprites/equipment/head/guyfawkes.xml
diff --git a/graphics/sprites/equipment/head/heart-glasses-male.xml b/graphics/sprites/equipment/head/heart-glasses.xml
index 1b1c9071..1b1c9071 100644
--- a/graphics/sprites/equipment/head/heart-glasses-male.xml
+++ b/graphics/sprites/equipment/head/heart-glasses.xml
diff --git a/graphics/sprites/equipment/head/highpriest-crown-male.xml b/graphics/sprites/equipment/head/highpriest-crown.xml
index f67059f6..ab3484df 100644
--- a/graphics/sprites/equipment/head/highpriest-crown-male.xml
+++ b/graphics/sprites/equipment/head/highpriest-crown.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/highpriest-crown.png" width="40" height="40"/>
-  <include file="equipment/head/monster-skull-helm-male.xml"/>
+  <include file="equipment/head/monster-skull-helm.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/infantryhelm-male.xml b/graphics/sprites/equipment/head/infantryhelm.xml
index be90144b..be90144b 100644
--- a/graphics/sprites/equipment/head/infantryhelm-male.xml
+++ b/graphics/sprites/equipment/head/infantryhelm.xml
diff --git a/graphics/sprites/equipment/head/inspector-hat-male.xml b/graphics/sprites/equipment/head/inspector-hat.xml
index 0ef382e4..0ef382e4 100644
--- a/graphics/sprites/equipment/head/inspector-hat-male.xml
+++ b/graphics/sprites/equipment/head/inspector-hat.xml
diff --git a/graphics/sprites/equipment/head/jestermask-male.xml b/graphics/sprites/equipment/head/jestermask.xml
index d1d6bcd1..d1d6bcd1 100644
--- a/graphics/sprites/equipment/head/jestermask-male.xml
+++ b/graphics/sprites/equipment/head/jestermask.xml
diff --git a/graphics/sprites/equipment/head/knighthelm-male.xml b/graphics/sprites/equipment/head/knighthelm.xml
index a0a93bcb..a0a93bcb 100644
--- a/graphics/sprites/equipment/head/knighthelm-male.xml
+++ b/graphics/sprites/equipment/head/knighthelm.xml
diff --git a/graphics/sprites/equipment/head/knit-cap-male.xml b/graphics/sprites/equipment/head/knit-cap.xml
index e1b826f4..e1b826f4 100644
--- a/graphics/sprites/equipment/head/knit-cap-male.xml
+++ b/graphics/sprites/equipment/head/knit-cap.xml
diff --git a/graphics/sprites/equipment/head/long-beard-male.xml b/graphics/sprites/equipment/head/long-beard.xml
index d8b47afb..6253c057 100644
--- a/graphics/sprites/equipment/head/long-beard-male.xml
+++ b/graphics/sprites/equipment/head/long-beard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/long-beard.png|W" width="40" height="40"/>
-  <include file="equipment/head/mustache-male.xml"/>
+  <include file="equipment/head/mustache.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/magicgmtophat-male.xml b/graphics/sprites/equipment/head/magicgmtophat.xml
index c4cc5347..c4cc5347 100644
--- a/graphics/sprites/equipment/head/magicgmtophat-male.xml
+++ b/graphics/sprites/equipment/head/magicgmtophat.xml
diff --git a/graphics/sprites/equipment/head/mask-male.xml b/graphics/sprites/equipment/head/mask.xml
index 36eef7b3..36eef7b3 100644
--- a/graphics/sprites/equipment/head/mask-male.xml
+++ b/graphics/sprites/equipment/head/mask.xml
diff --git a/graphics/sprites/equipment/head/minershat-male.xml b/graphics/sprites/equipment/head/minershat.xml
index 3ae2f591..3ae2f591 100644
--- a/graphics/sprites/equipment/head/minershat-male.xml
+++ b/graphics/sprites/equipment/head/minershat.xml
diff --git a/graphics/sprites/equipment/head/monocle-male.xml b/graphics/sprites/equipment/head/monocle.xml
index 269a6566..269a6566 100644
--- a/graphics/sprites/equipment/head/monocle-male.xml
+++ b/graphics/sprites/equipment/head/monocle.xml
diff --git a/graphics/sprites/equipment/head/monster-skull-helm-male.xml b/graphics/sprites/equipment/head/monster-skull-helm.xml
index f36762b3..f36762b3 100644
--- a/graphics/sprites/equipment/head/monster-skull-helm-male.xml
+++ b/graphics/sprites/equipment/head/monster-skull-helm.xml
diff --git a/graphics/sprites/equipment/head/moonshroomhat-male.xml b/graphics/sprites/equipment/head/moonshroomhat.xml
index 7d591353..7d591353 100644
--- a/graphics/sprites/equipment/head/moonshroomhat-male.xml
+++ b/graphics/sprites/equipment/head/moonshroomhat.xml
diff --git a/graphics/sprites/equipment/head/mouboohead-male.xml b/graphics/sprites/equipment/head/mouboohead.xml
index 8bd29dd5..8bd29dd5 100644
--- a/graphics/sprites/equipment/head/mouboohead-male.xml
+++ b/graphics/sprites/equipment/head/mouboohead.xml
diff --git a/graphics/sprites/equipment/head/moubootaurhead-male.xml b/graphics/sprites/equipment/head/moubootaurhead.xml
index ef4c06aa..82f5f3a7 100644
--- a/graphics/sprites/equipment/head/moubootaurhead-male.xml
+++ b/graphics/sprites/equipment/head/moubootaurhead.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/moubootaurhead.png" width="80" height="51"/>
-  <include file="equipment/head/christmastree-male.xml"/>
+  <include file="equipment/head/christmastree.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/mushroom-male.xml b/graphics/sprites/equipment/head/mushroom.xml
index 8fb5b8eb..8fb5b8eb 100644
--- a/graphics/sprites/equipment/head/mushroom-male.xml
+++ b/graphics/sprites/equipment/head/mushroom.xml
diff --git a/graphics/sprites/equipment/head/mustache-male.xml b/graphics/sprites/equipment/head/mustache.xml
index fc26f89a..fc26f89a 100644
--- a/graphics/sprites/equipment/head/mustache-male.xml
+++ b/graphics/sprites/equipment/head/mustache.xml
diff --git a/graphics/sprites/equipment/head/nohmask-male.xml b/graphics/sprites/equipment/head/nohmask.xml
index f978968d..f978968d 100644
--- a/graphics/sprites/equipment/head/nohmask-male.xml
+++ b/graphics/sprites/equipment/head/nohmask.xml
diff --git a/graphics/sprites/equipment/head/nutcrackerhat-male.xml b/graphics/sprites/equipment/head/nutcrackerhat.xml
index 32103eef..32103eef 100644
--- a/graphics/sprites/equipment/head/nutcrackerhat-male.xml
+++ b/graphics/sprites/equipment/head/nutcrackerhat.xml
diff --git a/graphics/sprites/equipment/head/operamask-male.xml b/graphics/sprites/equipment/head/operamask.xml
index 7211c2fd..7211c2fd 100644
--- a/graphics/sprites/equipment/head/operamask-male.xml
+++ b/graphics/sprites/equipment/head/operamask.xml
diff --git a/graphics/sprites/equipment/head/overlordhelm-male.xml b/graphics/sprites/equipment/head/overlordhelm.xml
index 9dba725b..9dba725b 100644
--- a/graphics/sprites/equipment/head/overlordhelm-male.xml
+++ b/graphics/sprites/equipment/head/overlordhelm.xml
diff --git a/graphics/sprites/equipment/head/paladinhelm-male.xml b/graphics/sprites/equipment/head/paladinhelm.xml
index 347bd0ab..347bd0ab 100644
--- a/graphics/sprites/equipment/head/paladinhelm-male.xml
+++ b/graphics/sprites/equipment/head/paladinhelm.xml
diff --git a/graphics/sprites/equipment/head/panhat-male.xml b/graphics/sprites/equipment/head/panhat.xml
index 4941b63d..4941b63d 100644
--- a/graphics/sprites/equipment/head/panhat-male.xml
+++ b/graphics/sprites/equipment/head/panhat.xml
diff --git a/graphics/sprites/equipment/head/paperbag-male.xml b/graphics/sprites/equipment/head/paperbag.xml
index c47d725e..c47d725e 100644
--- a/graphics/sprites/equipment/head/paperbag-male.xml
+++ b/graphics/sprites/equipment/head/paperbag.xml
diff --git a/graphics/sprites/equipment/head/parsley-earplugs-male.xml b/graphics/sprites/equipment/head/parsley-earplugs.xml
index 1b4e1db8..1b4e1db8 100644
--- a/graphics/sprites/equipment/head/parsley-earplugs-male.xml
+++ b/graphics/sprites/equipment/head/parsley-earplugs.xml
diff --git a/graphics/sprites/equipment/head/phylactery-male.xml b/graphics/sprites/equipment/head/phylactery.xml
index 867ba681..867ba681 100644
--- a/graphics/sprites/equipment/head/phylactery-male.xml
+++ b/graphics/sprites/equipment/head/phylactery.xml
diff --git a/graphics/sprites/equipment/head/pilot-hat-male.xml b/graphics/sprites/equipment/head/pilot-hat.xml
index 3cbf1feb..3cbf1feb 100644
--- a/graphics/sprites/equipment/head/pilot-hat-male.xml
+++ b/graphics/sprites/equipment/head/pilot-hat.xml
diff --git a/graphics/sprites/equipment/head/pinkie-helmet-male.xml b/graphics/sprites/equipment/head/pinkie-helmet.xml
index cce7d1ae..cce7d1ae 100644
--- a/graphics/sprites/equipment/head/pinkie-helmet-male.xml
+++ b/graphics/sprites/equipment/head/pinkie-helmet.xml
diff --git a/graphics/sprites/equipment/head/pinkiehat-male.xml b/graphics/sprites/equipment/head/pinkiehat.xml
index 8f154b40..8f154b40 100644
--- a/graphics/sprites/equipment/head/pinkiehat-male.xml
+++ b/graphics/sprites/equipment/head/pinkiehat.xml
diff --git a/graphics/sprites/equipment/head/piratehat-male.xml b/graphics/sprites/equipment/head/piratehat.xml
index 25fe5bb8..25fe5bb8 100644
--- a/graphics/sprites/equipment/head/piratehat-male.xml
+++ b/graphics/sprites/equipment/head/piratehat.xml
diff --git a/graphics/sprites/equipment/head/pumpkinhelmet-male.xml b/graphics/sprites/equipment/head/pumpkinhelmet.xml
index 2203b0f9..2203b0f9 100644
--- a/graphics/sprites/equipment/head/pumpkinhelmet-male.xml
+++ b/graphics/sprites/equipment/head/pumpkinhelmet.xml
diff --git a/graphics/sprites/equipment/head/rabbit-ears-male.xml b/graphics/sprites/equipment/head/rabbit-ears.xml
index ad6bb4ab..ad6bb4ab 100644
--- a/graphics/sprites/equipment/head/rabbit-ears-male.xml
+++ b/graphics/sprites/equipment/head/rabbit-ears.xml
diff --git a/graphics/sprites/equipment/head/rangerhat-male.xml b/graphics/sprites/equipment/head/rangerhat.xml
index f37124d4..f37124d4 100644
--- a/graphics/sprites/equipment/head/rangerhat-male.xml
+++ b/graphics/sprites/equipment/head/rangerhat.xml
diff --git a/graphics/sprites/equipment/head/rednose-male.xml b/graphics/sprites/equipment/head/rednose.xml
index 5b3d4eb9..5b3d4eb9 100644
--- a/graphics/sprites/equipment/head/rednose-male.xml
+++ b/graphics/sprites/equipment/head/rednose.xml
diff --git a/graphics/sprites/equipment/head/rosehat-male.xml b/graphics/sprites/equipment/head/rosehat.xml
index 9215ff31..9215ff31 100644
--- a/graphics/sprites/equipment/head/rosehat-male.xml
+++ b/graphics/sprites/equipment/head/rosehat.xml
diff --git a/graphics/sprites/equipment/head/sailor-hat-male.xml b/graphics/sprites/equipment/head/sailor-hat.xml
index 327c78d33..327c78d33 100644
--- a/graphics/sprites/equipment/head/sailor-hat-male.xml
+++ b/graphics/sprites/equipment/head/sailor-hat.xml
diff --git a/graphics/sprites/equipment/head/santabeardhat-male.xml b/graphics/sprites/equipment/head/santabeardhat.xml
index e94589ea..e94589ea 100644
--- a/graphics/sprites/equipment/head/santabeardhat-male.xml
+++ b/graphics/sprites/equipment/head/santabeardhat.xml
diff --git a/graphics/sprites/equipment/head/santahat-male.xml b/graphics/sprites/equipment/head/santahat.xml
index a1ced392..a1ced392 100644
--- a/graphics/sprites/equipment/head/santahat-male.xml
+++ b/graphics/sprites/equipment/head/santahat.xml
diff --git a/graphics/sprites/equipment/head/serf-male.xml b/graphics/sprites/equipment/head/serf.xml
index bb7f68fe..bb7f68fe 100644
--- a/graphics/sprites/equipment/head/serf-male.xml
+++ b/graphics/sprites/equipment/head/serf.xml
diff --git a/graphics/sprites/equipment/head/shroom-male.xml b/graphics/sprites/equipment/head/shroom.xml
index 75d1756e..75d1756e 100644
--- a/graphics/sprites/equipment/head/shroom-male.xml
+++ b/graphics/sprites/equipment/head/shroom.xml
diff --git a/graphics/sprites/equipment/head/silkheadband-male.xml b/graphics/sprites/equipment/head/silkheadband.xml
index b7dfe1fc..b7dfe1fc 100644
--- a/graphics/sprites/equipment/head/silkheadband-male.xml
+++ b/graphics/sprites/equipment/head/silkheadband.xml
diff --git a/graphics/sprites/equipment/head/skullmask-male.xml b/graphics/sprites/equipment/head/skullmask.xml
index b7b85406..b7b85406 100644
--- a/graphics/sprites/equipment/head/skullmask-male.xml
+++ b/graphics/sprites/equipment/head/skullmask.xml
diff --git a/graphics/sprites/equipment/head/snowgoggles-male.xml b/graphics/sprites/equipment/head/snowgoggles.xml
index 3c92e427..3c92e427 100644
--- a/graphics/sprites/equipment/head/snowgoggles-male.xml
+++ b/graphics/sprites/equipment/head/snowgoggles.xml
diff --git a/graphics/sprites/equipment/head/standardheadband-male.xml b/graphics/sprites/equipment/head/standardheadband.xml
index 0ab6356b..0ab6356b 100644
--- a/graphics/sprites/equipment/head/standardheadband-male.xml
+++ b/graphics/sprites/equipment/head/standardheadband.xml
diff --git a/graphics/sprites/equipment/head/sunglasses-male.xml b/graphics/sprites/equipment/head/sunglasses.xml
index aac51eb8..aac51eb8 100644
--- a/graphics/sprites/equipment/head/sunglasses-male.xml
+++ b/graphics/sprites/equipment/head/sunglasses.xml
diff --git a/graphics/sprites/equipment/head/tamoshanter-male.xml b/graphics/sprites/equipment/head/tamoshanter.xml
index 0f2aff0b..0f2aff0b 100644
--- a/graphics/sprites/equipment/head/tamoshanter-male.xml
+++ b/graphics/sprites/equipment/head/tamoshanter.xml
diff --git a/graphics/sprites/equipment/head/terranitehelm-male.xml b/graphics/sprites/equipment/head/terranitehelm.xml
index 6422fa57..6422fa57 100644
--- a/graphics/sprites/equipment/head/terranitehelm-male.xml
+++ b/graphics/sprites/equipment/head/terranitehelm.xml
diff --git a/graphics/sprites/equipment/head/thin-crown-male.xml b/graphics/sprites/equipment/head/thin-crown.xml
index 079ec8c9..079ec8c9 100644
--- a/graphics/sprites/equipment/head/thin-crown-male.xml
+++ b/graphics/sprites/equipment/head/thin-crown.xml
diff --git a/graphics/sprites/equipment/head/tophat-male.xml b/graphics/sprites/equipment/head/tophat.xml
index dd767090..dd767090 100644
--- a/graphics/sprites/equipment/head/tophat-male.xml
+++ b/graphics/sprites/equipment/head/tophat.xml
diff --git a/graphics/sprites/equipment/head/underworld-mask-male.xml b/graphics/sprites/equipment/head/underworld-mask.xml
index a716e7eb..a716e7eb 100644
--- a/graphics/sprites/equipment/head/underworld-mask-male.xml
+++ b/graphics/sprites/equipment/head/underworld-mask.xml
diff --git a/graphics/sprites/equipment/head/warlordhelm-male.xml b/graphics/sprites/equipment/head/warlordhelm.xml
index ddedaa4b..ddedaa4b 100644
--- a/graphics/sprites/equipment/head/warlordhelm-male.xml
+++ b/graphics/sprites/equipment/head/warlordhelm.xml
diff --git a/graphics/sprites/equipment/head/witch-doctor-mask-male.xml b/graphics/sprites/equipment/head/witch-doctor-mask.xml
index c1ed9f64..c1ed9f64 100644
--- a/graphics/sprites/equipment/head/witch-doctor-mask-male.xml
+++ b/graphics/sprites/equipment/head/witch-doctor-mask.xml
diff --git a/graphics/sprites/equipment/head/witch-hat-male.xml b/graphics/sprites/equipment/head/witch-hat.xml
index 2ea5186d..2ea5186d 100644
--- a/graphics/sprites/equipment/head/witch-hat-male.xml
+++ b/graphics/sprites/equipment/head/witch-hat.xml
diff --git a/graphics/sprites/equipment/head/witch-hat2-male.xml b/graphics/sprites/equipment/head/witch-hat2.xml
index 6f870944..6f870944 100644
--- a/graphics/sprites/equipment/head/witch-hat2-male.xml
+++ b/graphics/sprites/equipment/head/witch-hat2.xml
diff --git a/graphics/sprites/equipment/head/wizard-hat-male.xml b/graphics/sprites/equipment/head/wizard-hat.xml
index 2beec166..2beec166 100644
--- a/graphics/sprites/equipment/head/wizard-hat-male.xml
+++ b/graphics/sprites/equipment/head/wizard-hat.xml
diff --git a/graphics/sprites/equipment/head/woolen-male.xml b/graphics/sprites/equipment/head/woolen.xml
index 31950b77..31950b77 100644
--- a/graphics/sprites/equipment/head/woolen-male.xml
+++ b/graphics/sprites/equipment/head/woolen.xml
diff --git a/graphics/sprites/equipment/head/xmaself-male.xml b/graphics/sprites/equipment/head/xmaself.xml
index bdfa27f6..bdfa27f6 100644
--- a/graphics/sprites/equipment/head/xmaself-male.xml
+++ b/graphics/sprites/equipment/head/xmaself.xml
diff --git a/graphics/sprites/equipment/head/yeti-mask-male.xml b/graphics/sprites/equipment/head/yeti-mask.xml
index 401d4681..401d4681 100644
--- a/graphics/sprites/equipment/head/yeti-mask-male.xml
+++ b/graphics/sprites/equipment/head/yeti-mask.xml
diff --git a/graphics/sprites/equipment/legs/assassin-male.png b/graphics/sprites/equipment/legs/assassin.png
index a8d7aaf6..a8d7aaf6 100644
--- a/graphics/sprites/equipment/legs/assassin-male.png
+++ b/graphics/sprites/equipment/legs/assassin.png
diff --git a/graphics/sprites/equipment/legs/assassin-male.xml b/graphics/sprites/equipment/legs/assassin.xml
index 8be74e7c..66943c11 100644
--- a/graphics/sprites/equipment/legs/assassin-male.xml
+++ b/graphics/sprites/equipment/legs/assassin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/assassin-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/assassin.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.png b/graphics/sprites/equipment/legs/bromenallegs.png
index 326b30d5..326b30d5 100644
--- a/graphics/sprites/equipment/legs/bromenallegs-male.png
+++ b/graphics/sprites/equipment/legs/bromenallegs.png
diff --git a/graphics/sprites/equipment/legs/bromenallegs-male.xml b/graphics/sprites/equipment/legs/bromenallegs.xml
index 37a8fc43..a682be3a 100644
--- a/graphics/sprites/equipment/legs/bromenallegs-male.xml
+++ b/graphics/sprites/equipment/legs/bromenallegs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/chaps-male.png b/graphics/sprites/equipment/legs/chaps.png
index 711355b1..711355b1 100644
--- a/graphics/sprites/equipment/legs/chaps-male.png
+++ b/graphics/sprites/equipment/legs/chaps.png
diff --git a/graphics/sprites/equipment/legs/chaps-male.xml b/graphics/sprites/equipment/legs/chaps.xml
index c25fe93f..ed0eaf81 100644
--- a/graphics/sprites/equipment/legs/chaps-male.xml
+++ b/graphics/sprites/equipment/legs/chaps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/chaps-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/chaps.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/miniskirt-male.png b/graphics/sprites/equipment/legs/miniskirt.png
index 0d6a5142..0d6a5142 100644
--- a/graphics/sprites/equipment/legs/miniskirt-male.png
+++ b/graphics/sprites/equipment/legs/miniskirt.png
diff --git a/graphics/sprites/equipment/legs/miniskirt-male.xml b/graphics/sprites/equipment/legs/miniskirt.xml
index 57303d5a..64b48eff 100644
--- a/graphics/sprites/equipment/legs/miniskirt-male.xml
+++ b/graphics/sprites/equipment/legs/miniskirt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/miniskirt.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/pants-oversized.xml b/graphics/sprites/equipment/legs/pants-oversized.xml
new file mode 100644
index 00000000..9acbedbc
--- /dev/null
+++ b/graphics/sprites/equipment/legs/pants-oversized.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite variants="135" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/equipment/legs/pants.png|W" width="64" height="64"/>
+  <action name="default" imageset="base"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/legs/pants-male.png b/graphics/sprites/equipment/legs/pants.png
index 3af6ca19..3af6ca19 100644
--- a/graphics/sprites/equipment/legs/pants-male.png
+++ b/graphics/sprites/equipment/legs/pants.png
diff --git a/graphics/sprites/equipment/legs/pants-male.xml b/graphics/sprites/equipment/legs/pants.xml
index 5ccdf808..50ee7b64 100644
--- a/graphics/sprites/equipment/legs/pants-male.xml
+++ b/graphics/sprites/equipment/legs/pants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/pants-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/pants.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/shorts-male.png b/graphics/sprites/equipment/legs/shorts.png
index 8f8e7bf0..8f8e7bf0 100644
--- a/graphics/sprites/equipment/legs/shorts-male.png
+++ b/graphics/sprites/equipment/legs/shorts.png
diff --git a/graphics/sprites/equipment/legs/shorts-male.xml b/graphics/sprites/equipment/legs/shorts.xml
index fc6d8932..683a7134 100644
--- a/graphics/sprites/equipment/legs/shorts-male.xml
+++ b/graphics/sprites/equipment/legs/shorts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/shorts-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/shorts.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/silkpants-male.png b/graphics/sprites/equipment/legs/silkpants.png
index fd46f3da..fd46f3da 100644
--- a/graphics/sprites/equipment/legs/silkpants-male.png
+++ b/graphics/sprites/equipment/legs/silkpants.png
diff --git a/graphics/sprites/equipment/legs/silkpants-male.xml b/graphics/sprites/equipment/legs/silkpants.xml
index 4b7a7634..78793ca4 100644
--- a/graphics/sprites/equipment/legs/silkpants-male.xml
+++ b/graphics/sprites/equipment/legs/silkpants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants-male.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/silkpants.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/skirt-male.png b/graphics/sprites/equipment/legs/skirt-male.png
deleted file mode 100644
index cb9b5397..00000000
--- a/graphics/sprites/equipment/legs/skirt-male.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/legs/skirt-male.xml b/graphics/sprites/equipment/legs/skirt.xml
index befbedff..11606c5e 100644
--- a/graphics/sprites/equipment/legs/skirt-male.xml
+++ b/graphics/sprites/equipment/legs/skirt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/skirt-female.png|W" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/skirt.png|W" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/legs/terranite-male.png b/graphics/sprites/equipment/legs/terranite.png
index 2664f78d..2664f78d 100644
--- a/graphics/sprites/equipment/legs/terranite-male.png
+++ b/graphics/sprites/equipment/legs/terranite.png
diff --git a/graphics/sprites/equipment/legs/terranite-male.xml b/graphics/sprites/equipment/legs/terranite.xml
index 8918f613..72f27002 100644
--- a/graphics/sprites/equipment/legs/terranite-male.xml
+++ b/graphics/sprites/equipment/legs/terranite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/legs/terranite-male.png" width="64" height="64"/>
-  <include file="model/male.xml"/>
+  <imageset name="base" src="graphics/sprites/equipment/legs/terranite.png" width="64" height="64"/>
+  <include file="model/base.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/axe-chop-male.xml b/graphics/sprites/equipment/weapons/axe-chop.xml
index 8885903c..8885903c 100644
--- a/graphics/sprites/equipment/weapons/axe-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-chop.xml
diff --git a/graphics/sprites/equipment/weapons/axe-stab-male.xml b/graphics/sprites/equipment/weapons/axe-stab.xml
index 476e6e79..476e6e79 100644
--- a/graphics/sprites/equipment/weapons/axe-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-stab.xml
diff --git a/graphics/sprites/equipment/weapons/bow-banshee-male.xml b/graphics/sprites/equipment/weapons/bow-banshee.xml
index 14078256..14078256 100644
--- a/graphics/sprites/equipment/weapons/bow-banshee-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-banshee.xml
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml b/graphics/sprites/equipment/weapons/bow-slimecovered.xml
index 584bb97d..584bb97d 100644
--- a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slimecovered.xml
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml b/graphics/sprites/equipment/weapons/bow-slingshot.xml
index 50a593a5..50a593a5 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slingshot.xml
diff --git a/graphics/sprites/equipment/weapons/bow-male.xml b/graphics/sprites/equipment/weapons/bow.xml
index 1ed461b1..1ed461b1 100644
--- a/graphics/sprites/equipment/weapons/bow-male.xml
+++ b/graphics/sprites/equipment/weapons/bow.xml
diff --git a/graphics/sprites/equipment/weapons/dagger-male.xml b/graphics/sprites/equipment/weapons/dagger.xml
index d100e878..d100e878 100644
--- a/graphics/sprites/equipment/weapons/dagger-male.xml
+++ b/graphics/sprites/equipment/weapons/dagger.xml
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml b/graphics/sprites/equipment/weapons/polearm-blunt.xml
index 45efe267..45efe267 100644
--- a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-blunt.xml
diff --git a/graphics/sprites/equipment/weapons/polearm-chop-male.xml b/graphics/sprites/equipment/weapons/polearm-chop.xml
index 6a75fed0..6a75fed0 100644
--- a/graphics/sprites/equipment/weapons/polearm-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-chop.xml
diff --git a/graphics/sprites/equipment/weapons/polearm-spear-male.xml b/graphics/sprites/equipment/weapons/polearm-spear.xml
index 66402495..66402495 100644
--- a/graphics/sprites/equipment/weapons/polearm-spear-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-spear.xml
diff --git a/graphics/sprites/equipment/weapons/polearm-stab-male.xml b/graphics/sprites/equipment/weapons/polearm-stab.xml
index 240599e3..240599e3 100644
--- a/graphics/sprites/equipment/weapons/polearm-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-stab.xml
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml b/graphics/sprites/equipment/weapons/sword-deadsword.xml
index 3463cb7d..f35e9b77 100644
--- a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-deadsword.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
   <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-deadsword.png" width="128" height="128"/>
-  <include file="equipment/weapons/sword-long-male.xml"/>
+  <include file="equipment/weapons/sword-long.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-long-male.xml b/graphics/sprites/equipment/weapons/sword-long.xml
index b7ded47d..b7ded47d 100644
--- a/graphics/sprites/equipment/weapons/sword-long-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-long.xml
diff --git a/graphics/sprites/equipment/weapons/sword-short-male.xml b/graphics/sprites/equipment/weapons/sword-short.xml
index 04cc7fe6..04cc7fe6 100644
--- a/graphics/sprites/equipment/weapons/sword-short-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-short.xml
diff --git a/graphics/sprites/equipment/weapons/wand-deathshand-male.xml b/graphics/sprites/equipment/weapons/wand-deathshand.xml
index 5395ef80..c8590111 100644
--- a/graphics/sprites/equipment/weapons/wand-deathshand-male.xml
+++ b/graphics/sprites/equipment/weapons/wand-deathshand.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
   <imageset name="wand" src="graphics/sprites/equipment/weapons/wand-deathshand.png" width="128" height="128"/>
-  <include file="equipment/weapons/wand-male.xml"/>
+  <include file="equipment/weapons/wand.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/wand-male.xml b/graphics/sprites/equipment/weapons/wand.xml
index c2164aff..c2164aff 100644
--- a/graphics/sprites/equipment/weapons/wand-male.xml
+++ b/graphics/sprites/equipment/weapons/wand.xml