Fixing numerous warnings and errors in manaplus

closes #121
closes #108
closes #100
closes #93

1 files changed, 150 insertions, 150 deletions

diff --git a/npcs.xml b/npcs.xml
index 4073446b..bdb24dd0 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -10,7 +10,7 @@
 <npcs>
   <!-- Desert Barber -->
   <npc id="100">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#522129,ff7139</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
@@ -19,16 +19,16 @@
   </npc>
   <!-- Trader (Shop) -->
   <npc id="101">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/cotton-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#202020,414441,b4b6bd,cdcacd,ffffff</sprite>
     <sprite>equipment/feet/boots-male.xml|#522129,ff7139</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#201818,313031,424242,4e4e4e</sprite>
-    <sprite>equipment/head/goatee.xml|#212121,ffffff</sprite>
+    <sprite>equipment/head/goatee-male.xml|#212121,ffffff</sprite>
   </npc>
   <!-- The Trainer -->
   <npc id="102">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#cdb784,dec38c,eef1c5,ffffff</sprite>
     <sprite>equipment/legs/shorts-male.xml|#2e0890,7898e8</sprite>
     <sprite>equipment/feet/boots-male.xml|#490000,b66d49</sprite>
@@ -36,13 +36,13 @@
   </npc>
   <!-- Guy in black cloak (Shop) -->
   <npc id="103">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#490000,b66d49</sprite>
     <sprite variant="0">equipment/override/adult-outfits.xml</sprite>
   </npc>
   <!-- Soldier with sword -->
   <npc id="104">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle03-male.xml|#201818,313031,424242,4e4e4e</sprite>
     <sprite>equipment/head/infantryhelm-male.xml</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#a4b2b2,ffffff</sprite>
@@ -53,19 +53,19 @@
   </npc>
   <!-- Santa Clause -->
   <npc id="105">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#f4f0f0,787c78</sprite>
     <sprite>equipment/head/santahat-male.xml|#580000,a40000,c02020;#87876c,bbc39c,edf4e1,ffffff</sprite>
-    <sprite>equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020;</sprite>
+    <sprite>equipment/chest/tnecksweater-male.xml|#580000,a40000,c02020</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#580000,a40000,c02020</sprite>
     <sprite variant="4">equipment/override/adult-outfits.xml</sprite>
     <sprite>equipment/hands/generic-male.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
-    <sprite>equipment/head/long-beard.xml|#87876c,bbc39c,edf4e1</sprite>
+    <sprite>equipment/head/long-beard-male.xml|#87876c,bbc39c,edf4e1</sprite>
     <sprite>equipment/feet/furboots-male.xml</sprite>
   </npc>
   <!-- Girl with pink hair and blue top -->
   <npc id="106">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle01-female.xml|#69006a,880884,a404a2,c000c0,ff40ff</sprite>
     <sprite>equipment/feet/boots-female.xml|#490000,b66d49</sprite>
     <sprite>equipment/legs/skirt-female.xml|#251e06,443c21,71653b,a0945e</sprite>
@@ -73,7 +73,7 @@
   </npc>
   <!-- Scholar guy with glasses -->
   <npc id="107">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/glasses-male.xml|#a89feb,d5d1f5</sprite>
     <sprite>hairstyles/hairstyle01-male.xml|#404040,606060,808080,a4a4a4,b1b1b1,c0c0c0,e4e4e4</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#010101,202020,404040,606060</sprite>
@@ -83,13 +83,13 @@
   </npc>
   <!-- Woman with green hair and pink dress (Shop) -->
   <npc id="108">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#2b552b,55552b,55802b,80aa55,80aa80,aad480</sprite>
     <sprite>equipment/chest/fine-dress-female.xml|#9e005d,bc0c73,dc168b,db78a7,dea0c5,efbfdb</sprite>
   </npc>
   <!-- Miner (Shop) -->
   <npc id="109">
-    <sprite>races/gispaan-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/minershat-male.xml</sprite>
     <sprite>equipment/hands/generic-male.xml|#202020,505050</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
@@ -103,29 +103,29 @@
   </npc>
   <!-- Barkeeper (Shop) -->
   <npc id="112">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#503200,734a00,966200,b97a00,ffaa25</sprite>
     <sprite>equipment/legs/pants-male.xml|#966200,734a00</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#808080,b1b1b1,cacaca</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#3c3000,2e3f00,0d6400,007300</sprite>
-    <sprite>equipment/head/goatee.xml|#212121,ffffff</sprite>
+    <sprite>equipment/head/goatee-male.xml|#212121,ffffff</sprite>
     <sprite variant="4">equipment/override/adult-head.xml</sprite>
   </npc>
   <!-- boy with pointy hat -->
   <npc id="113">
-    <sprite variant="2">races/talponian-child.xml</sprite>
+    <sprite variant="2">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="5">equipment/override/child-head.xml|#902808,d87038,f0b050</sprite>
-    <sprite variant="1">equipment/override/child-outfits.xml|#563116,bc5326,f0682e;#594524;#;#ffffff;#623a34,f0c2b4;#ffffff;#f5c27f</sprite>
+    <sprite variant="1">equipment/override/child-outfits.xml|#563116,bc5326,f0682e;#594524;#ffffff;#623a34,f0c2b4;#ffffff;#f5c27f</sprite>
   </npc>
   <!-- Little blue-haired girl -->
   <npc id="114">
-    <sprite variant="2">races/talponian-child.xml</sprite>
+    <sprite variant="2">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="0">equipment/override/child-head.xml|#201820,5c47a5,8d74d9,7eafee,b9daff,ffffff</sprite>
     <sprite variant="5">equipment/override/child-outfits.xml|#ffffff;#ffffff;#ffffff;#ffffff;#623a34,f0c2b4;#ffffff;#7b5541,ac794a,c5a16a,ac9962,deca8b</sprite>
   </npc>
   <!-- Guy with red hair and green cloak (Shop) -->
   <npc id="115">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#808080,b1b1b1,cacaca</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#22230f,38380a,48490d,595a10,706b14</sprite>
     <sprite variant="5">equipment/override/adult-outfits.xml</sprite>
@@ -134,7 +134,7 @@
   </npc>
   <!-- Old geezer -->
   <npc id="116">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/robe-male.xml|#201818,521800,7b5541,ac9962,c5b176</sprite>
     <sprite variant="6">equipment/override/adult-outfits.xml</sprite>
     <sprite variant="1">equipment/override/adult-head.xml</sprite>
@@ -142,13 +142,13 @@
   </npc>
   <!-- Boy with brown hair -->
   <npc id="117">
-    <sprite variant="2">races/talponian-child.xml</sprite>
+    <sprite variant="2">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="2">equipment/override/child-head.xml|#2f1b08,4a2a0d,643a12,844c18</sprite>
     <sprite variant="7">equipment/override/child-outfits.xml|#ffffff;#ffffff;#ffffff;#ffffff;#490000,b66d49;#0a0a01,0c4e0e,024f2d,1f8327,178b5a,1ca269,75bd7a;#cdb784,dec38c,eef1c5,ffffff</sprite>
   </npc>
   <!-- Nurse without hat -->
   <npc id="118">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle17-female.xml|#05594c,217b6d,189481,1edca9</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#808080,cdb5b5,ddd9d9,f4f0f0</sprite>
     <sprite>equipment/legs/skirt-female.xml|#808080,cdb5b5,ddd9d9,f4f0f0</sprite>
@@ -156,7 +156,7 @@
   </npc>
   <!-- Nurse with hat -->
   <npc id="119">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle17-female.xml|#05594c,217b6d,189481,1edca9</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#808080,cdb5b5,ddd9d9,f4f0f0</sprite>
     <sprite>equipment/legs/skirt-female.xml|#808080,cdb5b5,ddd9d9,f4f0f0</sprite>
@@ -165,14 +165,14 @@
   </npc>
   <!-- Guy with brown hair in plain clothes (Shop) -->
   <npc id="120">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#2f1b08,4a2a0d,643a12,844c18,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#94835a,aca47b,cdc594</sprite>
     <sprite>equipment/legs/pants-male.xml|#413100,524a08,6a5a18,7b7331,837b41</sprite>
   </npc>
   <!-- Soldier -->
   <npc id="121">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#2f1b08,4a2a0d,643a12,844c18,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#94835a,aca47b,cdc594</sprite>
     <sprite>equipment/legs/pants-male.xml|#413100,524a08,6a5a18,7b7331,837b41</sprite>
@@ -180,19 +180,19 @@
   </npc>
   <!-- Soldier with sword and shield -->
   <npc id="122">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#2f1b08,4a2a0d,643a12,844c18,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#94835a,aca47b,cdc594</sprite>
-    <sprite>equipment/legs/chaps-male.xml|#413100,524a08,6a5a18,7b7331,837b41</sprite>
+    <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
     <sprite>equipment/weapons/sword-short-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </npc>
   <!-- Soldier with sword, shield, and helmet -->
   <npc id="123">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#2f1b08,4a2a0d,643a12,844c18,ffffff</sprite>
     <sprite>equipment/feet/warlordboots-male.xml</sprite>
-    <sprite>equipment/legs/chaps-male.xml|#413100,524a08,6a5a18,7b7331,837b41</sprite>
+    <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#94835a,aca47b,cdc594</sprite>
     <sprite>equipment/chest/lightplatemail-male.xml|#ddeeff</sprite>
     <sprite>equipment/weapons/sword-short-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
@@ -201,26 +201,26 @@
   </npc>
   <!-- Guy with black hair in plain clothes (Shop) -->
   <npc id="124">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#212121,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#94835a,aca47b,cdc594</sprite>
-    <sprite>equipment/legs/chaps-male.xml|#413100,524a08,6a5a18,7b7331,837b41</sprite>
+    <sprite>equipment/legs/chaps-male.xml</sprite>
   </npc>
   <!-- Guy with black clothes -->
   <npc id="125">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#212121,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#000000,181818,202020,292929</sprite>
-    <sprite>equipment/legs/chaps-male.xml|#000000,181818,202020,292929</sprite>
+    <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     <sprite>equipment/chest/lightplatemail-male.xml|#000000,181818,202020,292929</sprite>
   </npc>
   <!-- Guy with black clothes and axe -->
   <npc id="126">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#212121,ffffff</sprite>
     <sprite>equipment/chest/cotton-male.xml|#000000,181818,202020,292929</sprite>
-    <sprite>equipment/legs/chaps-male.xml|#000000,181818,202020,292929</sprite>
+    <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     <sprite>equipment/chest/lightplatemail-male.xml|#000000,181818,202020,292929</sprite>
     <sprite>equipment/weapons/axe-chop-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
@@ -234,7 +234,7 @@
   </npc>
   <!-- Nomad, standing -->
   <npc id="128">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#522129,ff7139</sprite>
     <sprite>equipment/legs/pants-male.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
@@ -249,7 +249,7 @@
   <!-- Npc Id 130 Open -->
   <!-- Nomad, sitting (Add to TMWA) -->
   <npc id="131">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#522129,ff7139</sprite>
     <sprite>equipment/legs/pants-male.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
@@ -259,7 +259,7 @@
   </npc>
   <!-- Nomad, sitting with pipe -->
   <npc id="132">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#522129,ff7139</sprite>
     <sprite>equipment/legs/pants-male.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
@@ -271,7 +271,7 @@
   <!-- Npc Id 134 Open -->
   <!-- Guy with sword over shoulder (Shop) -->
   <npc id="135">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#4f2d29,c89078</sprite>
     <sprite>equipment/chest/leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
     <sprite>equipment/legs/pants-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
@@ -284,7 +284,7 @@
   </npc>
   <!-- guy with pink shirt sitting (Shop) -->
   <npc id="137">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#291912,513a30,6d5246,8a6b5d</sprite>
     <sprite>equipment/chest/cotton-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121,ffffff</sprite>
@@ -301,7 +301,7 @@
   </npc>
   <!-- Woman with green dress and apron -->
   <npc id="140">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/fine-dress-female.xml|#304c16,628c3c,75ab46,7dc14c</sprite>
     <sprite>hairstyles/hairstyle19-female.xml|#8b3535,a43e3e,b94747,cc4a4a</sprite>
     <sprite variant="8">equipment/override/adult-outfits.xml</sprite>
@@ -312,12 +312,12 @@
   </npc>
   <!-- Farmer -->
   <npc id="142">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite gender="male">equipment/head/rangerhat-male.xml</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d4f</sprite>
     <sprite>equipment/feet/boots-male.xml|#4f2d29,c89078</sprite>
-    <sprite>equipment/weapons/polearm-stab-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-stab-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Indian Chief-->
   <npc id="143">
@@ -330,7 +330,7 @@
   </npc>
   <!-- Mechanic (Shop) -->
   <npc id="146">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d4f</sprite>
     <sprite>equipment/feet/boots-male.xml|#4f2d29,c89078</sprite>
@@ -339,7 +339,7 @@
   </npc>
   <!-- Mechanic with tool -->
   <npc id="147">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d4f</sprite>
     <sprite>equipment/feet/boots-male.xml|#4f2d29,c89078</sprite>
@@ -349,17 +349,17 @@
   </npc>
   <!-- Chef -->
   <npc id="148">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="1">equipment/override/adult-outfits.xml</sprite>
     <sprite>equipment/legs/pants-male.xml|#001720,001b25,003e55,035776</sprite>
     <sprite variant="4">equipment/override/adult-head.xml</sprite>
     <sprite>equipment/head/chefhat-male.xml</sprite>
-    <sprite>equipment/head/goatee.xml</sprite>
+    <sprite>equipment/head/goatee-male.xml</sprite>
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <!-- Desert Banker -->
   <npc id="149">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/chainmail-male.xml|#eef1c5,ffffff</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#151614,1b1c1a,242624,313230,373936,393b38,424441</sprite>
     <sprite>equipment/legs/pants-male.xml|#151614,1b1c1a,242624,313230,373936,393b38,424441</sprite>
@@ -369,7 +369,7 @@
   </npc>
   <!-- Investigator -->
   <npc id="150">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/inspector-hat-male.xml|#001720,003e55,035776</sprite>
     <sprite>equipment/chest/chainmail-male.xml|#eef1c5,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#001720,001b25,003e55,035776</sprite>
@@ -378,7 +378,7 @@
   </npc>
   <!-- Lora Tay -->
   <npc id="151">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="0">equipment/override/adult-head.xml</sprite>
     <sprite>hairstyles/hairstyle09-female.xml|#40413f,555754,757774,8d8f8c,9b9d9a,bdbfbb,e8eae7</sprite>
     <sprite>equipment/chest/tnecksweater-female.xml|#200303,380505,570909,700c0c,8a1010</sprite>
@@ -389,23 +389,23 @@
   </npc>
   <!-- Desert Bard -->
   <npc id="152">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/robe-male.xml|#ffffff</sprite>
     <sprite>equipment/head/deserthat-male.xml|#ffffff</sprite>
     <sprite variant="11">equipment/override/adult-outfits.xml</sprite>
   </npc>
   <!-- Old Wizard -->
   <npc id="153">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="1">equipment/override/adult-head.xml</sprite>
     <sprite>hairstyles/hairstyle06-male.xml</sprite>
     <sprite>equipment/feet/assassin-boots-male.xml|#b80f0f,580000,a40000,b80f0f,c02020,ff6060</sprite>
     <sprite>equipment/chest/robe-male.xml|#212121,ffffff</sprite>
-    <sprite>equipment/head/long-beard.xml|#ffffff</sprite>
+    <sprite>equipment/head/long-beard-male.xml|#ffffff</sprite>
   </npc>
   <!-- Old Woman -->
   <npc id="154">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="0">equipment/override/adult-head.xml</sprite>
     <sprite>hairstyles/hairstyle13-female.xml|#878787,a8a8a8,cacaca,fdfdfd</sprite>
     <sprite>equipment/chest/cotton-female.xml|#291b07,4a310c,6c4818,7a5525,89693b,9c7b52,af946e</sprite>
@@ -414,7 +414,7 @@
   </npc>
   <!-- Construction Worker -->
   <npc id="155">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/minershat-male.xml</sprite>
     <sprite>equipment/chest/cotton-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#2e0890,7898e8</sprite>
@@ -423,15 +423,15 @@
   </npc>
   <!-- Desert Barber/Desert Man -->
   <npc id="156">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#201818,313031,424242,4e4e4e</sprite>
-    <sprite>equipment/chest/vnecksweater-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d4</sprite>
+    <sprite>equipment/chest/vnecksweater-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d40</sprite>
     <sprite>equipment/legs/silkpants-male.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <!-- Trainer 2 -->
   <npc id="157">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#cdb784,dec38c,eef1c5,ffffff</sprite>
     <sprite>equipment/legs/shorts-male.xml|#2e0890,7898e8</sprite>
     <sprite>equipment/feet/boots-male.xml|#490000,b66d49</sprite>
@@ -439,28 +439,28 @@
   </npc>
   <!-- Young Male Wizard -->
   <npc id="158">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#490000,b66d49</sprite>
     <sprite variant="13">equipment/override/adult-outfits.xml</sprite>
   </npc>
   <!-- Old man -->
   <npc id="159">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/cotton-male.xml|#291b07,4a310c,6c4818,7a5525,89693b,9c7b52,af946e</sprite>
     <sprite>equipment/legs/skirt-male.xml|#39230f,4e2f14,5e3817,6b4422,79502e,815d3b,926d4f</sprite>
-    <sprite>equipment/head/long-beard.xml</sprite>
+    <sprite>equipment/head/long-beard-male.xml</sprite>
     <sprite variant="5">equipment/override/adult-head.xml</sprite>
   </npc>
   <!-- Generic Man -->
   <npc id="160">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#cdb784,dec38c,eef1c5,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#0a1b08,0e330c,11330f,174613,20641b,288521,0a1b08</sprite>
     <sprite>hairstyles/hairstyle07-male.xml|#573a26,ffffff</sprite>
   </npc>
   <!-- Generic Banker -->
   <npc id="161">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#573a26,ffffff</sprite>
     <sprite>equipment/chest/chainmail-male.xml|#eef1c5,ffffff</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#151614,1b1c1a,242624,313230,373936,393b38,424441</sprite>
@@ -470,7 +470,7 @@
   </npc>
   <!-- Generic Desert Man -->
   <npc id="162">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/deserthat-male.xml|#ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#202020,414441,b4b6bd,cdcacd,ffffff</sprite>
     <sprite>equipment/chest/tnecksweater-male.xml|#808080,b1b1b1,cacaca</sprite>
@@ -479,7 +479,7 @@
   </npc>
   <!-- Flower Girl (Shop) -->
   <npc id="163">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle13-female.xml|#878787,a8a8a8,cacaca,fdfdfd</sprite>
     <sprite>equipment/chest/cotton-female.xml|#ffffff</sprite>
     <sprite>equipment/chest/tanktop-female.xml|#730417,9c061f,c40727,d9082b,ee092f</sprite>
@@ -489,7 +489,7 @@
   </npc>
   <!-- Wedding Officiator -->
   <npc id="164">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle19-female.xml|#dbd41e</sprite>
     <sprite>equipment/head/silkheadband-female.xml|#77a85c,86b36e,9cc27e</sprite>
     <sprite>equipment/chest/robe-female.xml|#558b39,6b9a4a,77a85c,86b36e,9cc27e</sprite>
@@ -497,7 +497,7 @@
   </npc>
   <!-- Dimond/Magician -->
   <npc id="165">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle19-female.xml|#223b2e,154242,1d5553,226461,418481,639b9a,8eb9ba</sprite>
     <sprite>equipment/head/tophat-female.xml</sprite>
     <sprite>equipment/chest/tanktop-female.xml|#0e1b27,163a51,1d425c,2f5673,466680,5b7b95,7691a7</sprite>
@@ -511,21 +511,21 @@
   </npc>
   <!-- Young Witch -->
   <npc id="167">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#2c3a0a,317300,3b8700,4ead00</sprite>
     <sprite>equipment/head/wizard-hat-female.xml|#4f0a76,8010c0,d699f7</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7;#EC0000</sprite>
   </npc>
   <!-- Middle-Aged Wizard -->
   <npc id="168">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#222255,6666ff;#EFEFEF</sprite>
     <sprite>hairstyles/hairstyle07-male.xml|#878787,a8a8a8,cacaca</sprite>
-    <sprite>equipment/head/goatee.xml|#212121,ffffff</sprite>
+    <sprite>equipment/head/goatee-male.xml|#212121,ffffff</sprite>
   </npc>
   <!-- Miner -->
   <npc id="169">
-    <sprite>races/gispaan-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/minershat-male.xml</sprite>
     <sprite>equipment/chest/cotton-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#2e0890,7898e8</sprite>
@@ -546,13 +546,13 @@
   </npc>
   <!-- Kadiya (Omar's sick daughter) -->
   <npc id="174" nameOffsetX="16" targetOffsetX="16">
-    <sprite variant="5">races/talponian-child-in-bed.xml</sprite>
+    <sprite variant="5">model/child-in-bed.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="2">equipment/override/child-head-in-bed.xml|#1e0b26,461959,5a2073</sprite>
     <sprite variant="10">equipment/override/child-outfits-in-bed.xml|#5b4976;#ffffff;#ffffff;#ffffff;#ffffff;#ffffff;#36a1bc</sprite>
   </npc>
   <!-- Miriam the cat burglar -->
   <npc id="175">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle12-female.xml|#1e0b26,461959,5a2073</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/assassin-female.xml</sprite>
@@ -576,13 +576,13 @@
   <!-- Npc Id 181 Open -->
   <!-- Young archer -->
   <npc id="182">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#66500b,80630e,997711,b38b14,cc9f16,e5b319,ffc71c</sprite>
     <sprite>equipment/feet/boots-male.xml|#443c21,71653b</sprite>
     <sprite>equipment/legs/pants-female.xml|#115511,22aa22,99dd99</sprite>
     <sprite>equipment/chest/forest-armor-female.xml</sprite>
     <sprite>equipment/head/fairy_hat-female.xml</sprite>
-    <sprite>equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Skeleton man -->
   <npc id="183">
@@ -605,7 +605,7 @@
   <!-- Npc Id 188 Open -->
   <!-- Gambler -->
   <npc id="189">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#35351c,6f6f3c,bcbd84</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/legs/pants-male.xml|#251e06,443c21,71653b</sprite>
@@ -613,7 +613,7 @@
   </npc>
   <!-- Olana -->
   <npc id="190">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="0">equipment/override/adult-head.xml</sprite>
     <sprite>hairstyles/hairstyle13-female.xml|#878787,a8a8a8,cacaca,fdfdfd</sprite>
     <sprite>equipment/chest/cotton-female.xml|#dbd41e</sprite>
@@ -621,7 +621,7 @@
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
   </npc>
   <npc id="191">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#35351c,6f6f3c,bcbd84</sprite>
     <sprite>equipment/chest/cotton-male.xml|#443c21</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#251e06,443c21,71653b,a0945e</sprite>
@@ -629,7 +629,7 @@
     <sprite>equipment/feet/boots-male.xml|#443c21</sprite>
   </npc>
   <npc id="192">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle06-male.xml|#35351c,6f6f3c,bcbd84</sprite>
     <sprite>equipment/chest/cotton-male.xml|#443c21</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#251e06,443c21,71653b,a0945e</sprite>
@@ -638,7 +638,7 @@
   </npc>
   <!-- Gambler -->
   <npc id="193">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/chainmail-male.xml|#eef1c5,ffffff</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#151614,1b1c1a,242624,313230,373936,393b38,424441</sprite>
     <sprite>equipment/legs/pants-male.xml|#151614,1b1c1a,242624,313230,373936,393b38,424441</sprite>
@@ -649,10 +649,10 @@
   <!-- Npc Id 194 Open -->
   <!-- Angela outside -->
   <npc id="195">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/furboots-female.xml</sprite>
     <sprite>hairstyles/hairstyle08-female.xml|#994312,c55818,e46c28</sprite>
-    <sprite>equipment/head/knit-cap-female.xml|#ff625a,ffffff;#c1352e,ff625a;#942300,d13435;</sprite>
+    <sprite>equipment/head/knit-cap-female.xml|#ff625a,ffffff;#c1352e,ff625a;#942300,d13435</sprite>
     <sprite>equipment/legs/skirt-female.xml|#571207,6f1c0f,942300,9c2920,c1352e,d13435,ff625a</sprite>
     <sprite>equipment/chest/ugly-sweater-female.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,364c17;#49661f</sprite>
     <sprite>equipment/hands/generic-female.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
@@ -660,7 +660,7 @@
   </npc>
   <!-- Angela inside -->
   <npc id="196">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle08-female.xml|#994312,c55818,e46c28</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml|#b80f0f,580000,a40000,b80f0f,c02020,ff6060</sprite>
     <sprite>equipment/chest/fine-dress-female.xml|#571207,6f1c0f,942300,9c2920,c1352e,d13435,ff625a</sprite>
@@ -675,7 +675,7 @@
   </npc>
   <!-- Npc Id 200 Open -->
   <npc id="201">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
     <sprite>equipment/legs/chaps-female.xml</sprite>
     <sprite>equipment/chest/shorttanktop-female.xml</sprite>
@@ -688,7 +688,7 @@
   </npc>
   <!-- The entries 205-215 borrow concepts from npc id 201, which should not be regularly done. -->
   <npc id="205">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle01-female.xml|#347235,52D017</sprite>
     <sprite>equipment/head/goggles-female.xml</sprite>
     <sprite>equipment/legs/skirt-female.xml|#d3b79e,ffffff</sprite>
@@ -696,49 +696,49 @@
     <sprite>equipment/feet/boots-female.xml|#9e7654,ffffff</sprite>
   </npc>
   <npc id="206">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle10-female.xml|#7F462C,F9966B</sprite>
     <sprite>equipment/chest/cotton-female.xml|#B93B8F,C38EC7,F9B7FF</sprite>
     <sprite>equipment/legs/skirt-female.xml|#AF7817,E8A317</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
   </npc>
   <npc id="207">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#C8B560,FFE87C</sprite>
     <sprite>equipment/chest/robe-female.xml|#7F5217,AF7817,E9AB17,FBB917</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
   </npc>
   <npc id="208">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle09-female.xml|#3B9C9C,AFDCEC</sprite>
     <sprite>equipment/head/wizard-hat-female.xml|#4f0a76,8010c0,d699f7</sprite>
     <sprite>equipment/chest/robe-female.xml|#4f0a76,8010c0,d699f7</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
-    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <npc id="209">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle12-female.xml|#573a26,ffffff</sprite>
     <sprite>equipment/chest/cotton-female.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/miniskirt-female.xml|#251e06,443c21,71653b,a0945e</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
   </npc>
   <npc id="210">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle04-female.xml|#810541,F535AA</sprite>
     <sprite>equipment/legs/chaps-female.xml</sprite>
     <sprite>equipment/chest/tanktop-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
   </npc>
   <npc id="211">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle07-male.xml|#bb2222,ffee33</sprite>
     <sprite>equipment/legs/shorts-male.xml|#255367,266c84,68b0c5,ffffff</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#a4b2b2,ffffff</sprite>
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <npc id="212">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle08-male.xml|#EE9A4D,ffee33</sprite>
     <sprite>equipment/head/captain-hat-male.xml</sprite>
     <sprite>equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
@@ -746,7 +746,7 @@
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <npc id="213">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#254117,ffee33</sprite>
     <sprite>equipment/head/sailor-hat-male.xml</sprite>
     <sprite>equipment/legs/shorts-male.xml|#a4b2b2,ffffff</sprite>
@@ -754,7 +754,7 @@
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <npc id="214">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#817339,FFE87C</sprite>
     <sprite>equipment/head/silkheadband-male.xml</sprite>
     <sprite>equipment/legs/shorts-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
@@ -762,7 +762,7 @@
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
   </npc>
   <npc id="215">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#F88017,FBB117</sprite>
     <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/cotton-male.xml|#222255,6666ff</sprite>
@@ -784,39 +784,39 @@
   <!-- Npc Ids 219-257 Open -->
   <!-- Female child crying, with light blue dress. Purple hair up in two ponytails. -->
   <npc id="258">
-    <sprite variant="1">races/talponian-child.xml</sprite>
+    <sprite variant="1">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="0">equipment/override/child-head.xml|#ed9ecc</sprite>
     <sprite variant="2">equipment/override/child-outfits.xml|#5b4976;#ffffff;#ffffff;#ffffff;#ffffff;#ffffff;#36a1bc</sprite>
   </npc>
   <!-- Male child lying on stomach, with brown shirt, green pants. Short red hair. -->
   <npc id="259" nameOffsetY="-18" targetOffsetY="-18" nameOffsetX="3" targetOffsetX="3">
-    <sprite variant="3">races/talponian-child.xml</sprite>
+    <sprite variant="3">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="3">equipment/override/child-head.xml|#d9980b</sprite>
     <sprite variant="3">equipment/override/child-outfits.xml|#962222;#665204;#c68319;#ffffff;#ffffff;#ffffff;#ffffff</sprite>
   </npc>
   <!-- Female child standing holding lollipop, with dull purple dress, yellow leggings, dull purple shoes. Yellow hair in two ponytails. -->
   <npc id="260">
-    <sprite variant="4">races/talponian-child.xml</sprite>
+    <sprite variant="4">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="4">equipment/override/child-head.xml|#dbd41e</sprite>
     <sprite variant="4">equipment/override/child-outfits.xml|#dbd41e;#dbd41e;#ffffff;#ffffff;#ffffff;#8c5a9a;#ffffff</sprite>
   </npc>
   <!-- Npc Id 261 Open -->
   <!-- Male child hiding behind a crate. Spiky green hair. -->
   <npc id="262">
-    <sprite variant="5">races/talponian-child.xml</sprite>
+    <sprite variant="5">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="2">equipment/override/child-head.xml|#326632</sprite>
     <sprite variant="6">equipment/override/child-outfits.xml|#326632;#ffffff;#ffffff;#ffffff;#ffffff;#ffffff;#ffffff</sprite>
   </npc>
   <!-- Male child standing, with dark red shirt, dark blue pants, purple shoes. Spiky dark blue hair. -->
   <npc id="263">
-    <sprite variant="2">races/talponian-child.xml</sprite>
+    <sprite variant="2">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="2">equipment/override/child-head.xml|#3d3d63</sprite>
     <sprite variant="7">equipment/override/child-outfits.xml|#3d3d63;#ffffff;#ffffff;#ffffff;#542d63;#282858;#850707</sprite>
   </npc>
   <!-- Npc id 264 Open -->
   <!-- Female child standing, with pink shirt, navy blue pants, pink shoes.  Light blue/cyan hair.  -->
   <npc id="265">
-    <sprite variant="2">races/talponian-child.xml</sprite>
+    <sprite variant="2">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="1">equipment/override/child-head.xml|#328abc</sprite>
     <sprite variant="7">equipment/override/child-outfits.xml|#328abc;#ffffff;#ffffff;#ffffff;#cb1c66;#112f57;#cb1c7b</sprite>
   </npc>
@@ -830,7 +830,7 @@
   </npc>
   <!-- Barmaid (Shop) -->
   <npc id="301">
-    <sprite variant="1">races/talponian-female.xml</sprite>
+    <sprite variant="1">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/fine-dress-female.xml|#212121,ffffff</sprite>
     <sprite>hairstyles/hairstyle19-female.xml|#8b3535,a43e3e,b94747,cc4a4a</sprite>
     <sprite variant="8">equipment/override/adult-outfits.xml</sprite>
@@ -872,7 +872,7 @@
     <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#580000,A40000,C02020,ff6060</sprite>
     <sprite>equipment/head/tophat-male.xml</sprite>
-    <sprite>equipment/head/mustache.xml|#212121,ffffff</sprite>
+    <sprite>equipment/head/mustache-male.xml|#212121,ffffff</sprite>
   </npc>
   <!-- Barman -->
   <npc id="310">
@@ -881,11 +881,11 @@
     <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#0d1430,21337c,4363e5</sprite>
     <sprite>equipment/head/bowler-hat-male.xml</sprite>
-    <sprite>equipment/head/mustache.xml|#212121,ffffff</sprite>
+    <sprite>equipment/head/mustache-male.xml|#212121,ffffff</sprite>
   </npc>
   <!-- SwordGuy -->
   <npc id="311">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#201818,313031,424242,4e4e4e</sprite>
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
     <sprite>equipment/legs/chaps-male.xml</sprite>
@@ -941,7 +941,7 @@
   </npc>
   <!-- Dyer -->
   <npc id="326">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml|#800000,9d1f1f,b52424,df2c2c,f13030</sprite>
     <sprite>equipment/legs/pants-male.xml|#592f36,6e3741,803e4b,9a4859,bd5666</sprite>
     <sprite>equipment/feet/boots-male.xml|#800000,9d1f1f,b52424,df2c2c,f13030</sprite>
@@ -950,13 +950,13 @@
   <!-- Npc Id 327 Open -->
   <!-- Elf -->
   <npc id="328">
-    <sprite variant="6">races/talponian-child.xml</sprite>
+    <sprite variant="6">model/child.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#1f3d23,72982c,ffeebd,ffffff;#3a3a3a,d5d5d5</sprite>
     <sprite variant="9">equipment/override/child-outfits.xml</sprite>
     <sprite variant="5">equipment/override/child-head.xml|#870a0f,931714,d22b27,ff422c</sprite>
   </npc>
   <!-- Cloaked Elf -->
   <npc id="329">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite variant="7">equipment/override/adult-outfits.xml</sprite>
     <sprite>equipment/head/santahat-male.xml|#870a0f,931714,d22b27,ff422c;#7eafee,bbc39c,edf4e1,ffffff</sprite>
   </npc>
@@ -993,7 +993,7 @@
   <!-- Npc Ids 336-339 Open -->
   <!-- Female Miner -->
   <npc id="340">
-    <sprite>races/gispaan-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/minershat-male.xml</sprite>
     <sprite>equipment/chest/cotton-male.xml|#573a26,9e7654,d3b79e,ffffff</sprite>
     <sprite>equipment/legs/pants-male.xml|#2e0890,7898e8</sprite>
@@ -1049,38 +1049,38 @@
   </npc>
   <!-- Yellow Sage -->
   <npc id="355">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml|#846211,dab333,fffb93,ffffff;#ec3e3e</sprite>
     <sprite>equipment/legs/pants-female.xml|#846211</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#bb2222,ffee33</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#846211,dab333,fffb93,ffffff;#ec3e3e</sprite>
     <sprite>equipment/head/wizard-hat-female.xml|#846211,dab333,fffb93,ffffff</sprite>
-    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Red Sage -->
   <npc id="356">
-    <sprite>races/talponian-female.xml</sprite>
-    <sprite >hairstyles/hairstyle19-female.xml|b04810</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite >hairstyles/hairstyle19-female.xml|#b04810</sprite>
     <sprite>equipment/feet/boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     <sprite>equipment/legs/pants-female.xml|#104010,268026,56a743,3e9c3e</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#09BC09</sprite>
     <sprite>equipment/head/witch-hat2-female.xml|#80280f,b04810,ef681f,ffb830;#f06ce3</sprite>
-    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Green Sage -->
   <npc id="357">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#104010,208020,30c030</sprite>
     <sprite>equipment/legs/pants-male.xml|#115511</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#994312,c55818,e46c28</sprite>
-    <sprite>equipment/head/beard.xml|#5b280a,994312,c55818,e46c28</sprite>
+    <sprite>equipment/head/beard-male.xml|#5b280a,994312,c55818,e46c28</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#115511,22aa22,99dd99;#ec3e3e</sprite>
     <sprite>equipment/head/wizard-hat-male.xml|#104010,208020,30c030</sprite>
-    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Purple Sage -->
   <npc id="358">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#4f0a76,8010c0,d699f7;#ec3e3e</sprite>
     <sprite>equipment/legs/pants-male.xml|#4f0a76</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#817339,FFE87C</sprite>
@@ -1089,48 +1089,48 @@
   </npc>
   <!-- Pink Sage -->
   <npc id="359">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff;#ec3e3e</sprite>
     <sprite>equipment/legs/pants-male.xml|#56002f</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#201818,313031,424242,4e4e4e</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#56002f,930050,fe70bd,feb7de,ffffff;#ec3e3e</sprite>
     <sprite>equipment/head/wizard-hat-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Black Sage -->
   <npc id="360">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml|#070707,202020,303030,404040</sprite>
     <sprite>equipment/legs/pants-female.xml|#070707</sprite>
     <sprite>hairstyles/hairstyle01-female.xml|#69006a,880884,a404a2,c000c0,ff40ff</sprite>
     <sprite>equipment/chest/robe-female.xml|#000000</sprite>
     <sprite>equipment/head/wizard-hat-female.xml|#070707,202020,303030,404040</sprite>
-    <sprite>equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- White Sage -->
   <npc id="361">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml|#070707,202020,303030,404040</sprite>
     <sprite>equipment/legs/pants-female.xml|#070707</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite>
     <sprite>equipment/chest/robe-female.xml|#5e7480,f1ffff,ffffff</sprite>
     <sprite>equipment/head/circlet-female.xml</sprite>
-    <sprite>equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </npc>
   <!-- Blue Sage -->
   <npc id="362">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     <sprite>equipment/legs/pants-male.xml|#222255</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#222255,6666ff;#2050BE</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#5b280a,994312,c55818,e46c28</sprite>
-    <sprite>equipment/head/beard.xml|#5b280a,994312,c55818,e46c28</sprite>
+    <sprite>equipment/head/beard-male.xml|#5b280a,994312,c55818,e46c28</sprite>
     <sprite>equipment/head/woolen-male.xml|#222255,EFEFEF</sprite>
     <sprite variant="6">equipment/override/adult-outfits.xml</sprite>
   </npc>
   <!-- Woman wearing blue clothes with white borders (helper) -->
   <npc id="363">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml|#212121</sprite>
     <sprite>hairstyles/hairstyle08-female.xml|#994312,c55818,e46c28</sprite>
     <sprite>equipment/legs/pants-female.xml|#16486e,498ec5,e4f2fc</sprite>
@@ -1139,20 +1139,20 @@
   </npc>
   <!-- Man with short beard and white-blue clothes including cape (helper) -->
   <npc id="365">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#994312,c55818,e46c28</sprite>
-    <sprite>equipment/head/beard.xml|#994312,c55818,e46c28</sprite>
+    <sprite>equipment/head/beard-male.xml|#994312,c55818,e46c28</sprite>
     <sprite>equipment/legs/pants-male.xml|#498ec5</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#41B3FF</sprite>
     <sprite>equipment/head/santahat-male.xml|#16486e,498ec5,e4f2fc;#7eafee,bbc39c,edf4e1,ffffff</sprite>
   </npc>
   <!-- Man with short beard and white-blue clothes (helper) -->
   <npc id="366">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     <sprite>hairstyles/hairstyle02-male.xml|#5b280a,994312,c55818</sprite>
-    <sprite>equipment/head/beard.xml|#5b280a,994312,c55818</sprite>
+    <sprite>equipment/head/beard-male.xml|#5b280a,994312,c55818</sprite>
     <sprite>equipment/legs/pants-male.xml|#498ec5</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#222255,6666ff;#EFEFEF</sprite>
     <sprite>equipment/head/santahat-male.xml|#16486e,498ec5,e4f2fc;#7eafee,bbc39c,edf4e1,ffffff</sprite>
@@ -1174,7 +1174,7 @@
   <!-- Witch sister 1 -->
   <npc id="370">
     <particlefx>graphics/particles/power-circle.particle.xml</particlefx>
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/shorts-female.xml|#121212,343434</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#468AD6</sprite>
@@ -1184,7 +1184,7 @@
   <!-- Witch sister 2 -->
   <npc id="371">
     <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx>
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/shorts-female.xml|#121212,343434</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite>
@@ -1205,16 +1205,16 @@
   </npc>
   <!-- Blonde girl with spinning wheel by Chef Chelios-->
   <npc id="376">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528</sprite>
-    <sprite variant="1">npcs/weaver-wheel.xml</sprite>
+    <sprite variant="0">npcs/weaver-wheel.xml</sprite>
   </npc>
   <!-- Trapper -->
   <npc id="377">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle05-female.xml|#8c6625,dab425,ffffff</sprite>
-    <sprite>equipment/head/silkheadband-male.xml|W:#412300,c9866b,8d4900</sprite>
+    <sprite>equipment/head/silkheadband-male.xml|#412300,c9866b,8d4900</sprite>
     <sprite>equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
     <sprite>equipment/legs/pants-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
     <sprite>equipment/feet/furboots-male.xml</sprite>
@@ -1236,7 +1236,7 @@
   <!-- Christmas Decorated Pine Tree (LARGE)-->
   <npc id="381"
     targetSelection="false">
-    <sprite variant="1">npcs/xmastree-nosnow.xml</sprite>
+    <sprite variant="0">npcs/xmastree-nosnow.xml</sprite>
   </npc>
   <!-- Green Leafs Tree 3 Tiles high -->
   <npc id="382"
@@ -1246,7 +1246,7 @@
   <!-- Christmas Decorated Palm Tree -->
   <npc id="383"
     targetSelection="false">
-    <sprite variant="3">npcs/xmas-palm.xml</sprite>
+    <sprite variant="0">npcs/xmas-palm.xml</sprite>
   </npc>
   <!-- Palm Tree -->
   <npc id="384"
@@ -1255,24 +1255,24 @@
   </npc>
   <!-- Male Wizard In Bubble -->
   <npc id="385">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-male.xml|#490000,b66d49</sprite>
     <sprite variant="0">equipment/override/adult-outfits.xml</sprite>
     <particlefx>graphics/particles/sphere-white.particle.xml</particlefx>
   </npc>
   <npc id="386">
-    <sprite>npcs/present.xml|R:#ec2843;W:#1e8c1e</sprite>
+    <sprite>npcs/present.xml|#ec2843;#1e8c1e</sprite>
   </npc>
   <!-- IDs 387 - 393 reserved for Vday -->
   <!-- Large Green Tree -->
   <npc id="394"
        targetSelection="false">
-    <sprite variant="1">npcs/tree-large.xml</sprite>
+    <sprite variant="0">npcs/tree-large.xml</sprite>
   </npc>
   <!-- Ship -->
   <npc id="395"
        targetCursor="large">
-    <sprite variant="1">npcs/koga.xml</sprite>
+    <sprite variant="0">npcs/koga.xml</sprite>
   </npc>
   <!-- Dock Sign (Light) -->
   <npc id="396">
@@ -1298,13 +1298,13 @@
   </npc>
   <!-- Manakins -->
   <npc id="401">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/legs/terranite-female.xml</sprite>
     <sprite>equipment/chest/terranite-female.xml</sprite>
     <sprite>equipment/head/terranitehelm-female.xml</sprite>
   </npc>
   <npc id="402">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/legs/terranite-male.xml</sprite>
     <sprite>equipment/chest/terranite-male.xml</sprite>
     <sprite>equipment/head/terranitehelm-male.xml</sprite>
@@ -1313,7 +1313,7 @@
     <sprite>monsters/terranite.xml</sprite>
   </npc>
   <npc id="404">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml</sprite>
     <sprite>hairstyles/hairstyle11-female.xml|#bb2222,ffee33</sprite>
     <sprite>equipment/chest/robe-female.xml|#ffffff</sprite>
@@ -1321,7 +1321,7 @@
     <sprite>equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite>
   </npc>
   <npc id="405">
-    <sprite>races/talponian-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/legs/chaps-male.xml</sprite>
     <sprite>equipment/chest/tanktop-male.xml</sprite>
     <sprite>hairstyles/hairstyle18-male.xml|#817339,FFE87C</sprite>
@@ -1330,7 +1330,7 @@
     <sprite>equipment/feet/boots-male.xml|#a4b2b2,ffffff</sprite>
   </npc>
   <npc id="406">
-    <sprite>races/gispaan-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/boots-female.xml</sprite>
     <sprite>equipment/chest/leather-female.xml|#412300,603100,8d4900;#ffff00</sprite>
     <sprite>equipment/legs/skirt-female.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
@@ -1339,7 +1339,7 @@
     <sprite>equipment/head/minershat-female.xml</sprite>
   </npc>
   <npc id="407">
-    <sprite>races/gispaan-male.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/legs/pants-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
     <sprite>equipment/feet/boots-male.xml|#623a34,f0c2b4</sprite>
     <sprite>hairstyles/hairstyle14-male.xml|#817339,FFE87C</sprite>