From 18305b7c040b54efd169d5887e169a7b7fe862ea Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Tue, 1 Jul 2014 13:50:19 -0500
Subject: Fixing numerous warnings and errors in manaplus closes #121 closes
 #108 closes #100 closes #93

---
 ea-skills.xml                                      |   12 +-
 emotes.xml                                         |   38 +-
 equipmentwindow.xml                                |   26 +-
 features.xml                                       |    2 +-
 graphics/items/equipment/feet/warlordboots.png     |  Bin
 .../items/equipment/weapon/wand-deathshand.png     |  Bin 763 -> 755 bytes
 graphics/items/use/food/boxofchocolates.png        |  Bin 1790 -> 1756 bytes
 graphics/particles/arrowh-green-slime.particle.xml |    2 +-
 graphics/particles/arrowh-sea-slime.particle.xml   |    2 +-
 graphics/particles/arrowh-slime.particle.xml       |    2 +-
 graphics/particles/arrowh-slime.png                |  Bin 1919 -> 939 bytes
 .../particles/undead-witch-attack.particle.xml     |    2 +-
 .../equipment/chest/bromenalchest-female.xml       |    2 +-
 .../sprites/equipment/chest/bromenalchest-male.xml |    2 +-
 .../sprites/equipment/chest/chainmail-female.xml   |    2 +-
 .../sprites/equipment/chest/chainmail-male.xml     |    2 +-
 .../equipment/feet/assassin-boots-female.xml       |    2 +-
 .../sprites/equipment/feet/assassin-boots-male.xml |    2 +-
 .../sprites/equipment/feet/warlordboots-female.png |  Bin
 .../sprites/equipment/feet/warlordboots-male.png   |  Bin
 graphics/sprites/equipment/hands/magefire.xml      |   72 --
 .../sprites/equipment/head/antlerhat-female.xml    |   26 +-
 graphics/sprites/equipment/head/antlerhat-male.xml |   24 +-
 .../sprites/equipment/head/autumn-mask-female.xml  |   26 +-
 .../sprites/equipment/head/autumn-mask-male.xml    |   24 +-
 graphics/sprites/equipment/head/axehat-female.xml  |   26 +-
 graphics/sprites/equipment/head/axehat-male.xml    |   24 +-
 graphics/sprites/equipment/head/bandana-female.xml |   31 +-
 graphics/sprites/equipment/head/bandana-male.xml   |   26 +-
 .../sprites/equipment/head/beaniecopter-female.xml |  144 +--
 .../sprites/equipment/head/beaniecopter-male.xml   |  144 +--
 graphics/sprites/equipment/head/beard-female.xml   |    5 +
 graphics/sprites/equipment/head/beard-male.xml     |    5 +
 graphics/sprites/equipment/head/beard.png          |  Bin 263 -> 261 bytes
 graphics/sprites/equipment/head/beard.xml          |    5 -
 graphics/sprites/equipment/head/beret-female.xml   |  259 ++--
 graphics/sprites/equipment/head/beret-male.xml     |  278 ++--
 .../equipment/head/bowler-hat-brown-female.xml     |   26 +-
 .../equipment/head/bowler-hat-brown-male.xml       |   24 +-
 .../sprites/equipment/head/bowler-hat-female.xml   |   26 +-
 .../sprites/equipment/head/bowler-hat-male.xml     |   24 +-
 .../equipment/head/bromenalhelmet-female.xml       |   26 +-
 .../sprites/equipment/head/bromenalhelmet-male.xml |   21 +-
 graphics/sprites/equipment/head/bucket-female.xml  |  210 ++--
 graphics/sprites/equipment/head/bucket-male.xml    |  253 ++--
 graphics/sprites/equipment/head/bull-female.xml    |   21 +-
 graphics/sprites/equipment/head/bull-male.xml      |   21 +-
 .../sprites/equipment/head/bunnyears-female.xml    |   26 +-
 graphics/sprites/equipment/head/bunnyears-male.xml |   24 +-
 .../sprites/equipment/head/candlehelmet-female.xml |    7 +-
 .../sprites/equipment/head/candlehelmet-male.xml   |    7 +-
 graphics/sprites/equipment/head/cap-female.xml     |   23 +-
 graphics/sprites/equipment/head/cap-male.xml       |   24 +-
 .../sprites/equipment/head/captain-hat-female.xml  |   26 +-
 .../sprites/equipment/head/captain-hat-male.xml    |   24 +-
 graphics/sprites/equipment/head/captain-hat.png    |  Bin 3061 -> 3043 bytes
 .../sprites/equipment/head/cashiershade-female.xml |   21 +-
 .../sprites/equipment/head/cashiershade-male.xml   |   21 +-
 graphics/sprites/equipment/head/catears-female.xml |   26 +-
 graphics/sprites/equipment/head/catears-male.xml   |   24 +-
 graphics/sprites/equipment/head/chefhat-female.xml |   26 +-
 graphics/sprites/equipment/head/chefhat-male.xml   |   24 +-
 .../equipment/head/christmastree-female.xml        |   26 +-
 .../sprites/equipment/head/christmastree-male.xml  |   24 +-
 graphics/sprites/equipment/head/circlet-female.xml |   26 +-
 graphics/sprites/equipment/head/circlet-male.xml   |   24 +-
 .../sprites/equipment/head/cowboyblack-female.xml  |   26 +-
 .../sprites/equipment/head/cowboyblack-male.xml    |   24 +-
 .../sprites/equipment/head/cowboywhite-female.xml  |   26 +-
 .../sprites/equipment/head/cowboywhite-male.xml    |   24 +-
 graphics/sprites/equipment/head/crown-female.xml   |   26 +-
 graphics/sprites/equipment/head/crown-male.xml     |   24 +-
 .../sprites/equipment/head/crusadehelm-female.xml  |   26 +-
 .../sprites/equipment/head/crusadehelm-male.xml    |   21 +-
 .../sprites/equipment/head/dark-helm-female.xml    |   32 +-
 graphics/sprites/equipment/head/dark-helm-male.xml |   27 +-
 .../sprites/equipment/head/demonmask-female.xml    |   26 +-
 graphics/sprites/equipment/head/demonmask-male.xml |   24 +-
 .../equipment/head/desert-helmet-female.xml        |   26 +-
 .../sprites/equipment/head/desert-helmet-male.xml  |   24 +-
 .../sprites/equipment/head/deserthat-female.xml    |    4 +
 graphics/sprites/equipment/head/deserthat-male.xml |    4 +
 graphics/sprites/equipment/head/devcap-female.xml  |   23 +-
 graphics/sprites/equipment/head/devcap-male.xml    |   24 +-
 .../sprites/equipment/head/earmuffs-female.xml     |   26 +-
 graphics/sprites/equipment/head/earmuffs-male.xml  |   24 +-
 .../sprites/equipment/head/eggshell-female.xml     |   26 +-
 graphics/sprites/equipment/head/eggshell-male.xml  |   24 +-
 .../sprites/equipment/head/elf-nightcap-female.xml |   26 +-
 .../sprites/equipment/head/elf-nightcap-male.xml   |   24 +-
 graphics/sprites/equipment/head/elf-nightcap.png   |  Bin 4600 -> 3993 bytes
 .../sprites/equipment/head/eskimohat-female.xml    |  240 ++--
 graphics/sprites/equipment/head/eskimohat-male.xml |  260 ++--
 .../sprites/equipment/head/eyepatch-female.xml     |   26 +-
 graphics/sprites/equipment/head/eyepatch-male.xml  |   24 +-
 .../sprites/equipment/head/fairy_hat-female.xml    |   26 +-
 graphics/sprites/equipment/head/fairy_hat-male.xml |   24 +-
 .../sprites/equipment/head/fancyhat-female.xml     |   26 +-
 graphics/sprites/equipment/head/fancyhat-male.xml  |   24 +-
 .../sprites/equipment/head/fluffyhat-female.xml    |   69 +-
 graphics/sprites/equipment/head/fluffyhat-male.xml |   64 +-
 .../sprites/equipment/head/funkywinter-female.xml  |   26 +-
 .../sprites/equipment/head/funkywinter-male.xml    |   24 +-
 .../sprites/equipment/head/gas-carbon-female.xml   |  240 ++--
 .../sprites/equipment/head/gas-carbon-male.xml     |  263 ++--
 graphics/sprites/equipment/head/gasmask-female.xml |  240 ++--
 graphics/sprites/equipment/head/gasmask-male.xml   |  263 ++--
 graphics/sprites/equipment/head/glasses-female.xml |   28 +-
 graphics/sprites/equipment/head/glasses-male.xml   |   26 +-
 graphics/sprites/equipment/head/gmcap-female.xml   |   23 +-
 graphics/sprites/equipment/head/gmcap-male.xml     |   24 +-
 graphics/sprites/equipment/head/goatee-female.xml  |    5 +
 graphics/sprites/equipment/head/goatee-male.xml    |    5 +
 graphics/sprites/equipment/head/goatee.png         |  Bin 538 -> 345 bytes
 graphics/sprites/equipment/head/goatee.xml         |    5 -
 .../sprites/equipment/head/goblin-mask-female.xml  |   26 +-
 .../sprites/equipment/head/goblin-mask-male.xml    |   24 +-
 graphics/sprites/equipment/head/goggles-female.xml |   26 +-
 graphics/sprites/equipment/head/goggles-male.xml   |   24 +-
 graphics/sprites/equipment/head/gradcap-female.xml |   26 +-
 graphics/sprites/equipment/head/gradcap-male.xml   |   24 +-
 .../sprites/equipment/head/guyfawkes-female.xml    |   26 +-
 graphics/sprites/equipment/head/guyfawkes-male.xml |   24 +-
 .../equipment/head/heart-glasses-female.xml        |   26 +-
 .../sprites/equipment/head/heart-glasses-male.xml  |   24 +-
 .../sprites/equipment/head/infantryhelm-female.xml |   26 +-
 .../sprites/equipment/head/infantryhelm-male.xml   |   21 +-
 .../equipment/head/inspector-hat-female.xml        |   34 +-
 .../sprites/equipment/head/inspector-hat-male.xml  |   26 +-
 .../sprites/equipment/head/jestermask-female.xml   |    4 +
 .../sprites/equipment/head/jestermask-male.xml     |    4 +
 .../sprites/equipment/head/knighthelm-female.xml   |   26 +-
 .../sprites/equipment/head/knighthelm-male.xml     |   21 +-
 .../sprites/equipment/head/knit-cap-female.xml     |   71 +-
 graphics/sprites/equipment/head/knit-cap-male.xml  |   69 +-
 .../sprites/equipment/head/long-beard-female.xml   |    5 +
 .../sprites/equipment/head/long-beard-male.xml     |    5 +
 graphics/sprites/equipment/head/long-beard.xml     |    5 -
 .../equipment/head/magicgmtophat-female.xml        |   26 +-
 .../sprites/equipment/head/magicgmtophat-male.xml  |   24 +-
 graphics/sprites/equipment/head/mask-female.xml    |   26 +-
 graphics/sprites/equipment/head/mask-male.xml      |   24 +-
 .../sprites/equipment/head/minershat-female.xml    |   26 +-
 graphics/sprites/equipment/head/minershat-male.xml |   24 +-
 graphics/sprites/equipment/head/monocle-female.xml |   26 +-
 graphics/sprites/equipment/head/monocle-male.xml   |   24 +-
 .../equipment/head/monster-skull-helm-female.xml   |   26 +-
 .../equipment/head/monster-skull-helm-male.xml     |   31 +-
 .../equipment/head/moonshroomhat-female.xml        |   26 +-
 .../sprites/equipment/head/moonshroomhat-male.xml  |  256 ++--
 .../sprites/equipment/head/mouboohead-female.xml   |   23 +-
 .../sprites/equipment/head/mouboohead-male.xml     |   24 +-
 .../equipment/head/moubootaurhead-female.xml       |    1 +
 .../sprites/equipment/head/moubootaurhead-male.xml |    2 +-
 .../sprites/equipment/head/mushroom-female.xml     |   26 +-
 graphics/sprites/equipment/head/mushroom-male.xml  |  256 ++--
 .../sprites/equipment/head/mustache-female.xml     |  233 ++++
 graphics/sprites/equipment/head/mustache-male.xml  |  233 ++++
 graphics/sprites/equipment/head/mustache.xml       |  118 --
 graphics/sprites/equipment/head/nohmask-female.xml |   26 +-
 graphics/sprites/equipment/head/nohmask-male.xml   |   24 +-
 .../equipment/head/nutcrackerhat-female.xml        |   22 +-
 .../sprites/equipment/head/nutcrackerhat-male.xml  |   26 +-
 graphics/sprites/equipment/head/nutcrackerhat.png  |  Bin 1352 -> 1410 bytes
 .../sprites/equipment/head/operamask-female.xml    |   26 +-
 graphics/sprites/equipment/head/operamask-male.xml |   24 +-
 .../sprites/equipment/head/overlordhelm-female.xml |   20 +-
 .../sprites/equipment/head/overlordhelm-male.xml   |   18 +-
 .../sprites/equipment/head/paladinhelm-female.xml  |   20 +-
 .../sprites/equipment/head/paladinhelm-male.xml    |   18 +-
 graphics/sprites/equipment/head/panhat-female.xml  |   37 +-
 graphics/sprites/equipment/head/panhat-male.xml    |   32 +-
 .../sprites/equipment/head/paperbag-female.xml     |   26 +-
 graphics/sprites/equipment/head/paperbag-male.xml  |   24 +-
 .../equipment/head/parsley-earplugs-female.xml     |   26 +-
 .../equipment/head/parsley-earplugs-male.xml       |   24 +-
 .../sprites/equipment/head/phylactery-female.xml   |   27 +-
 .../sprites/equipment/head/phylactery-male.xml     |   21 +-
 .../sprites/equipment/head/pilot-hat-female.xml    |  240 ++--
 graphics/sprites/equipment/head/pilot-hat-male.xml |  259 ++--
 graphics/sprites/equipment/head/pilot-hat.png      |  Bin 4453 -> 3907 bytes
 .../equipment/head/pinkie-helmet-female.xml        |   14 +-
 .../sprites/equipment/head/pinkie-helmet-male.xml  |   18 +-
 graphics/sprites/equipment/head/pinkie-helmet.png  |  Bin 2911 -> 2616 bytes
 .../sprites/equipment/head/pinkiehat-female.xml    |   26 +-
 graphics/sprites/equipment/head/pinkiehat-male.xml |   24 +-
 graphics/sprites/equipment/head/pipe.xml           |   62 +-
 .../sprites/equipment/head/piratehat-female.xml    |   26 +-
 graphics/sprites/equipment/head/piratehat-male.xml |   24 +-
 .../equipment/head/pumpkinhelmet-female.xml        |   26 +-
 .../sprites/equipment/head/pumpkinhelmet-male.xml  |   24 +-
 .../sprites/equipment/head/rabbit-ears-female.xml  |   26 +-
 .../sprites/equipment/head/rabbit-ears-male.xml    |   24 +-
 .../sprites/equipment/head/rangerhat-female.xml    |   26 +-
 graphics/sprites/equipment/head/rangerhat-male.xml |   24 +-
 graphics/sprites/equipment/head/rednose-female.xml |   23 +-
 graphics/sprites/equipment/head/rednose-male.xml   |   24 +-
 graphics/sprites/equipment/head/rosehat-female.xml |  363 +++---
 graphics/sprites/equipment/head/rosehat-male.xml   |  375 +++---
 .../sprites/equipment/head/sailor-hat-female.xml   |   26 +-
 .../sprites/equipment/head/sailor-hat-male.xml     |   24 +-
 .../equipment/head/santabeardhat-female.xml        |   26 +-
 .../sprites/equipment/head/santabeardhat-male.xml  |   24 +-
 .../sprites/equipment/head/santahat-female.xml     |   28 +-
 graphics/sprites/equipment/head/santahat-male.xml  |   26 +-
 graphics/sprites/equipment/head/serf-female.xml    |   26 +-
 graphics/sprites/equipment/head/serf-male.xml      |   24 +-
 graphics/sprites/equipment/head/shroom-female.xml  |   26 +-
 graphics/sprites/equipment/head/shroom-male.xml    |   24 +-
 .../sprites/equipment/head/silkheadband-female.xml |   26 +-
 .../sprites/equipment/head/silkheadband-male.xml   |   24 +-
 .../sprites/equipment/head/skullmask-female.xml    |   26 +-
 graphics/sprites/equipment/head/skullmask-male.xml |   24 +-
 .../sprites/equipment/head/snowgoggles-female.xml  |   26 +-
 .../sprites/equipment/head/snowgoggles-male.xml    |   24 +-
 .../equipment/head/standardheadband-female.xml     |   26 +-
 .../equipment/head/standardheadband-male.xml       |   24 +-
 .../sprites/equipment/head/sunglasses-female.xml   |   26 +-
 .../sprites/equipment/head/sunglasses-male.xml     |   24 +-
 .../sprites/equipment/head/tamoshanter-female.xml  |   21 +-
 .../sprites/equipment/head/tamoshanter-male.xml    |   21 +-
 .../equipment/head/terranitehelm-female.xml        |   24 +-
 .../sprites/equipment/head/terranitehelm-male.xml  |   25 +-
 .../sprites/equipment/head/thin-crown-female.xml   |   26 +-
 .../sprites/equipment/head/thin-crown-male.xml     |   24 +-
 graphics/sprites/equipment/head/tophat-female.xml  |   26 +-
 graphics/sprites/equipment/head/tophat-male.xml    |   24 +-
 .../equipment/head/underworld-mask-female.xml      |   26 +-
 .../equipment/head/underworld-mask-male.xml        |   24 +-
 .../sprites/equipment/head/warlordhelm-female.xml  |   26 +-
 .../sprites/equipment/head/warlordhelm-male.xml    |   21 +-
 .../equipment/head/witch-doctor-mask-female.xml    |   26 +-
 .../equipment/head/witch-doctor-mask-male.xml      |   24 +-
 .../sprites/equipment/head/witch-hat-female.xml    |   28 +-
 graphics/sprites/equipment/head/witch-hat-male.xml |   26 +-
 .../sprites/equipment/head/witch-hat2-female.xml   |   29 +-
 .../sprites/equipment/head/witch-hat2-male.xml     |   26 +-
 .../sprites/equipment/head/wizard-hat-female.xml   |   26 +-
 .../sprites/equipment/head/wizard-hat-male.xml     |   24 +-
 graphics/sprites/equipment/head/woolen-female.xml  |  237 ++--
 graphics/sprites/equipment/head/woolen-male.xml    |  258 ++--
 graphics/sprites/equipment/head/xmaself-female.xml |   26 +-
 graphics/sprites/equipment/head/xmaself-male.xml   |   24 +-
 .../sprites/equipment/head/yeti-mask-female.xml    |   26 +-
 graphics/sprites/equipment/head/yeti-mask-male.xml |   24 +-
 graphics/sprites/equipment/override/adult-head.xml |    2 +-
 .../sprites/equipment/override/adult-outfits.xml   |    2 +-
 .../equipment/override/child-head-in-bed.xml       |    4 +-
 graphics/sprites/equipment/override/child-head.xml |    4 +-
 .../sprites/equipment/weapons/axe-chop-female.xml  |    2 +-
 .../sprites/equipment/weapons/axe-chop-male.xml    |    2 +-
 .../sprites/equipment/weapons/axe-stab-female.xml  |    2 +-
 .../sprites/equipment/weapons/axe-stab-male.xml    |    2 +-
 .../equipment/weapons/bow-banshee-female.xml       |   82 +-
 .../sprites/equipment/weapons/bow-banshee-male.xml |   82 +-
 graphics/sprites/equipment/weapons/bow-female.xml  |    6 +-
 graphics/sprites/equipment/weapons/bow-male.xml    |    6 +-
 .../equipment/weapons/bow-slimecovered-female.xml  |   82 +-
 .../equipment/weapons/bow-slimecovered-male.xml    |   82 +-
 .../sprites/equipment/weapons/bow-slimecovered.png |  Bin 5356 -> 16724 bytes
 .../equipment/weapons/bow-slingshot-female.xml     |    6 +-
 .../equipment/weapons/bow-slingshot-male.xml       |    6 +-
 .../sprites/equipment/weapons/dagger-female.xml    |    2 +-
 graphics/sprites/equipment/weapons/dagger-male.xml |    2 +-
 .../equipment/weapons/polearm-blunt-female.xml     |    6 +-
 .../equipment/weapons/polearm-blunt-male.xml       |    6 +-
 .../sprites/equipment/weapons/polearm-blunt.png    |  Bin 11781 -> 11915 bytes
 .../equipment/weapons/polearm-chop-female.xml      |    6 +-
 .../equipment/weapons/polearm-chop-male.xml        |    6 +-
 .../sprites/equipment/weapons/polearm-chop.png     |  Bin 23190 -> 23183 bytes
 .../equipment/weapons/polearm-spear-female.xml     |    6 +-
 .../equipment/weapons/polearm-spear-male.xml       |    6 +-
 .../sprites/equipment/weapons/polearm-spear.png    |  Bin 13259 -> 13209 bytes
 .../equipment/weapons/polearm-stab-female.xml      |   82 +-
 .../equipment/weapons/polearm-stab-male.xml        |   81 +-
 .../sprites/equipment/weapons/polearm-stab.png     |  Bin 20318 -> 20315 bytes
 .../equipment/weapons/sword-deadsword-female.xml   |    2 +-
 .../equipment/weapons/sword-deadsword-male.xml     |    2 +-
 .../sprites/equipment/weapons/sword-deadsword.png  |  Bin 9578 -> 29925 bytes
 .../equipment/weapons/sword-long-female.xml        |    6 +-
 .../sprites/equipment/weapons/sword-long-male.xml  |    6 +-
 .../equipment/weapons/sword-short-female.xml       |    6 +-
 .../sprites/equipment/weapons/sword-short-male.xml |    6 +-
 .../sprites/equipment/weapons/wand-deathshand.png  |  Bin 3732 -> 14746 bytes
 graphics/sprites/equipment/weapons/wand-female.xml |    2 +-
 graphics/sprites/equipment/weapons/wand-male.xml   |   10 +-
 graphics/sprites/hairstyles/hairstyle01-female.xml |   26 +-
 graphics/sprites/hairstyles/hairstyle01-male.xml   |   24 +-
 graphics/sprites/hairstyles/hairstyle13-female.xml |   29 +-
 graphics/sprites/hairstyles/hairstyle13-male.xml   |   24 +-
 graphics/sprites/hairstyles/hairstyle14.png        |  Bin 5214 -> 5195 bytes
 graphics/sprites/icons/haste-potion.xml            |    2 +-
 graphics/sprites/icons/iron-potion.xml             |    2 +-
 graphics/sprites/icons/potion-b.png                |  Bin 497 -> 422 bytes
 graphics/sprites/icons/potion-c.png                |  Bin 978 -> 704 bytes
 graphics/sprites/icons/red-rotating-hex.xml        |    2 +-
 graphics/sprites/model/child-in-bed.xml            |    9 +
 graphics/sprites/model/child.xml                   |    2 +-
 graphics/sprites/model/female.xml                  |    2 +-
 graphics/sprites/model/male.xml                    |    6 +-
 .../monsters/accessories/bow-slimecovered.png      |  Bin 0 -> 4137 bytes
 .../accessories/mouboo-demonic-antlers.png         |  Bin 950 -> 738 bytes
 .../monsters/accessories/mushroom-base1-arms1.xml  |   11 +-
 .../accessories/mushroom-base1-cap1-spikes.xml     |    4 +
 .../monsters/accessories/mushroom-base1-cap1.xml   |    4 +
 .../monsters/accessories/mushroom-base1-cap2.xml   |    4 +
 .../monsters/accessories/mushroom-base1-face1.xml  |   11 +-
 .../monsters/accessories/mushroom-base1-face2.xml  |   11 +-
 .../monsters/accessories/mushroom-base1.xml        |    4 +
 .../monsters/accessories/nutcrackerhair.xml        |    2 +-
 .../sprites/monsters/accessories/nutcrackerhat.xml |    4 +-
 .../sprites/monsters/accessories/scythe-shadow.xml |    1 +
 .../sprites/monsters/accessories/slime-bubble.xml  |   43 +-
 .../monsters/accessories/slime-covered-bow.xml     |   22 +
 .../sprites/monsters/accessories/weapon-bow.xml    |   23 -
 .../sprites/monsters/accessories/weapon-dagger.xml |   23 -
 .../weapon-slime-covered-forrest-bow.xml           |   23 -
 graphics/sprites/monsters/butterfly.xml            |    2 +-
 graphics/sprites/monsters/cave-maggot.xml          |    2 +-
 graphics/sprites/monsters/element-ball.xml         |   32 +
 graphics/sprites/monsters/lizard.xml               |    4 +-
 graphics/sprites/monsters/logmonster.xml           |    2 +-
 graphics/sprites/monsters/mana-bug.xml             |    2 +-
 graphics/sprites/monsters/mana-ghost.xml           |    4 +
 graphics/sprites/monsters/mouboo-demonic.xml       |    2 +-
 graphics/sprites/monsters/mouboo.xml               |    2 +-
 graphics/sprites/monsters/penguin.xml              |    6 +-
 graphics/sprites/monsters/plant.png                |  Bin 4532 -> 4276 bytes
 graphics/sprites/monsters/psi-bubble.xml           |    4 +
 graphics/sprites/monsters/serqet.xml               |    8 +-
 graphics/sprites/monsters/slime-mother.xml         |   72 --
 graphics/sprites/monsters/snail.xml                |    2 +-
 graphics/sprites/monsters/snake-cave.xml           |    8 +-
 graphics/sprites/monsters/spinning-scythe.xml      |    1 +
 graphics/sprites/monsters/squirrel.xml             |    4 +-
 graphics/sprites/monsters/terranite-mask.png       |  Bin 1361 -> 1290 bytes
 graphics/sprites/monsters/troll.xml                |   18 +-
 graphics/sprites/monsters/wraith.xml               |    4 +
 graphics/sprites/monsters/zombie.xml               |    6 +-
 graphics/sprites/npcs/palm-tree.xml                |    2 +-
 graphics/sprites/npcs/present.xml                  |    2 +-
 graphics/sprites/races/gispaan-child.xml           |    9 -
 graphics/sprites/races/gispaan-female.xml          |    5 -
 graphics/sprites/races/gispaan-male.xml            |    5 -
 graphics/sprites/races/talponian-child-in-bed.xml  |    9 -
 graphics/sprites/races/talponian-child.xml         |    9 -
 graphics/sprites/races/talponian-female.xml        |    5 -
 graphics/sprites/races/talponian-male.xml          |    5 -
 graphics/sprites/races/talponian-pirate.xml        |    5 -
 hair.xml                                           |    9 +-
 items.xml                                          |  622 ++++-----
 maps.xml                                           | 1330 ++++++++++----------
 monsters.xml                                       |   55 +-
 npcs.xml                                           |  300 ++---
 paths.xml                                          |    8 +-
 skills.xml                                         |    1 -
 status-effects.xml                                 |    6 +-
 weapons.xml                                        |   39 +-
 358 files changed, 6857 insertions(+), 7162 deletions(-)
 mode change 100755 => 100644 graphics/items/equipment/feet/warlordboots.png
 mode change 100755 => 100644 graphics/sprites/equipment/feet/warlordboots-female.png
 mode change 100755 => 100644 graphics/sprites/equipment/feet/warlordboots-male.png
 create mode 100644 graphics/sprites/equipment/head/beard-female.xml
 create mode 100644 graphics/sprites/equipment/head/beard-male.xml
 delete mode 100644 graphics/sprites/equipment/head/beard.xml
 create mode 100644 graphics/sprites/equipment/head/goatee-female.xml
 create mode 100644 graphics/sprites/equipment/head/goatee-male.xml
 delete mode 100644 graphics/sprites/equipment/head/goatee.xml
 create mode 100644 graphics/sprites/equipment/head/long-beard-female.xml
 create mode 100644 graphics/sprites/equipment/head/long-beard-male.xml
 delete mode 100644 graphics/sprites/equipment/head/long-beard.xml
 create mode 100644 graphics/sprites/equipment/head/mustache-female.xml
 create mode 100644 graphics/sprites/equipment/head/mustache-male.xml
 delete mode 100644 graphics/sprites/equipment/head/mustache.xml
 create mode 100644 graphics/sprites/model/child-in-bed.xml
 create mode 100644 graphics/sprites/monsters/accessories/bow-slimecovered.png
 create mode 100644 graphics/sprites/monsters/accessories/slime-covered-bow.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-bow.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-dagger.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
 delete mode 100644 graphics/sprites/races/gispaan-child.xml
 delete mode 100644 graphics/sprites/races/gispaan-female.xml
 delete mode 100644 graphics/sprites/races/gispaan-male.xml
 delete mode 100644 graphics/sprites/races/talponian-child-in-bed.xml
 delete mode 100644 graphics/sprites/races/talponian-child.xml
 delete mode 100644 graphics/sprites/races/talponian-female.xml
 delete mode 100644 graphics/sprites/races/talponian-male.xml
 delete mode 100644 graphics/sprites/races/talponian-pirate.xml

diff --git a/ea-skills.xml b/ea-skills.xml
index b8875de3..9aed32ee 100644
--- a/ea-skills.xml
+++ b/ea-skills.xml
@@ -5,12 +5,12 @@
     See documentation: http://manaplus.org/skills.xml
 -->
 <skills>
-    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-        <its:translateRule selector="//set/@name" translate="yes"/>
-        <its:translateRule selector="//set/skill/@name" translate="yes"/>
-        <its:translateRule selector="//set/skill/@description" translate="yes"/>
-        <its:translateRule selector="//*" translate="no"/>
-    </its:rules>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//set/@name" translate="yes"/>
+    <its:translateRule selector="//set/skill/@name" translate="yes"/>
+    <its:translateRule selector="//set/skill/@description" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
   <set name="Basic">
     <skill id="1" name="Emote" icon="graphics/skills/basic/emote.png"/>
     <skill id="2" name="Trade" icon="graphics/skills/basic/trade.png"/>
diff --git a/emotes.xml b/emotes.xml
index d0c0ece2..34eeae71 100644
--- a/emotes.xml
+++ b/emotes.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <emotes>
-    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-        <its:translateRule selector="//emote/@name" translate="yes"/>
-        <its:translateRule selector="//emote/sprite/@name" translate="yes"/>
-        <its:translateRule selector="//*" translate="no"/>
-    </its:rules>
-    <emote id="0"><sprite name="Disgust" variant="0">emote.xml</sprite></emote>
-    <emote id="1"><sprite name="Surprise" variant="1">emote.xml</sprite></emote>
-    <emote id="2"><sprite name="Happy" variant="2">emote.xml</sprite></emote>
-    <emote id="3"><sprite name="Sad" variant="3">emote.xml</sprite></emote>
-    <emote id="4"><sprite name="Evil" variant="4">emote.xml</sprite></emote>
-    <emote id="5"><sprite name="Wink" variant="5">emote.xml</sprite></emote>
-    <emote id="6"><sprite name="Angel" variant="6">emote.xml</sprite></emote>
-    <emote id="7"><sprite name="Blush" variant="7">emote.xml</sprite></emote>
-    <emote id="8"><sprite name="Tongue" variant="8">emote.xml</sprite></emote>
-    <emote id="9"><sprite name="Grin" variant="9">emote.xml</sprite></emote>
-    <emote id="10"><sprite name="Upset" variant="10">emote.xml</sprite></emote>
-    <emote id="11"><sprite name="Perturbed" variant="11">emote.xml</sprite></emote>
-    <emote id="12"><sprite name="Speech" variant="12">emote.xml</sprite></emote>
-    <emote id="13"><sprite name="Blah" variant="13">emote.xml</sprite></emote>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//emote/@name" translate="yes"/>
+    <its:translateRule selector="//emote/sprite/@name" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <emote id="0"><sprite name="Disgust" variant="0">emote.xml</sprite></emote>
+  <emote id="1"><sprite name="Surprise" variant="1">emote.xml</sprite></emote>
+  <emote id="2"><sprite name="Happy" variant="2">emote.xml</sprite></emote>
+  <emote id="3"><sprite name="Sad" variant="3">emote.xml</sprite></emote>
+  <emote id="4"><sprite name="Evil" variant="4">emote.xml</sprite></emote>
+  <emote id="5"><sprite name="Wink" variant="5">emote.xml</sprite></emote>
+  <emote id="6"><sprite name="Angel" variant="6">emote.xml</sprite></emote>
+  <emote id="7"><sprite name="Blush" variant="7">emote.xml</sprite></emote>
+  <emote id="8"><sprite name="Tongue" variant="8">emote.xml</sprite></emote>
+  <emote id="9"><sprite name="Grin" variant="9">emote.xml</sprite></emote>
+  <emote id="10"><sprite name="Upset" variant="10">emote.xml</sprite></emote>
+  <emote id="11"><sprite name="Perturbed" variant="11">emote.xml</sprite></emote>
+  <emote id="12"><sprite name="Speech" variant="12">emote.xml</sprite></emote>
+  <emote id="13"><sprite name="Blah" variant="13">emote.xml</sprite></emote>
 </emotes>
diff --git a/equipmentwindow.xml b/equipmentwindow.xml
index 02fde278..1ea7b28d 100644
--- a/equipmentwindow.xml
+++ b/equipmentwindow.xml
@@ -2,17 +2,17 @@
 <!-- Author: 4144
 Copyright (C) 2011-2012 Evol Online -->
 <equipment>
-    <window width="205" height="400"/>
-    <playerbox x="50" y="80" width="74" height="123"/>
-    <slot name="torso" x="94" y="48" image="0"/>
-    <slot name="gloves" x="8" y="92" image="1"/>
-    <slot name="hat" x="72" y="4" image="2"/>
-    <slot name="pants" x="50" y="226" image="3"/>
-    <slot name="boots" x="94" y="226" image="4"/>
-    <slot name="cape" x="8" y="182" image="5" />
-    <slot name="wings" x="136" y="182" image="6"/>
-    <slot name="scarf" x="50" y="48" image="5"/>
-    <slot name="weapon" x="8" y="137" image="7"/>
-    <slot name="shield" x="136" y="137" image="8"/>
-    <slot name="ammo" x="136" y="92" image="9"/>
+  <window width="205" height="400"/>
+  <playerbox x="50" y="80" width="74" height="123"/>
+  <slot name="torso" x="94" y="48" image="0"/>
+  <slot name="gloves" x="8" y="92" image="1"/>
+  <slot name="hat" x="72" y="4" image="2"/>
+  <slot name="pants" x="50" y="226" image="3"/>
+  <slot name="boots" x="94" y="226" image="4"/>
+  <slot name="cape" x="8" y="182" image="5" />
+  <slot name="wings" x="136" y="182" image="6"/>
+  <slot name="scarf" x="50" y="48" image="5"/>
+  <slot name="weapon" x="8" y="137" image="7"/>
+  <slot name="shield" x="136" y="137" image="8"/>
+  <slot name="ammo" x="136" y="92" image="9"/>
 </equipment>
diff --git a/features.xml b/features.xml
index d31f5c35..9ae38754 100644
--- a/features.xml
+++ b/features.xml
@@ -2,5 +2,5 @@
 <!-- Authors: 4144
 Copyright (C) 2013 Evol Online -->
 <configuration>
-    <option name="allowFollow" value="0"/>
+  <option name="allowFollow" value="0"/>
 </configuration>
diff --git a/graphics/items/equipment/feet/warlordboots.png b/graphics/items/equipment/feet/warlordboots.png
old mode 100755
new mode 100644
diff --git a/graphics/items/equipment/weapon/wand-deathshand.png b/graphics/items/equipment/weapon/wand-deathshand.png
index dd0fb12f..ad9bcc45 100644
Binary files a/graphics/items/equipment/weapon/wand-deathshand.png and b/graphics/items/equipment/weapon/wand-deathshand.png differ
diff --git a/graphics/items/use/food/boxofchocolates.png b/graphics/items/use/food/boxofchocolates.png
index 59031105..7263f755 100644
Binary files a/graphics/items/use/food/boxofchocolates.png and b/graphics/items/use/food/boxofchocolates.png differ
diff --git a/graphics/particles/arrowh-green-slime.particle.xml b/graphics/particles/arrowh-green-slime.particle.xml
index 34c09f60..602d562a 100644
--- a/graphics/particles/arrowh-green-slime.particle.xml
+++ b/graphics/particles/arrowh-green-slime.particle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <effect>
   <particle position-x="0" position-y="0" position-z="32" lifetime="128">
-    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|W:#72982c,ffffff" width="16" height="16">
+    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|R:#72982c,8bd936" width="16" height="16">
       <sequence start="0" end="7"/>
     </rotation>
   </particle>
diff --git a/graphics/particles/arrowh-sea-slime.particle.xml b/graphics/particles/arrowh-sea-slime.particle.xml
index 5d3b64c6..8c2c95d7 100644
--- a/graphics/particles/arrowh-sea-slime.particle.xml
+++ b/graphics/particles/arrowh-sea-slime.particle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <effect>
   <particle position-x="0" position-y="0" position-z="32" lifetime="128">
-    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|W:#4Ca16e,ffffff" width="16" height="16">
+    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|R:#4da4b3,69def2" width="16" height="16">
       <sequence start="0" end="7"/>
     </rotation>
   </particle>
diff --git a/graphics/particles/arrowh-slime.particle.xml b/graphics/particles/arrowh-slime.particle.xml
index 0207e785..a09b0824 100644
--- a/graphics/particles/arrowh-slime.particle.xml
+++ b/graphics/particles/arrowh-slime.particle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <effect>
   <particle position-x="0" position-y="0" position-z="32" lifetime="128">
-    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|W:#ff00fc,ffffff" width="16" height="16">
+    <rotation name="base" imageset="graphics/particles/arrowh-slime.png|R:#72982c,ffffff" width="16" height="16">
       <sequence start="0" end="7"/>
     </rotation>
   </particle>
diff --git a/graphics/particles/arrowh-slime.png b/graphics/particles/arrowh-slime.png
index 704ca1ce..efe54499 100644
Binary files a/graphics/particles/arrowh-slime.png and b/graphics/particles/arrowh-slime.png differ
diff --git a/graphics/particles/undead-witch-attack.particle.xml b/graphics/particles/undead-witch-attack.particle.xml
index a298a0ac..a8940f45 100644
--- a/graphics/particles/undead-witch-attack.particle.xml
+++ b/graphics/particles/undead-witch-attack.particle.xml
@@ -5,7 +5,7 @@ A energy ball like particle effect intended for use of the Undead-Witch's attack
 <effect>
   <particle position-x="0" position-y="0" position-z="8" lifetime="102">
     <emitter>
-      <property name="image" value="graphics/particles/star-small.png|W:#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF"/>
+      <property name="image" value="graphics/particles/star-small.png|W:#111111,222222,333333,444444,555555,aaaaaa"/>
       <property name="lifetime" value="200"/>
       <property name="fade-out" value="100"/>
       <property name="output" min="0" max="1"/>
diff --git a/graphics/sprites/equipment/chest/bromenalchest-female.xml b/graphics/sprites/equipment/chest/bromenalchest-female.xml
index 6067c0a5..c33a3c03 100644
--- a/graphics/sprites/equipment/chest/bromenalchest-female.xml
+++ b/graphics/sprites/equipment/chest/bromenalchest-female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-female.png" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-female.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/bromenalchest-male.xml b/graphics/sprites/equipment/chest/bromenalchest-male.xml
index 809bf3a2..079498ed 100644
--- a/graphics/sprites/equipment/chest/bromenalchest-male.xml
+++ b/graphics/sprites/equipment/chest/bromenalchest-male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-male.png" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-male.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/chainmail-female.xml b/graphics/sprites/equipment/chest/chainmail-female.xml
index 8ac711e9..4ad21cf8 100644
--- a/graphics/sprites/equipment/chest/chainmail-female.xml
+++ b/graphics/sprites/equipment/chest/chainmail-female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail-female.png" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail-female.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/chest/chainmail-male.xml b/graphics/sprites/equipment/chest/chainmail-male.xml
index 45ba3ea6..02630eeb 100644
--- a/graphics/sprites/equipment/chest/chainmail-male.xml
+++ b/graphics/sprites/equipment/chest/chainmail-male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail-male.png" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/chest/chainmail-male.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/assassin-boots-female.xml b/graphics/sprites/equipment/feet/assassin-boots-female.xml
index a2f48c5a..64bce0a8 100644
--- a/graphics/sprites/equipment/feet/assassin-boots-female.xml
+++ b/graphics/sprites/equipment/feet/assassin-boots-female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots-female.png|W;" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots-female.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/assassin-boots-male.xml b/graphics/sprites/equipment/feet/assassin-boots-male.xml
index 90ea21de..11f78041 100644
--- a/graphics/sprites/equipment/feet/assassin-boots-male.xml
+++ b/graphics/sprites/equipment/feet/assassin-boots-male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots-male.png|W;" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/feet/assassin-boots-male.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/feet/warlordboots-female.png b/graphics/sprites/equipment/feet/warlordboots-female.png
old mode 100755
new mode 100644
diff --git a/graphics/sprites/equipment/feet/warlordboots-male.png b/graphics/sprites/equipment/feet/warlordboots-male.png
old mode 100755
new mode 100644
diff --git a/graphics/sprites/equipment/hands/magefire.xml b/graphics/sprites/equipment/hands/magefire.xml
index 28db34a9..31155a96 100644
--- a/graphics/sprites/equipment/hands/magefire.xml
+++ b/graphics/sprites/equipment/hands/magefire.xml
@@ -93,76 +93,4 @@
       <end/>
     </animation>
   </action>
-  <action name="attack_polearm" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_1hand" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/head/antlerhat-female.xml b/graphics/sprites/equipment/head/antlerhat-female.xml
index 970e2b91..0b701afd 100644
--- a/graphics/sprites/equipment/head/antlerhat-female.xml
+++ b/graphics/sprites/equipment/head/antlerhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/antlerhat-male.xml b/graphics/sprites/equipment/head/antlerhat-male.xml
index a4ba6871..2dec85ef 100644
--- a/graphics/sprites/equipment/head/antlerhat-male.xml
+++ b/graphics/sprites/equipment/head/antlerhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/autumn-mask-female.xml b/graphics/sprites/equipment/head/autumn-mask-female.xml
index 5dbbd6fb..e2dfc746 100644
--- a/graphics/sprites/equipment/head/autumn-mask-female.xml
+++ b/graphics/sprites/equipment/head/autumn-mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-34"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="1" offsetY="-35"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="1" offsetY="-35"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-35"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-34"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-35"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-32" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-37" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-37" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-37" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-31" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-37" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-37" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-37" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-33" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/autumn-mask-male.xml b/graphics/sprites/equipment/head/autumn-mask-male.xml
index c16e2d54..3bed204c 100644
--- a/graphics/sprites/equipment/head/autumn-mask-male.xml
+++ b/graphics/sprites/equipment/head/autumn-mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="1" offsetY="-35" delay="150"/>
       <frame index="1" offsetX="1" offsetY="-34" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-35" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-31" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/axehat-female.xml b/graphics/sprites/equipment/head/axehat-female.xml
index 0a506cbb..8be11807 100644
--- a/graphics/sprites/equipment/head/axehat-female.xml
+++ b/graphics/sprites/equipment/head/axehat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-44"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-43"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-44"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-44"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-44"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-43"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-44"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-43"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-44"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-43"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-44"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-44"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-44"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-43"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-44"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-43" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-45" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-46" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-46" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-46" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-42" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/axehat-male.xml b/graphics/sprites/equipment/head/axehat-male.xml
index 688bfa57..40662560 100644
--- a/graphics/sprites/equipment/head/axehat-male.xml
+++ b/graphics/sprites/equipment/head/axehat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-44" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-43" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-44" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-44" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-44" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-43" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-44" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-43" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-44" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-43" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-44" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-44" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-44" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-43" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-44" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-44" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-43" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-43" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-43" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index a87016b0..96909412 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="21" name="base" src="graphics/sprites/equipment/head/bandana.png|W;R;" width="29"/>
+  <imageset height="21" name="base" src="graphics/sprites/equipment/head/bandana.png|W;R" width="29"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-38"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,8 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <end/>
@@ -206,30 +205,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bandana-male.xml b/graphics/sprites/equipment/head/bandana-male.xml
index 48db56ad..0607f94d 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/bandana.png|W;R;" width="29" height="21"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/bandana.png|W;R" width="29" height="21"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-38"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/beaniecopter-female.xml b/graphics/sprites/equipment/head/beaniecopter-female.xml
index bd910a72..5c267c4a 100644
--- a/graphics/sprites/equipment/head/beaniecopter-female.xml
+++ b/graphics/sprites/equipment/head/beaniecopter-female.xml
@@ -4,58 +4,42 @@
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" delay="56"/>
-      <frame index="1" offsetX="-1" delay="19"/>
-      <frame index="1" offsetX="-1" delay="37"/>
-      <frame index="2" offsetX="-1" delay="38"/>
-      <frame index="2" offsetX="-1" delay="18"/>
+      <frame index="1" offsetX="-1" delay="56"/>
+      <frame index="2" offsetX="-1" delay="56"/>
       <frame index="3" offsetX="-1" delay="57"/>
       <frame index="0" offsetX="-1" delay="55"/>
-      <frame index="1" offsetX="-1" delay="20"/>
-      <frame index="1" offsetX="-1" delay="36"/>
-      <frame index="2" offsetX="-1" delay="39"/>
-      <frame index="2" offsetX="-1" delay="17"/>
+      <frame index="1" offsetX="-1" delay="56"/>
+      <frame index="2" offsetX="-1" delay="56"/>
       <frame index="3" offsetX="-1" delay="58"/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetY="-1" delay="56"/>
-      <frame index="5" offsetY="-1" delay="19"/>
-      <frame index="5" offsetY="-1" delay="37"/>
-      <frame index="6" offsetY="-1" delay="38"/>
-      <frame index="6" offsetY="-1" delay="18"/>
+      <frame index="5" offsetY="-1" delay="56"/>
+      <frame index="6" offsetY="-1" delay="56"/>
       <frame index="7" offsetY="-1" delay="56"/>
       <frame index="4" offsetY="-1" delay="56"/>
-      <frame index="5" offsetY="-1" delay="20"/>
-      <frame index="5" offsetY="-1" delay="36"/>
-      <frame index="6" offsetY="-1" delay="39"/>
-      <frame index="6" offsetY="-1" delay="17"/>
+      <frame index="5" offsetY="-1" delay="56"/>
+      <frame index="6" offsetY="-1" delay="56"/>
       <frame index="7" offsetY="-1" delay="58"/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="37"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="38"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="18"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="56"/>
+      <frame index="10" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-1" delay="57"/>
       <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="36"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="39"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="17"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="56"/>
+      <frame index="10" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-1" delay="58"/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetY="-1" delay="56"/>
-      <frame index="13" offsetY="-1" delay="19"/>
-      <frame index="13" offsetY="-1" delay="37"/>
-      <frame index="14" offsetY="-1" delay="38"/>
-      <frame index="14" offsetY="-1" delay="18"/>
+      <frame index="13" offsetY="-1" delay="56"/>
+      <frame index="14" offsetY="-1" delay="56"/>
       <frame index="15" offsetY="-1" delay="56"/>
       <frame index="12" offsetY="-1" delay="56"/>
-      <frame index="13" offsetY="-1" delay="20"/>
-      <frame index="13" offsetY="-1" delay="36"/>
-      <frame index="14" offsetY="-1" delay="39"/>
-      <frame index="14" offsetY="-1" delay="17"/>
+      <frame index="13" offsetY="-1" delay="56"/>
+      <frame index="14" offsetY="-1" delay="56"/>
       <frame index="15" offsetY="-1" delay="56"/>
     </animation>
   </action>
@@ -64,15 +48,14 @@
       <frame index="0" offsetX="-1" delay="56"/>
       <frame index="1" offsetX="-1" delay="19"/>
       <frame index="1" offsetX="-1" offsetY="-1" delay="37"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="38"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="18"/>
+      <frame index="2" offsetX="-1" offsetY="-1" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="-1" delay="57"/>
       <frame index="0" offsetX="-1" delay="55"/>
       <frame index="1" offsetX="-1" delay="20"/>
       <frame index="1" offsetX="-1" offsetY="-1" delay="36"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="39"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="17"/>
+      <frame index="2" offsetX="-1" offsetY="-1" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="-1" delay="58"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetX="-1" offsetY="-1" delay="56"/>
@@ -87,20 +70,20 @@
       <frame index="6" offsetX="-1" delay="39"/>
       <frame index="6" offsetX="-1" offsetY="-1" delay="17"/>
       <frame index="7" offsetX="-1" offsetY="-1" delay="58"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
       <frame index="9" offsetX="-2" offsetY="-2" delay="37"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="38"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="18"/>
+      <frame index="10" offsetX="-2" offsetY="-2" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-2" delay="57"/>
       <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
       <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
       <frame index="9" offsetX="-2" offsetY="-2" delay="36"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="39"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="17"/>
+      <frame index="10" offsetX="-2" offsetY="-2" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-2" delay="58"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetY="-1" delay="56"/>
@@ -115,6 +98,7 @@
       <frame index="14" delay="39"/>
       <frame index="14" offsetY="-1" delay="17"/>
       <frame index="15" offsetY="-1" delay="56"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -149,10 +133,8 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="1" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="1" delay="19"/>
-      <frame index="1" offsetX="-1" offsetY="1" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="1" delay="19"/>
+      <frame index="0" offsetX="-1" offsetY="1" delay="94"/>
+      <frame index="1" offsetX="-1" offsetY="1" delay="94"/>
       <frame index="2" offsetX="-1" offsetY="1" delay="37"/>
       <frame index="2" offsetX="-1" offsetY="2" delay="57"/>
       <frame index="3" offsetX="-1" offsetY="2" delay="18"/>
@@ -160,21 +142,16 @@
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="4" offsetX="2" offsetY="-1" delay="75"/>
-      <frame index="4" offsetX="2" offsetY="-1" delay="19"/>
-      <frame index="5" offsetX="2" offsetY="-1" delay="75"/>
-      <frame index="5" offsetX="2" offsetY="-1" delay="19"/>
+      <frame index="4" offsetX="2" offsetY="-1" delay="94"/>
+      <frame index="5" offsetX="2" offsetY="-1" delay="94"/>
       <frame index="6" offsetX="2" offsetY="-1" delay="37"/>
       <frame index="6" offsetX="4" offsetY="-2" delay="57"/>
-      <frame index="7" offsetX="4" offsetY="-2" delay="18"/>
-      <frame index="7" offsetX="4" offsetY="-2" delay="75"/>
+      <frame index="7" offsetX="4" offsetY="-2" delay="93"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="8" offsetX="-2" offsetY="-1" delay="75"/>
-      <frame index="8" offsetX="-2" offsetY="-1" delay="19"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="75"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
+      <frame index="8" offsetX="-2" offsetY="-1" delay="94"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="94"/>
       <frame index="10" offsetX="-2" offsetY="-1" delay="37"/>
       <frame index="10" offsetX="-3" delay="57"/>
       <frame index="11" offsetX="-3" delay="18"/>
@@ -182,72 +159,53 @@
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="12" offsetX="-5" offsetY="-1" delay="75"/>
-      <frame index="12" offsetX="-5" offsetY="-1" delay="19"/>
-      <frame index="13" offsetX="-5" offsetY="-1" delay="75"/>
-      <frame index="13" offsetX="-5" offsetY="-1" delay="19"/>
+      <frame index="12" offsetX="-5" offsetY="-1" delay="94"/>
+      <frame index="13" offsetX="-5" offsetY="-1" delay="94"/>
       <frame index="14" offsetX="-5" offsetY="-1" delay="37"/>
       <frame index="14" offsetX="-7" offsetY="-2" delay="57"/>
-      <frame index="15" offsetX="-7" offsetY="-2" delay="18"/>
-      <frame index="15" offsetX="-7" offsetY="-2" delay="75"/>
+      <frame index="15" offsetX="-7" offsetY="-2" delay="93"/>
       <end/>
     </animation>
   </action>
   <action name="sit" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="12" delay="56"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="19"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="37"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="38"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="18"/>
+      <frame index="1" offsetX="-1" offsetY="12" delay="56"/>
+      <frame index="2" offsetX="-1" offsetY="12" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="12" delay="57"/>
       <frame index="0" offsetX="-1" offsetY="12" delay="55"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="20"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="36"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="39"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="17"/>
+      <frame index="1" offsetX="-1" offsetY="12" delay="56"/>
+      <frame index="2" offsetX="-1" offsetY="12" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="12" delay="58"/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetX="4" offsetY="8" delay="56"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="19"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="37"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="38"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="18"/>
+      <frame index="5" offsetX="4" offsetY="8" delay="56"/>
+      <frame index="6" offsetX="4" offsetY="8" delay="56"/>
       <frame index="7" offsetX="4" offsetY="8" delay="56"/>
       <frame index="4" offsetX="4" offsetY="8" delay="56"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="20"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="36"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="39"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="17"/>
+      <frame index="5" offsetX="4" offsetY="8" delay="56"/>
+      <frame index="6" offsetX="4" offsetY="8" delay="56"/>
       <frame index="7" offsetX="4" offsetY="8" delay="58"/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-1" offsetY="8" delay="56"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="19"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="37"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="38"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="18"/>
+      <frame index="9" offsetX="-1" offsetY="8" delay="56"/>
+      <frame index="10" offsetX="-1" offsetY="8" delay="56"/>
       <frame index="11" offsetX="-1" offsetY="8" delay="57"/>
       <frame index="8" offsetX="-1" offsetY="8" delay="55"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="20"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="36"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="39"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="17"/>
+      <frame index="9" offsetX="-1" offsetY="8" delay="56"/>
+      <frame index="10" offsetX="-1" offsetY="8" delay="56"/>
       <frame index="11" offsetX="-1" offsetY="8" delay="58"/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="19"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="37"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="38"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="18"/>
+      <frame index="13" offsetX="-6" offsetY="8" delay="56"/>
+      <frame index="14" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="20"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="36"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="39"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="17"/>
+      <frame index="13" offsetX="-6" offsetY="8" delay="56"/>
+      <frame index="14" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
     </animation>
   </action>
@@ -424,4 +382,4 @@
       <end/>
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/equipment/head/beaniecopter-male.xml b/graphics/sprites/equipment/head/beaniecopter-male.xml
index fbf27372..96dda9cb 100644
--- a/graphics/sprites/equipment/head/beaniecopter-male.xml
+++ b/graphics/sprites/equipment/head/beaniecopter-male.xml
@@ -4,58 +4,42 @@
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" delay="56"/>
-      <frame index="1" offsetX="-1" delay="19"/>
-      <frame index="1" offsetX="-1" delay="37"/>
-      <frame index="2" offsetX="-1" delay="38"/>
-      <frame index="2" offsetX="-1" delay="18"/>
+      <frame index="1" offsetX="-1" delay="56"/>
+      <frame index="2" offsetX="-1" delay="56"/>
       <frame index="3" offsetX="-1" delay="57"/>
       <frame index="0" offsetX="-1" delay="55"/>
-      <frame index="1" offsetX="-1" delay="20"/>
-      <frame index="1" offsetX="-1" delay="36"/>
-      <frame index="2" offsetX="-1" delay="39"/>
-      <frame index="2" offsetX="-1" delay="17"/>
+      <frame index="1" offsetX="-1" delay="56"/>
+      <frame index="2" offsetX="-1" delay="56"/>
       <frame index="3" offsetX="-1" delay="58"/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetY="-1" delay="56"/>
-      <frame index="5" offsetY="-1" delay="19"/>
-      <frame index="5" offsetY="-1" delay="37"/>
-      <frame index="6" offsetY="-1" delay="38"/>
-      <frame index="6" offsetY="-1" delay="18"/>
+      <frame index="5" offsetY="-1" delay="56"/>
+      <frame index="6" offsetY="-1" delay="56"/>
       <frame index="7" offsetY="-1" delay="56"/>
       <frame index="4" offsetY="-1" delay="56"/>
-      <frame index="5" offsetY="-1" delay="20"/>
-      <frame index="5" offsetY="-1" delay="36"/>
-      <frame index="6" offsetY="-1" delay="39"/>
-      <frame index="6" offsetY="-1" delay="17"/>
+      <frame index="5" offsetY="-1" delay="56"/>
+      <frame index="6" offsetY="-1" delay="56"/>
       <frame index="7" offsetY="-1" delay="58"/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="37"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="38"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="18"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="56"/>
+      <frame index="10" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-1" delay="57"/>
       <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="36"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="39"/>
-      <frame index="10" offsetX="-2" offsetY="-1" delay="17"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="56"/>
+      <frame index="10" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-1" delay="58"/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetY="-1" delay="56"/>
-      <frame index="13" offsetY="-1" delay="19"/>
-      <frame index="13" offsetY="-1" delay="37"/>
-      <frame index="14" offsetY="-1" delay="38"/>
-      <frame index="14" offsetY="-1" delay="18"/>
+      <frame index="13" offsetY="-1" delay="56"/>
+      <frame index="14" offsetY="-1" delay="56"/>
       <frame index="15" offsetY="-1" delay="56"/>
       <frame index="12" offsetY="-1" delay="56"/>
-      <frame index="13" offsetY="-1" delay="20"/>
-      <frame index="13" offsetY="-1" delay="36"/>
-      <frame index="14" offsetY="-1" delay="39"/>
-      <frame index="14" offsetY="-1" delay="17"/>
+      <frame index="13" offsetY="-1" delay="56"/>
+      <frame index="14" offsetY="-1" delay="56"/>
       <frame index="15" offsetY="-1" delay="56"/>
     </animation>
   </action>
@@ -64,15 +48,14 @@
       <frame index="0" offsetX="-1" delay="56"/>
       <frame index="1" offsetX="-1" delay="19"/>
       <frame index="1" offsetX="-1" offsetY="-1" delay="37"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="38"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="18"/>
+      <frame index="2" offsetX="-1" offsetY="-1" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="-1" delay="57"/>
       <frame index="0" offsetX="-1" delay="55"/>
       <frame index="1" offsetX="-1" delay="20"/>
       <frame index="1" offsetX="-1" offsetY="-1" delay="36"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="39"/>
-      <frame index="2" offsetX="-1" offsetY="-1" delay="17"/>
+      <frame index="2" offsetX="-1" offsetY="-1" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="-1" delay="58"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetX="-1" offsetY="-1" delay="56"/>
@@ -87,20 +70,20 @@
       <frame index="6" offsetX="-1" delay="39"/>
       <frame index="6" offsetX="-1" offsetY="-1" delay="17"/>
       <frame index="7" offsetX="-1" offsetY="-1" delay="58"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
       <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
       <frame index="9" offsetX="-2" offsetY="-2" delay="37"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="38"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="18"/>
+      <frame index="10" offsetX="-2" offsetY="-2" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-2" delay="57"/>
       <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
       <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
       <frame index="9" offsetX="-2" offsetY="-2" delay="36"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="39"/>
-      <frame index="10" offsetX="-2" offsetY="-2" delay="17"/>
+      <frame index="10" offsetX="-2" offsetY="-2" delay="56"/>
       <frame index="11" offsetX="-2" offsetY="-2" delay="58"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetY="-1" delay="56"/>
@@ -115,6 +98,7 @@
       <frame index="14" delay="39"/>
       <frame index="14" offsetY="-1" delay="17"/>
       <frame index="15" offsetY="-1" delay="56"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -149,10 +133,8 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="1" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="1" delay="19"/>
-      <frame index="1" offsetX="-1" offsetY="1" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="1" delay="19"/>
+      <frame index="0" offsetX="-1" offsetY="1" delay="94"/>
+      <frame index="1" offsetX="-1" offsetY="1" delay="94"/>
       <frame index="2" offsetX="-1" offsetY="1" delay="37"/>
       <frame index="2" offsetX="-1" offsetY="2" delay="57"/>
       <frame index="3" offsetX="-1" offsetY="2" delay="18"/>
@@ -160,21 +142,16 @@
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="4" offsetX="2" offsetY="-1" delay="75"/>
-      <frame index="4" offsetX="2" offsetY="-1" delay="19"/>
-      <frame index="5" offsetX="2" offsetY="-1" delay="75"/>
-      <frame index="5" offsetX="2" offsetY="-1" delay="19"/>
+      <frame index="4" offsetX="2" offsetY="-1" delay="94"/>
+      <frame index="5" offsetX="2" offsetY="-1" delay="94"/>
       <frame index="6" offsetX="2" offsetY="-1" delay="37"/>
       <frame index="6" offsetX="4" offsetY="-2" delay="57"/>
-      <frame index="7" offsetX="4" offsetY="-2" delay="18"/>
-      <frame index="7" offsetX="4" offsetY="-2" delay="75"/>
+      <frame index="7" offsetX="4" offsetY="-2" delay="93"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="8" offsetX="-2" offsetY="-1" delay="75"/>
-      <frame index="8" offsetX="-2" offsetY="-1" delay="19"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="75"/>
-      <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
+      <frame index="8" offsetX="-2" offsetY="-1" delay="94"/>
+      <frame index="9" offsetX="-2" offsetY="-1" delay="94"/>
       <frame index="10" offsetX="-2" offsetY="-1" delay="37"/>
       <frame index="10" offsetX="-3" delay="57"/>
       <frame index="11" offsetX="-3" delay="18"/>
@@ -182,72 +159,53 @@
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="12" offsetX="-5" offsetY="-1" delay="75"/>
-      <frame index="12" offsetX="-5" offsetY="-1" delay="19"/>
-      <frame index="13" offsetX="-5" offsetY="-1" delay="75"/>
-      <frame index="13" offsetX="-5" offsetY="-1" delay="19"/>
+      <frame index="12" offsetX="-5" offsetY="-1" delay="94"/>
+      <frame index="13" offsetX="-5" offsetY="-1" delay="94"/>
       <frame index="14" offsetX="-5" offsetY="-1" delay="37"/>
       <frame index="14" offsetX="-7" offsetY="-2" delay="57"/>
-      <frame index="15" offsetX="-7" offsetY="-2" delay="18"/>
-      <frame index="15" offsetX="-7" offsetY="-2" delay="75"/>
+      <frame index="15" offsetX="-7" offsetY="-2" delay="93"/>
       <end/>
     </animation>
   </action>
   <action name="sit" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="12" delay="56"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="19"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="37"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="38"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="18"/>
+      <frame index="1" offsetX="-1" offsetY="12" delay="56"/>
+      <frame index="2" offsetX="-1" offsetY="12" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="12" delay="57"/>
       <frame index="0" offsetX="-1" offsetY="12" delay="55"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="20"/>
-      <frame index="1" offsetX="-1" offsetY="12" delay="36"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="39"/>
-      <frame index="2" offsetX="-1" offsetY="12" delay="17"/>
+      <frame index="1" offsetX="-1" offsetY="12" delay="56"/>
+      <frame index="2" offsetX="-1" offsetY="12" delay="56"/>
       <frame index="3" offsetX="-1" offsetY="12" delay="58"/>
     </animation>
     <animation direction="left">
       <frame index="4" offsetX="4" offsetY="8" delay="56"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="19"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="37"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="38"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="18"/>
+      <frame index="5" offsetX="4" offsetY="8" delay="56"/>
+      <frame index="6" offsetX="4" offsetY="8" delay="56"/>
       <frame index="7" offsetX="4" offsetY="8" delay="56"/>
       <frame index="4" offsetX="4" offsetY="8" delay="56"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="20"/>
-      <frame index="5" offsetX="4" offsetY="8" delay="36"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="39"/>
-      <frame index="6" offsetX="4" offsetY="8" delay="17"/>
+      <frame index="5" offsetX="4" offsetY="8" delay="56"/>
+      <frame index="6" offsetX="4" offsetY="8" delay="56"/>
       <frame index="7" offsetX="4" offsetY="8" delay="58"/>
     </animation>
     <animation direction="up">
       <frame index="8" offsetX="-1" offsetY="8" delay="56"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="19"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="37"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="38"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="18"/>
+      <frame index="9" offsetX="-1" offsetY="8" delay="56"/>
+      <frame index="10" offsetX="-1" offsetY="8" delay="56"/>
       <frame index="11" offsetX="-1" offsetY="8" delay="57"/>
       <frame index="8" offsetX="-1" offsetY="8" delay="55"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="20"/>
-      <frame index="9" offsetX="-1" offsetY="8" delay="36"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="39"/>
-      <frame index="10" offsetX="-1" offsetY="8" delay="17"/>
+      <frame index="9" offsetX="-1" offsetY="8" delay="56"/>
+      <frame index="10" offsetX="-1" offsetY="8" delay="56"/>
       <frame index="11" offsetX="-1" offsetY="8" delay="58"/>
     </animation>
     <animation direction="right">
       <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="19"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="37"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="38"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="18"/>
+      <frame index="13" offsetX="-6" offsetY="8" delay="56"/>
+      <frame index="14" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="20"/>
-      <frame index="13" offsetX="-6" offsetY="8" delay="36"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="39"/>
-      <frame index="14" offsetX="-6" offsetY="8" delay="17"/>
+      <frame index="13" offsetX="-6" offsetY="8" delay="56"/>
+      <frame index="14" offsetX="-6" offsetY="8" delay="56"/>
       <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
     </animation>
   </action>
@@ -424,4 +382,4 @@
       <end/>
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/equipment/head/beard-female.xml b/graphics/sprites/equipment/head/beard-female.xml
new file mode 100644
index 00000000..62cb3dcf
--- /dev/null
+++ b/graphics/sprites/equipment/head/beard-female.xml
@@ -0,0 +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-female.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/beard-male.xml b/graphics/sprites/equipment/head/beard-male.xml
new file mode 100644
index 00000000..5a28c319
--- /dev/null
+++ b/graphics/sprites/equipment/head/beard-male.xml
@@ -0,0 +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"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/beard.png b/graphics/sprites/equipment/head/beard.png
index 19e8af8a..03b033cf 100644
Binary files a/graphics/sprites/equipment/head/beard.png and b/graphics/sprites/equipment/head/beard.png differ
diff --git a/graphics/sprites/equipment/head/beard.xml b/graphics/sprites/equipment/head/beard.xml
deleted file mode 100644
index abd9e928..00000000
--- a/graphics/sprites/equipment/head/beard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.xml"/>
-</sprite>
diff --git a/graphics/sprites/equipment/head/beret-female.xml b/graphics/sprites/equipment/head/beret-female.xml
index e71dec3f..35034fb5 100644
--- a/graphics/sprites/equipment/head/beret-female.xml
+++ b/graphics/sprites/equipment/head/beret-female.xml
@@ -2,136 +2,123 @@
 <sprite>
   <imageset height="21" name="base" src="graphics/sprites/equipment/head/beret.png|W" width="29"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY="-40"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY="-40"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY="-40"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY="-40"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-40"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-40"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-40"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-40"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
+      <frame delay="150" index="1" offsetX="0" offsetY="-40"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-40"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-41"/>
+      <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-41"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <frame delay="150" index="3" offsetX="0" offsetY="-40"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-40"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-36"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-35"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="4" offsetY="-41"/>
-		  <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-40"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-40"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-40"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-3" offsetY="-41"/>
-		  <frame delay="75" index="3" offsetX="-3" offsetY="-42"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-36"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-35"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="4" offsetY="-41"/>
+      <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-40"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-3" offsetY="-41"/>
+      <frame delay="75" index="3" offsetX="-3" offsetY="-42"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="3" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="3" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="3" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="5" offsetY="-41"/>
-		  <frame delay="75" index="1" offsetX="5" offsetY="-41"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-39"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-39"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="-5" offsetY="-41"/>
-		  <frame delay="75" index="3" offsetX="-5" offsetY="-41"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="3" offsetY="-40"/>
+      <frame delay="150" index="1" offsetX="5" offsetY="-41"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="150" index="2" offsetX="-1" offsetY="-39"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-39"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-3" offsetY="-40"/>
+      <frame delay="150" index="3" offsetX="-5" offsetY="-41"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY="-28"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY="-31"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY="-32"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-6" offsetY="-31"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-28"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-31"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="0" offsetY="-32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY="-31"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-			<frame index="4" offsetX="32" offsetY="1"/>
-		</animation>
-	</action>
+    <animation direction="default">
+        <frame index="4" offsetX="32" offsetY="1"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
@@ -148,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
@@ -178,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
       <end/>
     </animation>
@@ -194,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -224,30 +207,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/beret-male.xml b/graphics/sprites/equipment/head/beret-male.xml
index d57a6d8a..5b686e7d 100644
--- a/graphics/sprites/equipment/head/beret-male.xml
+++ b/graphics/sprites/equipment/head/beret-male.xml
@@ -1,144 +1,124 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/beret.png|W" width="29" height="21" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-40" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-40"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-40"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-40"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-38" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-41" delay="75" />
-		  <frame index="1" offsetX="4" offsetY ="-42" delay="75" />
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="1" offsetX="-1" offsetY ="-38" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-42" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-38" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-41" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-41" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-41" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-31"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-32"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-6" offsetY ="-31"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="32" offsetY="1"/>
-		</animation>
-	</action>
-
+  <imageset name="base" src="graphics/sprites/equipment/head/beret.png|W" width="29" height="21"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-40"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY ="-40"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-40"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY ="-40"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-40" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-41" delay="150"/>
+      <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-38" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
+      <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-40" delay="225"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-41" delay="75"/>
+      <frame index="3" offsetX="-3" offsetY ="-42" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-39" delay="225"/>
+      <frame index="0" offsetX="0" offsetY ="-38" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY ="-40" delay="225"/>
+      <frame index="1" offsetX="5" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-39" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-40" delay="225"/>
+      <frame index="3" offsetX="-5" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-28"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY ="-31"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="0" offsetY ="-32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY ="-31"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="32" offsetY="1"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-39" delay="140"/>
@@ -155,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -185,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
       <end/>
     </animation>
@@ -201,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -215,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
     </animation>
@@ -245,10 +219,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/bowler-hat-brown-female.xml b/graphics/sprites/equipment/head/bowler-hat-brown-female.xml
index 3d20a78b..cd51dc5b 100644
--- a/graphics/sprites/equipment/head/bowler-hat-brown-female.xml
+++ b/graphics/sprites/equipment/head/bowler-hat-brown-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bowler-hat-brown-male.xml b/graphics/sprites/equipment/head/bowler-hat-brown-male.xml
index 1ed1a03f..aa9b7c54 100644
--- a/graphics/sprites/equipment/head/bowler-hat-brown-male.xml
+++ b/graphics/sprites/equipment/head/bowler-hat-brown-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/bowler-hat-female.xml b/graphics/sprites/equipment/head/bowler-hat-female.xml
index a802b1d9..b06e9398 100644
--- a/graphics/sprites/equipment/head/bowler-hat-female.xml
+++ b/graphics/sprites/equipment/head/bowler-hat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bowler-hat-male.xml b/graphics/sprites/equipment/head/bowler-hat-male.xml
index 52d61af4..08fc7028 100644
--- a/graphics/sprites/equipment/head/bowler-hat-male.xml
+++ b/graphics/sprites/equipment/head/bowler-hat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/bromenalhelmet-female.xml b/graphics/sprites/equipment/head/bromenalhelmet-female.xml
index bb0ea35a..8fc5c626 100644
--- a/graphics/sprites/equipment/head/bromenalhelmet-female.xml
+++ b/graphics/sprites/equipment/head/bromenalhelmet-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="4" offsetY="-42"/>
       <frame delay="75" index="1" offsetX="4" offsetY="-41"/>
       <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-43"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-42"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-42"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-41"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-42"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="6" offsetY="-43" delay="140"/>
-      <frame index="1" offsetX="6" offsetY="-44" delay="140"/>
-      <frame index="1" offsetX="6" offsetY="-44" delay="140"/>
+      <frame index="1" offsetX="6" offsetY="-44" delay="280"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-44" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-44" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-44" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-40" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bromenalhelmet-male.xml b/graphics/sprites/equipment/head/bromenalhelmet-male.xml
index 20b9804a..664c81e9 100644
--- a/graphics/sprites/equipment/head/bromenalhelmet-male.xml
+++ b/graphics/sprites/equipment/head/bromenalhelmet-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-42" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="4" offsetY="-42" delay="150"/>
       <frame index="1" offsetX="4" offsetY="-41" delay="75"/>
       <frame index="1" offsetX="4" offsetY="-42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-42" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-43" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-42" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-43" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-42" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-42" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-41" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-42" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/bucket-female.xml b/graphics/sprites/equipment/head/bucket-female.xml
index ab0b5596..c0f49736 100644
--- a/graphics/sprites/equipment/head/bucket-female.xml
+++ b/graphics/sprites/equipment/head/bucket-female.xml
@@ -2,102 +2,106 @@
 <sprite>
   <imageset height="21" name="base" src="graphics/sprites/equipment/head/bucket.png" width="21"/>
   <action imageset="base" name="stand">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-41"/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="-1" offsetY="-39"/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-2" offsetY="-41"/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="0" offsetY="-39"/>
-        </animation>
-    </action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-41"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-39"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-41"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-39"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-        <animation direction="down">
-          <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
-          <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
-          <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
-        </animation>
-        <animation direction="left">
-          <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
-          <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
-          <frame delay="150" index="1" offsetX="-1" offsetY="-39"/>
-          <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
-          <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
-        </animation>
-        <animation direction="up">
-          <frame delay="75" index="2" offsetX="-2" offsetY="-41"/>
-          <frame delay="150" index="2" offsetX="-2" offsetY="-42"/>
-          <frame delay="75" index="2" offsetX="-2" offsetY="-41"/>
-          <frame delay="150" index="2" offsetX="-2" offsetY="-42"/>
-        </animation>
-        <animation direction="right">
-          <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
-          <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
-          <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
-          <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
-          <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
-        </animation>
-    </action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
+      <frame delay="150" index="1" offsetX="-1" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-2" offsetY="-41"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-42"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-41"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-42"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
+      <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-        <animation direction="down">
-          <frame delay="75" index="0" offsetX="-1" offsetY="-39"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
-          <end/>
-        </animation>
-        <animation direction="left">
-          <frame delay="75" index="1" offsetX="3" offsetY="-40"/>
-          <frame delay="75" index="1" offsetX="3" offsetY="-41"/>
-          <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
-          <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-          <end/>
-        </animation>
-        <animation direction="up">
-          <frame delay="225" index="2" offsetX="-3" offsetY="-41"/>
-          <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
-          <end/>
-        </animation>
-        <animation direction="right">
-          <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
-          <frame delay="75" index="3" offsetX="-3" offsetY="-41"/>
-          <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
-          <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-          <end/>
-        </animation>
-    </action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-39"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="3" offsetY="-40"/>
+      <frame delay="75" index="1" offsetX="3" offsetY="-41"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-3" offsetY="-41"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
+      <frame delay="75" index="3" offsetX="-3" offsetY="-41"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-        <animation direction="down">
-          <frame delay="225" index="0" offsetX="-1" offsetY="-40"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-39"/>
-          <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
-          <end/>
-        </animation>
-        <animation direction="left">
-          <frame delay="225" index="1" offsetX="2" offsetY="-39"/>
-          <frame delay="150" index="1" offsetX="4" offsetY="-40"/>
-          <end/>
-        </animation>
-        <animation direction="up">
-          <frame delay="225" index="2" offsetX="-2" offsetY="-41"/>
-          <frame delay="75" index="2" offsetX="-3" offsetY="-40"/>
-          <frame delay="75" index="2" offsetX="-3" offsetY="-41"/>
-          <end/>
-        </animation>
-        <animation direction="right">
-          <frame delay="225" index="3" offsetX="-3" offsetY="-39"/>
-          <frame delay="150" index="3" offsetX="-5" offsetY="-40"/>
-          <end/>
-        </animation>
-    </action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="-1" offsetY="-40"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-39"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="2" offsetY="-39"/>
+      <frame delay="150" index="1" offsetX="4" offsetY="-40"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-41"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-40"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-41"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-3" offsetY="-39"/>
+      <frame delay="150" index="3" offsetX="-5" offsetY="-40"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-29"/>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-29"/>
         </animation>
         <animation direction="left">
           <frame index="1" offsetX="3" offsetY="-30"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-41" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-41" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bucket-male.xml b/graphics/sprites/equipment/head/bucket-male.xml
index 463cd22f..57bfe98c 100644
--- a/graphics/sprites/equipment/head/bucket-male.xml
+++ b/graphics/sprites/equipment/head/bucket-male.xml
@@ -1,119 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sprite>
-    <imageset name="base" src="graphics/sprites/equipment/head/bucket.png" width="21" height="21"/>
-    <action name="stand" imageset="base">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-41"/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="-1" offsetY="-39"/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-2" offsetY="-41"/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="0" offsetY="-39"/>
-        </animation>
-    </action>
-    <action name="walk" imageset="base">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
-          <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
-          <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
-          <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
-          <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
-          <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
-          <frame index="2" offsetX="-2" offsetY="-42" delay="150"/>
-          <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
-          <frame index="2" offsetX="-2" offsetY="-42" delay="150"/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
-          <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
-          <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
-          <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
-          <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
-        </animation>
-    </action>
-    <action name="attack" imageset="base">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-39" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
-          <end/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="3" offsetY="-40" delay="75"/>
-          <frame index="1" offsetX="3" offsetY="-41" delay="75"/>
-          <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
-          <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
-          <end/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-3" offsetY="-41" delay="225"/>
-          <frame index="2" offsetX="-3" offsetY="-38" delay="75"/>
-          <end/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
-          <frame index="3" offsetX="-3" offsetY="-41" delay="75"/>
-          <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
-          <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
-          <end/>
-        </animation>
-    </action>
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-40" delay="225"/>
-          <frame index="0" offsetX="-1" offsetY="-39" delay="75"/>
-          <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
-          <end/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="2" offsetY="-39" delay="225"/>
-          <frame index="1" offsetX="4" offsetY="-40" delay="150"/>
-          <end/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-2" offsetY="-41" delay="225"/>
-          <frame index="2" offsetX="-3" offsetY="-40" delay="75"/>
-          <frame index="2" offsetX="-3" offsetY="-41" delay="75"/>
-          <end/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="-3" offsetY="-39" delay="225"/>
-          <frame index="3" offsetX="-5" offsetY="-40" delay="150"/>
-          <end/>
-        </animation>
-    </action>
-    <action name="sit" imageset="base">
-        <animation direction="down">
-          <frame index="0" offsetX="-1" offsetY="-29"/>
-        </animation>
-        <animation direction="left">
-          <frame index="1" offsetX="3" offsetY="-30"/>
-        </animation>
-        <animation direction="up">
-          <frame index="2" offsetX="-1" offsetY="-33"/>
-        </animation>
-        <animation direction="right">
-          <frame index="3" offsetX="-6" offsetY="-30"/>
-        </animation>
-    </action>
-    <action name="dead" imageset="base">
-        <animation direction="default">
-          <frame index="4" offsetX="22" offsetY="-15"/>
-        </animation>
-    </action>
+<?xml version="1.0" encoding="UTF-8"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/bucket.png" width="21" height="21"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-41"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-39"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-41"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-39"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY="-42" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY="-42" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
+      <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-40" delay="75"/>
+      <frame index="1" offsetX="3" offsetY="-41" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-41" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
+      <frame index="3" offsetX="-3" offsetY="-41" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
+      <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-40" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-39" delay="225"/>
+      <frame index="1" offsetX="4" offsetY="-40" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-41" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY="-40" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-39" delay="225"/>
+      <frame index="3" offsetX="-5" offsetY="-40" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-29"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-30"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-33"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY="-30"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="22" offsetY="-15"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/bull-female.xml b/graphics/sprites/equipment/head/bull-female.xml
index d4a34ef1..5f2732a0 100644
--- a/graphics/sprites/equipment/head/bull-female.xml
+++ b/graphics/sprites/equipment/head/bull-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
   </action>
   <action imageset="equipment" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -221,9 +220,7 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-35" delay="420"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/bull-male.xml b/graphics/sprites/equipment/head/bull-male.xml
index 7f062d62..9b669ec4 100644
--- a/graphics/sprites/equipment/head/bull-male.xml
+++ b/graphics/sprites/equipment/head/bull-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="equipment">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/bunnyears-female.xml b/graphics/sprites/equipment/head/bunnyears-female.xml
index c2003b5d..f5bf3dbf 100644
--- a/graphics/sprites/equipment/head/bunnyears-female.xml
+++ b/graphics/sprites/equipment/head/bunnyears-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/bunnyears-male.xml b/graphics/sprites/equipment/head/bunnyears-male.xml
index abcaf834..e161c86d 100644
--- a/graphics/sprites/equipment/head/bunnyears-male.xml
+++ b/graphics/sprites/equipment/head/bunnyears-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/candlehelmet-female.xml b/graphics/sprites/equipment/head/candlehelmet-female.xml
index 9f7a3659..c31b9b3c 100644
--- a/graphics/sprites/equipment/head/candlehelmet-female.xml
+++ b/graphics/sprites/equipment/head/candlehelmet-female.xml
@@ -44,6 +44,7 @@
       <frame delay="75" index="3" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="4" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="5" offsetX="-1" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="6" offsetX="-2" offsetY="-38"/>
@@ -52,6 +53,7 @@
       <frame delay="75" index="9" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="10" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="11" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="12" offsetX="-2" offsetY="-38"/>
@@ -60,6 +62,7 @@
       <frame delay="75" index="15" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="16" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="17" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="18" offsetX="1" offsetY="-40"/>
@@ -68,6 +71,7 @@
       <frame delay="75" index="21" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="22" offsetX="1" offsetY="-39"/>
       <frame delay="75" index="23" offsetX="1" offsetY="-40"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -172,8 +176,7 @@
     <animation direction="default">
       <frame delay="140" index="12" offsetX="40" offsetY="-7"/>
       <frame delay="140" index="13" offsetX="40" offsetY="-7"/>
-      <frame delay="140" index="14" offsetX="40" offsetY="-7"/>
-      <frame delay="0" index="14" offsetX="40" offsetY="-7"/>
+      <frame delay="5000" index="14" offsetX="40" offsetY="-7"/>
     </animation>
   </action>
   <action name="attack_2hand" imageset="base">
diff --git a/graphics/sprites/equipment/head/candlehelmet-male.xml b/graphics/sprites/equipment/head/candlehelmet-male.xml
index e3210c0f..1feadde3 100644
--- a/graphics/sprites/equipment/head/candlehelmet-male.xml
+++ b/graphics/sprites/equipment/head/candlehelmet-male.xml
@@ -44,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="4" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="5" offsetX="-1" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="6" offsetX="-2" offsetY="-38" delay="75"/>
@@ -52,6 +53,7 @@
       <frame index="9" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="10" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="11" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="12" offsetX="-2" offsetY="-38" delay="75"/>
@@ -60,6 +62,7 @@
       <frame index="15" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="16" offsetX="-2" offsetY="-39" delay="75"/>
       <frame index="17" offsetX="-2" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="18" offsetX="1" offsetY="-40" delay="75"/>
@@ -68,6 +71,7 @@
       <frame index="21" offsetX="1" offsetY="-40" delay="75"/>
       <frame index="22" offsetX="1" offsetY="-39" delay="75"/>
       <frame index="23" offsetX="1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -172,8 +176,7 @@
     <animation direction="default">
       <frame index="12" offsetX="40" offsetY="-7" delay="140"/>
       <frame index="13" offsetX="40" offsetY="-7" delay="140"/>
-      <frame index="14" offsetX="40" offsetY="-7" delay="140"/>
-      <frame index="14" offsetX="40" offsetY="-7" delay="0"/>
+      <frame index="14" offsetX="40" offsetY="-7" delay="5000"/>
     </animation>
   </action>
   <action name="attack_2hand" imageset="base">
diff --git a/graphics/sprites/equipment/head/cap-female.xml b/graphics/sprites/equipment/head/cap-female.xml
index 42e925eb..1e849311 100644
--- a/graphics/sprites/equipment/head/cap-female.xml
+++ b/graphics/sprites/equipment/head/cap-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-44"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-45"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-44"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-45"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-44"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-44" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
@@ -221,15 +220,13 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-47" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-43" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/cap-male.xml b/graphics/sprites/equipment/head/cap-male.xml
index 74c28df9..f0d4598b 100644
--- a/graphics/sprites/equipment/head/cap-male.xml
+++ b/graphics/sprites/equipment/head/cap-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-44" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-45" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-44" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-45" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-44" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-43" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/captain-hat-female.xml b/graphics/sprites/equipment/head/captain-hat-female.xml
index 4ac4af6b..a214b173 100644
--- a/graphics/sprites/equipment/head/captain-hat-female.xml
+++ b/graphics/sprites/equipment/head/captain-hat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-43"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-42"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-43"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-43"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-3" offsetY="-43"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-44"/>
       <frame delay="75" index="2" offsetX="-3" offsetY="-43"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-44"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-43"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-43"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-43"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-5" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-44" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-45" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-45" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-45" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-5" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/captain-hat-male.xml b/graphics/sprites/equipment/head/captain-hat-male.xml
index eec888d9..c6d84581 100644
--- a/graphics/sprites/equipment/head/captain-hat-male.xml
+++ b/graphics/sprites/equipment/head/captain-hat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-43" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-43" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-43" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-43" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-42" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-43" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-43" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="150"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-43" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-43" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-42" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-43" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="420"/>
       <frame index="2" offsetX="-5" offsetY="-46" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
+      <frame index="2" offsetX="-4" offsetY="-41" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/captain-hat.png b/graphics/sprites/equipment/head/captain-hat.png
index 0eb6d9d4..a327bb55 100644
Binary files a/graphics/sprites/equipment/head/captain-hat.png and b/graphics/sprites/equipment/head/captain-hat.png differ
diff --git a/graphics/sprites/equipment/head/cashiershade-female.xml b/graphics/sprites/equipment/head/cashiershade-female.xml
index 3412d964..133963d7 100644
--- a/graphics/sprites/equipment/head/cashiershade-female.xml
+++ b/graphics/sprites/equipment/head/cashiershade-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
   </action>
   <action imageset="equipment" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -221,9 +220,7 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-35" delay="420"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/cashiershade-male.xml b/graphics/sprites/equipment/head/cashiershade-male.xml
index 4e9bd6e2..cc3f29e0 100644
--- a/graphics/sprites/equipment/head/cashiershade-male.xml
+++ b/graphics/sprites/equipment/head/cashiershade-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="equipment">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/catears-female.xml b/graphics/sprites/equipment/head/catears-female.xml
index 891cd83f..5ceb6b99 100644
--- a/graphics/sprites/equipment/head/catears-female.xml
+++ b/graphics/sprites/equipment/head/catears-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/catears-male.xml b/graphics/sprites/equipment/head/catears-male.xml
index cdbfe3d9..bb142204 100644
--- a/graphics/sprites/equipment/head/catears-male.xml
+++ b/graphics/sprites/equipment/head/catears-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/chefhat-female.xml b/graphics/sprites/equipment/head/chefhat-female.xml
index caee3613..b5d6f37e 100644
--- a/graphics/sprites/equipment/head/chefhat-female.xml
+++ b/graphics/sprites/equipment/head/chefhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-50"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-52" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-52" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/chefhat-male.xml b/graphics/sprites/equipment/head/chefhat-male.xml
index 79801b05..318e3f18 100644
--- a/graphics/sprites/equipment/head/chefhat-male.xml
+++ b/graphics/sprites/equipment/head/chefhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-50" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-51" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-52" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-53" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/christmastree-female.xml b/graphics/sprites/equipment/head/christmastree-female.xml
index 1fe4de46..41c49334 100644
--- a/graphics/sprites/equipment/head/christmastree-female.xml
+++ b/graphics/sprites/equipment/head/christmastree-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/christmastree-male.xml b/graphics/sprites/equipment/head/christmastree-male.xml
index f436efb2..20d3e4c7 100644
--- a/graphics/sprites/equipment/head/christmastree-male.xml
+++ b/graphics/sprites/equipment/head/christmastree-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/circlet-female.xml b/graphics/sprites/equipment/head/circlet-female.xml
index bfd7ff6e..16b4836a 100644
--- a/graphics/sprites/equipment/head/circlet-female.xml
+++ b/graphics/sprites/equipment/head/circlet-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/circlet-male.xml b/graphics/sprites/equipment/head/circlet-male.xml
index 63d7a486..302dc765 100644
--- a/graphics/sprites/equipment/head/circlet-male.xml
+++ b/graphics/sprites/equipment/head/circlet-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/cowboyblack-female.xml b/graphics/sprites/equipment/head/cowboyblack-female.xml
index 3f6bd4bc..b96a8468 100644
--- a/graphics/sprites/equipment/head/cowboyblack-female.xml
+++ b/graphics/sprites/equipment/head/cowboyblack-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-46"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/cowboyblack-male.xml b/graphics/sprites/equipment/head/cowboyblack-male.xml
index ece06071..84f96261 100644
--- a/graphics/sprites/equipment/head/cowboyblack-male.xml
+++ b/graphics/sprites/equipment/head/cowboyblack-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-47" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-51" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-46" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/cowboywhite-female.xml b/graphics/sprites/equipment/head/cowboywhite-female.xml
index 43faa835..70dcaaf9 100644
--- a/graphics/sprites/equipment/head/cowboywhite-female.xml
+++ b/graphics/sprites/equipment/head/cowboywhite-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-46"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/cowboywhite-male.xml b/graphics/sprites/equipment/head/cowboywhite-male.xml
index 08c981cd..ea7187f2 100644
--- a/graphics/sprites/equipment/head/cowboywhite-male.xml
+++ b/graphics/sprites/equipment/head/cowboywhite-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-47" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-51" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-46" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/crown-female.xml b/graphics/sprites/equipment/head/crown-female.xml
index cf4e1d18..180ce92c 100644
--- a/graphics/sprites/equipment/head/crown-female.xml
+++ b/graphics/sprites/equipment/head/crown-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-51" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-51" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/crown-male.xml b/graphics/sprites/equipment/head/crown-male.xml
index 9838c6d4..e9819cea 100644
--- a/graphics/sprites/equipment/head/crown-male.xml
+++ b/graphics/sprites/equipment/head/crown-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-49" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/crusadehelm-female.xml b/graphics/sprites/equipment/head/crusadehelm-female.xml
index ea4cba79..2130dd09 100644
--- a/graphics/sprites/equipment/head/crusadehelm-female.xml
+++ b/graphics/sprites/equipment/head/crusadehelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-41" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-41" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-41" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/crusadehelm-male.xml b/graphics/sprites/equipment/head/crusadehelm-male.xml
index 0483ce58..8d57ca50 100644
--- a/graphics/sprites/equipment/head/crusadehelm-male.xml
+++ b/graphics/sprites/equipment/head/crusadehelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-39" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-40" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-40" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-34" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/dark-helm-female.xml b/graphics/sprites/equipment/head/dark-helm-female.xml
index 9b43015a..32198c61 100644
--- a/graphics/sprites/equipment/head/dark-helm-female.xml
+++ b/graphics/sprites/equipment/head/dark-helm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-35"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-34"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-32"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-32"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-31"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-32"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-32"/>
@@ -41,13 +44,13 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-32"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-32"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
     <animation direction="down">
       <frame delay="75" index="0" offsetX="-1" offsetY="-30"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-30"/>
       <end/>
     </animation>
@@ -130,8 +133,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-31" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-29" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
@@ -147,8 +149,7 @@
   <action name="attack_sword_stab" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-30" delay="100"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="100"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="100"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="200"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="100"/>
       <end/>
     </animation>
@@ -160,9 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +175,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-30" delay="140"/>
       <end/>
@@ -206,30 +204,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-34" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-34" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-34" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-30" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-30" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/dark-helm-male.xml b/graphics/sprites/equipment/head/dark-helm-male.xml
index d8b7e5c4..9fd551e7 100644
--- a/graphics/sprites/equipment/head/dark-helm-male.xml
+++ b/graphics/sprites/equipment/head/dark-helm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-35" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-34" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-32" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-32" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-31" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-32" delay="75"/>
@@ -41,13 +44,13 @@
       <frame index="3" offsetX="2" offsetY="-32" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-31" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="75"/>
       <end/>
     </animation>
@@ -130,8 +133,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -147,8 +149,7 @@
   <action name="attack_sword_stab" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-30" delay="100"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="100"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="100"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="200"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="100"/>
       <end/>
     </animation>
@@ -160,9 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +175,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <end/>
@@ -190,9 +188,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +216,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/demonmask-female.xml b/graphics/sprites/equipment/head/demonmask-female.xml
index e622df88..2d846bf3 100644
--- a/graphics/sprites/equipment/head/demonmask-female.xml
+++ b/graphics/sprites/equipment/head/demonmask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/demonmask-male.xml b/graphics/sprites/equipment/head/demonmask-male.xml
index 540ed13d..1ef2904d 100644
--- a/graphics/sprites/equipment/head/demonmask-male.xml
+++ b/graphics/sprites/equipment/head/demonmask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/desert-helmet-female.xml b/graphics/sprites/equipment/head/desert-helmet-female.xml
index df974c00..16014b46 100644
--- a/graphics/sprites/equipment/head/desert-helmet-female.xml
+++ b/graphics/sprites/equipment/head/desert-helmet-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/desert-helmet-male.xml b/graphics/sprites/equipment/head/desert-helmet-male.xml
index 454fb186..430dbd11 100644
--- a/graphics/sprites/equipment/head/desert-helmet-male.xml
+++ b/graphics/sprites/equipment/head/desert-helmet-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/deserthat-female.xml b/graphics/sprites/equipment/head/deserthat-female.xml
index 448eb97a..945af049 100644
--- a/graphics/sprites/equipment/head/deserthat-female.xml
+++ b/graphics/sprites/equipment/head/deserthat-female.xml
@@ -23,6 +23,7 @@
       <frame delay="75" index="4" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="5" offsetX="-1" offsetY="-32"/>
       <frame delay="75" index="6" offsetX="-1" offsetY="-32"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="8" offsetX="-1" offsetY="-32"/>
@@ -31,6 +32,7 @@
       <frame delay="75" index="11" offsetX="-1" offsetY="-32"/>
       <frame delay="75" index="12" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="13" offsetX="-1" offsetY="-32"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="16" offsetX="-2" offsetY="-32"/>
@@ -39,6 +41,7 @@
       <frame delay="75" index="19" offsetX="-2" offsetY="-32"/>
       <frame delay="75" index="20" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="21" offsetX="-2" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="23" offsetX="0" offsetY="-32"/>
@@ -47,6 +50,7 @@
       <frame delay="75" index="26" offsetX="0" offsetY="-32"/>
       <frame delay="75" index="27" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="28" offsetX="0" offsetY="-32"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
diff --git a/graphics/sprites/equipment/head/deserthat-male.xml b/graphics/sprites/equipment/head/deserthat-male.xml
index 7682f625..0376954c 100644
--- a/graphics/sprites/equipment/head/deserthat-male.xml
+++ b/graphics/sprites/equipment/head/deserthat-male.xml
@@ -23,6 +23,7 @@
       <frame index="4" offsetX="-1" offsetY="-31" delay="75"/>
       <frame index="5" offsetX="-1" offsetY="-32" delay="75"/>
       <frame index="6" offsetX="-1" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="8" offsetX="-1" offsetY="-32" delay="75"/>
@@ -31,6 +32,7 @@
       <frame index="11" offsetX="-1" offsetY="-32" delay="75"/>
       <frame index="12" offsetX="-1" offsetY="-31" delay="75"/>
       <frame index="13" offsetX="-1" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="16" offsetX="-2" offsetY="-32" delay="75"/>
@@ -39,6 +41,7 @@
       <frame index="19" offsetX="-2" offsetY="-32" delay="75"/>
       <frame index="20" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="21" offsetX="-2" offsetY="-33" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="23" offsetX="0" offsetY="-32" delay="75"/>
@@ -47,6 +50,7 @@
       <frame index="26" offsetX="0" offsetY="-32" delay="75"/>
       <frame index="27" offsetX="0" offsetY="-31" delay="75"/>
       <frame index="28" offsetX="0" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/equipment/head/devcap-female.xml b/graphics/sprites/equipment/head/devcap-female.xml
index 6ab9c250..30bf2e28 100644
--- a/graphics/sprites/equipment/head/devcap-female.xml
+++ b/graphics/sprites/equipment/head/devcap-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-44"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-45"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-44"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-45"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-44"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-44" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
@@ -221,15 +220,13 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-47" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-43" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/devcap-male.xml b/graphics/sprites/equipment/head/devcap-male.xml
index 96b87df5..3d177c14 100644
--- a/graphics/sprites/equipment/head/devcap-male.xml
+++ b/graphics/sprites/equipment/head/devcap-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-44" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-45" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-44" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-45" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-44" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-43" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/earmuffs-female.xml b/graphics/sprites/equipment/head/earmuffs-female.xml
index e8aaafa1..2f4dc214 100644
--- a/graphics/sprites/equipment/head/earmuffs-female.xml
+++ b/graphics/sprites/equipment/head/earmuffs-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/earmuffs-male.xml b/graphics/sprites/equipment/head/earmuffs-male.xml
index f947ff3e..503e1903 100644
--- a/graphics/sprites/equipment/head/earmuffs-male.xml
+++ b/graphics/sprites/equipment/head/earmuffs-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/eggshell-female.xml b/graphics/sprites/equipment/head/eggshell-female.xml
index e1da93e5..2806626f 100644
--- a/graphics/sprites/equipment/head/eggshell-female.xml
+++ b/graphics/sprites/equipment/head/eggshell-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/eggshell-male.xml b/graphics/sprites/equipment/head/eggshell-male.xml
index dd9b609d..53b419dc 100644
--- a/graphics/sprites/equipment/head/eggshell-male.xml
+++ b/graphics/sprites/equipment/head/eggshell-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/elf-nightcap-female.xml b/graphics/sprites/equipment/head/elf-nightcap-female.xml
index ad983a79..858b665c 100644
--- a/graphics/sprites/equipment/head/elf-nightcap-female.xml
+++ b/graphics/sprites/equipment/head/elf-nightcap-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
       <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-32"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-5" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="1" offsetY="-30" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/elf-nightcap-male.xml b/graphics/sprites/equipment/head/elf-nightcap-male.xml
index f828f257..c36d56e0 100644
--- a/graphics/sprites/equipment/head/elf-nightcap-male.xml
+++ b/graphics/sprites/equipment/head/elf-nightcap-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-33" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-32" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="150"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-32" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-32" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-31" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/elf-nightcap.png b/graphics/sprites/equipment/head/elf-nightcap.png
index 3d7a0215..4675776d 100644
Binary files a/graphics/sprites/equipment/head/elf-nightcap.png and b/graphics/sprites/equipment/head/elf-nightcap.png differ
diff --git a/graphics/sprites/equipment/head/eskimohat-female.xml b/graphics/sprites/equipment/head/eskimohat-female.xml
index 48cd2e8b..edf357be 100644
--- a/graphics/sprites/equipment/head/eskimohat-female.xml
+++ b/graphics/sprites/equipment/head/eskimohat-female.xml
@@ -2,118 +2,122 @@
 <sprite>
   <imageset height="17" name="base" src="graphics/sprites/equipment/head/eskimohat.png" width="33"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY="-42"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="7" offsetY="-42"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="3" offsetY="-42"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="8" offsetY="-42"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY="-42"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="7" offsetY="-42"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="3" offsetY="-42"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="8" offsetY="-42"/>
+    </animation>
+    </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
-		  <frame delay="150" index="0" offsetX="4" offsetY="-42"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
-		  <frame delay="150" index="0" offsetX="4" offsetY="-42"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="8" offsetY="-42"/>
-		  <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
-		  <frame delay="150" index="1" offsetX="8" offsetY="-42"/>
-		  <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
-		  <frame delay="75" index="1" offsetX="8" offsetY="-42"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="3" offsetY="-42"/>
-		  <frame delay="150" index="2" offsetX="3" offsetY="-43"/>
-		  <frame delay="75" index="2" offsetX="3" offsetY="-42"/>
-		  <frame delay="150" index="2" offsetX="3" offsetY="-43"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="9" offsetY="-42"/>
-		  <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
-		  <frame delay="150" index="3" offsetX="9" offsetY="-42"/>
-		  <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
-		  <frame delay="75" index="3" offsetX="9" offsetY="-42"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
+      <frame delay="150" index="0" offsetX="4" offsetY="-42"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
+      <frame delay="150" index="0" offsetX="4" offsetY="-42"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="8" offsetY="-42"/>
+      <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
+      <frame delay="150" index="1" offsetX="8" offsetY="-42"/>
+      <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
+      <frame delay="75" index="1" offsetX="8" offsetY="-42"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="3" offsetY="-42"/>
+      <frame delay="150" index="2" offsetX="3" offsetY="-43"/>
+      <frame delay="75" index="2" offsetX="3" offsetY="-42"/>
+      <frame delay="150" index="2" offsetX="3" offsetY="-43"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="9" offsetY="-42"/>
+      <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
+      <frame delay="150" index="3" offsetX="9" offsetY="-42"/>
+      <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
+      <frame delay="75" index="3" offsetX="9" offsetY="-42"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="4" offsetY="-40"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-38"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-37"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="12" offsetY="-43"/>
-		  <frame delay="75" index="1" offsetX="12" offsetY="-44"/>
-		  <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
-		  <frame delay="75" index="1" offsetX="7" offsetY="-40"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="2" offsetY="-42"/>
-		  <frame delay="75" index="2" offsetX="2" offsetY="-39"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="6" offsetY="-43"/>
-		  <frame delay="75" index="3" offsetX="6" offsetY="-44"/>
-		  <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
-		  <frame delay="75" index="3" offsetX="10" offsetY="-40"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="4" offsetY="-40"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-38"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-37"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="12" offsetY="-43"/>
+      <frame delay="75" index="1" offsetX="12" offsetY="-44"/>
+      <frame delay="75" index="1" offsetX="8" offsetY="-41"/>
+      <frame delay="75" index="1" offsetX="7" offsetY="-40"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="2" offsetY="-42"/>
+      <frame delay="75" index="2" offsetX="2" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="6" offsetY="-43"/>
+      <frame delay="75" index="3" offsetX="6" offsetY="-44"/>
+      <frame delay="75" index="3" offsetX="9" offsetY="-41"/>
+      <frame delay="75" index="3" offsetX="10" offsetY="-40"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="225" index="0" offsetX="4" offsetY="-41"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-40"/>
-		  <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="225" index="1" offsetX="11" offsetY="-42"/>
-		  <frame delay="150" index="1" offsetX="13" offsetY="-43"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="3" offsetY="-42"/>
-		  <frame delay="75" index="2" offsetX="2" offsetY="-41"/>
-		  <frame delay="75" index="2" offsetX="2" offsetY="-42"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="225" index="3" offsetX="6" offsetY="-42"/>
-		  <frame delay="150" index="3" offsetX="4" offsetY="-43"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="4" offsetY="-41"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-40"/>
+      <frame delay="75" index="0" offsetX="4" offsetY="-41"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="11" offsetY="-42"/>
+      <frame delay="150" index="1" offsetX="13" offsetY="-43"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="3" offsetY="-42"/>
+      <frame delay="75" index="2" offsetX="2" offsetY="-41"/>
+      <frame delay="75" index="2" offsetX="2" offsetY="-42"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="6" offsetY="-42"/>
+      <frame delay="150" index="3" offsetX="4" offsetY="-43"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY="-30"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="12" offsetY="-33"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="4" offsetY="-34"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="3" offsetY="-33"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY="-30"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="12" offsetY="-33"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="4" offsetY="-34"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="3" offsetY="-33"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-			<frame index="4" offsetX="35" offsetY="-7"/>
-		</animation>
-	</action>
+    <animation direction="default">
+        <frame index="4" offsetX="35" offsetY="-7"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="3" offsetY="-39" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="1" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="1" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="2" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="2" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="2" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="2" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="2" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="2" offsetY="-37" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="3" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="3" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="3" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="3" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="3" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="11" offsetY="-43" delay="140"/>
-      <frame index="1" offsetX="11" offsetY="-44" delay="140"/>
-      <frame index="1" offsetX="11" offsetY="-44" delay="140"/>
+      <frame index="1" offsetX="11" offsetY="-44" delay="280"/>
       <frame index="1" offsetX="6" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="1" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="6" offsetY="-43" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-44" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-44" delay="140"/>
+      <frame index="3" offsetX="7" offsetY="-44" delay="280"/>
       <frame index="3" offsetX="12" offsetY="-40" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/eskimohat-male.xml b/graphics/sprites/equipment/head/eskimohat-male.xml
index 82218fea..9076a3ca 100644
--- a/graphics/sprites/equipment/head/eskimohat-male.xml
+++ b/graphics/sprites/equipment/head/eskimohat-male.xml
@@ -1,126 +1,123 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/eskimohat.png" width="33" height="17"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY ="-42"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="7" offsetY ="-42"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="3" offsetY ="-42"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="8" offsetY ="-42"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-42" delay="150"/>
-		  <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-42" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="8" offsetY ="-42" delay="75"/>
-		  <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="8" offsetY ="-42" delay="150"/>
-		  <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="8" offsetY ="-42" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="3" offsetY ="-42" delay="75"/>
-		  <frame index="2" offsetX="3" offsetY ="-43" delay="150"/>
-		  <frame index="2" offsetX="3" offsetY ="-42" delay="75"/>
-		  <frame index="2" offsetX="3" offsetY ="-43" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="9" offsetY ="-42" delay="75"/>
-		  <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="9" offsetY ="-42" delay="150"/>
-		  <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="9" offsetY ="-42" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY ="-40" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-38" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-37" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="12" offsetY ="-43" delay="75"/>
-		  <frame index="1" offsetX="12" offsetY ="-44" delay="75"/>
-		  <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
-		  <frame index="1" offsetX="7" offsetY ="-40" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="2" offsetY ="-42" delay="225"/>
-		  <frame index="2" offsetX="2" offsetY ="-39" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="6" offsetY ="-43" delay="75"/>
-		  <frame index="3" offsetX="6" offsetY ="-44" delay="75"/>
-		  <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="10" offsetY ="-40" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY ="-41" delay="225"/>
-		  <frame index="0" offsetX="4" offsetY ="-40" delay="75"/>
-		  <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="11" offsetY ="-42" delay="225"/>
-		  <frame index="1" offsetX="13" offsetY ="-43" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="3" offsetY ="-42" delay="225"/>
-		  <frame index="2" offsetX="2" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="2" offsetY ="-42" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="6" offsetY ="-42" delay="225"/>
-		  <frame index="3" offsetX="4" offsetY ="-43" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="4" offsetY ="-30"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="12" offsetY ="-33"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="4" offsetY ="-34"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="3" offsetY ="-33"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="35" offsetY="-7"/>
-		</animation>
-	</action>
-
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/eskimohat.png" width="33" height="17"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY ="-42"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="7" offsetY ="-42"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="3" offsetY ="-42"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="8" offsetY ="-42"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-42" delay="150"/>
+      <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-42" delay="150"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="8" offsetY ="-42" delay="75"/>
+      <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
+      <frame index="1" offsetX="8" offsetY ="-42" delay="150"/>
+      <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
+      <frame index="1" offsetX="8" offsetY ="-42" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="3" offsetY ="-42" delay="75"/>
+      <frame index="2" offsetX="3" offsetY ="-43" delay="150"/>
+      <frame index="2" offsetX="3" offsetY ="-42" delay="75"/>
+      <frame index="2" offsetX="3" offsetY ="-43" delay="150"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="9" offsetY ="-42" delay="75"/>
+      <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
+      <frame index="3" offsetX="9" offsetY ="-42" delay="150"/>
+      <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
+      <frame index="3" offsetX="9" offsetY ="-42" delay="75"/>
+      <end />
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY ="-40" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-38" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-37" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="12" offsetY ="-43" delay="75"/>
+      <frame index="1" offsetX="12" offsetY ="-44" delay="75"/>
+      <frame index="1" offsetX="8" offsetY ="-41" delay="75"/>
+      <frame index="1" offsetX="7" offsetY ="-40" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="2" offsetY ="-42" delay="225"/>
+      <frame index="2" offsetX="2" offsetY ="-39" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="6" offsetY ="-43" delay="75"/>
+      <frame index="3" offsetX="6" offsetY ="-44" delay="75"/>
+      <frame index="3" offsetX="9" offsetY ="-41" delay="75"/>
+      <frame index="3" offsetX="10" offsetY ="-40" delay="75"/>
+      <end />
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY ="-41" delay="225"/>
+      <frame index="0" offsetX="4" offsetY ="-40" delay="75"/>
+      <frame index="0" offsetX="4" offsetY ="-41" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="11" offsetY ="-42" delay="225"/>
+      <frame index="1" offsetX="13" offsetY ="-43" delay="150"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="3" offsetY ="-42" delay="225"/>
+      <frame index="2" offsetX="2" offsetY ="-41" delay="75"/>
+      <frame index="2" offsetX="2" offsetY ="-42" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="6" offsetY ="-42" delay="225"/>
+      <frame index="3" offsetX="4" offsetY ="-43" delay="150"/>
+      <end />
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="4" offsetY ="-30"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="12" offsetY ="-33"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="4" offsetY ="-34"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="3" offsetY ="-33"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="35" offsetY="-7"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="4" offsetY="-41" delay="140"/>
@@ -137,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="2" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="2" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="3" offsetY="-42" delay="140"/>
       <end/>
@@ -167,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="2" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -183,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="3" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="3" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="3" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="3" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="3" offsetY="-37" delay="140"/>
       <end/>
@@ -197,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="2" offsetY="-42" delay="420"/>
       <frame index="2" offsetX="1" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -227,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="2" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="2" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="2" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="2" offsetY="-39" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/eyepatch-female.xml b/graphics/sprites/equipment/head/eyepatch-female.xml
index 0823ef5f..11db9fb9 100644
--- a/graphics/sprites/equipment/head/eyepatch-female.xml
+++ b/graphics/sprites/equipment/head/eyepatch-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/eyepatch-male.xml b/graphics/sprites/equipment/head/eyepatch-male.xml
index 6706afd6..6b270081 100644
--- a/graphics/sprites/equipment/head/eyepatch-male.xml
+++ b/graphics/sprites/equipment/head/eyepatch-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/fairy_hat-female.xml b/graphics/sprites/equipment/head/fairy_hat-female.xml
index c5d3f8a1..e1bc81e8 100644
--- a/graphics/sprites/equipment/head/fairy_hat-female.xml
+++ b/graphics/sprites/equipment/head/fairy_hat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/fairy_hat-male.xml b/graphics/sprites/equipment/head/fairy_hat-male.xml
index 2f64ca68..04c29040 100644
--- a/graphics/sprites/equipment/head/fairy_hat-male.xml
+++ b/graphics/sprites/equipment/head/fairy_hat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/fancyhat-female.xml b/graphics/sprites/equipment/head/fancyhat-female.xml
index 13d8ba4e..676aa19d 100644
--- a/graphics/sprites/equipment/head/fancyhat-female.xml
+++ b/graphics/sprites/equipment/head/fancyhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end />
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/fancyhat-male.xml b/graphics/sprites/equipment/head/fancyhat-male.xml
index 1ac5d8e1..9b112682 100644
--- a/graphics/sprites/equipment/head/fancyhat-male.xml
+++ b/graphics/sprites/equipment/head/fancyhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end />
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/fluffyhat-female.xml b/graphics/sprites/equipment/head/fluffyhat-female.xml
index 970d572f..eb4da1c2 100644
--- a/graphics/sprites/equipment/head/fluffyhat-female.xml
+++ b/graphics/sprites/equipment/head/fluffyhat-female.xml
@@ -18,35 +18,33 @@
   <action imageset="base" name="walk">
     <animation direction="down">
       <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-44"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-44"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-44"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-44"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-44"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-44"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-37"/>
-      <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
-      <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
+      <frame delay="150" index="1" offsetX="2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-39"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-37"/>
-      <frame delay="75" index="3" offsetX="-2" offsetY="-38"/>
-      <frame delay="75" index="3" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="3" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-38"/>
+      <end />
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -65,9 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
+      <frame delay="225" index="2" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-35"/>
       <end/>
     </animation>
@@ -81,35 +77,26 @@
   </action>
   <action imageset="base" name="attack_bow">
     <animation direction="down">
-      <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
-      <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
+      <frame delay="225" index="0" offsetX="-1" offsetY="-43"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-43"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame delay="75" index="1" offsetX="5" offsetY="-38"/>
-      <frame delay="75" index="1" offsetX="5" offsetY="-38"/>
-      <frame delay="75" index="1" offsetX="5" offsetY="-38"/>
-      <frame delay="75" index="1" offsetX="7" offsetY="-39"/>
-      <frame delay="75" index="1" offsetX="7" offsetY="-39"/>
+      <frame delay="225" index="1" offsetX="5" offsetY="-38"/>
+      <frame delay="150" index="1" offsetX="7" offsetY="-39"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-38"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame delay="75" index="3" offsetX="-4" offsetY="-38"/>
-      <frame delay="75" index="3" offsetX="-4" offsetY="-38"/>
-      <frame delay="75" index="3" offsetX="-4" offsetY="-38"/>
-      <frame delay="75" index="3" offsetX="-6" offsetY="-39"/>
-      <frame delay="75" index="3" offsetX="-6" offsetY="-39"/>
+      <frame delay="225" index="3" offsetX="-4" offsetY="-38"/>
+      <frame delay="150" index="3" offsetX="-6" offsetY="-39"/>
       <end/>
     </animation>
   </action>
@@ -148,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-37" delay="140"/>
       <end/>
@@ -178,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="100"/>
       <end/>
     </animation>
@@ -194,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <end/>
@@ -224,30 +207,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="5" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="5" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="0" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/fluffyhat-male.xml b/graphics/sprites/equipment/head/fluffyhat-male.xml
index 16987320..68fb7e77 100644
--- a/graphics/sprites/equipment/head/fluffyhat-male.xml
+++ b/graphics/sprites/equipment/head/fluffyhat-male.xml
@@ -18,35 +18,33 @@
   <action name="walk" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-44" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-44" delay="150"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-37" delay="75"/>
-      <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
-      <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
+      <frame index="1" offsetX="2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="150"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-37" delay="75"/>
-      <frame index="3" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="3" offsetX="-2" offsetY="-38" delay="75"/>
+      <frame index="3" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-38" delay="75"/>
+      <end />
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -65,9 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="225"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="75"/>
       <end/>
     </animation>
@@ -81,35 +77,26 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="225"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="5" offsetY="-38" delay="75"/>
-      <frame index="1" offsetX="5" offsetY="-38" delay="75"/>
-      <frame index="1" offsetX="5" offsetY="-38" delay="75"/>
-      <frame index="1" offsetX="7" offsetY="-39" delay="75"/>
-      <frame index="1" offsetX="7" offsetY="-39" delay="75"/>
+      <frame index="1" offsetX="5" offsetY="-38" delay="225"/>
+      <frame index="1" offsetX="7" offsetY="-39" delay="150"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="-4" offsetY="-38" delay="75"/>
-      <frame index="3" offsetX="-4" offsetY="-38" delay="75"/>
-      <frame index="3" offsetX="-4" offsetY="-38" delay="75"/>
-      <frame index="3" offsetX="-6" offsetY="-39" delay="75"/>
-      <frame index="3" offsetX="-6" offsetY="-39" delay="75"/>
+      <frame index="3" offsetX="-4" offsetY="-38" delay="225"/>
+      <frame index="3" offsetX="-6" offsetY="-39" delay="150"/>
       <end/>
     </animation>
   </action>
@@ -148,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-38" delay="140"/>
       <end/>
@@ -178,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="100"/>
       <end/>
     </animation>
@@ -194,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -208,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
     </animation>
@@ -238,8 +219,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/funkywinter-female.xml b/graphics/sprites/equipment/head/funkywinter-female.xml
index 5f365a73..2959333b 100644
--- a/graphics/sprites/equipment/head/funkywinter-female.xml
+++ b/graphics/sprites/equipment/head/funkywinter-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-42"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
+      <end />
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/funkywinter-male.xml b/graphics/sprites/equipment/head/funkywinter-male.xml
index e1fe8864..bc10be8e 100644
--- a/graphics/sprites/equipment/head/funkywinter-male.xml
+++ b/graphics/sprites/equipment/head/funkywinter-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-42" delay="150"/>
+      <end />
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="1" offsetY="-40" delay="150"/>
       <frame index="1" offsetX="1" offsetY="-39" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
+      <end />
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
+      <end />
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-40" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+      <end />
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/gas-carbon-female.xml b/graphics/sprites/equipment/head/gas-carbon-female.xml
index 3efc9f4d..c28477a1 100644
--- a/graphics/sprites/equipment/head/gas-carbon-female.xml
+++ b/graphics/sprites/equipment/head/gas-carbon-female.xml
@@ -2,118 +2,122 @@
 <sprite>
   <imageset height="23" name="base" src="graphics/sprites/equipment/head/gas-carbon.png" width="25"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY="-38"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-38"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY="-38"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-38"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY="-38"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-34"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-33"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="2" offsetY="-39"/>
-		  <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="75" index="1" offsetX="-3" offsetY="-36"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-3" offsetY="-38"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-36"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-2" offsetY="-39"/>
-		  <frame delay="75" index="3" offsetX="-2" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-34"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-33"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="2" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="75" index="1" offsetX="-3" offsetY="-36"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-3" offsetY="-38"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-36"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-2" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="-2" offsetY="-40"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="225" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="225" index="1" offsetX="1" offsetY="-38"/>
-		  <frame delay="150" index="1" offsetX="3" offsetY="-39"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-37"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="225" index="3" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="3" offsetX="-4" offsetY="-39"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="1" offsetY="-38"/>
+      <frame delay="150" index="1" offsetX="3" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-37"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="3" offsetX="-4" offsetY="-39"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-26"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY="-30"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY="-29"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-30"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-29"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-			<frame index="4" offsetX="19" offsetY="-14"/>
-		</animation>
-	</action>
+    <animation direction="default">
+      <frame index="4" offsetX="19" offsetY="-14"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/gas-carbon-male.xml b/graphics/sprites/equipment/head/gas-carbon-male.xml
index cc562741..4f0508e3 100644
--- a/graphics/sprites/equipment/head/gas-carbon-male.xml
+++ b/graphics/sprites/equipment/head/gas-carbon-male.xml
@@ -1,126 +1,123 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/gas-carbon.png" width="25" height="23"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY ="-38"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="150"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="150"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-34" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-33" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-3" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-38" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="225"/>
-		  <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="1" offsetY ="-38" delay="225"/>
-		  <frame index="1" offsetX="3" offsetY ="-39" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-37" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-2" offsetY ="-38" delay="225"/>
-		  <frame index="3" offsetX="-4" offsetY ="-39" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-26"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-30"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-29"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="19" offsetY="-14"/>
-		</animation>
-	</action>
-
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/gas-carbon.png" width="25" height="23"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-38"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-38"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY ="-38"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="150"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="150"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-34" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-33" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-3" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY ="-38" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="-2" offsetY ="-40" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="1" offsetY ="-38" delay="225"/>
+      <frame index="1" offsetX="3" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-37" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY ="-38" delay="225"/>
+      <frame index="3" offsetX="-4" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-26"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-30"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY ="-29"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="19" offsetY="-14"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
@@ -137,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -167,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -183,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -197,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -227,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/gasmask-female.xml b/graphics/sprites/equipment/head/gasmask-female.xml
index 9f601868..ed577ad4 100644
--- a/graphics/sprites/equipment/head/gasmask-female.xml
+++ b/graphics/sprites/equipment/head/gasmask-female.xml
@@ -2,118 +2,122 @@
 <sprite>
   <imageset height="23" name="base" src="graphics/sprites/equipment/head/gasmask.png" width="25"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY="-38"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-38"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY="-38"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-38"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY="-38"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-34"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-33"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="2" offsetY="-39"/>
-		  <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
-		  <frame delay="75" index="1" offsetX="-3" offsetY="-36"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-3" offsetY="-38"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-36"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-2" offsetY="-39"/>
-		  <frame delay="75" index="3" offsetX="-2" offsetY="-40"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
-		  <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-34"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-33"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="2" offsetY="-39"/>
+      <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
+      <frame delay="75" index="1" offsetX="-3" offsetY="-36"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-3" offsetY="-38"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-36"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-2" offsetY="-39"/>
+      <frame delay="75" index="3" offsetX="-2" offsetY="-40"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
+      <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="225" index="0" offsetX="-1" offsetY="-37"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="225" index="1" offsetX="1" offsetY="-38"/>
-		  <frame delay="150" index="1" offsetX="3" offsetY="-39"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-2" offsetY="-38"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-37"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="225" index="3" offsetX="-2" offsetY="-38"/>
-		  <frame delay="150" index="3" offsetX="-4" offsetY="-39"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="-1" offsetY="-37"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="1" offsetY="-38"/>
+      <frame delay="150" index="1" offsetX="3" offsetY="-39"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-38"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-37"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-38"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-2" offsetY="-38"/>
+      <frame delay="150" index="3" offsetX="-4" offsetY="-39"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-26"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY="-30"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY="-29"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-30"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-29"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-			<frame index="4" offsetX="17" offsetY="-14"/>
-		</animation>
-	</action>
+    <animation direction="default">
+      <frame index="4" offsetX="17" offsetY="-14"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/gasmask-male.xml b/graphics/sprites/equipment/head/gasmask-male.xml
index a8a0a880..2587cc0d 100644
--- a/graphics/sprites/equipment/head/gasmask-male.xml
+++ b/graphics/sprites/equipment/head/gasmask-male.xml
@@ -1,126 +1,123 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/gasmask.png" width="25" height="23"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-38"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-38"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY ="-38"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="150"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="150"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-34" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-33" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
-		  <frame index="1" offsetX="-3" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-38" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="225"/>
-		  <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="1" offsetY ="-38" delay="225"/>
-		  <frame index="1" offsetX="3" offsetY ="-39" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-37" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-2" offsetY ="-38" delay="225"/>
-		  <frame index="3" offsetX="-4" offsetY ="-39" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-26"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-30"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-29"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="17" offsetY="-14"/>
-		</animation>
-	</action>
-
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/gasmask.png" width="25" height="23"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-38"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-38"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY ="-38"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-38" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="150"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="150"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-34" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-33" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="2" offsetY ="-40" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-37" delay="75"/>
+      <frame index="1" offsetX="-3" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY ="-38" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="-2" offsetY ="-40" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-37" delay="75"/>
+      <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-37" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="1" offsetY ="-38" delay="225"/>
+      <frame index="1" offsetX="3" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-37" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY ="-38" delay="225"/>
+      <frame index="3" offsetX="-4" offsetY ="-39" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-26"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-30"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY ="-29"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="17" offsetY="-14"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
@@ -137,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -167,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -183,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -197,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -227,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/glasses-female.xml b/graphics/sprites/equipment/head/glasses-female.xml
index 5e625b0b..18e49ef1 100644
--- a/graphics/sprites/equipment/head/glasses-female.xml
+++ b/graphics/sprites/equipment/head/glasses-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="29" name="base" src="graphics/sprites/equipment/head/glasses.png|B;" width="23"/>
+  <imageset height="29" name="base" src="graphics/sprites/equipment/head/glasses.png|B" width="23"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="-2" offsetY="-34"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/glasses-male.xml b/graphics/sprites/equipment/head/glasses-male.xml
index 88d7c7b6..dbbcbe79 100644
--- a/graphics/sprites/equipment/head/glasses-male.xml
+++ b/graphics/sprites/equipment/head/glasses-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/glasses.png|B;" width="23" height="29"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/glasses.png|B" width="23" height="29"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-2" offsetY="-34"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/gmcap-female.xml b/graphics/sprites/equipment/head/gmcap-female.xml
index a3a64058..047f47cc 100644
--- a/graphics/sprites/equipment/head/gmcap-female.xml
+++ b/graphics/sprites/equipment/head/gmcap-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-44"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-45"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-44"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-45"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-44"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-45"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-44" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
@@ -221,15 +220,13 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-47" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-47" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-43" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/gmcap-male.xml b/graphics/sprites/equipment/head/gmcap-male.xml
index 32458806..2780bd8b 100644
--- a/graphics/sprites/equipment/head/gmcap-male.xml
+++ b/graphics/sprites/equipment/head/gmcap-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-44" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-45" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-44" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-45" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-44" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-43" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/goatee-female.xml b/graphics/sprites/equipment/head/goatee-female.xml
new file mode 100644
index 00000000..f13c4abf
--- /dev/null
+++ b/graphics/sprites/equipment/head/goatee-female.xml
@@ -0,0 +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-female.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/goatee-male.xml b/graphics/sprites/equipment/head/goatee-male.xml
new file mode 100644
index 00000000..b36603f7
--- /dev/null
+++ b/graphics/sprites/equipment/head/goatee-male.xml
@@ -0,0 +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"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/goatee.png b/graphics/sprites/equipment/head/goatee.png
index 85a6a6ff..f3ff43ed 100644
Binary files a/graphics/sprites/equipment/head/goatee.png and b/graphics/sprites/equipment/head/goatee.png differ
diff --git a/graphics/sprites/equipment/head/goatee.xml b/graphics/sprites/equipment/head/goatee.xml
deleted file mode 100644
index 44d2ee6e..00000000
--- a/graphics/sprites/equipment/head/goatee.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.xml"/>
-</sprite>
diff --git a/graphics/sprites/equipment/head/goblin-mask-female.xml b/graphics/sprites/equipment/head/goblin-mask-female.xml
index 77bd8c77..67fce833 100644
--- a/graphics/sprites/equipment/head/goblin-mask-female.xml
+++ b/graphics/sprites/equipment/head/goblin-mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/goblin-mask-male.xml b/graphics/sprites/equipment/head/goblin-mask-male.xml
index b6440c8b..2767075b 100644
--- a/graphics/sprites/equipment/head/goblin-mask-male.xml
+++ b/graphics/sprites/equipment/head/goblin-mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/goggles-female.xml b/graphics/sprites/equipment/head/goggles-female.xml
index 06c95b5f..ec665e9b 100644
--- a/graphics/sprites/equipment/head/goggles-female.xml
+++ b/graphics/sprites/equipment/head/goggles-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-36"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-36"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-36"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-36"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-37"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-36"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-37"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-36"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-36"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-37" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-38" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-38" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-38" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-38" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-38" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-38" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-34" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/goggles-male.xml b/graphics/sprites/equipment/head/goggles-male.xml
index 5cc4c66b..60d55b8c 100644
--- a/graphics/sprites/equipment/head/goggles-male.xml
+++ b/graphics/sprites/equipment/head/goggles-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-36" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-36" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-36" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-36" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-35" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-36" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-36" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-37" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-36" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-37" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-36" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-36" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-35" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-36" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-37" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/gradcap-female.xml b/graphics/sprites/equipment/head/gradcap-female.xml
index ed5445c3..a9f78d84 100644
--- a/graphics/sprites/equipment/head/gradcap-female.xml
+++ b/graphics/sprites/equipment/head/gradcap-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-51" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-51" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/gradcap-male.xml b/graphics/sprites/equipment/head/gradcap-male.xml
index dfa4d31e..9ea14b1c 100644
--- a/graphics/sprites/equipment/head/gradcap-male.xml
+++ b/graphics/sprites/equipment/head/gradcap-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-49" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/guyfawkes-female.xml b/graphics/sprites/equipment/head/guyfawkes-female.xml
index 5e9fdeb1..1e2bb086 100644
--- a/graphics/sprites/equipment/head/guyfawkes-female.xml
+++ b/graphics/sprites/equipment/head/guyfawkes-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/guyfawkes-male.xml b/graphics/sprites/equipment/head/guyfawkes-male.xml
index 0fbfd030..22327ce5 100644
--- a/graphics/sprites/equipment/head/guyfawkes-male.xml
+++ b/graphics/sprites/equipment/head/guyfawkes-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/heart-glasses-female.xml b/graphics/sprites/equipment/head/heart-glasses-female.xml
index 508dade0..4a09367e 100644
--- a/graphics/sprites/equipment/head/heart-glasses-female.xml
+++ b/graphics/sprites/equipment/head/heart-glasses-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/heart-glasses-male.xml b/graphics/sprites/equipment/head/heart-glasses-male.xml
index 97fea1a5..a1c28d66 100644
--- a/graphics/sprites/equipment/head/heart-glasses-male.xml
+++ b/graphics/sprites/equipment/head/heart-glasses-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/infantryhelm-female.xml b/graphics/sprites/equipment/head/infantryhelm-female.xml
index ce2e60e5..31432762 100644
--- a/graphics/sprites/equipment/head/infantryhelm-female.xml
+++ b/graphics/sprites/equipment/head/infantryhelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="5" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="5" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="0" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/infantryhelm-male.xml b/graphics/sprites/equipment/head/infantryhelm-male.xml
index 39e2f059..3b504bb2 100644
--- a/graphics/sprites/equipment/head/infantryhelm-male.xml
+++ b/graphics/sprites/equipment/head/infantryhelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/inspector-hat-female.xml b/graphics/sprites/equipment/head/inspector-hat-female.xml
index b40378c8..8ffba070 100644
--- a/graphics/sprites/equipment/head/inspector-hat-female.xml
+++ b/graphics/sprites/equipment/head/inspector-hat-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="14" name="base" src="graphics/sprites/equipment/head/inspector-hat.png|W;" width="21"/>
+  <imageset height="14" name="base" src="graphics/sprites/equipment/head/inspector-hat.png|W" width="21"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-48"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -59,8 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="225" index="2" offsetX="-3" offsetY="-48"/>
-      <frame delay="75" index="2" offsetX="-3" offsetY="-48"/>
+      <frame delay="300" index="2" offsetX="-3" offsetY="-48"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -130,9 +133,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -160,10 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="400"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -176,8 +174,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
@@ -206,30 +203,25 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="420"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-50" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-50" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/inspector-hat-male.xml b/graphics/sprites/equipment/head/inspector-hat-male.xml
index 59185511..f538c8b8 100644
--- a/graphics/sprites/equipment/head/inspector-hat-male.xml
+++ b/graphics/sprites/equipment/head/inspector-hat-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/inspector-hat.png|W;" width="21" height="14"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/inspector-hat.png|W" width="21" height="14"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-48"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-48" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-51" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/jestermask-female.xml b/graphics/sprites/equipment/head/jestermask-female.xml
index 7d12f22c..0de069a1 100644
--- a/graphics/sprites/equipment/head/jestermask-female.xml
+++ b/graphics/sprites/equipment/head/jestermask-female.xml
@@ -18,15 +18,19 @@
   <action imageset="base" name="walk">
     <animation direction="down">
       <sequence delay="75" end="6" start="1"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence delay="75" end="24" start="19"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence delay="75" end="42" start="37"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence delay="75" end="60" start="55"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="sit">
diff --git a/graphics/sprites/equipment/head/jestermask-male.xml b/graphics/sprites/equipment/head/jestermask-male.xml
index 34c3d495..8715398f 100644
--- a/graphics/sprites/equipment/head/jestermask-male.xml
+++ b/graphics/sprites/equipment/head/jestermask-male.xml
@@ -18,15 +18,19 @@
   <action name="walk" imageset="base">
     <animation direction="down">
       <sequence start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="base">
diff --git a/graphics/sprites/equipment/head/knighthelm-female.xml b/graphics/sprites/equipment/head/knighthelm-female.xml
index c8224c47..1541420a 100644
--- a/graphics/sprites/equipment/head/knighthelm-female.xml
+++ b/graphics/sprites/equipment/head/knighthelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-36"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-35"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-36"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-36"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-36"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-36"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-37"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-36"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-36"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-36"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-35" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-36" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-37" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-38" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-38" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-38" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-34" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/knighthelm-male.xml b/graphics/sprites/equipment/head/knighthelm-male.xml
index 39418749..3427b099 100644
--- a/graphics/sprites/equipment/head/knighthelm-male.xml
+++ b/graphics/sprites/equipment/head/knighthelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-36" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-36" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-36" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-35" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-36" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-36" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-36" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-36" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-35" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-36" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/knit-cap-female.xml b/graphics/sprites/equipment/head/knit-cap-female.xml
index 99c47580..06a7d35d 100644
--- a/graphics/sprites/equipment/head/knit-cap-female.xml
+++ b/graphics/sprites/equipment/head/knit-cap-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="26" name="base" src="graphics/sprites/equipment/head/knit-cap.png|W;Y;R;" width="24"/>
+  <imageset height="26" name="base" src="graphics/sprites/equipment/head/knit-cap.png|W;Y;R" width="24"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-40"/>
@@ -18,35 +18,33 @@
   <action imageset="base" name="walk">
     <animation direction="down">
       <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-40"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-39"/>
-      <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
-      <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
+      <frame delay="150" index="1" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
-      <frame delay="75" index="2" offsetX="0" offsetY="-42"/>
-      <frame delay="75" index="2" offsetX="0" offsetY="-42"/>
+      <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
-      <frame delay="75" index="2" offsetX="0" offsetY="-42"/>
-      <frame delay="75" index="2" offsetX="0" offsetY="-42"/>
+      <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-39"/>
-      <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
-      <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
+      <frame delay="150" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -65,9 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
+      <frame delay="225" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-39"/>
       <end/>
     </animation>
@@ -81,35 +77,26 @@
   </action>
   <action imageset="base" name="attack_bow">
     <animation direction="down">
-      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
+      <frame delay="225" index="0" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame delay="75" index="1" offsetX="4" offsetY="-40"/>
-      <frame delay="75" index="1" offsetX="4" offsetY="-40"/>
-      <frame delay="75" index="1" offsetX="4" offsetY="-40"/>
-      <frame delay="75" index="1" offsetX="6" offsetY="-41"/>
-      <frame delay="75" index="1" offsetX="6" offsetY="-41"/>
+      <frame delay="225" index="1" offsetX="4" offsetY="-40"/>
+      <frame delay="150" index="1" offsetX="6" offsetY="-41"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
-      <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
+      <frame delay="150" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame delay="75" index="3" offsetX="-4" offsetY="-40"/>
-      <frame delay="75" index="3" offsetX="-4" offsetY="-40"/>
-      <frame delay="75" index="3" offsetX="-4" offsetY="-40"/>
-      <frame delay="75" index="3" offsetX="-6" offsetY="-41"/>
-      <frame delay="75" index="3" offsetX="-6" offsetY="-41"/>
+      <frame delay="225" index="3" offsetX="-4" offsetY="-40"/>
+      <frame delay="150" index="3" offsetX="-6" offsetY="-41"/>
       <end/>
     </animation>
   </action>
@@ -148,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -178,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -194,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -224,30 +207,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/knit-cap-male.xml b/graphics/sprites/equipment/head/knit-cap-male.xml
index 11e4956c..0d31db4b 100644
--- a/graphics/sprites/equipment/head/knit-cap-male.xml
+++ b/graphics/sprites/equipment/head/knit-cap-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/knit-cap.png|W;Y;R;" width="24" height="26"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/knit-cap.png|W;Y;R" width="24" height="26"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-40"/>
@@ -18,35 +18,33 @@
   <action name="walk" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-40" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-40" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-40" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-40" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-39" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="150"/>
       <frame index="1" offsetX="1" offsetY="-39" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
-      <frame index="2" offsetX="0" offsetY="-42" delay="75"/>
-      <frame index="2" offsetX="0" offsetY="-42" delay="75"/>
+      <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
-      <frame index="2" offsetX="0" offsetY="-42" delay="75"/>
-      <frame index="2" offsetX="0" offsetY="-42" delay="75"/>
+      <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -65,9 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="225"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
       <end/>
     </animation>
@@ -81,35 +77,26 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-39" delay="225"/>
       <frame index="0" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-40" delay="75"/>
-      <frame index="1" offsetX="4" offsetY="-40" delay="75"/>
-      <frame index="1" offsetX="4" offsetY="-40" delay="75"/>
-      <frame index="1" offsetX="6" offsetY="-41" delay="75"/>
-      <frame index="1" offsetX="6" offsetY="-41" delay="75"/>
+      <frame index="1" offsetX="4" offsetY="-40" delay="225"/>
+      <frame index="1" offsetX="6" offsetY="-41" delay="150"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
-      <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
+      <frame index="2" offsetX="0" offsetY="-41" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-40" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="-4" offsetY="-40" delay="75"/>
-      <frame index="3" offsetX="-4" offsetY="-40" delay="75"/>
-      <frame index="3" offsetX="-4" offsetY="-40" delay="75"/>
-      <frame index="3" offsetX="-6" offsetY="-41" delay="75"/>
-      <frame index="3" offsetX="-6" offsetY="-41" delay="75"/>
+      <frame index="3" offsetX="-4" offsetY="-40" delay="225"/>
+      <frame index="3" offsetX="-6" offsetY="-41" delay="150"/>
       <end/>
     </animation>
   </action>
@@ -148,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
       <end/>
@@ -178,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -194,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -208,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -238,10 +219,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/long-beard-female.xml b/graphics/sprites/equipment/head/long-beard-female.xml
new file mode 100644
index 00000000..ec8a5a43
--- /dev/null
+++ b/graphics/sprites/equipment/head/long-beard-female.xml
@@ -0,0 +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-female.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/long-beard-male.xml b/graphics/sprites/equipment/head/long-beard-male.xml
new file mode 100644
index 00000000..d8b47afb
--- /dev/null
+++ b/graphics/sprites/equipment/head/long-beard-male.xml
@@ -0,0 +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"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/long-beard.xml b/graphics/sprites/equipment/head/long-beard.xml
deleted file mode 100644
index 6253c057..00000000
--- a/graphics/sprites/equipment/head/long-beard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.xml"/>
-</sprite>
diff --git a/graphics/sprites/equipment/head/magicgmtophat-female.xml b/graphics/sprites/equipment/head/magicgmtophat-female.xml
index af18c1ca..f72b0245 100644
--- a/graphics/sprites/equipment/head/magicgmtophat-female.xml
+++ b/graphics/sprites/equipment/head/magicgmtophat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-50"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-52" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-52" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/magicgmtophat-male.xml b/graphics/sprites/equipment/head/magicgmtophat-male.xml
index a9f7574e..5fa5083e 100644
--- a/graphics/sprites/equipment/head/magicgmtophat-male.xml
+++ b/graphics/sprites/equipment/head/magicgmtophat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-50" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-51" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-52" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-53" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/mask-female.xml b/graphics/sprites/equipment/head/mask-female.xml
index ef319799..62e014c5 100644
--- a/graphics/sprites/equipment/head/mask-female.xml
+++ b/graphics/sprites/equipment/head/mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/mask-male.xml b/graphics/sprites/equipment/head/mask-male.xml
index b281a913..de27a6b3 100644
--- a/graphics/sprites/equipment/head/mask-male.xml
+++ b/graphics/sprites/equipment/head/mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/minershat-female.xml b/graphics/sprites/equipment/head/minershat-female.xml
index e539e07d..f4a6dd4f 100644
--- a/graphics/sprites/equipment/head/minershat-female.xml
+++ b/graphics/sprites/equipment/head/minershat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/minershat-male.xml b/graphics/sprites/equipment/head/minershat-male.xml
index ba3c40bd..51d1f9a2 100644
--- a/graphics/sprites/equipment/head/minershat-male.xml
+++ b/graphics/sprites/equipment/head/minershat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/monocle-female.xml b/graphics/sprites/equipment/head/monocle-female.xml
index c5e9ef55..7201b83b 100644
--- a/graphics/sprites/equipment/head/monocle-female.xml
+++ b/graphics/sprites/equipment/head/monocle-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/monocle-male.xml b/graphics/sprites/equipment/head/monocle-male.xml
index 01a54471..0f7a6735 100644
--- a/graphics/sprites/equipment/head/monocle-male.xml
+++ b/graphics/sprites/equipment/head/monocle-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/monster-skull-helm-female.xml b/graphics/sprites/equipment/head/monster-skull-helm-female.xml
index 43f23d88..376cc4ee 100644
--- a/graphics/sprites/equipment/head/monster-skull-helm-female.xml
+++ b/graphics/sprites/equipment/head/monster-skull-helm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-34"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="2" offsetY="-35"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="2" offsetY="-35"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-35"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-35"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-34"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-37" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-37" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-37" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-37" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-37" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-37" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-33" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/monster-skull-helm-male.xml b/graphics/sprites/equipment/head/monster-skull-helm-male.xml
index 346afc42..ac780bcc 100644
--- a/graphics/sprites/equipment/head/monster-skull-helm-male.xml
+++ b/graphics/sprites/equipment/head/monster-skull-helm-male.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/equipment/head/monster-skull-helm.png" width="40" height="40"/>
-
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-34"/>
@@ -16,13 +15,13 @@
       <frame index="3" offsetX="0" offsetY="-35"/>
     </animation>
   </action>
-
   <action name="walk" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-35" delay="75"/>
@@ -30,12 +29,14 @@
       <frame index="1" offsetX="2" offsetY="-35" delay="150"/>
       <frame index="1" offsetX="2" offsetY="-34" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-35" delay="75"/>
@@ -43,9 +44,9 @@
       <frame index="3" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
   </action>
-
   <action name="attack" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-32" delay="75"/>
@@ -74,7 +75,6 @@
       <end/>
     </animation>
   </action>
-
   <action name="attack_bow" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-33" delay="225"/>
@@ -99,7 +99,6 @@
       <end/>
     </animation>
   </action>
-
   <action name="sit" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-22"/>
@@ -114,13 +113,11 @@
       <frame index="3" offsetX="-6" offsetY="-26"/>
     </animation>
   </action>
-
   <action name="dead" imageset="base">
     <animation direction="default">
       <frame index="4" offsetX="31" offsetY="0"/>
     </animation>
   </action>
-
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-33" delay="140"/>
@@ -137,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -167,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -183,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
       <end/>
@@ -197,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -227,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-34" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/moonshroomhat-female.xml b/graphics/sprites/equipment/head/moonshroomhat-female.xml
index bd22a377..d1f7a98e 100644
--- a/graphics/sprites/equipment/head/moonshroomhat-female.xml
+++ b/graphics/sprites/equipment/head/moonshroomhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-46"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="1" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="1" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="1" offsetX="1" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="1" offsetX="1" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-46" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-44" delay="140"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="300"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="1" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="1" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="3" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/moonshroomhat-male.xml b/graphics/sprites/equipment/head/moonshroomhat-male.xml
index 63746b27..01d2be5f 100644
--- a/graphics/sprites/equipment/head/moonshroomhat-male.xml
+++ b/graphics/sprites/equipment/head/moonshroomhat-male.xml
@@ -1,119 +1,123 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/moonshroomhat.png" width="26" height="15"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-47"/>
-    </animation>
-    <animation direction="up">
-      <frame index="1" offsetX="-1" offsetY="-47"/>
-    </animation>
-    <animation direction="right">
-      <frame index="1" offsetX="0" offsetY="-47"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="150"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="150"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-47" delay="150"/>
-      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-48" delay="150"/>
-      <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-48" delay="150"/>
-    </animation>
-    <animation direction="right">
-      <frame index="1" offsetX="1" offsetY="-47" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-47" delay="150"/>
-      <frame index="1" offsetX="1" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-47" delay="75"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-42" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-48" delay="75"/>
-      <frame index="1" offsetX="4" offsetY="-49" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-45" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="225"/>
-      <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="1" offsetX="-3" offsetY="-48" delay="75"/>
-      <frame index="1" offsetX="-3" offsetY="-49" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="1" offsetY="-45" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="225"/>
-      <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="3" offsetY="-47" delay="225"/>
-      <frame index="1" offsetX="5" offsetY="-48" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="1" offsetX="-1" offsetY="-47" delay="225"/>
-      <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="1" offsetX="-3" offsetY="-47" delay="225"/>
-      <frame index="1" offsetX="-5" offsetY="-48" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-38"/>
-    </animation>
-    <animation direction="up">
-      <frame index="1" offsetX="0" offsetY="-39"/>
-    </animation>
-    <animation direction="right">
-      <frame index="1" offsetX="-6" offsetY="-37"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="0" offsetX="37" offsetY="-6"/>
-    </animation>
-  </action>
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/moonshroomhat.png" width="26" height="15"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-47"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-47"/>
+    </animation>
+    <animation direction="up">
+      <frame index="1" offsetX="-1" offsetY="-47"/>
+    </animation>
+    <animation direction="right">
+      <frame index="1" offsetX="0" offsetY="-47"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-47" delay="150"/>
+      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-47" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-48" delay="150"/>
+      <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-48" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="1" offsetX="1" offsetY="-47" delay="75"/>
+      <frame index="1" offsetX="1" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="1" offsetY="-47" delay="150"/>
+      <frame index="1" offsetX="1" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="1" offsetY="-47" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-48" delay="75"/>
+      <frame index="1" offsetX="4" offsetY="-49" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-45" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="1" offsetX="-2" offsetY="-47" delay="225"/>
+      <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="1" offsetX="-3" offsetY="-48" delay="75"/>
+      <frame index="1" offsetX="-3" offsetY="-49" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="1" offsetY="-45" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-46" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-47" delay="225"/>
+      <frame index="1" offsetX="5" offsetY="-48" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="1" offsetX="-1" offsetY="-47" delay="225"/>
+      <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="1" offsetX="-3" offsetY="-47" delay="225"/>
+      <frame index="1" offsetX="-5" offsetY="-48" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-35"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-38"/>
+    </animation>
+    <animation direction="up">
+      <frame index="1" offsetX="0" offsetY="-39"/>
+    </animation>
+    <animation direction="right">
+      <frame index="1" offsetX="-6" offsetY="-37"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="0" offsetX="37" offsetY="-6"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
       <frame index="1" offsetX="-1" offsetY="-48" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="300"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="420"/>
       <frame index="1" offsetX="-3" offsetY="-50" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY="-47" delay="280"/>
+      <frame index="1" offsetX="-2" offsetY="-45" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/mouboohead-female.xml b/graphics/sprites/equipment/head/mouboohead-female.xml
index 0da2819f..8268202b 100644
--- a/graphics/sprites/equipment/head/mouboohead-female.xml
+++ b/graphics/sprites/equipment/head/mouboohead-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-34"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-35"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-35"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-36"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-35"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-35"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-34"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-35"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="5" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="5" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="5" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="5" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="5" offsetX="-2" offsetY="-30" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="5" offsetX="-1" offsetY="-32" delay="140"/>
-      <frame index="5" offsetX="-1" offsetY="-32" delay="140"/>
+      <frame index="5" offsetX="-1" offsetY="-32" delay="280"/>
       <frame index="5" offsetX="-1" offsetY="-34" delay="140"/>
       <frame index="5" offsetX="-1" offsetY="-28" delay="140"/>
       <end/>
@@ -221,15 +220,13 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="8" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="8" offsetX="0" offsetY="-37" delay="140"/>
-      <frame index="8" offsetX="0" offsetY="-37" delay="140"/>
+      <frame index="8" offsetX="0" offsetY="-37" delay="280"/>
       <frame index="8" offsetX="5" offsetY="-33" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/mouboohead-male.xml b/graphics/sprites/equipment/head/mouboohead-male.xml
index 20ebc6b1..2ad36eb6 100644
--- a/graphics/sprites/equipment/head/mouboohead-male.xml
+++ b/graphics/sprites/equipment/head/mouboohead-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-35" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-35" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-35" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-33" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="5" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="5" offsetX="-1" offsetY="-36" delay="140"/>
+      <frame index="5" offsetX="-1" offsetY="-36" delay="280"/>
       <frame index="5" offsetX="-1" offsetY="-37" delay="140"/>
       <frame index="5" offsetX="-1" offsetY="-30" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-35" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-33" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/moubootaurhead-female.xml b/graphics/sprites/equipment/head/moubootaurhead-female.xml
index b5f040b7..bcfc383d 100644
--- a/graphics/sprites/equipment/head/moubootaurhead-female.xml
+++ b/graphics/sprites/equipment/head/moubootaurhead-female.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset height="51" name="base" src="graphics/sprites/equipment/head/moubootaurhead.png" width="80"/>
+  <include file="equipment/head/christmastree-female.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/moubootaurhead-male.xml b/graphics/sprites/equipment/head/moubootaurhead-male.xml
index 82f5f3a7..ef4c06aa 100644
--- a/graphics/sprites/equipment/head/moubootaurhead-male.xml
+++ b/graphics/sprites/equipment/head/moubootaurhead-male.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.xml"/>
+  <include file="equipment/head/christmastree-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/mushroom-female.xml b/graphics/sprites/equipment/head/mushroom-female.xml
index b170f0e5..e5f17aae 100644
--- a/graphics/sprites/equipment/head/mushroom-female.xml
+++ b/graphics/sprites/equipment/head/mushroom-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="0" offsetX="0" offsetY="-48"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="0" offsetX="-2" offsetY="-48"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-49"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-48"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="0" offsetX="-1" offsetY="-48"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="300"/>
       <frame index="0" offsetX="-3" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="0" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="3" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="3" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="0" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="0" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-46" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/mushroom-male.xml b/graphics/sprites/equipment/head/mushroom-male.xml
index e6ced05b..2d7b26cd 100644
--- a/graphics/sprites/equipment/head/mushroom-male.xml
+++ b/graphics/sprites/equipment/head/mushroom-male.xml
@@ -1,119 +1,123 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/mushroom.png" width="26" height="15"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-48"/>
-    </animation>
-    <animation direction="left">
-      <frame index="0" offsetX="0" offsetY="-48"/>
-    </animation>
-    <animation direction="up">
-      <frame index="0" offsetX="-2" offsetY="-48"/>
-    </animation>
-    <animation direction="right">
-      <frame index="0" offsetX="-1" offsetY="-48"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
-    </animation>
-    <animation direction="left">
-      <frame index="0" offsetX="0" offsetY="-48" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-48" delay="150"/>
-      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-48" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <frame index="0" offsetX="-2" offsetY="-48" delay="75"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="150"/>
-      <frame index="0" offsetX="-2" offsetY="-48" delay="75"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="150"/>
-    </animation>
-    <animation direction="right">
-      <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="0" offsetX="4" offsetY="-49" delay="75"/>
-      <frame index="0" offsetX="4" offsetY="-50" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="225"/>
-      <frame index="0" offsetX="-3" offsetY="-46" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="0" offsetX="-4" offsetY="-49" delay="75"/>
-      <frame index="0" offsetX="-4" offsetY="-50" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-46" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47" delay="225"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="0" offsetX="3" offsetY="-48" delay="225"/>
-      <frame index="0" offsetX="5" offsetY="-49" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="0" offsetX="-2" offsetY="-48" delay="225"/>
-      <frame index="0" offsetX="-3" offsetY="-47" delay="75"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="0" offsetX="-4" offsetY="-48" delay="225"/>
-      <frame index="0" offsetX="-6" offsetY="-49" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36"/>
-    </animation>
-    <animation direction="left">
-      <frame index="0" offsetX="4" offsetY="-39"/>
-    </animation>
-    <animation direction="up">
-      <frame index="0" offsetX="-1" offsetY="-40"/>
-    </animation>
-    <animation direction="right">
-      <frame index="0" offsetX="-7" offsetY="-38"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="1" offsetX="37" offsetY="-6"/>
-    </animation>
-  </action>
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/mushroom.png" width="26" height="15"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-48"/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetX="0" offsetY="-48"/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetX="-2" offsetY="-48"/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetX="-1" offsetY="-48"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetX="0" offsetY="-48" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-48" delay="150"/>
+      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetX="-2" offsetY="-48" delay="75"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="150"/>
+      <frame index="0" offsetX="-2" offsetY="-48" delay="75"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetX="4" offsetY="-49" delay="75"/>
+      <frame index="0" offsetX="4" offsetY="-50" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetX="-3" offsetY="-48" delay="225"/>
+      <frame index="0" offsetX="-3" offsetY="-46" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetX="-4" offsetY="-49" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY="-50" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-46" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-47" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetX="3" offsetY="-48" delay="225"/>
+      <frame index="0" offsetX="5" offsetY="-49" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetX="-2" offsetY="-48" delay="225"/>
+      <frame index="0" offsetX="-3" offsetY="-47" delay="75"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetX="-4" offsetY="-48" delay="225"/>
+      <frame index="0" offsetX="-6" offsetY="-49" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-36"/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetX="4" offsetY="-39"/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetX="-1" offsetY="-40"/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetX="-7" offsetY="-38"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="1" offsetX="37" offsetY="-6"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="100"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="300"/>
       <frame index="0" offsetX="-3" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="420"/>
       <frame index="0" offsetX="-4" offsetY="-51" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
+      <frame index="0" offsetX="-3" offsetY="-46" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/mustache-female.xml b/graphics/sprites/equipment/head/mustache-female.xml
new file mode 100644
index 00000000..edcf080f
--- /dev/null
+++ b/graphics/sprites/equipment/head/mustache-female.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset height="40" name="base" src="graphics/sprites/equipment/head/mustache.png|W" width="40"/>
+  <action imageset="base" name="stand">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-29"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-25"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-29"/>
+    </animation>
+  </action>
+  <action imageset="base" name="walk">
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
+      <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
+      <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
+      <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
+    </animation>
+  </action>
+  <action imageset="base" name="attack">
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-25"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-24"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="4" offsetY="-30"/>
+      <frame delay="75" index="1" offsetX="4" offsetY="-31"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-27"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-3" offsetY="-25"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-23"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-3" offsetY="-30"/>
+      <frame delay="75" index="3" offsetX="-3" offsetY="-31"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-27"/>
+      <end/>
+    </animation>
+  </action>
+  <action imageset="base" name="attack_bow">
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="0" offsetY="-28"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="3" offsetY="-29"/>
+      <frame delay="150" index="1" offsetX="5" offsetY="-30"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-25"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-24"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-25"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-3" offsetY="-29"/>
+      <frame delay="150" index="3" offsetX="-5" offsetY="-30"/>
+      <end/>
+    </animation>
+  </action>
+  <action imageset="base" name="sit">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-17"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-20"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-17"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY="-20"/>
+    </animation>
+  </action>
+  <action imageset="base" name="dead">
+    <animation direction="default">
+      <frame index="4" offsetX="21" offsetY="-4"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-23" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-29" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-29" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-25" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-4" offsetY="-24" delay="280"/>
+      <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="2" offsetY="-26" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-29" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-29" delay="140"/>
+      <frame index="3" offsetX="3" offsetY="-25" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-27" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-25" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-24" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-30" delay="100"/>
+      <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
+      <frame index="1" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
+      <frame index="3" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="3" offsetX="1" offsetY="-27" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_spear" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
+      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="7" offsetY="-28" delay="140"/>
+      <frame index="1" offsetX="0" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="0" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-5" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-29" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="-5" offsetY="-28" delay="140"/>
+      <frame index="3" offsetX="1" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="2" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_chop" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
+      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
+      <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-23" delay="280"/>
+      <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
+      <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/head/mustache-male.xml b/graphics/sprites/equipment/head/mustache-male.xml
new file mode 100644
index 00000000..509347d6
--- /dev/null
+++ b/graphics/sprites/equipment/head/mustache-male.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/mustache.png|W" width="40" height="40"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-29"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-29"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-25"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-29"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
+      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
+      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-25" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-30" delay="75"/>
+      <frame index="1" offsetX="4" offsetY="-31" delay="75"/>
+      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="75"/>
+      <frame index="3" offsetX="-3" offsetY="-31" delay="75"/>
+      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="3" offsetX="1" offsetY="-27" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-28" delay="225"/>
+      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
+      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-29" delay="225"/>
+      <frame index="1" offsetX="5" offsetY="-30" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-25" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-29" delay="225"/>
+      <frame index="3" offsetX="-5" offsetY="-30" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-17"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-20"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-17"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY="-20"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="21" offsetY="-4"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="0" offsetY="-24" delay="140"/>
+      <frame index="0" offsetX="0" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="0" offsetY="-24" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="5" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="2" offsetY="-28" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="2" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-27" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-25" delay="100"/>
+      <frame index="0" offsetX="0" offsetY="-24" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-30" delay="100"/>
+      <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
+      <frame index="1" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
+      <frame index="3" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="3" offsetX="1" offsetY="-27" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_spear" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="5" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="6" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="420"/>
+      <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_chop" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-27" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="0" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="0" offsetY="-25" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY="-32" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-32" delay="140"/>
+      <frame index="1" offsetX="-1" offsetY="-28" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="3" offsetY="-28" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/head/mustache.xml b/graphics/sprites/equipment/head/mustache.xml
deleted file mode 100644
index 3fe0e300..00000000
--- a/graphics/sprites/equipment/head/mustache.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<!-- Needs a Complete Male/Female Xml (Only NPC works for now) -->
-<sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/mustache.png|W" width="40" height="40"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="0" offsetY="-29"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
-      <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
-      <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-25" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-30" delay="75"/>
-      <frame index="1" offsetX="4" offsetY="-31" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="225"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="75"/>
-      <frame index="3" offsetX="-3" offsetY="-31" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="1" offsetY="-27" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="225"/>
-      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="3" offsetY="-29" delay="225"/>
-      <frame index="1" offsetX="5" offsetY="-30" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="225"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="75"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-29" delay="225"/>
-      <frame index="3" offsetX="-5" offsetY="-30" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-17"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-20"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-17"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-6" offsetY="-20"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="4" offsetX="21" offsetY="-4"/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/equipment/head/nohmask-female.xml b/graphics/sprites/equipment/head/nohmask-female.xml
index 6108c455..e175458f 100644
--- a/graphics/sprites/equipment/head/nohmask-female.xml
+++ b/graphics/sprites/equipment/head/nohmask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/nohmask-male.xml b/graphics/sprites/equipment/head/nohmask-male.xml
index 488f423b..0cc1026b 100644
--- a/graphics/sprites/equipment/head/nohmask-male.xml
+++ b/graphics/sprites/equipment/head/nohmask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/nutcrackerhat-female.xml b/graphics/sprites/equipment/head/nutcrackerhat-female.xml
index 0812dc57..e89e118c 100644
--- a/graphics/sprites/equipment/head/nutcrackerhat-female.xml
+++ b/graphics/sprites/equipment/head/nutcrackerhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-46"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-45"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-46"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-45"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-47"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-46"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-45"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-46"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -111,7 +115,7 @@
   </action>
   <action imageset="base" name="dead">
     <animation direction="default">
-      <frame index="4" offsetX="37" offsetY="-10"/>
+      <frame index="3" offsetX="37" offsetY="-10" delay="5000"/>
     </animation>
   </action>
   <action name="attack_2hand" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-45" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -221,8 +220,7 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-44" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/nutcrackerhat-male.xml b/graphics/sprites/equipment/head/nutcrackerhat-male.xml
index e774217e..776b8d1c 100644
--- a/graphics/sprites/equipment/head/nutcrackerhat-male.xml
+++ b/graphics/sprites/equipment/head/nutcrackerhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-46" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-46" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-46" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-46" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-46" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-45" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-46" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -111,7 +115,7 @@
   </action>
   <action name="dead" imageset="base">
     <animation direction="default">
-      <frame index="4" offsetX="37" offsetY="-10"/>
+      <frame index="3" offsetX="37" offsetY="-10" delay="5000"/>
     </animation>
   </action>
   <action name="attack_2hand" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-44" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/nutcrackerhat.png b/graphics/sprites/equipment/head/nutcrackerhat.png
index 3de660da..f45ed645 100644
Binary files a/graphics/sprites/equipment/head/nutcrackerhat.png and b/graphics/sprites/equipment/head/nutcrackerhat.png differ
diff --git a/graphics/sprites/equipment/head/operamask-female.xml b/graphics/sprites/equipment/head/operamask-female.xml
index 2f16c092..d86f26d9 100644
--- a/graphics/sprites/equipment/head/operamask-female.xml
+++ b/graphics/sprites/equipment/head/operamask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-37"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-37"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-38"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-36" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/operamask-male.xml b/graphics/sprites/equipment/head/operamask-male.xml
index c97ef434..27ed3907 100644
--- a/graphics/sprites/equipment/head/operamask-male.xml
+++ b/graphics/sprites/equipment/head/operamask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-38" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-38" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/overlordhelm-female.xml b/graphics/sprites/equipment/head/overlordhelm-female.xml
index 4b39a9a3..cb7630ec 100644
--- a/graphics/sprites/equipment/head/overlordhelm-female.xml
+++ b/graphics/sprites/equipment/head/overlordhelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-30"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-31" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-29" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="100"/>
       <end/>
     </animation>
@@ -214,22 +215,19 @@
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-33" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-29" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/overlordhelm-male.xml b/graphics/sprites/equipment/head/overlordhelm-male.xml
index 2f8be62c..61b478b1 100644
--- a/graphics/sprites/equipment/head/overlordhelm-male.xml
+++ b/graphics/sprites/equipment/head/overlordhelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-31" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-33" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="100"/>
       <end/>
     </animation>
@@ -190,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +219,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/paladinhelm-female.xml b/graphics/sprites/equipment/head/paladinhelm-female.xml
index 6db5bd04..8c8efb0f 100644
--- a/graphics/sprites/equipment/head/paladinhelm-female.xml
+++ b/graphics/sprites/equipment/head/paladinhelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-30"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-31" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-29" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="100"/>
       <end/>
     </animation>
@@ -214,22 +215,19 @@
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-33" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-29" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/paladinhelm-male.xml b/graphics/sprites/equipment/head/paladinhelm-male.xml
index 4fcd9bd9..5cb2ca42 100644
--- a/graphics/sprites/equipment/head/paladinhelm-male.xml
+++ b/graphics/sprites/equipment/head/paladinhelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-31" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-33" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="100"/>
       <end/>
     </animation>
@@ -190,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +219,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/panhat-female.xml b/graphics/sprites/equipment/head/panhat-female.xml
index 2c5db17d..eb88c717 100644
--- a/graphics/sprites/equipment/head/panhat-female.xml
+++ b/graphics/sprites/equipment/head/panhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-4" offsetY="-43"/>
       <frame delay="75" index="0" offsetX="-4" offsetY="-42"/>
       <frame delay="150" index="0" offsetX="-4" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-1" offsetY="-43"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-1" offsetY="-43"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="2" offsetY="-44"/>
       <frame delay="150" index="2" offsetX="2" offsetY="-45"/>
       <frame delay="75" index="2" offsetX="2" offsetY="-44"/>
       <frame delay="150" index="2" offsetX="2" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-43"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-43"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-42"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-43"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -59,8 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="225" index="2" offsetX="1" offsetY="-43"/>
-      <frame delay="75" index="2" offsetX="1" offsetY="-43"/>
+      <frame delay="300" index="2" offsetX="1" offsetY="-43"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -73,9 +76,7 @@
   </action>
   <action imageset="base" name="attack_bow">
     <animation direction="down">
-      <frame delay="225" index="0" offsetX="-4" offsetY="-42"/>
-      <frame delay="75" index="0" offsetX="-4" offsetY="-42"/>
-      <frame delay="75" index="0" offsetX="-4" offsetY="-42"/>
+      <frame delay="375" index="0" offsetX="-4" offsetY="-42"/>
       <end/>
     </animation>
     <animation direction="left">
@@ -84,8 +85,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="75" index="2" offsetX="2" offsetY="-43"/>
-      <frame delay="75" index="2" offsetX="2" offsetY="-43"/>
+      <frame delay="150" index="2" offsetX="2" offsetY="-43"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-43"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-43"/>
@@ -132,8 +132,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="0" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="1" offsetY="-45" delay="140"/>
       <end/>
@@ -162,10 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="400"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -178,8 +174,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-6" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-6" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-6" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-6" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-6" offsetY="-38" delay="140"/>
       <end/>
@@ -208,30 +203,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-5" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-5" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-5" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-5" offsetY="-36" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-45" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-46" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-46" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-46" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-46" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-46" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-42" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/panhat-male.xml b/graphics/sprites/equipment/head/panhat-male.xml
index 2acd36e0..0fb466d2 100644
--- a/graphics/sprites/equipment/head/panhat-male.xml
+++ b/graphics/sprites/equipment/head/panhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-4" offsetY="-43" delay="150"/>
       <frame index="0" offsetX="-4" offsetY="-42" delay="75"/>
       <frame index="0" offsetX="-4" offsetY="-43" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-1" offsetY="-43" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-1" offsetY="-43" delay="150"/>
       <frame index="1" offsetX="-1" offsetY="-42" delay="75"/>
       <frame index="1" offsetX="-1" offsetY="-43" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="2" offsetY="-44" delay="75"/>
       <frame index="2" offsetX="2" offsetY="-45" delay="150"/>
       <frame index="2" offsetX="2" offsetY="-44" delay="75"/>
       <frame index="2" offsetX="2" offsetY="-45" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-43" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-43" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-42" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-43" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -59,8 +63,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="225"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="75"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="300"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -73,9 +76,7 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-42" delay="225"/>
-      <frame index="0" offsetX="-4" offsetY="-42" delay="75"/>
-      <frame index="0" offsetX="-4" offsetY="-42" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY="-42" delay="375"/>
       <end/>
     </animation>
     <animation direction="left">
@@ -84,8 +85,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-43" delay="75"/>
-      <frame index="2" offsetX="2" offsetY="-43" delay="75"/>
+      <frame index="2" offsetX="2" offsetY="-43" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-43" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-42" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-43" delay="75"/>
@@ -132,8 +132,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="1" offsetY="-41" delay="140"/>
       <frame index="2" offsetX="2" offsetY="-46" delay="140"/>
       <end/>
@@ -162,10 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="100"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="400"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -178,8 +174,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-5" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-44" delay="140"/>
+      <frame index="0" offsetX="-5" offsetY="-44" delay="280"/>
       <frame index="0" offsetX="-5" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-5" offsetY="-38" delay="140"/>
       <end/>
@@ -192,9 +187,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="420"/>
       <frame index="2" offsetX="0" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -222,8 +215,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="1" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="1" offsetY="-41" delay="140"/>
       <frame index="2" offsetX="1" offsetY="-43" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/paperbag-female.xml b/graphics/sprites/equipment/head/paperbag-female.xml
index e6d158a3..b36a5002 100644
--- a/graphics/sprites/equipment/head/paperbag-female.xml
+++ b/graphics/sprites/equipment/head/paperbag-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-28"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-27"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-28"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-28"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-28"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-27"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-28"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="300"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-28" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-23" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-25" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-25" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-25" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-21" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-29" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-30" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-26" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/paperbag-male.xml b/graphics/sprites/equipment/head/paperbag-male.xml
index 1592e307..7c2fe54b 100644
--- a/graphics/sprites/equipment/head/paperbag-male.xml
+++ b/graphics/sprites/equipment/head/paperbag-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-28" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-28" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-27" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-28" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-28" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-28" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-28" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-27" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-28" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
       <frame index="2" offsetX="1" offsetY="-29" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="300"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-23" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="420"/>
       <frame index="2" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="280"/>
+      <frame index="2" offsetX="0" offsetY="-26" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/parsley-earplugs-female.xml b/graphics/sprites/equipment/head/parsley-earplugs-female.xml
index a6935d8e..8562981e 100644
--- a/graphics/sprites/equipment/head/parsley-earplugs-female.xml
+++ b/graphics/sprites/equipment/head/parsley-earplugs-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-40"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-41"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="2" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-3" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-3" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="-3" offsetY="-40"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="5" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="5" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="0" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-6" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-5" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-5" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-5" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/parsley-earplugs-male.xml b/graphics/sprites/equipment/head/parsley-earplugs-male.xml
index 60c91799..b1607c53 100644
--- a/graphics/sprites/equipment/head/parsley-earplugs-male.xml
+++ b/graphics/sprites/equipment/head/parsley-earplugs-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-40" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="2" offsetY="-40" delay="150"/>
       <frame index="1" offsetX="2" offsetY="-39" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-3" offsetY="-40" delay="150"/>
       <frame index="3" offsetX="-3" offsetY="-39" delay="75"/>
       <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/phylactery-female.xml b/graphics/sprites/equipment/head/phylactery-female.xml
index 31f94565..aec51e15 100644
--- a/graphics/sprites/equipment/head/phylactery-female.xml
+++ b/graphics/sprites/equipment/head/phylactery-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -92,8 +96,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -122,9 +125,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-24" delay="100"/>
       <end/>
     </animation>
@@ -138,8 +139,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -168,30 +168,25 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-27" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-23" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="420"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/phylactery-male.xml b/graphics/sprites/equipment/head/phylactery-male.xml
index 5b244be2..d7a52660 100644
--- a/graphics/sprites/equipment/head/phylactery-male.xml
+++ b/graphics/sprites/equipment/head/phylactery-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -92,8 +96,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
       <end/>
@@ -122,9 +125,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-24" delay="100"/>
       <end/>
     </animation>
@@ -138,8 +139,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-25" delay="140"/>
       <end/>
@@ -152,9 +152,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
     </animation>
@@ -182,8 +180,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/pilot-hat-female.xml b/graphics/sprites/equipment/head/pilot-hat-female.xml
index 8907916b..28d3d049 100644
--- a/graphics/sprites/equipment/head/pilot-hat-female.xml
+++ b/graphics/sprites/equipment/head/pilot-hat-female.xml
@@ -2,118 +2,122 @@
 <sprite>
   <imageset height="31" name="base" src="graphics/sprites/equipment/head/pilot-hat.png" width="40"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-33"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY="-34"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY="-34"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY="-32"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-33"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY="-34"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-34"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-1" offsetY="-32"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
-		  <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
-		  <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
-		  <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
-		  <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
-		  <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
-		  <frame delay="150" index="3" offsetX="-1" offsetY="-32"/>
-		  <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
-		  <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
+      <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
+      <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
+      <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
+      <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
+      <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
+      <frame delay="150" index="3" offsetX="-1" offsetY="-32"/>
+      <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
+      <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-29"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-28"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="2" offsetY="-35"/>
-		  <frame delay="75" index="1" offsetX="2" offsetY="-36"/>
-		  <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
-		  <frame delay="75" index="1" offsetX="-3" offsetY="-32"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-3" offsetY="-34"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-32"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="-5" offsetY="-33"/>
-		  <frame delay="75" index="3" offsetX="-5" offsetY="-34"/>
-		  <frame delay="75" index="3" offsetX="-2" offsetY="-31"/>
-		  <frame delay="75" index="3" offsetX="-1" offsetY="-30"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-29"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-28"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="2" offsetY="-35"/>
+      <frame delay="75" index="1" offsetX="2" offsetY="-36"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
+      <frame delay="75" index="1" offsetX="-3" offsetY="-32"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-3" offsetY="-34"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-32"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="-5" offsetY="-33"/>
+      <frame delay="75" index="3" offsetX="-5" offsetY="-34"/>
+      <frame delay="75" index="3" offsetX="-2" offsetY="-31"/>
+      <frame delay="75" index="3" offsetX="-1" offsetY="-30"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="225" index="0" offsetX="-1" offsetY="-32"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
-		  <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="225" index="1" offsetX="1" offsetY="-34"/>
-		  <frame delay="150" index="1" offsetX="3" offsetY="-35"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-2" offsetY="-34"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-33"/>
-		  <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="225" index="3" offsetX="-5" offsetY="-33"/>
-		  <frame delay="150" index="3" offsetX="-7" offsetY="-34"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="-1" offsetY="-32"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-31"/>
+      <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="1" offsetY="-34"/>
+      <frame delay="150" index="1" offsetX="3" offsetY="-35"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-34"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-33"/>
+      <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-5" offsetY="-33"/>
+      <frame delay="150" index="3" offsetX="-7" offsetY="-34"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY="-19"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY="-23"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY="-24"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-8" offsetY="-23"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-19"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-23"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-24"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-8" offsetY="-23"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-		  <frame index="4" offsetX="21" offsetY="-8"/>
-		</animation>
-	</action>
+    <animation direction="default">
+      <frame index="4" offsetX="21" offsetY="-8"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-5" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="1" offsetY="-30" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/pilot-hat-male.xml b/graphics/sprites/equipment/head/pilot-hat-male.xml
index 38c40f30..3571860e 100644
--- a/graphics/sprites/equipment/head/pilot-hat-male.xml
+++ b/graphics/sprites/equipment/head/pilot-hat-male.xml
@@ -1,126 +1,123 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/pilot-hat.png" width="40" height="31"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-33"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-34"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-34"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-32"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/>
-		  <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-34" delay="150"/>
-		  <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/>
-		  <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-32" delay="150"/>
-		  <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-28" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
-		  <frame index="1" offsetX="2" offsetY ="-36" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
-		  <frame index="1" offsetX="-3" offsetY ="-32" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-34" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-32" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-34" delay="75"/>
-		  <frame index="3" offsetX="-2" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-30" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-32" delay="225"/>
-		  <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="1" offsetY ="-34" delay="225"/>
-		  <frame index="1" offsetX="3" offsetY ="-35" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-34" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-33" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-33" delay="225"/>
-		  <frame index="3" offsetX="-7" offsetY ="-34" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-19"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-23"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-24"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-8" offsetY ="-23"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-		  <frame index="4" offsetX="21" offsetY="-8"/>
-		</animation>
-	</action>
-
+  <imageset name="base" src="graphics/sprites/equipment/head/pilot-hat.png" width="40" height="31"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-33"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-34"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY ="-34"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-1" offsetY ="-32"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/>
+      <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-34" delay="150"/>
+      <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/>
+      <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY ="-32" delay="150"/>
+      <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-29" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-28" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-35" delay="75"/>
+      <frame index="1" offsetX="2" offsetY ="-36" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
+      <frame index="1" offsetX="-3" offsetY ="-32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY ="-34" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
+      <frame index="3" offsetX="-5" offsetY ="-34" delay="75"/>
+      <frame index="3" offsetX="-2" offsetY ="-31" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY ="-30" delay="75"/>
+      <end />
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-32" delay="225"/>
+      <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="1" offsetY ="-34" delay="225"/>
+      <frame index="1" offsetX="3" offsetY ="-35" delay="150"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-34" delay="225"/>
+      <frame index="2" offsetX="-3" offsetY ="-33" delay="75"/>
+      <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY ="-33" delay="225"/>
+      <frame index="3" offsetX="-7" offsetY ="-34" delay="150"/>
+      <end />
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY ="-19"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-23"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-24"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-8" offsetY ="-23"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="21" offsetY="-8"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
@@ -137,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -167,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -183,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
       <end/>
@@ -197,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -227,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/pilot-hat.png b/graphics/sprites/equipment/head/pilot-hat.png
index 1b31caf7..15f634f8 100644
Binary files a/graphics/sprites/equipment/head/pilot-hat.png and b/graphics/sprites/equipment/head/pilot-hat.png differ
diff --git a/graphics/sprites/equipment/head/pinkie-helmet-female.xml b/graphics/sprites/equipment/head/pinkie-helmet-female.xml
index d62d3b09..b29860a1 100644
--- a/graphics/sprites/equipment/head/pinkie-helmet-female.xml
+++ b/graphics/sprites/equipment/head/pinkie-helmet-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-34"/>
       <frame delay="150" index="5" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="6" offsetX="2" offsetY="-35"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="6" offsetX="2" offsetY="-35"/>
       <frame delay="75" index="6" offsetX="2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="7" offsetX="-1" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-35"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-34"/>
       <frame delay="150" index="7" offsetX="-1" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="8" offsetX="0" offsetY="-35"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="8" offsetX="0" offsetY="-35"/>
       <frame delay="75" index="8" offsetX="0" offsetY="-34"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-35"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="7" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="7" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="7" offsetX="-3" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
+      <frame index="7" offsetX="-2" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -221,8 +222,7 @@
     </animation>
     <animation direction="up">
       <frame index="7" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="7" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="7" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="7" offsetX="-3" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/pinkie-helmet-male.xml b/graphics/sprites/equipment/head/pinkie-helmet-male.xml
index b2aa2d36..517cd70b 100644
--- a/graphics/sprites/equipment/head/pinkie-helmet-male.xml
+++ b/graphics/sprites/equipment/head/pinkie-helmet-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="5" offsetX="0" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="6" offsetX="2" offsetY="-35" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="6" offsetX="2" offsetY="-35" delay="150"/>
       <frame index="6" offsetX="2" offsetY="-34" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="7" offsetX="-1" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-34" delay="75"/>
       <frame index="7" offsetX="-1" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="8" offsetX="0" offsetY="-35" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="8" offsetX="0" offsetY="-35" delay="150"/>
       <frame index="8" offsetX="0" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-35" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="7" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="7" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="100"/>
+      <frame index="7" offsetX="-2" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -190,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="7" offsetX="-2" offsetY="-34" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +219,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="7" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="7" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="7" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-32" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/pinkie-helmet.png b/graphics/sprites/equipment/head/pinkie-helmet.png
index f5a2eef0..113b8adf 100644
Binary files a/graphics/sprites/equipment/head/pinkie-helmet.png and b/graphics/sprites/equipment/head/pinkie-helmet.png differ
diff --git a/graphics/sprites/equipment/head/pinkiehat-female.xml b/graphics/sprites/equipment/head/pinkiehat-female.xml
index a20ff1d0..794377bb 100644
--- a/graphics/sprites/equipment/head/pinkiehat-female.xml
+++ b/graphics/sprites/equipment/head/pinkiehat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-28"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-27"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-28"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-28"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-28"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-27"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-28"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="300"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-28" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-23" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-25" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-25" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-25" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-21" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-29" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-30" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-30" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-26" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/pinkiehat-male.xml b/graphics/sprites/equipment/head/pinkiehat-male.xml
index 1eb136d4..d1e22725 100644
--- a/graphics/sprites/equipment/head/pinkiehat-male.xml
+++ b/graphics/sprites/equipment/head/pinkiehat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-28" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-28" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-27" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-28" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-28" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-28" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-28" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-27" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-28" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
       <frame index="2" offsetX="1" offsetY="-29" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="100"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="300"/>
       <frame index="2" offsetX="0" offsetY="-26" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-23" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="420"/>
       <frame index="2" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="0" offsetY="-26" delay="140"/>
+      <frame index="2" offsetX="0" offsetY="-28" delay="280"/>
+      <frame index="2" offsetX="0" offsetY="-26" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/pipe.xml b/graphics/sprites/equipment/head/pipe.xml
index ca17d248..f6da714f 100644
--- a/graphics/sprites/equipment/head/pipe.xml
+++ b/graphics/sprites/equipment/head/pipe.xml
@@ -4,14 +4,14 @@
   <imageset name="base" src="graphics/sprites/equipment/head/pipe.png" width="16" height="16"/>
   <action name="stand" imageset="base">
     <animation direction="left">
-      <frame index="0" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="1" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="2" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="3" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="4" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="5" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="6" offsetX="-8" offsetY="-30" delay="250"/>
-      <frame index="7" offsetX="-8" offsetY="-30" delay="250"/>
+      <frame index="0" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="1" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="2" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="3" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="4" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="5" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="6" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="7" offsetX="-10" offsetY="-38" delay="250"/>
     </animation>
     <animation direction="down">
       <frame index="8" offsetX="3" offsetY="-33" delay="250"/>
@@ -24,14 +24,14 @@
       <frame index="15" offsetX="3" offsetY="-33" delay="250"/>
     </animation>
     <animation direction="right">
-      <frame index="16" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="17" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="18" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="19" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="20" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="21" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="22" offsetX="6" offsetY="-30" delay="250"/>
-      <frame index="23" offsetX="6" offsetY="-30" delay="250"/>
+      <frame index="16" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="17" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="18" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="19" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="20" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="21" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="22" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="23" offsetX="10" offsetY="-40" delay="250"/>
     </animation>
     <animation direction="up">
        <frame index="27"/>
@@ -39,16 +39,40 @@
   </action>
   <action name="walk" imageset="base">
     <animation direction="down">
-      <frame index="27"/>
+      <frame index="8" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="9" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="10" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="11" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="12" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="13" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="14" offsetX="3" offsetY="-33" delay="250"/>
+      <frame index="15" offsetX="3" offsetY="-33" delay="250"/>
+      <end/>
     </animation>
     <animation direction="left">
-      <frame index="27"/>
+      <frame index="0" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="1" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="2" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="3" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="4" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="5" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="6" offsetX="-10" offsetY="-38" delay="250"/>
+      <frame index="7" offsetX="-10" offsetY="-38" delay="250"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="27"/>
     </animation>
     <animation direction="right">
-       <frame index="27"/>
+      <frame index="16" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="17" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="18" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="19" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="20" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="21" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="22" offsetX="10" offsetY="-40" delay="250"/>
+      <frame index="23" offsetX="10" offsetY="-40" delay="250"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/equipment/head/piratehat-female.xml b/graphics/sprites/equipment/head/piratehat-female.xml
index 76a38080..f033f48f 100644
--- a/graphics/sprites/equipment/head/piratehat-female.xml
+++ b/graphics/sprites/equipment/head/piratehat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="2" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="2" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="2" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-45"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-3" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-3" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="-3" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="-3" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-44" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="5" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="5" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="0" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-43" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-6" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="-5" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-5" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="-5" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="0" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/piratehat-male.xml b/graphics/sprites/equipment/head/piratehat-male.xml
index 4dd82006..6ea5c1de 100644
--- a/graphics/sprites/equipment/head/piratehat-male.xml
+++ b/graphics/sprites/equipment/head/piratehat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="2" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="2" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-45" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-3" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="-3" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="-3" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-45" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-43" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/pumpkinhelmet-female.xml b/graphics/sprites/equipment/head/pumpkinhelmet-female.xml
index 4d3ee11b..d3406887 100644
--- a/graphics/sprites/equipment/head/pumpkinhelmet-female.xml
+++ b/graphics/sprites/equipment/head/pumpkinhelmet-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/pumpkinhelmet-male.xml b/graphics/sprites/equipment/head/pumpkinhelmet-male.xml
index 5ae04f8a..24df9236 100644
--- a/graphics/sprites/equipment/head/pumpkinhelmet-male.xml
+++ b/graphics/sprites/equipment/head/pumpkinhelmet-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/rabbit-ears-female.xml b/graphics/sprites/equipment/head/rabbit-ears-female.xml
index e2bf2cd1..2158541b 100644
--- a/graphics/sprites/equipment/head/rabbit-ears-female.xml
+++ b/graphics/sprites/equipment/head/rabbit-ears-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-46"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-46"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-47"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-46"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-47"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-48" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-49" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-49" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-49" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-45" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/rabbit-ears-male.xml b/graphics/sprites/equipment/head/rabbit-ears-male.xml
index 4b6d3829..d5f6f52b 100644
--- a/graphics/sprites/equipment/head/rabbit-ears-male.xml
+++ b/graphics/sprites/equipment/head/rabbit-ears-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-45" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-46" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-47" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-46" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-47" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-46" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/rangerhat-female.xml b/graphics/sprites/equipment/head/rangerhat-female.xml
index 1b8121ca..f6c1e3b9 100644
--- a/graphics/sprites/equipment/head/rangerhat-female.xml
+++ b/graphics/sprites/equipment/head/rangerhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/rangerhat-male.xml b/graphics/sprites/equipment/head/rangerhat-male.xml
index 094d4d25..5abdd16c 100644
--- a/graphics/sprites/equipment/head/rangerhat-male.xml
+++ b/graphics/sprites/equipment/head/rangerhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/rednose-female.xml b/graphics/sprites/equipment/head/rednose-female.xml
index 9d3fc28c..553a374e 100644
--- a/graphics/sprites/equipment/head/rednose-female.xml
+++ b/graphics/sprites/equipment/head/rednose-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-36"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-35"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-36"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-39"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-39"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-39"/>
+      <end/>
     </animation>
   </action>
   <action imageset="equipment" name="attack">
@@ -131,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -161,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -177,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -207,8 +207,7 @@
   </action>
   <action name="attack_chop" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
       <end/>
@@ -222,15 +221,13 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-41" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-41" delay="280"/>
       <frame index="3" offsetX="5" offsetY="-37" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/rednose-male.xml b/graphics/sprites/equipment/head/rednose-male.xml
index ce990660..3c0c78d9 100644
--- a/graphics/sprites/equipment/head/rednose-male.xml
+++ b/graphics/sprites/equipment/head/rednose-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-36" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-35" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-36" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-39" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-39" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="equipment">
@@ -131,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="140"/>
       <end/>
@@ -161,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -177,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <end/>
@@ -191,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -221,10 +219,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/rosehat-female.xml b/graphics/sprites/equipment/head/rosehat-female.xml
index 7b25bb14..d92fabb2 100644
--- a/graphics/sprites/equipment/head/rosehat-female.xml
+++ b/graphics/sprites/equipment/head/rosehat-female.xml
@@ -2,236 +2,233 @@
 <sprite>
   <imageset height="12" name="equipment" src="graphics/sprites/equipment/head/rosehat.png|R" width="16"/>
   <action imageset="equipment" name="stand">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY="-50"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-6" offsetY="-50"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="5" offsetY="-49"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="4" offsetY="-48"/>
-        </animation>
-    </action>
+    <animation direction="down">
+      <frame index="0" offsetX="-4" offsetY="-50"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-6" offsetY="-50"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="5" offsetY="-49"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="4" offsetY="-48"/>
+    </animation>
+  </action>
   <action imageset="equipment" name="walk">
-        <animation direction="down">
-            <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
-            <frame delay="150" index="0" offsetX="-4" offsetY="-50"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
-            <frame delay="150" index="0" offsetX="-4" offsetY="-50"/>
-        </animation>
-        <animation direction="left">
-            <frame delay="75" index="1" offsetX="-6" offsetY="-50"/>
-            <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
-            <frame delay="150" index="1" offsetX="-6" offsetY="-50"/>
-            <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
-            <frame delay="75" index="1" offsetX="-6" offsetY="-50"/>
-        </animation>
-        <animation direction="up">
-            <frame delay="75" index="2" offsetX="5" offsetY="-49"/>
-            <frame delay="150" index="2" offsetX="5" offsetY="-50"/>
-            <frame delay="75" index="2" offsetX="5" offsetY="-49"/>
-            <frame delay="150" index="2" offsetX="5" offsetY="-50"/>
-        </animation>
-        <animation direction="right">
-            <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
-            <frame delay="75" index="3" offsetX="4" offsetY="-47"/>
-            <frame delay="150" index="3" offsetX="4" offsetY="-48"/>
-            <frame delay="75" index="3" offsetX="4" offsetY="-47"/>
-            <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
-        </animation>
-    </action>
-  <action imageset="equipment" name="attack">
-        <animation direction="down">
-            <frame delay="75" index="0" offsetX="-4" offsetY="-48"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-46"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-45"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame delay="75" index="1" offsetX="-2" offsetY="-51"/>
-            <frame delay="75" index="1" offsetX="-2" offsetY="-52"/>
-            <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
-            <frame delay="75" index="1" offsetX="-7" offsetY="-48"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame delay="225" index="2" offsetX="4" offsetY="-49"/>
-            <frame delay="75" index="2" offsetX="4" offsetY="-47"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame delay="75" index="3" offsetX="1" offsetY="-49"/>
-            <frame delay="75" index="3" offsetX="1" offsetY="-50"/>
-            <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
-            <frame delay="75" index="3" offsetX="5" offsetY="-47"/>
-            <end/>
-        </animation>
-    </action>
-  <action imageset="equipment" name="attack_bow">
-        <animation direction="down">
-            <frame delay="225" index="0" offsetX="-4" offsetY="-49"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-48"/>
-            <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame delay="225" index="1" offsetX="-3" offsetY="-50"/>
-            <frame delay="150" index="1" offsetX="-1" offsetY="-51"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame delay="225" index="2" offsetX="5" offsetY="-49"/>
-            <frame delay="75" index="2" offsetX="4" offsetY="-48"/>
-            <frame delay="75" index="2" offsetX="4" offsetY="-49"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame delay="225" index="3" offsetX="1" offsetY="-48"/>
-            <frame delay="150" index="3" offsetX="-1" offsetY="-49"/>
-            <end/>
-        </animation>
-    </action>
-  <action imageset="equipment" name="sit">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY="-38"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-2" offsetY="-41"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="6" offsetY="-41"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-2" offsetY="-39"/>
-        </animation>
-    </action>
-  <action imageset="equipment" name="dead">
-        <animation direction="default">
-            <frame index="4" offsetX="35" offsetY="-10"/>
-        </animation>
-    </action>
-  <action name="attack_2hand" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-5" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-44" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-43" delay="140"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
+      <frame delay="150" index="0" offsetX="-4" offsetY="-50"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
+      <frame delay="150" index="0" offsetX="-4" offsetY="-50"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-7" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="-4" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="-9" offsetY="-46" delay="140"/>
+      <frame delay="75" index="1" offsetX="-6" offsetY="-50"/>
+      <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
+      <frame delay="150" index="1" offsetX="-6" offsetY="-50"/>
+      <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
+      <frame delay="75" index="1" offsetX="-6" offsetY="-50"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
+      <frame delay="75" index="2" offsetX="5" offsetY="-49"/>
+      <frame delay="150" index="2" offsetX="5" offsetY="-50"/>
+      <frame delay="75" index="2" offsetX="5" offsetY="-49"/>
+      <frame delay="150" index="2" offsetX="5" offsetY="-50"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="6" offsetY="-45" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-45" delay="140"/>
+      <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="4" offsetY="-47"/>
+      <frame delay="150" index="3" offsetX="4" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="4" offsetY="-47"/>
+      <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
       <end/>
     </animation>
   </action>
-  <action name="attack_sword_stab" imageset="equipment">
+  <action imageset="equipment" name="attack">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-49" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-46" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-45" delay="100"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-48"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-46"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-45"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-2" offsetY="-51" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-52" delay="100"/>
-      <frame index="1" offsetX="-6" offsetY="-49" delay="100"/>
-      <frame index="1" offsetX="-7" offsetY="-48" delay="100"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-51"/>
+      <frame delay="75" index="1" offsetX="-2" offsetY="-52"/>
+      <frame delay="75" index="1" offsetX="-6" offsetY="-49"/>
+      <frame delay="75" index="1" offsetX="-7" offsetY="-48"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-47" delay="100"/>
+      <frame delay="225" index="2" offsetX="4" offsetY="-49"/>
+      <frame delay="75" index="2" offsetX="4" offsetY="-47"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="1" offsetY="-49" delay="100"/>
-      <frame index="3" offsetX="1" offsetY="-50" delay="100"/>
-      <frame index="3" offsetX="4" offsetY="-48" delay="100"/>
-      <frame index="3" offsetX="5" offsetY="-47" delay="100"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-49"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-50"/>
+      <frame delay="75" index="3" offsetX="4" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="5" offsetY="-47"/>
       <end/>
     </animation>
   </action>
-  <action name="attack_spear" imageset="equipment">
+  <action imageset="equipment" name="attack_bow">
     <animation direction="down">
-      <frame index="0" offsetX="-6" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-6" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-6" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-6" offsetY="-45" delay="140"/>
+      <frame delay="225" index="0" offsetX="-4" offsetY="-49"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-48"/>
+      <frame delay="75" index="0" offsetX="-4" offsetY="-49"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-2" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="-6" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="-6" offsetY="-48" delay="140"/>
+      <frame delay="225" index="1" offsetX="-3" offsetY="-50"/>
+      <frame delay="150" index="1" offsetX="-1" offsetY="-51"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="2" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="2" offsetY="-53" delay="140"/>
+      <frame delay="225" index="2" offsetX="5" offsetY="-49"/>
+      <frame delay="75" index="2" offsetX="4" offsetY="-48"/>
+      <frame delay="75" index="2" offsetX="4" offsetY="-49"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="5" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
+      <frame delay="225" index="3" offsetX="1" offsetY="-48"/>
+      <frame delay="150" index="3" offsetX="-1" offsetY="-49"/>
       <end/>
     </animation>
   </action>
-  <action name="attack_chop" imageset="equipment">
+  <action imageset="equipment" name="sit">
     <animation direction="down">
-      <frame index="0" offsetX="-5" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-43" delay="140"/>
-      <end/>
+      <frame index="0" offsetX="-4" offsetY="-38"/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-8" offsetY="-48" delay="140"/>
-      <end/>
+      <frame index="1" offsetX="-2" offsetY="-41"/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-46" delay="140"/>
-      <end/>
+      <frame index="2" offsetX="6" offsetY="-41"/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="2" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="2" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-47" delay="140"/>
-      <end/>
+      <frame index="3" offsetX="-2" offsetY="-39"/>
+    </animation>
+  </action>
+  <action imageset="equipment" name="dead">
+    <animation direction="default">
+      <frame index="4" offsetX="35" offsetY="-10"/>
     </animation>
   </action>
+  <action name="attack_2hand" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-5" offsetY="-47" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-44" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-43" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-7" offsetY="-47" delay="140"/>
+    <frame index="1" offsetX="-4" offsetY="-50" delay="140"/>
+    <frame index="1" offsetX="-2" offsetY="-50" delay="140"/>
+    <frame index="1" offsetX="-9" offsetY="-46" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="3" offsetY="-48" delay="280"/>
+    <frame index="2" offsetX="3" offsetY="-46" delay="140"/>
+    <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="6" offsetY="-45" delay="140"/>
+    <frame index="3" offsetX="3" offsetY="-48" delay="140"/>
+    <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
+    <frame index="3" offsetX="7" offsetY="-45" delay="140"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-4" offsetY="-48" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-49" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-46" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-45" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-2" offsetY="-51" delay="100"/>
+    <frame index="1" offsetX="-2" offsetY="-52" delay="100"/>
+    <frame index="1" offsetX="-6" offsetY="-49" delay="100"/>
+    <frame index="1" offsetX="-7" offsetY="-48" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="4" offsetY="-49" delay="300"/>
+    <frame index="2" offsetX="4" offsetY="-47" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="1" offsetY="-49" delay="100"/>
+    <frame index="3" offsetX="1" offsetY="-50" delay="100"/>
+    <frame index="3" offsetX="4" offsetY="-48" delay="100"/>
+    <frame index="3" offsetX="5" offsetY="-47" delay="100"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_spear" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-6" offsetY="-50" delay="280"/>
+    <frame index="0" offsetX="-6" offsetY="-51" delay="140"/>
+    <frame index="0" offsetX="-6" offsetY="-45" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-2" offsetY="-51" delay="140"/>
+    <frame index="1" offsetX="1" offsetY="-49" delay="140"/>
+    <frame index="1" offsetX="-6" offsetY="-51" delay="140"/>
+    <frame index="1" offsetX="-6" offsetY="-48" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="2" offsetY="-49" delay="140"/>
+    <frame index="2" offsetX="3" offsetY="-49" delay="140"/>
+    <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
+    <frame index="2" offsetX="2" offsetY="-53" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
+    <frame index="3" offsetX="-1" offsetY="-47" delay="140"/>
+    <frame index="3" offsetX="5" offsetY="-50" delay="140"/>
+    <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_chop" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-5" offsetY="-47" delay="280"/>
+    <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-43" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-3" offsetY="-51" delay="140"/>
+    <frame index="1" offsetX="-3" offsetY="-52" delay="280"/>
+    <frame index="1" offsetX="-8" offsetY="-48" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="3" offsetY="-48" delay="140"/>
+    <frame index="2" offsetX="3" offsetY="-47" delay="280"/>
+    <frame index="2" offsetX="3" offsetY="-46" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
+    <frame index="3" offsetX="2" offsetY="-50" delay="140"/>
+    <frame index="3" offsetX="2" offsetY="-51" delay="140"/>
+    <frame index="3" offsetX="7" offsetY="-47" delay="140"/>
+    <end/>
+  </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/head/rosehat-male.xml b/graphics/sprites/equipment/head/rosehat-male.xml
index 7414612e..100bc791 100644
--- a/graphics/sprites/equipment/head/rosehat-male.xml
+++ b/graphics/sprites/equipment/head/rosehat-male.xml
@@ -1,244 +1,233 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="equipment" src="graphics/sprites/equipment/head/rosehat.png|R" width="16" height="12"/>
-
-    <action name="stand" imageset="equipment">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY ="-50"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-6" offsetY ="-50"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="5" offsetY ="-49"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="4" offsetY ="-48"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="equipment">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-50" delay="150"/>
-            <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-50" delay="150"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-6" offsetY ="-50" delay="75"/>
-            <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
-            <frame index="1" offsetX="-6" offsetY ="-50" delay="150"/>
-            <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
-            <frame index="1" offsetX="-6" offsetY ="-50" delay="75"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="5" offsetY ="-49" delay="75"/>
-            <frame index="2" offsetX="5" offsetY ="-50" delay="150"/>
-            <frame index="2" offsetX="5" offsetY ="-49" delay="75"/>
-            <frame index="2" offsetX="5" offsetY ="-50" delay="150"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
-            <frame index="3" offsetX="4" offsetY ="-47" delay="75"/>
-            <frame index="3" offsetX="4" offsetY ="-48" delay="150"/>
-            <frame index="3" offsetX="4" offsetY ="-47" delay="75"/>
-            <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="equipment">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY ="-48" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-46" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-45" delay="75"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-2" offsetY ="-51" delay="75"/>
-            <frame index="1" offsetX="-2" offsetY ="-52" delay="75"/>
-            <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
-            <frame index="1" offsetX="-7" offsetY ="-48" delay="75"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="4" offsetY ="-49" delay="225"/>
-            <frame index="2" offsetX="4" offsetY ="-47" delay="75"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="1" offsetY ="-49" delay="75"/>
-            <frame index="3" offsetX="1" offsetY ="-50" delay="75"/>
-            <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
-            <frame index="3" offsetX="5" offsetY ="-47" delay="75"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="equipment">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY ="-49" delay="225"/>
-            <frame index="0" offsetX="-4" offsetY ="-48" delay="75"/>
-            <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-3" offsetY ="-50" delay="225"/>
-            <frame index="1" offsetX="-1" offsetY ="-51" delay="150"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="5" offsetY ="-49" delay="225"/>
-            <frame index="2" offsetX="4" offsetY ="-48" delay="75"/>
-            <frame index="2" offsetX="4" offsetY ="-49" delay="75"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="1" offsetY ="-48" delay="225"/>
-            <frame index="3" offsetX="-1" offsetY ="-49" delay="150"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="equipment">
-        <animation direction="down">
-            <frame index="0" offsetX="-4" offsetY ="-38"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-2" offsetY ="-41"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="6" offsetY ="-41"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-2" offsetY ="-39"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="equipment">
-        <animation direction="default">
-            <frame index="4" offsetX="35" offsetY="-10"/>
-        </animation>
-    </action>
-
-  <action name="attack_2hand" imageset="equipment">
+  <imageset name="equipment" src="graphics/sprites/equipment/head/rosehat.png|R" width="16" height="12"/>
+  <action name="stand" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
-      <end/>
+      <frame index="0" offsetX="-4" offsetY ="-50"/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-6" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-1" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-8" offsetY="-48" delay="140"/>
-      <end/>
+      <frame index="1" offsetX="-6" offsetY ="-50"/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="5" offsetY="-50" delay="140"/>
-      <end/>
+      <frame index="2" offsetX="5" offsetY ="-49"/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="1" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
-      <end/>
+      <frame index="3" offsetX="4" offsetY ="-48"/>
     </animation>
   </action>
-  <action name="attack_sword_stab" imageset="equipment">
+  <action name="walk" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-49" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-46" delay="100"/>
-      <frame index="0" offsetX="-4" offsetY="-45" delay="100"/>
+      <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-50" delay="150"/>
+      <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-50" delay="150"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-2" offsetY="-51" delay="100"/>
-      <frame index="1" offsetX="-2" offsetY="-52" delay="100"/>
-      <frame index="1" offsetX="-6" offsetY="-49" delay="100"/>
-      <frame index="1" offsetX="-7" offsetY="-48" delay="100"/>
+      <frame index="1" offsetX="-6" offsetY ="-50" delay="75"/>
+      <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
+      <frame index="1" offsetX="-6" offsetY ="-50" delay="150"/>
+      <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
+      <frame index="1" offsetX="-6" offsetY ="-50" delay="75"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="4" offsetY="-47" delay="100"/>
+      <frame index="2" offsetX="5" offsetY ="-49" delay="75"/>
+      <frame index="2" offsetX="5" offsetY ="-50" delay="150"/>
+      <frame index="2" offsetX="5" offsetY ="-49" delay="75"/>
+      <frame index="2" offsetX="5" offsetY ="-50" delay="150"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="1" offsetY="-49" delay="100"/>
-      <frame index="3" offsetX="1" offsetY="-50" delay="100"/>
-      <frame index="3" offsetX="4" offsetY="-48" delay="100"/>
-      <frame index="3" offsetX="5" offsetY="-47" delay="100"/>
+      <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
+      <frame index="3" offsetX="4" offsetY ="-47" delay="75"/>
+      <frame index="3" offsetX="4" offsetY ="-48" delay="150"/>
+      <frame index="3" offsetX="4" offsetY ="-47" delay="75"/>
+      <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
       <end/>
     </animation>
   </action>
-  <action name="attack_spear" imageset="equipment">
+  <action name="attack" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-5" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-52" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY ="-48" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-46" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-45" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-1" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="0" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-5" offsetY="-53" delay="140"/>
-      <frame index="1" offsetX="-7" offsetY="-48" delay="140"/>
+      <frame index="1" offsetX="-2" offsetY ="-51" delay="75"/>
+      <frame index="1" offsetX="-2" offsetY ="-52" delay="75"/>
+      <frame index="1" offsetX="-6" offsetY ="-49" delay="75"/>
+      <frame index="1" offsetX="-7" offsetY ="-48" delay="75"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="3" offsetY="-52" delay="140"/>
+      <frame index="2" offsetX="4" offsetY ="-49" delay="225"/>
+      <frame index="2" offsetX="4" offsetY ="-47" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="0" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="5" offsetY="-52" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-47" delay="140"/>
+      <frame index="3" offsetX="1" offsetY ="-49" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-50" delay="75"/>
+      <frame index="3" offsetX="4" offsetY ="-48" delay="75"/>
+      <frame index="3" offsetX="5" offsetY ="-47" delay="75"/>
       <end/>
     </animation>
   </action>
-  <action name="attack_chop" imageset="equipment">
+  <action name="attack_bow" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY ="-49" delay="225"/>
+      <frame index="0" offsetX="-4" offsetY ="-48" delay="75"/>
+      <frame index="0" offsetX="-4" offsetY ="-49" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-2" offsetY="-53" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-53" delay="140"/>
-      <frame index="1" offsetX="-7" offsetY="-49" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY ="-50" delay="225"/>
+      <frame index="1" offsetX="-1" offsetY ="-51" delay="150"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="5" offsetY ="-49" delay="225"/>
+      <frame index="2" offsetX="4" offsetY ="-48" delay="75"/>
+      <frame index="2" offsetX="4" offsetY ="-49" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="2" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="2" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-52" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-48" delay="140"/>
+      <frame index="3" offsetX="1" offsetY ="-48" delay="225"/>
+      <frame index="3" offsetX="-1" offsetY ="-49" delay="150"/>
       <end/>
     </animation>
   </action>
+  <action name="sit" imageset="equipment">
+    <animation direction="down">
+      <frame index="0" offsetX="-4" offsetY ="-38"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-2" offsetY ="-41"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="6" offsetY ="-41"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY ="-39"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="equipment">
+    <animation direction="default">
+      <frame index="4" offsetX="35" offsetY="-10"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-4" offsetY="-49" delay="140"/>
+    <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
+    <frame index="0" offsetX="-4" offsetY="-50" delay="140"/>
+    <frame index="0" offsetX="-4" offsetY="-45" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-6" offsetY="-49" delay="140"/>
+    <frame index="1" offsetX="-3" offsetY="-52" delay="140"/>
+    <frame index="1" offsetX="-1" offsetY="-52" delay="140"/>
+    <frame index="1" offsetX="-8" offsetY="-48" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="4" offsetY="-49" delay="280"/>
+    <frame index="2" offsetX="4" offsetY="-47" delay="140"/>
+    <frame index="2" offsetX="5" offsetY="-50" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
+    <frame index="3" offsetX="3" offsetY="-50" delay="140"/>
+    <frame index="3" offsetX="1" offsetY="-51" delay="140"/>
+    <frame index="3" offsetX="6" offsetY="-47" delay="140"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-4" offsetY="-48" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-49" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-46" delay="100"/>
+    <frame index="0" offsetX="-4" offsetY="-45" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-2" offsetY="-51" delay="100"/>
+    <frame index="1" offsetX="-2" offsetY="-52" delay="100"/>
+    <frame index="1" offsetX="-6" offsetY="-49" delay="100"/>
+    <frame index="1" offsetX="-7" offsetY="-48" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="4" offsetY="-49" delay="300"/>
+    <frame index="2" offsetX="4" offsetY="-47" delay="100"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="1" offsetY="-49" delay="100"/>
+    <frame index="3" offsetX="1" offsetY="-50" delay="100"/>
+    <frame index="3" offsetX="4" offsetY="-48" delay="100"/>
+    <frame index="3" offsetX="5" offsetY="-47" delay="100"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_spear" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-5" offsetY="-51" delay="280"/>
+    <frame index="0" offsetX="-5" offsetY="-52" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-45" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-1" offsetY="-51" delay="140"/>
+    <frame index="1" offsetX="0" offsetY="-52" delay="140"/>
+    <frame index="1" offsetX="-5" offsetY="-53" delay="140"/>
+    <frame index="1" offsetX="-7" offsetY="-48" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="4" offsetY="-49" delay="420"/>
+    <frame index="2" offsetX="3" offsetY="-52" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="1" offsetY="-49" delay="140"/>
+    <frame index="3" offsetX="0" offsetY="-50" delay="140"/>
+    <frame index="3" offsetX="5" offsetY="-52" delay="140"/>
+    <frame index="3" offsetX="7" offsetY="-47" delay="140"/>
+    <end/>
+  </animation>
+  </action>
+  <action name="attack_chop" imageset="equipment">
+  <animation direction="down">
+    <frame index="0" offsetX="-4" offsetY="-48" delay="140"/>
+    <frame index="0" offsetX="-5" offsetY="-49" delay="140"/>
+    <frame index="0" offsetX="-4" offsetY="-51" delay="140"/>
+    <frame index="0" offsetX="-4" offsetY="-46" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="left">
+    <frame index="1" offsetX="-2" offsetY="-53" delay="140"/>
+    <frame index="1" offsetX="-2" offsetY="-52" delay="140"/>
+    <frame index="1" offsetX="-2" offsetY="-53" delay="140"/>
+    <frame index="1" offsetX="-7" offsetY="-49" delay="140"/>
+    <end/>
+  </animation>
+  <animation direction="up">
+    <frame index="2" offsetX="4" offsetY="-49" delay="280"/>
+    <frame index="2" offsetX="4" offsetY="-47" delay="280"/>
+    <end/>
+  </animation>
+  <animation direction="right">
+    <frame index="3" offsetX="2" offsetY="-51" delay="140"/>
+    <frame index="3" offsetX="2" offsetY="-50" delay="140"/>
+    <frame index="3" offsetX="3" offsetY="-52" delay="140"/>
+    <frame index="3" offsetX="7" offsetY="-48" delay="140"/>
+    <end/>
+  </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/head/sailor-hat-female.xml b/graphics/sprites/equipment/head/sailor-hat-female.xml
index d6ff047c..dc605a8d 100644
--- a/graphics/sprites/equipment/head/sailor-hat-female.xml
+++ b/graphics/sprites/equipment/head/sailor-hat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-47"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-3" offsetY="-48"/>
       <frame delay="75" index="2" offsetX="-3" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-48"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-47"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-5" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-45" delay="140"/>
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="2" offsetY="-49" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-50" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-50" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-5" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-46" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-45" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-46" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/sailor-hat-male.xml b/graphics/sprites/equipment/head/sailor-hat-male.xml
index 6c900322..eaadb28a 100644
--- a/graphics/sprites/equipment/head/sailor-hat-male.xml
+++ b/graphics/sprites/equipment/head/sailor-hat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-1" offsetY="-48" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="1" offsetX="-1" offsetY="-48" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-48" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="150"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-48" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-47" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="420"/>
       <frame index="2" offsetX="-5" offsetY="-51" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
+      <frame index="2" offsetX="-4" offsetY="-46" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/santabeardhat-female.xml b/graphics/sprites/equipment/head/santabeardhat-female.xml
index 4fbcba3d..6141638c 100644
--- a/graphics/sprites/equipment/head/santabeardhat-female.xml
+++ b/graphics/sprites/equipment/head/santabeardhat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/santabeardhat-male.xml b/graphics/sprites/equipment/head/santabeardhat-male.xml
index b7af5059..2b55baa4 100644
--- a/graphics/sprites/equipment/head/santabeardhat-male.xml
+++ b/graphics/sprites/equipment/head/santabeardhat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/santahat-female.xml b/graphics/sprites/equipment/head/santahat-female.xml
index a29618b6..58d4ccb9 100644
--- a/graphics/sprites/equipment/head/santahat-female.xml
+++ b/graphics/sprites/equipment/head/santahat-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="40" name="base" src="graphics/sprites/equipment/head/santahat.png|R;W;" width="40"/>
+  <imageset height="40" name="base" src="graphics/sprites/equipment/head/santahat.png|R;W" width="40"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-29"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/santahat-male.xml b/graphics/sprites/equipment/head/santahat-male.xml
index d77fb94f..3d7d1edf 100644
--- a/graphics/sprites/equipment/head/santahat-male.xml
+++ b/graphics/sprites/equipment/head/santahat-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/santahat.png|R;W;" width="40" height="40"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/santahat.png|R;W" width="40" height="40"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-29"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="200"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/serf-female.xml b/graphics/sprites/equipment/head/serf-female.xml
index b2ab4736..fb78a866 100644
--- a/graphics/sprites/equipment/head/serf-female.xml
+++ b/graphics/sprites/equipment/head/serf-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-39"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/serf-male.xml b/graphics/sprites/equipment/head/serf-male.xml
index daec6108..3c7947f2 100644
--- a/graphics/sprites/equipment/head/serf-male.xml
+++ b/graphics/sprites/equipment/head/serf-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-40" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-39" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-40" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="1" offsetY="-40" delay="150"/>
       <frame index="1" offsetX="1" offsetY="-39" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-40" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/shroom-female.xml b/graphics/sprites/equipment/head/shroom-female.xml
index 490ee2a8..ae4dea57 100644
--- a/graphics/sprites/equipment/head/shroom-female.xml
+++ b/graphics/sprites/equipment/head/shroom-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/shroom-male.xml b/graphics/sprites/equipment/head/shroom-male.xml
index e1d85dd1..9d2d9d2f 100644
--- a/graphics/sprites/equipment/head/shroom-male.xml
+++ b/graphics/sprites/equipment/head/shroom-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/silkheadband-female.xml b/graphics/sprites/equipment/head/silkheadband-female.xml
index b947a388..3bb7a491 100644
--- a/graphics/sprites/equipment/head/silkheadband-female.xml
+++ b/graphics/sprites/equipment/head/silkheadband-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/silkheadband-male.xml b/graphics/sprites/equipment/head/silkheadband-male.xml
index 39ffb597..e1e2ff21 100644
--- a/graphics/sprites/equipment/head/silkheadband-male.xml
+++ b/graphics/sprites/equipment/head/silkheadband-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/skullmask-female.xml b/graphics/sprites/equipment/head/skullmask-female.xml
index 44e603ef..d40b778f 100644
--- a/graphics/sprites/equipment/head/skullmask-female.xml
+++ b/graphics/sprites/equipment/head/skullmask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/skullmask-male.xml b/graphics/sprites/equipment/head/skullmask-male.xml
index 4d73c68d..8052dede 100644
--- a/graphics/sprites/equipment/head/skullmask-male.xml
+++ b/graphics/sprites/equipment/head/skullmask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/snowgoggles-female.xml b/graphics/sprites/equipment/head/snowgoggles-female.xml
index 1d533e9e..c2093df7 100644
--- a/graphics/sprites/equipment/head/snowgoggles-female.xml
+++ b/graphics/sprites/equipment/head/snowgoggles-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/snowgoggles-male.xml b/graphics/sprites/equipment/head/snowgoggles-male.xml
index e500d984..f6dce3d9 100644
--- a/graphics/sprites/equipment/head/snowgoggles-male.xml
+++ b/graphics/sprites/equipment/head/snowgoggles-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/standardheadband-female.xml b/graphics/sprites/equipment/head/standardheadband-female.xml
index 8a062291..364f8c43 100644
--- a/graphics/sprites/equipment/head/standardheadband-female.xml
+++ b/graphics/sprites/equipment/head/standardheadband-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/standardheadband-male.xml b/graphics/sprites/equipment/head/standardheadband-male.xml
index 733f7c0e..95541695 100644
--- a/graphics/sprites/equipment/head/standardheadband-male.xml
+++ b/graphics/sprites/equipment/head/standardheadband-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/sunglasses-female.xml b/graphics/sprites/equipment/head/sunglasses-female.xml
index e09005e3..29a21c83 100644
--- a/graphics/sprites/equipment/head/sunglasses-female.xml
+++ b/graphics/sprites/equipment/head/sunglasses-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="-2" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
       <frame delay="75" index="3" offsetX="-2" offsetY="-34"/>
       <frame delay="150" index="3" offsetX="-2" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="2" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="2" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-4" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-4" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/sunglasses-male.xml b/graphics/sprites/equipment/head/sunglasses-male.xml
index 9eaa9c06..05e95e47 100644
--- a/graphics/sprites/equipment/head/sunglasses-male.xml
+++ b/graphics/sprites/equipment/head/sunglasses-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
       <frame index="3" offsetX="-2" offsetY="-34" delay="75"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="2" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="2" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="2" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="3" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="3" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="3" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="3" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/tamoshanter-female.xml b/graphics/sprites/equipment/head/tamoshanter-female.xml
index 67b17531..99a4a269 100644
--- a/graphics/sprites/equipment/head/tamoshanter-female.xml
+++ b/graphics/sprites/equipment/head/tamoshanter-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-36"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-37"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-38"/>
       <frame delay="75" index="1" offsetX="-1" offsetY="-39"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-37"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-38"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-38"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-39"/>
+      <end/>
     </animation>
   </action>
   <action imageset="equipment" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-36" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-34" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-38" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -206,8 +206,7 @@
   </action>
   <action name="attack_chop" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -221,9 +220,7 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-36" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-35" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-35" delay="420"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/tamoshanter-male.xml b/graphics/sprites/equipment/head/tamoshanter-male.xml
index e78fa99f..792d189b 100644
--- a/graphics/sprites/equipment/head/tamoshanter-male.xml
+++ b/graphics/sprites/equipment/head/tamoshanter-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
       <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-39" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-38" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-39" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="equipment">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="equipment">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-38" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-37" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/terranitehelm-female.xml b/graphics/sprites/equipment/head/terranitehelm-female.xml
index 0bf3d2bb..d9d973df 100644
--- a/graphics/sprites/equipment/head/terranitehelm-female.xml
+++ b/graphics/sprites/equipment/head/terranitehelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="1" offsetX="-2" offsetY="-41"/>
       <frame delay="150" index="1" offsetX="-2" offsetY="-42"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-41"/>
       <frame delay="150" index="1" offsetX="-2" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-41"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-41"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-41"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="-4" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="-4" offsetY="-40" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-38" delay="140"/>
       <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
+      <frame index="1" offsetX="-3" offsetY="-41" delay="300"/>
       <frame index="1" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,9 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-42" delay="420"/>
       <frame index="0" offsetX="-3" offsetY="-36" delay="140"/>
       <end/>
     </animation>
@@ -206,8 +205,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
       <end/>
@@ -221,15 +219,13 @@
     </animation>
     <animation direction="up">
       <frame index="1" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="1" offsetX="-4" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="-4" offsetY="-39" delay="140"/>
+      <frame index="1" offsetX="-4" offsetY="-39" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-43" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-43" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-43" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-39" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/terranitehelm-male.xml b/graphics/sprites/equipment/head/terranitehelm-male.xml
index f4424a44..29cd8df6 100644
--- a/graphics/sprites/equipment/head/terranitehelm-male.xml
+++ b/graphics/sprites/equipment/head/terranitehelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="2" offsetX="-1" offsetY="-41" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-40" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="1" offsetX="-2" offsetY="-41" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-42" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-41" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-41" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-41" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-41" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-41" delay="280"/>
       <frame index="1" offsetX="-3" offsetY="-39" delay="140"/>
       <frame index="1" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="100"/>
+      <frame index="1" offsetX="-3" offsetY="-41" delay="300"/>
       <frame index="1" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,9 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-43" delay="420"/>
       <frame index="0" offsetX="-2" offsetY="-36" delay="140"/>
       <end/>
     </animation>
@@ -190,9 +189,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-41" delay="420"/>
       <frame index="1" offsetX="-4" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +217,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-39" delay="140"/>
+      <frame index="1" offsetX="-3" offsetY="-41" delay="280"/>
+      <frame index="1" offsetX="-3" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/thin-crown-female.xml b/graphics/sprites/equipment/head/thin-crown-female.xml
index 2b0aad77..a5dcb22b 100644
--- a/graphics/sprites/equipment/head/thin-crown-female.xml
+++ b/graphics/sprites/equipment/head/thin-crown-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-48"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-48"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-50" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-51" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-46" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-50" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-51" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-51" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-47" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/thin-crown-male.xml b/graphics/sprites/equipment/head/thin-crown-male.xml
index 001185e3..7cd8eddf 100644
--- a/graphics/sprites/equipment/head/thin-crown-male.xml
+++ b/graphics/sprites/equipment/head/thin-crown-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-49" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-49" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-47" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-49" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/tophat-female.xml b/graphics/sprites/equipment/head/tophat-female.xml
index b1d755b3..98166c69 100644
--- a/graphics/sprites/equipment/head/tophat-female.xml
+++ b/graphics/sprites/equipment/head/tophat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-49"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-50"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-49"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-50"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-50"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-51"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-50"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-49"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-50"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-49" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-45" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-49" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-51" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-52" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-52" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-49" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-47" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-51" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-52" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-52" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-48" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/tophat-male.xml b/graphics/sprites/equipment/head/tophat-male.xml
index d5c35335..e880e8a6 100644
--- a/graphics/sprites/equipment/head/tophat-male.xml
+++ b/graphics/sprites/equipment/head/tophat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-50" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-50" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-51" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-48" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-51" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-51" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-52" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-53" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-50" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-50" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-48" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/underworld-mask-female.xml b/graphics/sprites/equipment/head/underworld-mask-female.xml
index 79f6fbc8..7e9c586f 100644
--- a/graphics/sprites/equipment/head/underworld-mask-female.xml
+++ b/graphics/sprites/equipment/head/underworld-mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-29"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-30"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/underworld-mask-male.xml b/graphics/sprites/equipment/head/underworld-mask-male.xml
index d2df4470..e4219c6e 100644
--- a/graphics/sprites/equipment/head/underworld-mask-male.xml
+++ b/graphics/sprites/equipment/head/underworld-mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-29" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-30" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-29" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/warlordhelm-female.xml b/graphics/sprites/equipment/head/warlordhelm-female.xml
index 28833f20..608b25c7 100644
--- a/graphics/sprites/equipment/head/warlordhelm-female.xml
+++ b/graphics/sprites/equipment/head/warlordhelm-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="4" offsetY="-42"/>
       <frame delay="75" index="1" offsetX="4" offsetY="-41"/>
       <frame delay="75" index="1" offsetX="4" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-43"/>
       <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
       <frame delay="150" index="2" offsetX="-2" offsetY="-43"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="2" offsetY="-42"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="2" offsetY="-42"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-41"/>
       <frame delay="75" index="3" offsetX="2" offsetY="-42"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-37" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="6" offsetY="-43" delay="140"/>
-      <frame index="1" offsetX="6" offsetY="-44" delay="140"/>
-      <frame index="1" offsetX="6" offsetY="-44" delay="140"/>
+      <frame index="1" offsetX="6" offsetY="-44" delay="280"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-44" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-44" delay="140"/>
+      <frame index="3" offsetX="-1" offsetY="-44" delay="280"/>
       <frame index="3" offsetX="4" offsetY="-40" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/warlordhelm-male.xml b/graphics/sprites/equipment/head/warlordhelm-male.xml
index 0f8b0c66..3be153e8 100644
--- a/graphics/sprites/equipment/head/warlordhelm-male.xml
+++ b/graphics/sprites/equipment/head/warlordhelm-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-42" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="4" offsetY="-42" delay="150"/>
       <frame index="1" offsetX="4" offsetY="-41" delay="75"/>
       <frame index="1" offsetX="4" offsetY="-42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-42" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-43" delay="150"/>
       <frame index="2" offsetX="-2" offsetY="-42" delay="75"/>
       <frame index="2" offsetX="-2" offsetY="-43" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="2" offsetY="-42" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="2" offsetY="-42" delay="150"/>
       <frame index="3" offsetX="2" offsetY="-41" delay="75"/>
       <frame index="3" offsetX="2" offsetY="-42" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,8 +218,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/witch-doctor-mask-female.xml b/graphics/sprites/equipment/head/witch-doctor-mask-female.xml
index 21230905..73dd026b 100644
--- a/graphics/sprites/equipment/head/witch-doctor-mask-female.xml
+++ b/graphics/sprites/equipment/head/witch-doctor-mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-34"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-33"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-4" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-4" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-4" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-4" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-4" offsetY="-30"/>
       <frame delay="150" index="2" offsetX="-4" offsetY="-31"/>
       <frame delay="75" index="2" offsetX="-4" offsetY="-30"/>
       <frame delay="150" index="2" offsetX="-4" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="1" offsetY="-34"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="1" offsetY="-34"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-33"/>
       <frame delay="75" index="3" offsetX="1" offsetY="-34"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-5" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-29" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-29" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-27" delay="140"/>
       <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-5" offsetY="-29" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-5" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="-5" offsetY="-28" delay="280"/>
       <frame index="2" offsetX="-5" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-35" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-36" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-36" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-36" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-32" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/witch-doctor-mask-male.xml b/graphics/sprites/equipment/head/witch-doctor-mask-male.xml
index 60c9d6e4..b72b635d 100644
--- a/graphics/sprites/equipment/head/witch-doctor-mask-male.xml
+++ b/graphics/sprites/equipment/head/witch-doctor-mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-34" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-33" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-4" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-4" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-4" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-4" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-30" delay="75"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="150"/>
       <frame index="2" offsetX="-4" offsetY="-30" delay="75"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="1" offsetY="-34" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="1" offsetY="-34" delay="150"/>
       <frame index="3" offsetX="1" offsetY="-33" delay="75"/>
       <frame index="3" offsetX="1" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-31" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="100"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="300"/>
       <frame index="2" offsetX="-4" offsetY="-28" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-29" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="420"/>
       <frame index="2" offsetX="-5" offsetY="-33" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-30" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-28" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-30" delay="280"/>
+      <frame index="2" offsetX="-4" offsetY="-28" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/witch-hat-female.xml b/graphics/sprites/equipment/head/witch-hat-female.xml
index 7ad8e4d6..ac94239c 100644
--- a/graphics/sprites/equipment/head/witch-hat-female.xml
+++ b/graphics/sprites/equipment/head/witch-hat-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="40" name="base" src="graphics/sprites/equipment/head/witch-hat.png|W;" width="40"/>
+  <imageset height="40" name="base" src="graphics/sprites/equipment/head/witch-hat.png|W" width="40"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-29"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/witch-hat-male.xml b/graphics/sprites/equipment/head/witch-hat-male.xml
index a28f38d0..7a29a349 100644
--- a/graphics/sprites/equipment/head/witch-hat-male.xml
+++ b/graphics/sprites/equipment/head/witch-hat-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/witch-hat.png|W;" width="40" height="40"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/witch-hat.png|W" width="40" height="40"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-29"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/witch-hat2-female.xml b/graphics/sprites/equipment/head/witch-hat2-female.xml
index 6316e8b0..d2f55894 100644
--- a/graphics/sprites/equipment/head/witch-hat2-female.xml
+++ b/graphics/sprites/equipment/head/witch-hat2-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset height="32" name="base" src="graphics/sprites/equipment/head/witch-hat2.png" width="32"/>
+  <imageset height="32" name="base" src="graphics/sprites/equipment/head/witch-hat2.png|R;W" width="32"/>
   <action imageset="base" name="stand">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-45"/>
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-45"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-44"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-45"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-45"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-44"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-45"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-45"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-45"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-44"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-45"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -84,9 +88,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame delay="225" index="2" offsetX="-2" offsetY="-42"/>
-      <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
-      <frame delay="75" index="2" offsetX="-2" offsetY="-42"/>
+      <frame delay="375" index="2" offsetX="-2" offsetY="-42"/>
       <end/>
     </animation>
     <animation direction="right">
@@ -130,8 +132,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +161,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +175,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-40" delay="140"/>
       <end/>
@@ -214,22 +212,19 @@
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-46" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-47" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-47" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-47" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-47" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-47" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-47" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-43" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/witch-hat2-male.xml b/graphics/sprites/equipment/head/witch-hat2-male.xml
index 0f685dd1..f0afa5ca 100644
--- a/graphics/sprites/equipment/head/witch-hat2-male.xml
+++ b/graphics/sprites/equipment/head/witch-hat2-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/witch-hat2.png" width="32" height="32"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/witch-hat2.png|R;W" width="32" height="32"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-45"/>
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-45" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-45" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-45" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-45" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-44" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-45" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-45" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-44" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-45" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-46" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-46" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-47" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-40" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/wizard-hat-female.xml b/graphics/sprites/equipment/head/wizard-hat-female.xml
index 5d590017..2e02d038 100644
--- a/graphics/sprites/equipment/head/wizard-hat-female.xml
+++ b/graphics/sprites/equipment/head/wizard-hat-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-30"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-27"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-28"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-27"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-28"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-30"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-31"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-26" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-28" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-33" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-33" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-26" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-29" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/wizard-hat-male.xml b/graphics/sprites/equipment/head/wizard-hat-male.xml
index 0adcc8c5..7cc089f1 100644
--- a/graphics/sprites/equipment/head/wizard-hat-male.xml
+++ b/graphics/sprites/equipment/head/wizard-hat-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-31" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-27" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-28" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-27" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-31" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-30" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-31" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-28" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-32" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-32" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-30" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-27" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/woolen-female.xml b/graphics/sprites/equipment/head/woolen-female.xml
index d26aaf93..d2b011da 100644
--- a/graphics/sprites/equipment/head/woolen-female.xml
+++ b/graphics/sprites/equipment/head/woolen-female.xml
@@ -2,119 +2,120 @@
 <sprite>
   <imageset height="17" name="base" src="graphics/sprites/equipment/head/woolen.png|W" width="18"/>
   <action imageset="base" name="stand">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY="-48"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-1" offsetY="-48"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY="-48"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="+1" offsetY="-48"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-48"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-48"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-48"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="+1" offsetY="-48"/>
+    </animation>
+  </action>
   <action imageset="base" name="walk">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
-		  <frame delay="150" index="0" offsetX="0" offsetY="-48"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
-		  <frame delay="150" index="0" offsetX="0" offsetY="-48"/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
-		  <frame delay="150" index="1" offsetX="-1" offsetY="-48"/>
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
-		  <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
-		  <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="75" index="3" offsetX="+1" offsetY="-48"/>
-		  <frame delay="75" index="3" offsetX="+1" offsetY="-47"/>
-		  <frame delay="150" index="3" offsetX="+1" offsetY="-48"/>
-		  <frame delay="75" index="3" offsetX="+1" offsetY="-47"/>
-		  <frame delay="75" index="3" offsetX="+1" offsetY="-48"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-48"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
+      <frame delay="150" index="0" offsetX="0" offsetY="-48"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
+      <frame delay="150" index="1" offsetX="-1" offsetY="-48"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-48"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
+      <frame delay="75" index="2" offsetX="-1" offsetY="-48"/>
+      <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="75" index="3" offsetX="+1" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="+1" offsetY="-47"/>
+      <frame delay="150" index="3" offsetX="+1" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="+1" offsetY="-47"/>
+      <frame delay="75" index="3" offsetX="+1" offsetY="-48"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack">
-		<animation direction="down">
-		  <frame delay="75" index="0" offsetX="0" offsetY="-46"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-43"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="75" index="1" offsetX="3" offsetY="-49"/>
-		  <frame delay="75" index="1" offsetX="3" offsetY="-50"/>
-		  <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
-		  <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="225" index="2" offsetX="-2" offsetY="-48"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-47"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="150" index="3" offsetX="-3" offsetY="-49"/>
-		  <frame delay="75" index="3" offsetX="0" offsetY="-48"/>
-		  <frame delay="75" index="3" offsetX="1" offsetY="-47"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="75" index="0" offsetX="0" offsetY="-46"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-43"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="75" index="1" offsetX="3" offsetY="-49"/>
+      <frame delay="75" index="1" offsetX="3" offsetY="-50"/>
+      <frame delay="75" index="1" offsetX="0" offsetY="-48"/>
+      <frame delay="75" index="1" offsetX="-1" offsetY="-47"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="225" index="2" offsetX="-2" offsetY="-48"/>
+      <frame delay="75" index="2" offsetX="-2" offsetY="-47"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="150" index="3" offsetX="-3" offsetY="-49"/>
+      <frame delay="75" index="3" offsetX="0" offsetY="-48"/>
+      <frame delay="75" index="3" offsetX="1" offsetY="-47"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="attack_bow">
-		<animation direction="down">
-		  <frame delay="225" index="0" offsetX="0" offsetY="-47"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
-		  <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
-		  <end/>
-		</animation>
-		<animation direction="left">
-		  <frame delay="150" index="1" offsetX="2" offsetY="-48"/>
-		  <frame delay="75" index="1" offsetX="2" offsetY="-48"/>
-		  <frame delay="150" index="1" offsetX="4" offsetY="-49"/>
-		  <end/>
-		</animation>
-		<animation direction="up">
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-49"/>
-		  <frame delay="75" index="2" offsetX="-1" offsetY="-49"/>
-		  <frame delay="150" index="2" offsetX="-2" offsetY="-48"/>
-		  <frame delay="75" index="2" offsetX="-2" offsetY="-49"/>
-		  <end/>
-		</animation>
-		<animation direction="right">
-		  <frame delay="225" index="3" offsetX="-3" offsetY="-48"/>
-		  <frame delay="150" index="3" offsetX="-5" offsetY="-49"/>
-		  <end/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame delay="225" index="0" offsetX="0" offsetY="-47"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-45"/>
+      <frame delay="75" index="0" offsetX="0" offsetY="-47"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame delay="225" index="1" offsetX="2" offsetY="-48"/>
+      <frame delay="150" index="1" offsetX="4" offsetY="-49"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame delay="150" index="2" offsetX="-1" offsetY="-49"/>
+      <frame delay="225" index="2" offsetX="-2" offsetY="-48"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame delay="225" index="3" offsetX="-3" offsetY="-48"/>
+      <frame delay="150" index="3" offsetX="-5" offsetY="-49"/>
+      <end/>
+    </animation>
+  </action>
   <action imageset="base" name="sit">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY="-36"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY="-39"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY="-39"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY="-39"/>
-		</animation>
-	</action>
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY="-36"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-39"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="0" offsetY="-39"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-39"/>
+    </animation>
+  </action>
   <action imageset="base" name="dead">
-		<animation direction="default">
-			<frame index="1" offsetX="32" offsetY="-12"/>
-		</animation>
-	</action>
+    <animation direction="default">
+      <frame index="1" offsetX="32" offsetY="-12"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
@@ -131,8 +132,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-47" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-45" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-49" delay="140"/>
       <end/>
@@ -161,15 +161,12 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="100"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-49" delay="200"/>
       <frame index="3" offsetX="0" offsetY="-48" delay="100"/>
       <frame index="3" offsetX="1" offsetY="-47" delay="100"/>
       <end/>
@@ -177,8 +174,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-50" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <end/>
@@ -207,8 +203,7 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-45" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-45" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-48" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -222,9 +217,7 @@
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-47" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-46" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-46" delay="420"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/woolen-male.xml b/graphics/sprites/equipment/head/woolen-male.xml
index baedd128..035b768c 100644
--- a/graphics/sprites/equipment/head/woolen-male.xml
+++ b/graphics/sprites/equipment/head/woolen-male.xml
@@ -1,126 +1,122 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/woolen.png|W" width="18" height="17"/>
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-48"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-1" offsetY ="-48"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-48"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="+1" offsetY ="-48"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-48" delay="150"/>
-		  <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-48" delay="150"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-1" offsetY ="-48" delay="75"/>
-		  <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <frame index="1" offsetX="-1" offsetY ="-48" delay="150"/>
-		  <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <frame index="1" offsetX="-1" offsetY ="-48" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-48" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-49" delay="150"/>
-		  <frame index="2" offsetX="-1" offsetY ="-48" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-49" delay="150"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="+1" offsetY ="-48" delay="75"/>
-		  <frame index="3" offsetX="+1" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="+1" offsetY ="-48" delay="150"/>
-		  <frame index="3" offsetX="+1" offsetY ="-47" delay="75"/>
-		  <frame index="3" offsetX="+1" offsetY ="-48" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-46" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-43" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-49" delay="75"/>
-		  <frame index="1" offsetX="3" offsetY ="-50" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-48" delay="75"/>
-		  <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-48" delay="225"/>
-		  <frame index="2" offsetX="-2" offsetY ="-47" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-49" delay="150"/>
-		  <frame index="3" offsetX="0" offsetY ="-48" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-47" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-47" delay="225"/>
-		  <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-48" delay="150"/>
-		  <frame index="1" offsetX="2" offsetY ="-48" delay="75"/>
-		  <frame index="1" offsetX="4" offsetY ="-49" delay="150"/>
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-48" delay="150"/>
-		  <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-48" delay="225"/>
-		  <frame index="3" offsetX="-5" offsetY ="-49" delay="150"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-36"/>
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-39"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-39"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-39"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="1" offsetX="32" offsetY="-12"/>
-		</animation>
-	</action>
+  <imageset name="base" src="graphics/sprites/equipment/head/woolen.png|W" width="18" height="17"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-48"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY ="-48"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-48"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="+1" offsetY ="-48"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-48" delay="150"/>
+      <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-48" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY ="-48" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY ="-48" delay="150"/>
+      <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
+      <end/>
+      <frame index="1" offsetX="-1" offsetY ="-48" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-48" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-49" delay="150"/>
+      <frame index="2" offsetX="-1" offsetY ="-48" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-49" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="+1" offsetY ="-48" delay="75"/>
+      <frame index="3" offsetX="+1" offsetY ="-47" delay="75"/>
+      <frame index="3" offsetX="+1" offsetY ="-48" delay="150"/>
+      <frame index="3" offsetX="+1" offsetY ="-47" delay="75"/>
+      <frame index="3" offsetX="+1" offsetY ="-48" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-46" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-43" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY ="-49" delay="75"/>
+      <frame index="1" offsetX="3" offsetY ="-50" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-48" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY ="-47" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-48" delay="225"/>
+      <frame index="2" offsetX="-2" offsetY ="-47" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-49" delay="150"/>
+      <frame index="3" offsetX="0" offsetY ="-48" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-47" delay="75"/>
+      <end />
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-47" delay="225"/>
+      <frame index="0" offsetX="0" offsetY ="-45" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-47" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY ="-48" delay="225"/>
+      <frame index="1" offsetX="4" offsetY ="-49" delay="150"/>
+      <end />
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-49" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-48" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-49" delay="75"/>
+      <end />
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-48" delay="225"/>
+      <frame index="3" offsetX="-5" offsetY ="-49" delay="150"/>
+      <end />
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-36"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY ="-39"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="0" offsetY ="-39"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY ="-39"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="1" offsetX="32" offsetY="-12"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-47" delay="140"/>
@@ -137,8 +133,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-50" delay="140"/>
       <end/>
@@ -167,15 +162,12 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="100"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-49" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-49" delay="100"/>
+      <frame index="3" offsetX="-3" offsetY="-49" delay="200"/>
       <frame index="3" offsetX="0" offsetY="-48" delay="100"/>
       <frame index="3" offsetX="1" offsetY="-47" delay="100"/>
       <end/>
@@ -183,8 +175,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-49" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-49" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-49" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-51" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
       <end/>
@@ -197,9 +188,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-52" delay="140"/>
       <end/>
     </animation>
@@ -227,8 +216,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-48" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-48" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-46" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-47" delay="140"/>
       <end/>
diff --git a/graphics/sprites/equipment/head/xmaself-female.xml b/graphics/sprites/equipment/head/xmaself-female.xml
index 42c8c570..de9e0e5c 100644
--- a/graphics/sprites/equipment/head/xmaself-female.xml
+++ b/graphics/sprites/equipment/head/xmaself-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="1" offsetY="-40"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-39"/>
       <frame delay="75" index="1" offsetX="1" offsetY="-40"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
       <frame delay="75" index="2" offsetX="0" offsetY="-41"/>
       <frame delay="150" index="2" offsetX="0" offsetY="-42"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-40"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-39"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-40"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-42" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-42" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-43" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-37" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="4" offsetY="-41" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-42" delay="140"/>
+      <frame index="1" offsetX="4" offsetY="-42" delay="280"/>
       <frame index="1" offsetX="-1" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-4" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-42" delay="140"/>
+      <frame index="3" offsetX="-3" offsetY="-42" delay="280"/>
       <frame index="3" offsetX="2" offsetY="-38" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/xmaself-male.xml b/graphics/sprites/equipment/head/xmaself-male.xml
index fd77a5cd..49932171 100644
--- a/graphics/sprites/equipment/head/xmaself-male.xml
+++ b/graphics/sprites/equipment/head/xmaself-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="1" offsetY="-40" delay="150"/>
       <frame index="1" offsetX="1" offsetY="-39" delay="75"/>
       <frame index="1" offsetX="1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
       <frame index="2" offsetX="0" offsetY="-41" delay="75"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-40" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
       <frame index="2" offsetX="0" offsetY="-42" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="100"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="300"/>
       <frame index="2" offsetX="-1" offsetY="-39" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-43" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-43" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-44" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="420"/>
       <frame index="2" offsetX="-2" offsetY="-44" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="2" offsetX="-1" offsetY="-41" delay="280"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/head/yeti-mask-female.xml b/graphics/sprites/equipment/head/yeti-mask-female.xml
index 62e8c4cd..399d7281 100644
--- a/graphics/sprites/equipment/head/yeti-mask-female.xml
+++ b/graphics/sprites/equipment/head/yeti-mask-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
       <frame delay="75" index="0" offsetX="-1" offsetY="-32"/>
       <frame delay="150" index="0" offsetX="-1" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="-2" offsetY="-34"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-33"/>
       <frame delay="75" index="1" offsetX="-2" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
       <frame delay="75" index="2" offsetX="-3" offsetY="-34"/>
       <frame delay="150" index="2" offsetX="-3" offsetY="-35"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="-1" offsetY="-32"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-31"/>
       <frame delay="75" index="3" offsetX="-1" offsetY="-32"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-33" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="-3" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="-3" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="-3" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-32" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-26" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-36" delay="140"/>
+      <frame index="1" offsetX="1" offsetY="-36" delay="280"/>
       <frame index="1" offsetX="-4" offsetY="-32" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-4" offsetY="-33" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-4" offsetY="-32" delay="280"/>
       <frame index="2" offsetX="-4" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-5" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-34" delay="140"/>
+      <frame index="3" offsetX="-4" offsetY="-34" delay="280"/>
       <frame index="3" offsetX="1" offsetY="-30" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/equipment/head/yeti-mask-male.xml b/graphics/sprites/equipment/head/yeti-mask-male.xml
index f1340a9d..5632634b 100644
--- a/graphics/sprites/equipment/head/yeti-mask-male.xml
+++ b/graphics/sprites/equipment/head/yeti-mask-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="-1" offsetY="-33" delay="150"/>
       <frame index="0" offsetX="-1" offsetY="-32" delay="75"/>
       <frame index="0" offsetX="-1" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="-2" offsetY="-34" delay="150"/>
       <frame index="1" offsetX="-2" offsetY="-33" delay="75"/>
       <frame index="1" offsetX="-2" offsetY="-34" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="150"/>
       <frame index="2" offsetX="-3" offsetY="-34" delay="75"/>
       <frame index="2" offsetX="-3" offsetY="-35" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-1" offsetY="-32" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="-1" offsetY="-32" delay="150"/>
       <frame index="3" offsetX="-1" offsetY="-31" delay="75"/>
       <frame index="3" offsetX="-1" offsetY="-32" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-35" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="100"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="300"/>
       <frame index="2" offsetX="-3" offsetY="-32" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-34" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-35" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-28" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="420"/>
       <frame index="2" offsetX="-4" offsetY="-37" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-32" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-34" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-32" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/equipment/override/adult-head.xml b/graphics/sprites/equipment/override/adult-head.xml
index dee5bbbf..3e42fd73 100644
--- a/graphics/sprites/equipment/override/adult-head.xml
+++ b/graphics/sprites/equipment/override/adult-head.xml
@@ -2,7 +2,7 @@
 <sprite variants="8" variant_offset="1">
   <imageset name="base" src="graphics/sprites/equipment/override/adult-head.png|W;Y;G;C;B;M;R" width="32" height="64"/>
   <action name="stand" imageset="base">
-    <animation direction="down">
+    <animation>
       <frame index="0" offsetX="0" offsetY="0"/>
     </animation>
   </action>
diff --git a/graphics/sprites/equipment/override/adult-outfits.xml b/graphics/sprites/equipment/override/adult-outfits.xml
index 3d5755c5..0bafd361 100644
--- a/graphics/sprites/equipment/override/adult-outfits.xml
+++ b/graphics/sprites/equipment/override/adult-outfits.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="16" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/override/adult-outfits.png|W;" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/equipment/override/adult-outfits.png|W" width="64" height="64"/>
   <action name="stand" imageset="base">
     <animation direction="default">
       <frame index="0"/>
diff --git a/graphics/sprites/equipment/override/child-head-in-bed.xml b/graphics/sprites/equipment/override/child-head-in-bed.xml
index 0964846e..7c8c4a5f 100644
--- a/graphics/sprites/equipment/override/child-head-in-bed.xml
+++ b/graphics/sprites/equipment/override/child-head-in-bed.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <sprite variants="6" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/override/child-head.png|W;R;" width="30" height="30"/>
+  <imageset name="base" src="graphics/sprites/equipment/override/child-head.png|W;R" width="30" height="30"/>
   <action name="stand" imageset="base">
-    <animation direction="down">
+    <animation>
       <frame index="0" offsetX="14" offsetY="-34"/>
     </animation>
   </action>
diff --git a/graphics/sprites/equipment/override/child-head.xml b/graphics/sprites/equipment/override/child-head.xml
index c5be2af4..3ff02638 100644
--- a/graphics/sprites/equipment/override/child-head.xml
+++ b/graphics/sprites/equipment/override/child-head.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <sprite variants="6" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/equipment/override/child-head.png|W;R;" width="30" height="30"/>
+  <imageset name="base" src="graphics/sprites/equipment/override/child-head.png|W;R" width="30" height="30"/>
   <action name="stand" imageset="base">
-    <animation direction="down">
+    <animation>
       <frame index="0" offsetX="0" offsetY="-37"/>
     </animation>
   </action>
diff --git a/graphics/sprites/equipment/weapons/axe-chop-female.xml b/graphics/sprites/equipment/weapons/axe-chop-female.xml
index 5725d6ab..4491967c 100644
--- a/graphics/sprites/equipment/weapons/axe-chop-female.xml
+++ b/graphics/sprites/equipment/weapons/axe-chop-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand"  variants="135" variant_offset="1">
-  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-chop"/>
   <action name="stand" imageset="axe-chop">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-chop-male.xml b/graphics/sprites/equipment/weapons/axe-chop-male.xml
index 5725d6ab..4491967c 100644
--- a/graphics/sprites/equipment/weapons/axe-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-chop-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand"  variants="135" variant_offset="1">
-  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-chop"/>
   <action name="stand" imageset="axe-chop">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-stab-female.xml b/graphics/sprites/equipment/weapons/axe-stab-female.xml
index 2f6a9beb..329eee9d 100644
--- a/graphics/sprites/equipment/weapons/axe-stab-female.xml
+++ b/graphics/sprites/equipment/weapons/axe-stab-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-stab"/>
   <action name="stand" imageset="axe-stab">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-stab-male.xml b/graphics/sprites/equipment/weapons/axe-stab-male.xml
index 2f6a9beb..329eee9d 100644
--- a/graphics/sprites/equipment/weapons/axe-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-stab-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-stab"/>
   <action name="stand" imageset="axe-stab">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/bow-banshee-female.xml b/graphics/sprites/equipment/weapons/bow-banshee-female.xml
index 8422a28a..b6d22c21 100644
--- a/graphics/sprites/equipment/weapons/bow-banshee-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-banshee-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-female.xml"/>
+  <imageset name="banshee-bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B" width="128" height="128"/>
+  <action name="default" imageset="banshee-bow"/>
+  <action name="stand" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-banshee-male.xml b/graphics/sprites/equipment/weapons/bow-banshee-male.xml
index bfb0c275..b6d22c21 100644
--- a/graphics/sprites/equipment/weapons/bow-banshee-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-banshee-male.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-male.xml"/>
+  <imageset name="banshee-bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B" width="128" height="128"/>
+  <action name="default" imageset="banshee-bow"/>
+  <action name="stand" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-female.xml b/graphics/sprites/equipment/weapons/bow-female.xml
index da43d0e4..c24f0797 100644
--- a/graphics/sprites/equipment/weapons/bow-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-male.xml b/graphics/sprites/equipment/weapons/bow-male.xml
index da43d0e4..c24f0797 100644
--- a/graphics/sprites/equipment/weapons/bow-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml b/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
index 1d6799e9..9965126b 100644
--- a/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/slimecovered-bow.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-female.xml"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slimecovered.png|B;R;W" width="128" height="128"/>
+  <action name="default" imageset="bow"/>
+  <action name="stand" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml b/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
index 92fb8206..9965126b 100644
--- a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/slimecovered-bow.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-male.xml"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slimecovered.png|B;R;W" width="128" height="128"/>
+  <action name="default" imageset="bow"/>
+  <action name="stand" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered.png b/graphics/sprites/equipment/weapons/bow-slimecovered.png
index 4580aba1..97ab7f4a 100644
Binary files a/graphics/sprites/equipment/weapons/bow-slimecovered.png and b/graphics/sprites/equipment/weapons/bow-slimecovered.png differ
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot-female.xml b/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
index 154bd887..2dbee092 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml b/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
index 154bd887..2dbee092 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/dagger-female.xml b/graphics/sprites/equipment/weapons/dagger-female.xml
index af56bf3e..78be5ddc 100644
--- a/graphics/sprites/equipment/weapons/dagger-female.xml
+++ b/graphics/sprites/equipment/weapons/dagger-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R;" width="128" height="128"/>
+  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R" width="128" height="128"/>
   <action name="default" imageset="dagger"/>
   <action name="stand" imageset="dagger">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/dagger-male.xml b/graphics/sprites/equipment/weapons/dagger-male.xml
index af56bf3e..78be5ddc 100644
--- a/graphics/sprites/equipment/weapons/dagger-male.xml
+++ b/graphics/sprites/equipment/weapons/dagger-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R;" width="128" height="128"/>
+  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R" width="128" height="128"/>
   <action name="default" imageset="dagger"/>
   <action name="stand" imageset="dagger">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt-female.xml b/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
index 9783a1db..f406848d 100644
--- a/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R;" width="128" height="128"/>
+  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R" width="128" height="128"/>
   <action name="default" imageset="polearm-blunt"/>
   <action name="stand" imageset="polearm-blunt">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-blunt">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-blunt">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml b/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
index 9783a1db..f406848d 100644
--- a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R;" width="128" height="128"/>
+  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R" width="128" height="128"/>
   <action name="default" imageset="polearm-blunt"/>
   <action name="stand" imageset="polearm-blunt">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-blunt">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-blunt">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt.png b/graphics/sprites/equipment/weapons/polearm-blunt.png
index ca08ab0d..39ae078b 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-blunt.png and b/graphics/sprites/equipment/weapons/polearm-blunt.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-chop-female.xml b/graphics/sprites/equipment/weapons/polearm-chop-female.xml
index 70b4d4f5..4af11eca 100644
--- a/graphics/sprites/equipment/weapons/polearm-chop-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-chop-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-chop"/>
   <action name="stand" imageset="polearm-chop">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-chop">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-chop">
diff --git a/graphics/sprites/equipment/weapons/polearm-chop-male.xml b/graphics/sprites/equipment/weapons/polearm-chop-male.xml
index 70b4d4f5..4af11eca 100644
--- a/graphics/sprites/equipment/weapons/polearm-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-chop-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-chop"/>
   <action name="stand" imageset="polearm-chop">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-chop">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-chop">
diff --git a/graphics/sprites/equipment/weapons/polearm-chop.png b/graphics/sprites/equipment/weapons/polearm-chop.png
index 85133cce..d5f76561 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-chop.png and b/graphics/sprites/equipment/weapons/polearm-chop.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-spear-female.xml b/graphics/sprites/equipment/weapons/polearm-spear-female.xml
index 88ffb39f..ea1c9083 100644
--- a/graphics/sprites/equipment/weapons/polearm-spear-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-spear-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-spear"/>
   <action name="stand" imageset="polearm-spear">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-spear">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-spear">
diff --git a/graphics/sprites/equipment/weapons/polearm-spear-male.xml b/graphics/sprites/equipment/weapons/polearm-spear-male.xml
index 88ffb39f..ea1c9083 100644
--- a/graphics/sprites/equipment/weapons/polearm-spear-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-spear-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-spear"/>
   <action name="stand" imageset="polearm-spear">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-spear">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-spear">
diff --git a/graphics/sprites/equipment/weapons/polearm-spear.png b/graphics/sprites/equipment/weapons/polearm-spear.png
index 27dd0f36..ef299eb9 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-spear.png and b/graphics/sprites/equipment/weapons/polearm-spear.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-stab-female.xml b/graphics/sprites/equipment/weapons/polearm-stab-female.xml
index 46acbf97..82257491 100644
--- a/graphics/sprites/equipment/weapons/polearm-stab-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-stab-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/polearm-chop-female.xml"/>
+  <imageset name="polearm-stab" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R" width="128" height="128"/>
+  <action name="default" imageset="polearm-stab"/>
+  <action name="stand" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="108" end="111" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="112" end="115" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="117" end="120" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="121" end="124" delay="140"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/polearm-stab-male.xml b/graphics/sprites/equipment/weapons/polearm-stab-male.xml
index f1a61fba..29a91e0d 100644
--- a/graphics/sprites/equipment/weapons/polearm-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-stab-male.xml
@@ -1,5 +1,82 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/polearm-chop-male.xml"/>
+  <imageset name="polearm-stab" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R" width="128" height="128"/>
+  <action name="stand" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="108" end="111" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="112" end="115" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="117" end="120" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="121" end="124" delay="140"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/polearm-stab.png b/graphics/sprites/equipment/weapons/polearm-stab.png
index a168823c..5be42f16 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-stab.png and b/graphics/sprites/equipment/weapons/polearm-stab.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword-female.xml b/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
index 29eca387..46235413 100644
--- a/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" 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/long-sword-female.xml"/>
+  <include file="equipment/weapons/sword-long-female.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml b/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
index 8e4a2685..c008b9bd 100644
--- a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" 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/long-sword-male.xml"/>
+  <include file="equipment/weapons/sword-long-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword.png b/graphics/sprites/equipment/weapons/sword-deadsword.png
index c87018aa..4b1c5cbe 100644
Binary files a/graphics/sprites/equipment/weapons/sword-deadsword.png and b/graphics/sprites/equipment/weapons/sword-deadsword.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-long-female.xml b/graphics/sprites/equipment/weapons/sword-long-female.xml
index 462618fb..51305dda 100644
--- a/graphics/sprites/equipment/weapons/sword-long-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-long-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-long"/>
   <action name="stand" imageset="sword-long">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-long">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-long">
diff --git a/graphics/sprites/equipment/weapons/sword-long-male.xml b/graphics/sprites/equipment/weapons/sword-long-male.xml
index 462618fb..51305dda 100644
--- a/graphics/sprites/equipment/weapons/sword-long-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-long-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-long"/>
   <action name="stand" imageset="sword-long">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-long">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-long">
diff --git a/graphics/sprites/equipment/weapons/sword-short-female.xml b/graphics/sprites/equipment/weapons/sword-short-female.xml
index 1d581300..dd04f384 100644
--- a/graphics/sprites/equipment/weapons/sword-short-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-short-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-short"/>
   <action name="stand" imageset="sword-short">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-short">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-short">
diff --git a/graphics/sprites/equipment/weapons/sword-short-male.xml b/graphics/sprites/equipment/weapons/sword-short-male.xml
index 1d581300..dd04f384 100644
--- a/graphics/sprites/equipment/weapons/sword-short-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-short-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-short"/>
   <action name="stand" imageset="sword-short">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-short">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-short">
diff --git a/graphics/sprites/equipment/weapons/wand-deathshand.png b/graphics/sprites/equipment/weapons/wand-deathshand.png
index 320c90f8..c14f11b5 100644
Binary files a/graphics/sprites/equipment/weapons/wand-deathshand.png and b/graphics/sprites/equipment/weapons/wand-deathshand.png differ
diff --git a/graphics/sprites/equipment/weapons/wand-female.xml b/graphics/sprites/equipment/weapons/wand-female.xml
index 816b473b..c0d89d8b 100644
--- a/graphics/sprites/equipment/weapons/wand-female.xml
+++ b/graphics/sprites/equipment/weapons/wand-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R;" width="128" height="128"/>
+  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R" width="128" height="128"/>
   <action name="default" imageset="wand"/>
   <action name="stand" imageset="wand">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/wand-male.xml b/graphics/sprites/equipment/weapons/wand-male.xml
index 816b473b..a2c6ea30 100644
--- a/graphics/sprites/equipment/weapons/wand-male.xml
+++ b/graphics/sprites/equipment/weapons/wand-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R;" width="128" height="128"/>
+  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R" width="128" height="128"/>
   <action name="default" imageset="wand"/>
   <action name="stand" imageset="wand">
     <animation direction="down">
@@ -32,19 +32,19 @@
   </action>
   <action name="walk" imageset="wand">
     <animation direction="down">
-      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <sequence offsetY="32" start="0" end="6" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <sequence offsetY="32" start="18" end="24" delay="75"/>
       <end/>
     </animation>
     <animation direction="up">
-      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <sequence offsetY="32" start="36" end="42" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <sequence offsetY="32" start="54" end="60" delay="75"/>
       <end/>
     </animation>
   </action>
diff --git a/graphics/sprites/hairstyles/hairstyle01-female.xml b/graphics/sprites/hairstyles/hairstyle01-female.xml
index 14fc296e..8556ec36 100644
--- a/graphics/sprites/hairstyles/hairstyle01-female.xml
+++ b/graphics/sprites/hairstyles/hairstyle01-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/hairstyles/hairstyle01-male.xml b/graphics/sprites/hairstyles/hairstyle01-male.xml
index 2ba68ce0..23613a95 100644
--- a/graphics/sprites/hairstyles/hairstyle01-male.xml
+++ b/graphics/sprites/hairstyles/hairstyle01-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/hairstyles/hairstyle13-female.xml b/graphics/sprites/hairstyles/hairstyle13-female.xml
index 44c09174..b1bd2b96 100644
--- a/graphics/sprites/hairstyles/hairstyle13-female.xml
+++ b/graphics/sprites/hairstyles/hairstyle13-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="1" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="0" offsetX="3" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="3" offsetX="3" offsetY="-33"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="4" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="5" offsetX="3" offsetY="-32"/>
       <frame delay="75" index="5" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
       <frame delay="150" index="7" offsetX="3" offsetY="-34"/>
       <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
       <frame delay="150" index="8" offsetX="3" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="9" offsetX="3" offsetY="-33"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="10" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="11" offsetX="3" offsetY="-32"/>
       <frame delay="75" index="11" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -124,14 +128,12 @@
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="2" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="5" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="5" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="6" offsetX="1" offsetY="-32" delay="280"/>
       <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
       <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
       <end/>
@@ -160,9 +162,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="300"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +176,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="0" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="0" offsetX="1" offsetY="-32" delay="280"/>
       <frame index="0" offsetX="1" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="1" offsetY="-27" delay="140"/>
       <end/>
@@ -206,30 +205,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="2" offsetY="-25" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="6" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-35" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-35" delay="140"/>
+      <frame index="3" offsetX="6" offsetY="-35" delay="280"/>
       <frame index="3" offsetX="1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-31" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-31" delay="140"/>
+      <frame index="6" offsetX="1" offsetY="-31" delay="280"/>
       <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="9" offsetX="0" offsetY="-34" delay="140"/>
-      <frame index="9" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="9" offsetX="1" offsetY="-35" delay="140"/>
+      <frame index="9" offsetX="1" offsetY="-35" delay="280"/>
       <frame index="9" offsetX="6" offsetY="-31" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/hairstyles/hairstyle13-male.xml b/graphics/sprites/hairstyles/hairstyle13-male.xml
index 1fd2a257..ae768a86 100644
--- a/graphics/sprites/hairstyles/hairstyle13-male.xml
+++ b/graphics/sprites/hairstyles/hairstyle13-male.xml
@@ -21,6 +21,7 @@
       <frame index="1" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="0" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="3" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="3" offsetY="-33" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="4" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="5" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="5" offsetX="3" offsetY="-33" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
       <frame index="7" offsetX="3" offsetY="-34" delay="150"/>
       <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
       <frame index="8" offsetX="3" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="9" offsetX="3" offsetY="-33" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="10" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="11" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="11" offsetX="3" offsetY="-33" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="280"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
       <frame index="6" offsetX="3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="300"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="2" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="2" offsetY="-27" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="420"/>
       <frame index="6" offsetX="1" offsetY="-36" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="280"/>
+      <frame index="6" offsetX="2" offsetY="-31" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/hairstyles/hairstyle14.png b/graphics/sprites/hairstyles/hairstyle14.png
index 4c916bb2..5df35798 100644
Binary files a/graphics/sprites/hairstyles/hairstyle14.png and b/graphics/sprites/hairstyles/hairstyle14.png differ
diff --git a/graphics/sprites/icons/haste-potion.xml b/graphics/sprites/icons/haste-potion.xml
index 94725d36..887d1b91 100644
--- a/graphics/sprites/icons/haste-potion.xml
+++ b/graphics/sprites/icons/haste-potion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/potion-c.png|G:#da69e5,ffdaff" width="13" height="20"/>
+  <imageset name="base" src="graphics/sprites/icons/potion-c.png|G" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
       <frame index="0" offsetY="-12" delay="100"/>
diff --git a/graphics/sprites/icons/iron-potion.xml b/graphics/sprites/icons/iron-potion.xml
index 9bb1a98f..2d34a4d0 100644
--- a/graphics/sprites/icons/iron-potion.xml
+++ b/graphics/sprites/icons/iron-potion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/potion-b.png|G:#c05000,f0a000,f0f09f" width="13" height="20"/>
+  <imageset name="base" src="graphics/sprites/icons/potion-b.png|G" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
       <frame index="0" offsetY="-12"/>
diff --git a/graphics/sprites/icons/potion-b.png b/graphics/sprites/icons/potion-b.png
index c6e0685e..cc1ac529 100644
Binary files a/graphics/sprites/icons/potion-b.png and b/graphics/sprites/icons/potion-b.png differ
diff --git a/graphics/sprites/icons/potion-c.png b/graphics/sprites/icons/potion-c.png
index 567a8d8c..08150318 100644
Binary files a/graphics/sprites/icons/potion-c.png and b/graphics/sprites/icons/potion-c.png differ
diff --git a/graphics/sprites/icons/red-rotating-hex.xml b/graphics/sprites/icons/red-rotating-hex.xml
index 55602762..107b16be 100644
--- a/graphics/sprites/icons/red-rotating-hex.xml
+++ b/graphics/sprites/icons/red-rotating-hex.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11"/>
+  <imageset name="base" src="graphics/particles/hex-facet-50.png|W" width="9" height="11"/>
   <action name="default" imageset="base">
     <animation direction="default">
       <frame index="0" offsetX="-2" offsetY="-16" delay="120"/>
diff --git a/graphics/sprites/model/child-in-bed.xml b/graphics/sprites/model/child-in-bed.xml
new file mode 100644
index 00000000..5fd2dcf0
--- /dev/null
+++ b/graphics/sprites/model/child-in-bed.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite variants="7" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/model/child.png|W;B;R" width="30" height="65"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0" offsetX="14" offsetY="3"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/model/child.xml b/graphics/sprites/model/child.xml
index c68310ab..c93ec7d6 100644
--- a/graphics/sprites/model/child.xml
+++ b/graphics/sprites/model/child.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="7" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/child.png|W;B;R;" width="30" height="65"/>
+  <imageset name="base" src="graphics/sprites/model/child.png|W;B;R" width="30" height="65"/>
   <action name="stand" imageset="base">
     <animation direction="default">
       <frame index="0"/>
diff --git a/graphics/sprites/model/female.xml b/graphics/sprites/model/female.xml
index 3eb9066b..ec555005 100644
--- a/graphics/sprites/model/female.xml
+++ b/graphics/sprites/model/female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/female.png|W;B;R;" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/model/female.png|W;B;R" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/model/male.xml b/graphics/sprites/model/male.xml
index 04e0cc69..09ab293c 100644
--- a/graphics/sprites/model/male.xml
+++ b/graphics/sprites/model/male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" aciton="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/male.png|W;B;R;" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/model/male.png|W;B;R" width="64" height="64"/>
   <action name="default" imageset="base"/>
   <action name="stand" imageset="base">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="base">
     <animation direction="down">
       <sequence start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="base">
diff --git a/graphics/sprites/monsters/accessories/bow-slimecovered.png b/graphics/sprites/monsters/accessories/bow-slimecovered.png
new file mode 100644
index 00000000..e3f17a41
Binary files /dev/null and b/graphics/sprites/monsters/accessories/bow-slimecovered.png differ
diff --git a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png
index 6a24aca4..88817f27 100644
Binary files a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png and b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png differ
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
index f37db88b..7d46f61f 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
@@ -25,8 +25,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="10" delay="150" offsetX="2" offsetY="-5" />
@@ -66,7 +65,7 @@
     <animation direction="left">
       <frame index="19" />
     </animation>
-    <animation direction="29">
+    <animation direction="up">
       <frame index="30" />
     </animation>
     <animation direction="right">
@@ -76,21 +75,27 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="5" end="8" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <sequence start="15" end="18" delay="75" offsetX="2" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <sequence start="35" end="38" delay="75" offsetX="-2" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <sequence start="15" end="18" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="25" end="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="35" end="38" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
index 239961a0..a03d09d9 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
@@ -60,21 +60,25 @@
       <frame index="4" delay="75" offsetY="-19" />
       <frame index="4" delay="75" offsetY="-17" />
       <frame index="0" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" delay="75" offsetY="-19" />
       <frame index="1" delay="75" offsetY="-17" />
       <frame index="1" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="4" delay="75" offsetY="-19" />
       <frame index="4" delay="75" offsetY="-17" />
       <frame index="0" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="1" delay="75" offsetY="-19" />
       <frame index="1" delay="75" offsetY="-17" />
       <frame index="1" delay="150" offsetY="-20" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
index 752e14ee..fd729bc3 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
index e4f22daa..f3af15c8 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
index cffeb7ba..8f2ebbc5 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
@@ -30,8 +30,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="18" delay="150" offsetY="-5" />
@@ -79,25 +78,31 @@
     <animation direction="down">
       <frame index="5" delay="150" offsetY="-5" />
       <frame index="4" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <frame index="23" delay="150" offsetY="-5" />
       <frame index="22" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <frame index="11" delay="150" offsetY="-5" />
       <frame index="10" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <frame index="29" delay="150" offsetY="-5" />
       <frame index="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
-      <frame index="60" />
+      <frame index="30" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="17" delay="150" offsetY="-5" />
       <frame index="16" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
index b78e8ade..e46975f6 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
@@ -30,8 +30,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="18" delay="150" offsetY="-5" />
@@ -79,25 +78,31 @@
     <animation direction="down">
       <frame index="5" delay="150" offsetY="-5" />
       <frame index="4" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <frame index="23" delay="150" offsetY="-5" />
       <frame index="22" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <frame index="11" delay="150" offsetY="-5" />
       <frame index="10" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <frame index="29" delay="150" offsetY="-5" />
       <frame index="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
-      <frame index="60" />
+      <frame index="30" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="17" delay="150" offsetY="-5" />
       <frame index="16" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1.xml b/graphics/sprites/monsters/accessories/mushroom-base1.xml
index 0c1b8e99..e6da5c4b 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1.xml
@@ -58,15 +58,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="4" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/nutcrackerhair.xml b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
index 06e403c8..d07bd9ca 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhair.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/hairstyles/hairstyle07.png|W" width="40" height="40"/>
-  <include file="hairstyles/hairstyle01.xml"/>
+  <include file="hairstyles/hairstyle01-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/nutcrackerhat.xml b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
index 94a55f5e..5979c83f 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhat.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
@@ -110,8 +110,8 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="4" offsetX="37" offsetY="-10"/>
+    <animation>
+      <frame index="3" offsetX="37" offsetY="-10"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/scythe-shadow.xml b/graphics/sprites/monsters/accessories/scythe-shadow.xml
index af986f62..dc14033b 100644
--- a/graphics/sprites/monsters/accessories/scythe-shadow.xml
+++ b/graphics/sprites/monsters/accessories/scythe-shadow.xml
@@ -22,6 +22,7 @@
   <action name="attack" imageset="base">
     <animation direction="default">
       <sequence start="0" end="7" delay="40" offsetY="35"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-bubble.xml b/graphics/sprites/monsters/accessories/slime-bubble.xml
index 50df3329..0754814c 100644
--- a/graphics/sprites/monsters/accessories/slime-bubble.xml
+++ b/graphics/sprites/monsters/accessories/slime-bubble.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />
-    <action name="stand" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="walk" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="attack" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="dead" imageset="base">
-        <animation>
-            <frame index="3" />
-        </animation>
-    </action>
+  <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />
+  <action name="stand" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation>
+      <frame index="3" />
+      </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-covered-bow.xml b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
new file mode 100644
index 00000000..43c16f31
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
@@ -0,0 +1,22 @@
+<sprite name="player" action="stand">
+  <imageset name="bow" src="graphics/sprites/monsters/accessories/bow-slimecovered.png|B;R;W" width="64" height="64"/>
+  <action name="default" imageset="bow"/>
+  <action name="attack" imageset="bow">
+    <animation direction="down">
+      <sequence start="0" end="4" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="5" end="9" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="10" end="14" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="15" end="19" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-bow.xml b/graphics/sprites/monsters/accessories/weapon-bow.xml
deleted file mode 100644
index 4959626c..00000000
--- a/graphics/sprites/monsters/accessories/weapon-bow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/weapon1.png" width="64" height="64"/>
-  <action name="default" imageset="bow"/>
-  <action name="attack" imageset="bow">
-    <animation direction="down">
-      <sequence start="0" end="4" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="5" end="9" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="10" end="14" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="15" end="19" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-dagger.xml b/graphics/sprites/monsters/accessories/weapon-dagger.xml
deleted file mode 100644
index 6426fc67..00000000
--- a/graphics/sprites/monsters/accessories/weapon-dagger.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="dagger" src="graphics/sprites/weapon0.png" width="64" height="64"/>
-  <action name="default" imageset="dagger"/>
-  <action name="attack" imageset="dagger">
-    <animation direction="down">
-      <sequence start="0" end="3" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="4" end="7" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="8" end="11" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="12" end="15" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml b/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
deleted file mode 100644
index a0c6d2f9..00000000
--- a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/weapon-slimecovered-forrestbow.png|W:#7e0000,ffffff" width="64" height="64"/>
-  <action name="default" imageset="bow"/>
-  <action name="attack" imageset="bow">
-    <animation direction="down">
-      <sequence start="0" end="4" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="5" end="9" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="10" end="14" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="15" end="19" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 0fd14173..9d0af81e 100644
--- a/graphics/sprites/monsters/butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -92,7 +92,7 @@
       <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
       <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
       <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
-      <frame index="15" delay="3000" offsetY="0" offsetX="0"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index f51be495..ce7e9ffe 100644
--- a/graphics/sprites/monsters/cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/cave-maggot.png" width="20" height="15"/>
+  <imageset name="base" src="graphics/sprites/monsters/cave-maggot.png|W" width="20" height="15"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetY="-8"/>
diff --git a/graphics/sprites/monsters/element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index f8884488..dfdcdab7 100644
--- a/graphics/sprites/monsters/element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -53,6 +53,22 @@
     </animation>
   </action>
   <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="20" delay="80"/>
+      <frame index="21" delay="80"/>
+      <frame index="22" delay="80"/>
+      <frame index="23" delay="80"/>
+      <frame index="24" delay="80"/>
+      <frame index="25" delay="80"/>
+      <frame index="26" delay="220"/>
+      <frame index="25" delay="180"/>
+      <frame index="24" delay="140"/>
+      <frame index="23" delay="100"/>
+      <frame index="22" delay="80"/>
+      <frame index="21" delay="60"/>
+      <frame index="20" delay="60"/>
+      <end/>
+    </animation>
     <animation direction="right">
       <frame index="20" delay="80"/>
       <frame index="21" delay="80"/>
@@ -69,6 +85,22 @@
       <frame index="20" delay="60"/>
       <end/>
     </animation>
+    <animation direction="up">
+      <frame index="36" delay="80"/>
+      <frame index="35" delay="80"/>
+      <frame index="34" delay="80"/>
+      <frame index="33" delay="80"/>
+      <frame index="32" delay="80"/>
+      <frame index="31" delay="80"/>
+      <frame index="30" delay="220"/>
+      <frame index="31" delay="180"/>
+      <frame index="32" delay="140"/>
+      <frame index="33" delay="100"/>
+      <frame index="34" delay="80"/>
+      <frame index="35" delay="60"/>
+      <frame index="36" delay="60"/>
+      <end/>
+    </animation>
     <animation direction="left">
       <frame index="36" delay="80"/>
       <frame index="35" delay="80"/>
diff --git a/graphics/sprites/monsters/lizard.xml b/graphics/sprites/monsters/lizard.xml
index 1e663513..9558904e 100644
--- a/graphics/sprites/monsters/lizard.xml
+++ b/graphics/sprites/monsters/lizard.xml
@@ -30,11 +30,11 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <frame index="11" delay="100"/>
       <frame index="23" delay="100"/>
       <frame index="35" delay="100"/>
-      <frame index="47" delay="0"/>
+      <frame index="47" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/logmonster.xml b/graphics/sprites/monsters/logmonster.xml
index 27d5fc39..5cd3c847 100644
--- a/graphics/sprites/monsters/logmonster.xml
+++ b/graphics/sprites/monsters/logmonster.xml
@@ -42,7 +42,7 @@
   <action name="dead" imageset="base">
     <animation direction="default">
       <sequence start="24" end="29" delay="400"/>
-      <frame index="29" delay="2000"/>
+      <frame index="29" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/mana-bug.xml b/graphics/sprites/monsters/mana-bug.xml
index e35d7628..37319dbb 100644
--- a/graphics/sprites/monsters/mana-bug.xml
+++ b/graphics/sprites/monsters/mana-bug.xml
@@ -116,7 +116,7 @@
       <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
       <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
       <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
-      <frame index="15" delay="3000" offsetY="0" offsetX="0"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/mana-ghost.xml b/graphics/sprites/monsters/mana-ghost.xml
index e78d7eec..ada1522a 100644
--- a/graphics/sprites/monsters/mana-ghost.xml
+++ b/graphics/sprites/monsters/mana-ghost.xml
@@ -32,15 +32,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="0" end="8" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="30" end="38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="20" end="28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="10" end="18" delay="150"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/mouboo-demonic.xml b/graphics/sprites/monsters/mouboo-demonic.xml
index eab61b09..d3d11834 100644
--- a/graphics/sprites/monsters/mouboo-demonic.xml
+++ b/graphics/sprites/monsters/mouboo-demonic.xml
@@ -52,7 +52,7 @@
       <frame index="14" delay="150"/>
       <frame index="29" delay="150"/>
       <frame index="44" delay="150"/>
-      <frame index="59" delay="1150"/>
+      <frame index="59" delay="5150"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/mouboo.xml b/graphics/sprites/monsters/mouboo.xml
index 9ae68040..bca5a93e 100644
--- a/graphics/sprites/monsters/mouboo.xml
+++ b/graphics/sprites/monsters/mouboo.xml
@@ -52,7 +52,7 @@
       <frame index="14" delay="150"/>
       <frame index="29" delay="150"/>
       <frame index="44" delay="150"/>
-      <frame index="59" delay="1150"/>
+      <frame index="59" delay="5150"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/penguin.xml b/graphics/sprites/monsters/penguin.xml
index af47d77c..a15820aa 100644
--- a/graphics/sprites/monsters/penguin.xml
+++ b/graphics/sprites/monsters/penguin.xml
@@ -70,21 +70,25 @@
       <frame index="32" delay="100"/>
       <frame index="40" delay="100"/>
       <frame index="48" delay="100"/>
-      <frame index="56" delay="100"/>
+      <frame index="56" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="1" end="2" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="45" end="46" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="33" end="34" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="20" end="21" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/plant.png b/graphics/sprites/monsters/plant.png
index 04bb0490..2f701c7e 100644
Binary files a/graphics/sprites/monsters/plant.png and b/graphics/sprites/monsters/plant.png differ
diff --git a/graphics/sprites/monsters/psi-bubble.xml b/graphics/sprites/monsters/psi-bubble.xml
index 59727c9e..2183428e 100644
--- a/graphics/sprites/monsters/psi-bubble.xml
+++ b/graphics/sprites/monsters/psi-bubble.xml
@@ -21,24 +21,28 @@
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/serqet.xml b/graphics/sprites/monsters/serqet.xml
index 4a83045e..e0070841 100644
--- a/graphics/sprites/monsters/serqet.xml
+++ b/graphics/sprites/monsters/serqet.xml
@@ -35,16 +35,16 @@
   </action>
   <action name="dead" imageset="base">
     <animation direction="down">
-      <sequence start="30" end="32" delay="500"/>
+      <sequence start="30" end="32" delay="5000"/>
     </animation>
     <animation direction="left">
-      <sequence start="19" end="21" delay="500"/>
+      <sequence start="19" end="21" delay="5000"/>
     </animation>
     <animation direction="up">
-      <sequence start="41" end="43" delay="500"/>
+      <sequence start="41" end="43" delay="5000"/>
     </animation>
     <animation direction="right">
-      <sequence start="8" end="10" delay="500"/>
+      <sequence start="8" end="10" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/slime-mother.xml b/graphics/sprites/monsters/slime-mother.xml
index 98f74ff0..3d757912 100644
--- a/graphics/sprites/monsters/slime-mother.xml
+++ b/graphics/sprites/monsters/slime-mother.xml
@@ -87,76 +87,4 @@
       <end/>
     </animation>
   </action>
-  <action name="attack_polearm" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_1hand" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
 </sprite>
diff --git a/graphics/sprites/monsters/snail.xml b/graphics/sprites/monsters/snail.xml
index 96f1c322..46a86138 100644
--- a/graphics/sprites/monsters/snail.xml
+++ b/graphics/sprites/monsters/snail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50"/>
+  <imageset name="base" src="graphics/sprites/monsters/snail.png|W;R;Y;G;C;B" width="50" height="50"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0"/>
diff --git a/graphics/sprites/monsters/snake-cave.xml b/graphics/sprites/monsters/snake-cave.xml
index 95f61449..ff503052 100644
--- a/graphics/sprites/monsters/snake-cave.xml
+++ b/graphics/sprites/monsters/snake-cave.xml
@@ -33,22 +33,22 @@
     <animation direction="down">
       <frame index="29" delay="300" offsetX="0" offsetY="6"/>
       <frame index="28" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="30" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="30" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="left">
       <frame index="36" delay="300" offsetX="0" offsetY="6"/>
       <frame index="8" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="37" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="37" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="up">
       <frame index="43" delay="300" offsetX="0" offsetY="6"/>
       <frame index="42" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="44" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="44" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="right">
       <frame index="50" delay="300" offsetX="0" offsetY="6"/>
       <frame index="22" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="51" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="51" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/spinning-scythe.xml b/graphics/sprites/monsters/spinning-scythe.xml
index a5cc252f..4301748c 100644
--- a/graphics/sprites/monsters/spinning-scythe.xml
+++ b/graphics/sprites/monsters/spinning-scythe.xml
@@ -26,6 +26,7 @@
   <action name="attack" imageset="base">
     <animation direction="default">
       <sequence start="0" end="7" delay="40"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/squirrel.xml b/graphics/sprites/monsters/squirrel.xml
index be48970b..8bf96d79 100644
--- a/graphics/sprites/monsters/squirrel.xml
+++ b/graphics/sprites/monsters/squirrel.xml
@@ -38,9 +38,9 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <sequence start="54" end="55" delay="800"/>
-      <frame index="55" delay="4000"/>
+      <frame index="55" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/terranite-mask.png b/graphics/sprites/monsters/terranite-mask.png
index 3ec1653b..7362a057 100644
Binary files a/graphics/sprites/monsters/terranite-mask.png and b/graphics/sprites/monsters/terranite-mask.png differ
diff --git a/graphics/sprites/monsters/troll.xml b/graphics/sprites/monsters/troll.xml
index 985f866c..b6253ade 100644
--- a/graphics/sprites/monsters/troll.xml
+++ b/graphics/sprites/monsters/troll.xml
@@ -55,41 +55,49 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="96" end="101" delay="100"/>
+      <end/>
     </animation>
     <animation direction="downright">
       <sequence start="102" end="107" delay="100"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="108" end="113" delay="100"/>
+      <end/>
     </animation>
     <animation direction="upright">
       <sequence start="114" end="119" delay="100"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="120" end="125" delay="100"/>
+      <end/>
     </animation>
     <animation direction="upleft">
       <sequence start="126" end="131" delay="100"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="132" end="137" delay="100"/>
+      <end/>
     </animation>
     <animation direction="downleft">
       <sequence start="138" end="143" delay="100"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
     <animation direction="down">
-      <sequence start="144" end="149" delay="250"/>
+      <sequence start="144" end="149" delay="5250"/>
     </animation>
     <animation direction="right">
-      <sequence start="150" end="155" delay="250"/>
+      <sequence start="150" end="155" delay="5250"/>
     </animation>
     <animation direction="up">
-      <sequence start="156" end="161" delay="250"/>
+      <sequence start="156" end="161" delay="5250"/>
     </animation>
     <animation direction="left">
-      <sequence start="162" end="167" delay="250"/>
+      <sequence start="162" end="167" delay="5250"/>
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/wraith.xml b/graphics/sprites/monsters/wraith.xml
index 6cf5d151..5d74fe81 100644
--- a/graphics/sprites/monsters/wraith.xml
+++ b/graphics/sprites/monsters/wraith.xml
@@ -32,15 +32,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="0" end="4" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="24" end="28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="16" end="20" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="8" end="12" delay="150"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/zombie.xml b/graphics/sprites/monsters/zombie.xml
index c55e9a60..8ccd4672 100644
--- a/graphics/sprites/monsters/zombie.xml
+++ b/graphics/sprites/monsters/zombie.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite aciton="stand" variants="5656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656" variant_offset="1">
+<sprite aciton="stand" variants="56" variant_offset="1">
   <imageset name="base" src="graphics/sprites/monsters/zombie.png" width="64" height="64"/>
   <action name="stand" imageset="base">
     <animation direction="down">
@@ -30,9 +30,9 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <sequence start="44" end="55" delay="100"/>
-      <frame index="55" delay="0"/>
+      <frame index="55" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/npcs/palm-tree.xml b/graphics/sprites/npcs/palm-tree.xml
index 4cb3ed48..eff38982 100644
--- a/graphics/sprites/npcs/palm-tree.xml
+++ b/graphics/sprites/npcs/palm-tree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="1" variant_offset="1">
-  <imageset name="base" src="graphics/tiles/desert_x5.png" width="98" height="160"/>
+  <imageset name="base" src="graphics/tiles/desert_x5.png" width="96" height="160"/>
   <action name="stand" imageset="base">
     <animation direction="default">
       <frame index="0"/>
diff --git a/graphics/sprites/npcs/present.xml b/graphics/sprites/npcs/present.xml
index e32272b1..90271cd1 100644
--- a/graphics/sprites/npcs/present.xml
+++ b/graphics/sprites/npcs/present.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/items/generic/presentbox.png|R;W;" width="32" height="32"/>
+  <imageset name="base" src="graphics/items/generic/presentbox.png|R;W" width="32" height="32"/>
   <action name="stand" imageset="base">
     <animation direction="default">
       <frame index="0"/>
diff --git a/graphics/sprites/races/gispaan-child.xml b/graphics/sprites/races/gispaan-child.xml
deleted file mode 100644
index a7c3d474..00000000
--- a/graphics/sprites/races/gispaan-child.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="6" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/child.png|W:#53202b,7f4f45,9e6a43,d09459;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="30" height="65"/>
-  <action name="stand" imageset="base">
-    <animation direction="default">
-      <frame index="0"/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/races/gispaan-female.xml b/graphics/sprites/races/gispaan-female.xml
deleted file mode 100644
index bd330b33..00000000
--- a/graphics/sprites/races/gispaan-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/female.png|W:#53202b,7f4f45,9e6a43,d09459;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="64" height="64"/>
-  <include file="model/female.xml"/>
-</sprite>
diff --git a/graphics/sprites/races/gispaan-male.xml b/graphics/sprites/races/gispaan-male.xml
deleted file mode 100644
index 92f4a40c..00000000
--- a/graphics/sprites/races/gispaan-male.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/male.png|W:#53202b,7f4f45,9e6a43,d09459;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="64" height="64"/>
-  <include file="model/male.xml"/>
-</sprite>
diff --git a/graphics/sprites/races/talponian-child-in-bed.xml b/graphics/sprites/races/talponian-child-in-bed.xml
deleted file mode 100644
index 7e38f149..00000000
--- a/graphics/sprites/races/talponian-child-in-bed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="7" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/child.png|W:#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="30" height="65"/>
-  <action name="stand" imageset="base">
-    <animation direction="default">
-      <frame index="0" offsetX="14" offsetY="3"/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/races/talponian-child.xml b/graphics/sprites/races/talponian-child.xml
deleted file mode 100644
index cbeda37e..00000000
--- a/graphics/sprites/races/talponian-child.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="7" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/child.png|W:#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;B:#1f3d23,72982c,ffeebd,ffffff;R:#3a3a3a,d5d5d5;" width="30" height="65"/>
-  <action name="stand" imageset="base">
-    <animation direction="default">
-      <frame index="0"/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/races/talponian-female.xml b/graphics/sprites/races/talponian-female.xml
deleted file mode 100644
index 9a587246..00000000
--- a/graphics/sprites/races/talponian-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/female.png|W:#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="64" height="64"/>
-  <include file="model/female.xml"/>
-</sprite>
diff --git a/graphics/sprites/races/talponian-male.xml b/graphics/sprites/races/talponian-male.xml
deleted file mode 100644
index 0476acfb..00000000
--- a/graphics/sprites/races/talponian-male.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/male.png|W:#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;B:#2f312f,727471,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="64" height="64"/>
-  <include file="model/male.xml"/>
-</sprite>
diff --git a/graphics/sprites/races/talponian-pirate.xml b/graphics/sprites/races/talponian-pirate.xml
deleted file mode 100644
index ae7d87ea..00000000
--- a/graphics/sprites/races/talponian-pirate.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/male.png|W:#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;B:#36e2fc,0ba8bf,a4a6a3,dad5f5;R:#3a3a3a,d5d5d5;" width="64" height="64"/>
-  <include file="model/male.xml"/>
-</sprite>
diff --git a/hair.xml b/hair.xml
index a6896f61..91ade8a6 100644
--- a/hair.xml
+++ b/hair.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <colors>
-    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-        <its:translateRule selector="//color/@name" translate="yes"/>
-        <its:translateRule selector="//*" translate="no"/>
-    </its:rules>
-
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//color/@name" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
   <color id="0" value="#8c4b41,da9041,ffffff" name="light brown"/>
   <color id="1" value="#06372b,489e25,fdedcc" name="green"/>
   <color id="2" value="#5f0b33,91191c,f9ad81" name="red"/>
diff --git a/items.xml b/items.xml
index 3b0291fc..af1d1b80 100644
--- a/items.xml
+++ b/items.xml
@@ -13,7 +13,6 @@
         <its:translateRule selector="//item/@effect" translate="yes"/>
         <its:translateRule selector="//*" translate="no"/>
     </its:rules>
-
     <item id="-1" type="hairsprite" name="Flat ponytail">
         <sprite gender="male">hairstyles/hairstyle01-male.xml</sprite>
         <sprite gender="female">hairstyles/hairstyle01-female.xml</sprite>
@@ -90,14 +89,12 @@
         <sprite gender="male">hairstyles/hairstyle19-male.xml</sprite>
         <sprite gender="female">hairstyles/hairstyle19-female.xml</sprite>
     </item>
-
     <!-- Treating the base sprite as equipment too will be useful when we
          implement other playable races -->
     <item id="-100" type="racesprite" name="Human">
-        <sprite gender="male">races/talponian-male.xml</sprite>
-        <sprite gender="female">races/talponian-female.xml</sprite>
+        <sprite gender="male">model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+        <sprite gender="female">model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     </item>
-
     <!-- TEMPORARY LOW WEAPON ID:S (< 256) -->
     <!-- Used for tmwAthena magic system -->
     <!-- item id="16"
@@ -116,8 +113,8 @@
     </item>
     <item id="33"
         attack-action="attack">
-        <sprite gender="male">equipment/weapons/wand-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/wand-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="34"
         attack-action="attack"> <!-- magic fist -->
@@ -125,8 +122,6 @@
     <!-- item id="35"
         attack-action="attack_2hand">
     </item -->
-
-
     <!-- Items -->
     <item id="501"
         image="use/potions/a.png|G:#22ff22"
@@ -410,8 +405,8 @@
         attack-range="5"
         weight="600"
         missile-particle="graphics/particles/arrow.particle.xml">
-        <sprite gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">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 gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
         <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="531"
@@ -540,8 +535,8 @@
         attack-range="5"
         weight="1200"
         missile-particle="graphics/particles/arrow.particle.xml">
-        <sprite gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">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 gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
         <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="546"
@@ -574,8 +569,8 @@
         attack-action="attack_2hand"
         attack-range="2"
         weight="1400">
-        <sprite gender="male">equipment/weapons/polearm-chop-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-chop-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="549"
         image="equipment/weapon/axe-axe.png"
@@ -586,8 +581,8 @@
         attack-action="attack_chop"
         attack-range="2"
         weight="1200">
-        <sprite gender="male">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>
-        <sprite gender="female">equipment/weapons/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">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>
+        <sprite gender="female">equipment/weapons/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <!-- item id="550"
         image="equipment/weapon/axe-blacksmithsaxe.png"
@@ -810,7 +805,7 @@
         attack-range="2"
         weight="2000">
     </item -->
-    <item id="577"
+    <!-- item id="577"
         image="equipment/ammo/bonedarts.png"
         name="Bone Darts"
         description="Darts made of bones."
@@ -821,7 +816,7 @@
         weight="300">
         <sprite gender="male">equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
         <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    </item>
+    </item -->
     <!-- item id="578"
         image="equipment/weapon/sword-sandcutter.png"
         name="Sand Cutter"
@@ -1006,8 +1001,8 @@
         attack-action="attack_spear"
         attack-range="2"
         weight="700">
-        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="595"
         image="equipment/weapon/polearm-heavyspear.png"
@@ -1018,8 +1013,8 @@
         attack-action="attack_spear"
         attack-range="2"
         weight="1000">
-        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="596"
         image="equipment/weapon/polearm-pike.png"
@@ -1030,8 +1025,8 @@
         attack-action="attack_spear"
         attack-range="2"
         weight="1200">
-        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="597"
         image="equipment/weapon/polearm-heavypike.png"
@@ -1042,8 +1037,8 @@
         attack-action="attack_spear"
         attack-range="2"
         weight="1500">
-        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-spear-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <!-- item id="598"
         image="equipment/weapon/polearm-dualspear.png"
@@ -1290,8 +1285,8 @@
         type="equip-head"
         weight="20"
         defense="3">
-        <sprite gender="male">equipment/head/bandana-male.xml|#ffffff;#ff4645;</sprite>
-        <sprite gender="female">equipment/head/bandana-female.xml|#ffffff;#ff4645;</sprite>
+        <sprite gender="male">equipment/head/bandana-male.xml|#ffffff;#ff4645</sprite>
+        <sprite gender="female">equipment/head/bandana-female.xml|#ffffff;#ff4645</sprite>
         <replace sprite="hair">
             <item from="-5"/>
         </replace>
@@ -1307,8 +1302,8 @@
         weight="1200"
         sellProtected="true">
         <drawBefore name="hat" direction="left"/>
-        <sprite gender="male">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 gender="female">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 gender="male">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 gender="female">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>
     </item>
     <item id="624"
         image="equipment/chest/vnecksweater.png|W:#a4b2b2,ffffff"
@@ -1722,8 +1717,8 @@
         agi="1"
         weight="5">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#5e7480,f1ffff,ffffff;#2554c7</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -1737,8 +1732,8 @@
         agi="1"
         weight="5">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#000000;#2554c7</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -1980,8 +1975,8 @@
         defense="3"
         weight="23"
         sellProtected="true">
-        <sprite gender="male">equipment/head/demonmask-male.xml|#87876c,bbc39c,edf4e1,ffffff;#d62626;</sprite>
-        <sprite gender="female">equipment/head/demonmask-female.xml|#87876c,bbc39c,edf4e1,ffffff;#d62626;</sprite>
+        <sprite gender="male">equipment/head/demonmask-male.xml|#87876c,bbc39c,edf4e1,ffffff;#d62626</sprite>
+        <sprite gender="female">equipment/head/demonmask-female.xml|#87876c,bbc39c,edf4e1,ffffff;#d62626</sprite>
     </item>
     <item id="680"
         image="generic/herb-mauve.png|W:#e0b0ff"
@@ -2626,8 +2621,8 @@
         attack-range="2"
         weight="1000">
         <drawBefore name="hat" direction="left"/>
-        <sprite gender="male">equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="759"
         image="equipment/head/paladin-helm.png"
@@ -3476,8 +3471,8 @@
             <item from="-14" to="-8"/>
             <item from="-15" to="-17"/>
         </replace>
-        <sprite gender="male">equipment/head/knit-cap-male.xml|#ffffff;#2958b5,3c6cce,90b3fb,c5d8ff;#2453b3,3561bf,638bdc,7799de,b0caff;</sprite>
-        <sprite gender="female">equipment/head/knit-cap-female.xml|#ffffff;#2958b5,3c6cce,90b3fb,c5d8ff;#2453b3,3561bf,638bdc,7799de,b0caff;</sprite>
+        <sprite gender="male">equipment/head/knit-cap-male.xml|#ffffff;#2958b5,3c6cce,90b3fb,c5d8ff;#2453b3,3561bf,638bdc,7799de,b0caff</sprite>
+        <sprite gender="female">equipment/head/knit-cap-female.xml|#ffffff;#2958b5,3c6cce,90b3fb,c5d8ff;#2453b3,3561bf,638bdc,7799de,b0caff</sprite>
     </item>
     <item id="857"
         image="equipment/legs/pants.png|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f"
@@ -3939,7 +3934,7 @@
         <sprite gender="female">equipment/head/rosehat-female.xml|#6666aa,ccccff</sprite>
     </item>
     <item id="903"
-        image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d;"
+        image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d"
         name="Sling Shot"
         description="In the right hands, everything is a weapon."
         effect="Damage +5 / Range 3"
@@ -3948,8 +3943,8 @@
         attack-range="5"
         weight="10"
         missile-particle="graphics/particles/stoneprojectile.particle.xml">
-        <sprite gender="male">equipment/weapons/bow-slingshot-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/bow-slingshot-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="904"
         image="equipment/ammo/stoneprojectile-icon.png"
@@ -3958,7 +3953,6 @@
         effect="Damage +5"
         type="equip-ammo"
         weight="1"/>
-
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
     <item id="1171"
         image="equipment/weapon/wand.png"
@@ -3970,8 +3964,8 @@
         attack-range="3"
         weight="100">
         <drawBefore name="hat" direction="left"/>
-        <sprite gender="male">equipment/weapons/wand-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+        <sprite gender="male">equipment/weapons/wand-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     </item>
     <item id="1172"
         image="equipment/legs/silkpants.png|W:#87876c,bbc39c,edf4e1,ffffff"
@@ -4016,8 +4010,8 @@
         defense="1"
         weight="10"
         sellProtected="true">
-        <sprite gender="male">equipment/head/autumn-mask-male.xml|#2a3a3a;#ee0427;#cf7c04;#ffffff;</sprite>
-        <sprite gender="female">equipment/head/autumn-mask-female.xml|#2a3a3a;#ee0427;#cf7c04;#ffffff;</sprite>
+        <sprite gender="male">equipment/head/autumn-mask-male.xml|#2a3a3a;#ee0427;#cf7c04;#ffffff</sprite>
+        <sprite gender="female">equipment/head/autumn-mask-female.xml|#2a3a3a;#ee0427;#cf7c04;#ffffff</sprite>
     </item>
     <item id="1176"
         image="equipment/chest/contributor.png|W:#247279,318087,4fbdc7,66e3c7;R:#247279"
@@ -4111,21 +4105,19 @@
         type="equip-torso"
         defense="6"
         weight="35"
-        drawBefore="pants"
-        >
+        drawBefore="pants">
         <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#ffffff;#b0242f,e1c130;#35bc40;#8c7223,e1c130,ffdb63</sprite>
         <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#ffffff;#b0242f,e1c130;#35bc40;#8c7223,e1c130,ffdb63</sprite>
     </item>
     <item id="1184"
-        image="equipment/chest/ugly-sweater.png|W:#3f3f3f,ffffff;Y:#af5a2f,af5a2f,;G:#8ece91,ffffff;C:#578760,6daa78,92e5a2,9be8a9"
+        image="equipment/chest/ugly-sweater.png|W:#3f3f3f,ffffff;Y:#af5a2f,af5a2f;G:#8ece91,ffffff;C:#578760,6daa78,92e5a2,9be8a9"
         name="Funky Christmas Sweater"
         description="An itchy woolen tan green sweater with holiday motive."
         effect="M. Attack -12"
         type="equip-torso"
         defense="6"
         weight="35"
-        drawBefore="pants"
-        >
+        drawBefore="pants">
         <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,ffffff;#578760,6daa78,92e5a2,9be8a9</sprite>
         <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,ffffff;#578760,6daa78,92e5a2,9be8a9</sprite>
     </item>
@@ -4137,8 +4129,7 @@
         defense="5"
         weight="30"
         sellProtected="true"
-        drawBefore="pants"
-        >
+        drawBefore="pants">
         <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#000000,333333;#c44dff;#ff4df0;#a3a3a3,ffffff</sprite>
         <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#000000,333333;#c44dff;#ff4df0;#a3a3a3,ffffff</sprite>
     </item>
@@ -4150,23 +4141,21 @@
         type="equip-torso"
         defense="6"
         weight="35"
-        drawBefore="pants"
-        >
+        drawBefore="pants">
         <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,364c17;#49661f</sprite>
         <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,364c17;#49661f</sprite>
     </item>
     <item id="1187"
-        image="equipment/chest/ugly-sweater.png|W:#ffffff;Y:#2958b5G:#ff4df0;G:#a7a7a7,d6d6d6,fffffe;C:#2958b5,789eea,c5d8ff"
+        image="equipment/chest/ugly-sweater.png|W:#ffffff;Y:#2958b5,ff4df0;G:#a7a7a7,d6d6d6,fffffe;C:#2958b5,789eea,c5d8ff"
         name="Blue Christmas Sweater"
         description="A light and warming sweater with holiday motive."
         type="equip-torso"
         defense="5"
         weight="30"
         sellProtected="true"
-        drawBefore="pants"
-        >
-        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#ffffff;#2958b5G:#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
-        <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#ffffff;#2958b5G:#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
+        drawBefore="pants">
+        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#ffffff,2958b5;#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
+        <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#ffffff,2958b5;#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
     </item>
     <item id="1188"
         image="equipment/feet/assassinboots.png|W:#b80f0f,580000,a40000,b80f0f,c02020,ff6060"
@@ -4275,8 +4264,8 @@
         missile-particle="graphics/particles/arrow.particle.xml"
         attack-action="attack_bow"
         attack-range="5">
-        <sprite gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
-        <sprite gender="female">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 gender="male">equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+        <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
         <!-- <sound event="strike">weapons/bows/bow_shoot_1.ogg</sound> -->
     </item>
     <item id="1201"
@@ -4286,7 +4275,7 @@
         effect="Damage +5"
         type="equip-1hand"
         weight="120"
-        attack-action="attack">
+        attack-action="attack"
         attack-range="2">
         <sprite gender="male">equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
         <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
@@ -4647,9 +4636,7 @@
         <sprite gender="male">equipment/head/snowgoggles-male.xml</sprite>
         <sprite gender="female">equipment/head/snowgoggles-female.xml</sprite>
     </item>
-
     <!-- RESERVED -->
-
     <item id="1244"
         image="generic/iten.png"
         name="Dark Talisman"
@@ -4873,12 +4860,10 @@
         XX = item
         Y = color variant
         XXY = viewID
-
         On the new server recolorable items should use the same item number
         (as long as they are functionally identical while the color is sent as
         an additional item property.
     -->
-
     <item id="2050"
         image="equipment/chest/cottonshirt.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Shirt"
@@ -4989,7 +4974,6 @@
         <sprite gender="male">equipment/chest/cotton-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/chest/cotton-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2060"
         image="equipment/chest/vnecksweater.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red V-Neck Sweater"
@@ -5120,7 +5104,6 @@
         <sprite gender="male">equipment/chest/vnecksweater-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/chest/vnecksweater-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2070"
         image="equipment/chest/tnecksweater.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Turtleneck Sweater"
@@ -5337,10 +5320,9 @@
         defense="5"
         weight="30"
         sellProtected="true">
-        <sprite gender="male">equipment/chest/robe-male.xml|##0b300b,195519,3e832e,3e9c3e</sprite>
-        <sprite gender="female">equipment/chest/robe-female.xml|##0b300b,195519,3e832e,3e9c3e</sprite>
+        <sprite gender="male">equipment/chest/robe-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
+        <sprite gender="female">equipment/chest/robe-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2090"
         image="equipment/chest/tanktop.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Tank Top"
@@ -5458,7 +5440,6 @@
         <sprite gender="male">equipment/chest/tanktop-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/chest/tanktop-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2100"
         image="equipment/legs/skirt.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Skirt"
@@ -5569,7 +5550,6 @@
         <sprite gender="male">equipment/legs/skirt-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/legs/skirt-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2110"
         image="equipment/legs/shorts.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Shorts"
@@ -5680,7 +5660,6 @@
         <sprite gender="male">equipment/legs/shorts-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/legs/shorts-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2120"
         image="equipment/chest/tanktop-short.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Short Tank Top"
@@ -5799,7 +5778,6 @@
         <sprite gender="male">equipment/chest/shorttanktop-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/chest/shorttanktop-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2130"
         image="equipment/head/deserthat.png|R:#581a1a,a41111,c03a3a,ff6060"
         name="Red Desert Hat"
@@ -5970,7 +5948,6 @@
             <item from="-5" to="-5"/>
         </replace>
     </item>
-
     <item id="2140"
         image="equipment/head/standardheadband.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Headband"
@@ -6071,7 +6048,6 @@
         <sprite gender="male">equipment/head/standardheadband-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/head/standardheadband-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2150"
         image="equipment/feet/boots.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Boots"
@@ -6182,7 +6158,6 @@
         <sprite gender="male">equipment/feet/boots-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/feet/boots-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2160"
         image="equipment/hands/basicgloves.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Gloves"
@@ -6293,7 +6268,6 @@
         <sprite gender="male">equipment/hands/generic-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/hands/generic-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2170"
         image="equipment/legs/miniskirt.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Miniskirt"
@@ -6404,7 +6378,6 @@
         <sprite gender="male">equipment/legs/miniskirt-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/legs/miniskirt-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2180"
         image="equipment/legs/pants.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Cotton Trousers"
@@ -6635,7 +6608,6 @@
         <sprite gender="male">equipment/head/rabbit-ears-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/head/rabbit-ears-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2200"
         image="equipment/head/wizard-hat.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Wizard Hat"
@@ -6766,7 +6738,6 @@
         <sprite gender="male">equipment/head/wizard-hat-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
         <sprite gender="female">equipment/head/wizard-hat-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
     </item>
-
     <item id="2210"
         image="equipment/head/bowler-hat.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Bowler Hat"
@@ -6947,7 +6918,6 @@
             <item from="-5" to="-5"/>
         </replace>
     </item>
-
     <item id="2220"
         image="equipment/chest/sorcerer-robe.png|W:#581a1a,a41111,c03a3a,ff6060;R:#ec3e3e"
         name="Red Sorcerer Robe (Red)"
@@ -6959,8 +6929,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -6975,8 +6945,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -6991,8 +6961,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7007,8 +6977,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7023,8 +6993,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7039,8 +7009,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7055,8 +7025,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7071,8 +7041,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7087,8 +7057,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#ec3e3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#ec3e3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#ec3e3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -7103,12 +7073,11 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
-
     <item id="2230"
         image="equipment/head/bowler-hat-brown.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Red Bowler Hat (Brown)"
@@ -7981,7 +7950,6 @@
         <sprite gender="male">equipment/head/rednose-male.xml</sprite>
         <sprite gender="female">equipment/head/rednose-female.xml</sprite>
     </item>
-
     <item id="5000"
         image="equipment/chest/sorcerer-robe.png|W:#581a1a,a41111,c03a3a,ff6060;R:#09BC09"
         name="Red Sorcerer Robe (Green)"
@@ -7993,8 +7961,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8009,8 +7977,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8025,8 +7993,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8041,8 +8009,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8057,8 +8025,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8073,8 +8041,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8089,8 +8057,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8105,8 +8073,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8121,8 +8089,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8137,8 +8105,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8153,8 +8121,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#09BC09</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#09BC09</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#09BC09</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8169,8 +8137,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8185,8 +8153,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8201,8 +8169,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8217,8 +8185,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8233,8 +8201,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8249,8 +8217,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8265,8 +8233,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8281,8 +8249,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8297,8 +8265,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8313,24 +8281,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#2050BE</sprite>        <replace sprite="pants">
-
-            <item from="1172" to="648"/>
-        </replace>
-    </item>
-    <item id="5021"
-        image="equipment/chest/sorcerer-robe.png|W:#87876c,bbc39c,edf4e1,ffffff;R:#2050BE"
-        name="Sorcerer Robe (Dark Blue)"
-        description="A Dark Blue lined sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30"
-        sellProtected="true">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#2050BE</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#2050BE</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#2050BE</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8345,8 +8297,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8361,8 +8313,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8377,8 +8329,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8393,8 +8345,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8409,8 +8361,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8425,8 +8377,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8441,8 +8393,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8457,8 +8409,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8473,8 +8425,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8489,8 +8441,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8505,8 +8457,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#FFF528</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#FFF528</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#FFF528</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8521,8 +8473,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8537,8 +8489,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8553,8 +8505,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8569,8 +8521,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8585,8 +8537,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8601,8 +8553,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8617,8 +8569,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8633,8 +8585,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8649,8 +8601,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8665,8 +8617,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8681,8 +8633,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#41B3FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#41B3FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#41B3FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8697,8 +8649,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8713,8 +8665,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8729,8 +8681,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8745,8 +8697,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8761,8 +8713,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8777,8 +8729,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8793,8 +8745,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8809,8 +8761,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8825,8 +8777,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8841,8 +8793,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8857,8 +8809,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#E975FD</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#E975FD</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#E975FD</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8873,8 +8825,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8889,8 +8841,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8905,8 +8857,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8921,8 +8873,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8937,8 +8889,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8953,8 +8905,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8969,8 +8921,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -8985,8 +8937,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9001,8 +8953,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9017,8 +8969,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9033,8 +8985,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#262626</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#262626</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#262626</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9049,8 +9001,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9065,8 +9017,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9081,8 +9033,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9097,8 +9049,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9113,8 +9065,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9129,8 +9081,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9145,8 +9097,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9161,8 +9113,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9177,8 +9129,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9193,8 +9145,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#ED8200</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9209,24 +9161,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#ED8200</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#ED8200</sprite>        <replace sprite="pants">
-
-            <item from="1172" to="648"/>
-        </replace>
-    </item>
-    <item id="5077"
-        image="equipment/chest/sorcerer-robe.png|W:#581a1a,a41111,c03a3a,ff6060;R:#8000FF"
-        name="Red Sorcerer Robe (Purple)"
-        description="A Purple lined Red sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30"
-        sellProtected="true">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#ED8200</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9241,24 +9177,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#8000FF</sprite>        <replace sprite="pants">
-
-            <item from="1172" to="648"/>
-        </replace>
-    </item>
-    <item id="5079"
-        image="equipment/chest/sorcerer-robe.png|W:#1a1a41,392b6e,4c529f,5d5dc2;R:#8000FF"
-        name="Dark Blue Sorcerer Robe (Purple)"
-        description="A Purple lined Dark Blue sorcerer robe."
-        effect="M. Attack +20"
-        type="equip-torso"
-        defense="5"
-        agi="1"
-        weight="30"
-        sellProtected="true">
-        <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9273,8 +9193,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9289,8 +9209,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9305,8 +9225,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9321,8 +9241,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9337,8 +9257,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9353,8 +9273,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9369,8 +9289,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9385,8 +9305,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#8000FF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#8000FF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#8000FF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9401,8 +9321,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9417,8 +9337,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#255511,579932,4aaf36,4ed65e;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#255511,579932,4aaf36,4ed65e;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9433,8 +9353,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a1a41,392b6e,4c529f,5d5dc2;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9449,8 +9369,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#846928,dab641,ffef93,fff7c9;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#846928,dab641,ffef93,fff7c9;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9465,8 +9385,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9481,8 +9401,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#bf369b,f25cb1,ff87b7,ffcccf;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9497,8 +9417,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#111111,222222,333333,444444,555555,aaaaaa;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9513,8 +9433,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#80280f,b04810,ef681f,ffb830;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#80280f,b04810,ef681f,ffb830;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9529,8 +9449,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#1a0a33,380f4d,82158c,b359ab;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#1a0a33,380f4d,82158c,b359ab;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9545,8 +9465,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#0b300b,195519,3e832e,3e9c3e;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#0b300b,195519,3e832e,3e9c3e;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9561,8 +9481,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#87876c,bbc39c,edf4e1,ffffff;#2B9D27</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#2B9D27</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#87876c,bbc39c,edf4e1,ffffff;#2B9D27</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
@@ -9577,8 +9497,8 @@
         weight="30"
         sellProtected="true">
         <sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#581a1a,a41111,c03a3a,ff6060;#EFEFEF</sprite>
-        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#EFEFEF</sprite>        <replace sprite="pants">
-
+        <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#581a1a,a41111,c03a3a,ff6060;#EFEFEF</sprite>
+        <replace sprite="pants">
             <item from="1172" to="648"/>
         </replace>
     </item>
diff --git a/maps.xml b/maps.xml
index 796f6907..ffc7f6dc 100644
--- a/maps.xml
+++ b/maps.xml
@@ -2,689 +2,689 @@
 <!-- This file is used by the manaplus client, not by the mana client -->
 <maps>
 <!-- Desert Outdoors-->
-    <map name="001-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="002-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="003-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="004-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="005-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="006-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="021-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="022-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="023-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="024-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="032-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="041-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="042-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="043-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="068-1.tmx">
-        <atlas name="desert"/>
-    </map>
-    <map name="069-1.tmx">
-        <atlas name="desert"/>
-    </map>
+  <map name="001-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="002-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="003-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="004-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="005-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="006-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="021-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="022-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="023-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="024-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="032-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="041-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="042-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="043-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="068-1.tmx">
+    <atlas name="desert"/>
+  </map>
+  <map name="069-1.tmx">
+    <atlas name="desert"/>
+  </map>
 <!-- Woodland -->
-    <map name="007-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="008-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="009-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="010-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="011-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="012-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="013-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="014-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="015-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="016-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="017-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="018-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="025-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="026-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="027-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="028-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="029-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="052-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="055-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="056-1.tmx">
-        <atlas name="woodland"/>
-    </map>
-    <map name="057-1.tmx">
-        <atlas name="woodland"/>
-    </map>
+  <map name="007-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="008-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="009-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="010-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="011-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="012-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="013-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="014-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="015-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="016-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="017-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="018-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="025-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="026-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="027-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="028-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="029-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="052-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="055-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="056-1.tmx">
+    <atlas name="woodland"/>
+  </map>
+  <map name="057-1.tmx">
+    <atlas name="woodland"/>
+  </map>
 <!-- Snow -->
-    <map name="019-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="020-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="030-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="031-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="033-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="034-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="044-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="045-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="046-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="047-1.tmx">
-        <atlas name="snow"/>
-    </map>
-    <map name="048-1.tmx">
-        <atlas name="snow"/>
-    </map>
+  <map name="019-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="020-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="030-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="031-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="033-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="034-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="044-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="045-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="046-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="047-1.tmx">
+    <atlas name="snow"/>
+  </map>
+  <map name="048-1.tmx">
+    <atlas name="snow"/>
+  </map>
 <!-- Desert & Woodland -->
-    <map name="051-1.tmx">
-        <atlas name="desert"/>
-    </map>
+  <map name="051-1.tmx">
+    <atlas name="desert"/>
+  </map>
 <!-- Ships -->
-    <map name="017-9.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="035-2.tmx">
-        <atlas name="ship"/>
-    </map>
-    <map name="036-2.tmx">
-        <atlas name="ship"/>
-    </map>
+  <map name="017-9.tmx">
+    <atlas name="ship"/>
+  </map>
+  <map name="035-2.tmx">
+    <atlas name="ship"/>
+  </map>
+  <map name="036-2.tmx">
+    <atlas name="ship"/>
+  </map>
 <!-- Desert Indoors -->
-    <map name="001-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="002-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="003-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="004-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <!-- map name="005-2.tmx">
-        <atlas name="interiordesert"/>
-    </map -->
-    <map name="006-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="021-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <!-- map name="022-2.tmx">
-        <atlas name="interiordesert"/>
-    </map -->
-    <map name="023-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="024-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <!-- map name="032-2.tmx">
-        <atlas name="interiordesert"/>
-    </map -->
-    <!-- map name="041-2.tmx">
-        <atlas name="interiordesert"/>
-    </map -->
-    <map name="042-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <!-- map name="043-2.tmx">
-        <atlas name="interiordesert"/>
-    </map -->
-    <map name="068-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
-    <map name="069-2.tmx">
-        <atlas name="interiordesert"/>
-    </map>
+  <map name="001-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="002-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="003-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="004-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <!-- map name="005-2.tmx">
+    <atlas name="interiordesert"/>
+  </map -->
+  <map name="006-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="021-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <!-- map name="022-2.tmx">
+    <atlas name="interiordesert"/>
+  </map -->
+  <map name="023-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="024-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <!-- map name="032-2.tmx">
+    <atlas name="interiordesert"/>
+  </map -->
+  <!-- map name="041-2.tmx">
+    <atlas name="interiordesert"/>
+  </map -->
+  <map name="042-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <!-- map name="043-2.tmx">
+    <atlas name="interiordesert"/>
+  </map -->
+  <map name="068-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
+  <map name="069-2.tmx">
+    <atlas name="interiordesert"/>
+  </map>
 <!-- Woodland Interiors -->
-    <!-- map name="007-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="008-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="009-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <map name="010-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="011-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="012-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="013-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="014-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="015-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="016-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="017-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <map name="018-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="025-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="026-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="027-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="028-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <!-- map name="029-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="052-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="055-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
-    <map name="056-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map>
-    <!-- map name="057-2.tmx">
-        <atlas name="interiorwoodland"/>
-    </map -->
+  <!-- map name="007-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="008-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="009-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <map name="010-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="011-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="012-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="013-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="014-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="015-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="016-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="017-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <map name="018-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="025-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="026-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="027-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="028-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <!-- map name="029-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="052-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="055-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
+  <map name="056-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map>
+  <!-- map name="057-2.tmx">
+    <atlas name="interiorwoodland"/>
+  </map -->
 <!-- Snow Interiors -->
-    <map name="019-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="020-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="030-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="031-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="033-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <!-- Mana Battery Room -->
-    <map name="030-4.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="034-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="044-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="045-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="046-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="047-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
-    <map name="048-2.tmx">
-        <atlas name="interiorsnow"/>
-    </map>
+  <map name="019-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="020-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="030-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="031-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="033-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <!-- Mana Battery Room -->
+  <map name="030-4.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="034-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="044-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="045-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="046-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="047-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
+  <map name="048-2.tmx">
+    <atlas name="interiorsnow"/>
+  </map>
 <!-- PvP Undergrounds -->
-    <map name="001-3.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="005-4.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="009-3.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="009-5.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="013-3.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="025-3.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="025-4.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="029-3.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
-    <map name="botcheck.tmx">
-        <atlas name="arenaunderground"/>
-    </map>
+  <map name="001-3.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="005-4.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="009-3.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="009-5.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="013-3.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="025-3.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="025-4.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="029-3.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
+  <map name="botcheck.tmx">
+    <atlas name="arenaunderground"/>
+  </map>
 <!-- Desert Underground -->
-    <map name="002-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="002-4.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="002-5.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="004-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="004-4.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="004-5.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="005-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="006-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="021-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="023-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="024-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="024-4.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="032-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="043-3.tmx">
-        <atlas name="desertunderground"/>
-    </map>
-    <map name="043-4.tmx">
-        <atlas name="desertunderground"/>
-    </map>
+  <map name="002-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="002-4.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="002-5.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="004-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="004-4.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="004-5.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="005-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="006-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="021-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="023-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="024-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="024-4.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="032-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="043-3.tmx">
+    <atlas name="desertunderground"/>
+  </map>
+  <map name="043-4.tmx">
+    <atlas name="desertunderground"/>
+  </map>
 <!-- Woodland Underground -->
-    <map name="009-4.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="009-6.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="011-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="011-4.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="011-6.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="012-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="012-4.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="014-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="015-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="017-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="017-4.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="018-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="028-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="051-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
-    <map name="055-3.tmx">
-        <atlas name="woodlandunderground"/>
-    </map>
+  <map name="009-4.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="009-6.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="011-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="011-4.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="011-6.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="012-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="012-4.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="014-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="015-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="017-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="017-4.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="018-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="028-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="051-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
+  <map name="055-3.tmx">
+    <atlas name="woodlandunderground"/>
+  </map>
 <!-- Snow Underground -->
-    <map name="019-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="019-4.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="020-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="030-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="031-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="031-4.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="044-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
-    <map name="046-3.tmx">
-        <atlas name="snowunderground"/>
-    </map>
+  <map name="019-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="019-4.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="020-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="030-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="031-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="031-4.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="044-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
+  <map name="046-3.tmx">
+    <atlas name="snowunderground"/>
+  </map>
 <!-- Crypt -->
-    <map name="027-3.tmx">
-        <atlas name="crypt"/>
-    </map>
-    <map name="027-4.tmx">
-        <atlas name="crypt"/>
-    </map>
-    <map name="027-5.tmx">
-        <atlas name="crypt"/>
-    </map>
-    <map name="027-6.tmx">
-        <atlas name="crypt"/>
-    </map>
-    <map name="027-7.tmx">
-        <atlas name="crypt"/>
-    </map>
-    <map name="027-8.tmx">
-        <atlas name="crypt"/>
-    </map>
+  <map name="027-3.tmx">
+    <atlas name="crypt"/>
+  </map>
+  <map name="027-4.tmx">
+    <atlas name="crypt"/>
+  </map>
+  <map name="027-5.tmx">
+    <atlas name="crypt"/>
+  </map>
+  <map name="027-6.tmx">
+    <atlas name="crypt"/>
+  </map>
+  <map name="027-7.tmx">
+    <atlas name="crypt"/>
+  </map>
+  <map name="027-8.tmx">
+    <atlas name="crypt"/>
+  </map>
 <!-- Atlas All -->
-    <atlas name="all">
-        <file name="graphics/particles/aniblaze-medium.png|W:#746767"/>
-        <file name="graphics/particles/aniblaze-medium.png|W:#a831cf"/>
-        <file name="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659"/>
-        <file name="graphics/particles/bubble_8px.png"/>
-        <file name="graphics/particles/electricity.particle.png|W:#0000FF"/>
-        <file name="graphics/particles/electricity.particle.png|W:#FF0000"/>
-        <file name="graphics/particles/fog-medium-b.png|W:#535cd5"/>
-        <file name="graphics/particles/fog-medium-c.png"/>
-        <file name="graphics/particles/gloworb-medium.png|W:#00ffff"/>
-        <file name="graphics/particles/hot_coals.png"/>
-        <file name="graphics/particles/star-medium.png"/>
-        <file name="graphics/particles/star-medium.png|W:#ff0000,ffffff"/>
-        <file name="graphics/particles/star-medium.png|W:#00ff00,ffffff"/>
-        <file name="graphics/particles/mist-face-a.png|W:#855385"/>
-        <file name="graphics/particles/mist-face-b.png|W:#5b3558"/>
-        <file name="graphics/particles/orb-small.png|W:#e87a54"/>
-        <file name="graphics/particles/orb-small.png|W:#f4c874"/>
-        <file name="graphics/particles/orb-small.png|W:#00ffff"/>
-        <file name="graphics/particles/sparkle.png|W:#99ff66"/>
-        <file name="graphics/particles/casket-trap_96x96.png"/>
-    </atlas>
+  <atlas name="all">
+    <file name="graphics/particles/aniblaze-medium.png|W:#746767"/>
+    <file name="graphics/particles/aniblaze-medium.png|W:#a831cf"/>
+    <file name="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659"/>
+    <file name="graphics/particles/bubble_8px.png"/>
+    <file name="graphics/particles/electricity.particle.png|W:#0000FF"/>
+    <file name="graphics/particles/electricity.particle.png|W:#FF0000"/>
+    <file name="graphics/particles/fog-medium-b.png|W:#535cd5"/>
+    <file name="graphics/particles/fog-medium-c.png"/>
+    <file name="graphics/particles/gloworb-medium.png|W:#00ffff"/>
+    <file name="graphics/particles/hot_coals.png"/>
+    <file name="graphics/particles/star-medium.png"/>
+    <file name="graphics/particles/star-medium.png|W:#ff0000,ffffff"/>
+    <file name="graphics/particles/star-medium.png|W:#00ff00,ffffff"/>
+    <file name="graphics/particles/mist-face-a.png|W:#855385"/>
+    <file name="graphics/particles/mist-face-b.png|W:#5b3558"/>
+    <file name="graphics/particles/orb-small.png|W:#e87a54"/>
+    <file name="graphics/particles/orb-small.png|W:#f4c874"/>
+    <file name="graphics/particles/orb-small.png|W:#00ffff"/>
+    <file name="graphics/particles/sparkle.png|W:#99ff66"/>
+    <file name="graphics/particles/casket-trap_96x96.png"/>
+  </atlas>
 <!-- Desert Atlas -->
-    <atlas name="desert">
-        <file name="graphics/images/ambient/sandstorm.png"/>
-        <file name="graphics/tiles/desert1.png"/>
-        <file name="graphics/tiles/desert2.png"/>
-        <file name="graphics/tiles/desert3.png"/>
-        <file name="graphics/tiles/desert_castle2.png"/>
-        <file name="graphics/tiles/desert_castle.png"/>
-        <file name="graphics/tiles/desert_castle_x2.png"/>
-        <file name="graphics/tiles/desert_castle_x3.png"/>
-        <file name="graphics/tiles/desert_city.png"/>
-        <file name="graphics/tiles/desert_city_x2.png"/>
-        <file name="graphics/tiles/desert_city_x4.png"/>
-        <file name="graphics/tiles/desert_x2.png"/>
-        <file name="graphics/tiles/desert_x3.png"/>
-        <file name="graphics/tiles/desert_x5.png"/>
-        <file name="graphics/tiles/docks.png"/>
-        <file name="graphics/tiles/docks_x2.png"/>
-        <file name="graphics/tiles/docks_x4.png"/>
-        <file name="graphics/tiles/mountain.png"/>
-        <file name="graphics/tiles/trans_woodland_desert.png"/>
-        <file name="graphics/tiles/waterflow.png"/>
-        <file name="graphics/tiles/water_overflow.png"/>
-        <file name="graphics/tiles/water.png"/>
-    </atlas>
+  <atlas name="desert">
+    <file name="graphics/images/ambient/sandstorm.png"/>
+    <file name="graphics/tiles/desert1.png"/>
+    <file name="graphics/tiles/desert2.png"/>
+    <file name="graphics/tiles/desert3.png"/>
+    <file name="graphics/tiles/desert_castle2.png"/>
+    <file name="graphics/tiles/desert_castle.png"/>
+    <file name="graphics/tiles/desert_castle_x2.png"/>
+    <file name="graphics/tiles/desert_castle_x3.png"/>
+    <file name="graphics/tiles/desert_city.png"/>
+    <file name="graphics/tiles/desert_city_x2.png"/>
+    <file name="graphics/tiles/desert_city_x4.png"/>
+    <file name="graphics/tiles/desert_x2.png"/>
+    <file name="graphics/tiles/desert_x3.png"/>
+    <file name="graphics/tiles/desert_x5.png"/>
+    <file name="graphics/tiles/docks.png"/>
+    <file name="graphics/tiles/docks_x2.png"/>
+    <file name="graphics/tiles/docks_x4.png"/>
+    <file name="graphics/tiles/mountain.png"/>
+    <file name="graphics/tiles/trans_woodland_desert.png"/>
+    <file name="graphics/tiles/waterflow.png"/>
+    <file name="graphics/tiles/water_overflow.png"/>
+    <file name="graphics/tiles/water.png"/>
+  </atlas>
 <!-- Woodland Atlas -->
-    <atlas name="woodland">
-        <file name="graphics/images/ambient/clouds.png"/>
-        <file name="graphics/images/ambient/fog.png"/>
-        <file name="graphics/tiles/forest_cover.png"/>
-        <file name="graphics/tiles/forest.png"/>
-        <file name="graphics/tiles/mushrooms.png"/>
-        <file name="graphics/tiles/power_circle_x2.png"/>
-        <file name="graphics/tiles/soulmenhirs_x2.png"/>
-        <file name="graphics/tiles/woodenpump.png"/>
-        <file name="graphics/tiles/woodland_graveyard_crypt.png"/>
-        <file name="graphics/tiles/woodland_graveyard_ground.png"/>
-        <file name="graphics/tiles/woodland_graveyard_x3.png"/>
-        <file name="graphics/tiles/woodland_graveyard_x4.png"/>
-        <file name="graphics/tiles/woodland_ground.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_swamp.png"/>
-        <file name="graphics/tiles/woodland_village.png"/>
-        <file name="graphics/tiles/woodland_village_x2.png"/>
-        <file name="graphics/tiles/woodland_village_x3.png"/>
-        <file name="graphics/tiles/woodland_water.png"/>
-        <file name="graphics/tiles/woodland_x2.png"/>
-        <file name="graphics/tiles/woodland_x3.png"/>
-        <file name="graphics/tiles/woodland_x4.png"/>
-        <file name="graphics/tiles/woodland_x5.png"/>
-        <file name="graphics/tiles/woodland_x8.png"/>
-    </atlas>
+  <atlas name="woodland">
+    <file name="graphics/images/ambient/clouds.png"/>
+    <file name="graphics/images/ambient/fog.png"/>
+    <file name="graphics/tiles/forest_cover.png"/>
+    <file name="graphics/tiles/forest.png"/>
+    <file name="graphics/tiles/mushrooms.png"/>
+    <file name="graphics/tiles/power_circle_x2.png"/>
+    <file name="graphics/tiles/soulmenhirs_x2.png"/>
+    <file name="graphics/tiles/woodenpump.png"/>
+    <file name="graphics/tiles/woodland_graveyard_crypt.png"/>
+    <file name="graphics/tiles/woodland_graveyard_ground.png"/>
+    <file name="graphics/tiles/woodland_graveyard_x3.png"/>
+    <file name="graphics/tiles/woodland_graveyard_x4.png"/>
+    <file name="graphics/tiles/woodland_ground.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_swamp.png"/>
+    <file name="graphics/tiles/woodland_village.png"/>
+    <file name="graphics/tiles/woodland_village_x2.png"/>
+    <file name="graphics/tiles/woodland_village_x3.png"/>
+    <file name="graphics/tiles/woodland_water.png"/>
+    <file name="graphics/tiles/woodland_x2.png"/>
+    <file name="graphics/tiles/woodland_x3.png"/>
+    <file name="graphics/tiles/woodland_x4.png"/>
+    <file name="graphics/tiles/woodland_x5.png"/>
+    <file name="graphics/tiles/woodland_x8.png"/>
+  </atlas>
 <!-- Snow Atlas -->
-    <atlas name="snow">
-        <file name="graphics/images/ambient/snow.png"/>
-        <file name="graphics/tiles/barbarians_outdoor.png"/>
-        <file name="graphics/tiles/barbarians_yurt_x4.png"/>
-        <file name="graphics/tiles/snow_docks.png"/>
-        <file name="graphics/tiles/snow_ground.png"/>
-        <file name="graphics/tiles/snow_tree_x3.png"/>
-        <file name="graphics/tiles/snow.png"/>
-        <file name="graphics/tiles/snow_village2.png"/>
-        <file name="graphics/tiles/snow_village.png"/>
-        <file name="graphics/tiles/snow_x2.png"/>
-        <file name="graphics/tiles/snow_x3.png"/>
-    </atlas>
+  <atlas name="snow">
+    <file name="graphics/images/ambient/snow.png"/>
+    <file name="graphics/tiles/barbarians_outdoor.png"/>
+    <file name="graphics/tiles/barbarians_yurt_x4.png"/>
+    <file name="graphics/tiles/snow_docks.png"/>
+    <file name="graphics/tiles/snow_ground.png"/>
+    <file name="graphics/tiles/snow_tree_x3.png"/>
+    <file name="graphics/tiles/snow.png"/>
+    <file name="graphics/tiles/snow_village2.png"/>
+    <file name="graphics/tiles/snow_village.png"/>
+    <file name="graphics/tiles/snow_x2.png"/>
+    <file name="graphics/tiles/snow_x3.png"/>
+  </atlas>
 <!-- Crypt -->
-    <atlas name="crypt">
-        <file name="graphics/tiles/crypt1.png"/>
-        <file name="graphics/tiles/crypt2.png"/>
-        <file name="graphics/tiles/crypt2_x4.png"/>
-        <file name="graphics/tiles/crypt_blockwall.png"/>
-        <file name="graphics/tiles/crypt_fringe2_x3.png"/>
-        <file name="graphics/tiles/crypt_fringe_x3.png"/>
-        <file name="graphics/tiles/crypt_x4.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-    </atlas>
+  <atlas name="crypt">
+    <file name="graphics/tiles/crypt1.png"/>
+    <file name="graphics/tiles/crypt2.png"/>
+    <file name="graphics/tiles/crypt2_x4.png"/>
+    <file name="graphics/tiles/crypt_blockwall.png"/>
+    <file name="graphics/tiles/crypt_fringe2_x3.png"/>
+    <file name="graphics/tiles/crypt_fringe_x3.png"/>
+    <file name="graphics/tiles/crypt_x4.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+  </atlas>
 <!-- Ship -->
-    <atlas name="ship">
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-        <file name="graphics/tiles/inn_x3.png"/>
-    </atlas>
+  <atlas name="ship">
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+    <file name="graphics/tiles/inn_x3.png"/>
+  </atlas>
 <!-- Interior Atlas -->
-    <atlas name="interiordesert">
-        <file name="graphics/tiles/barbarians_outdoor.png"/>
-        <file name="graphics/tiles/cave2_bilevel.png"/>
-        <file name="graphics/tiles/cave2.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine_x4.png"/>
-        <file name="graphics/tiles/cave2_x2.png"/>
-        <file name="graphics/tiles/desert_castle_interior.png"/>
-        <file name="graphics/tiles/desert_castle_interior_x2.png"/>
-        <file name="graphics/tiles/desert_castle_interior_x4.png"/>
-        <file name="graphics/tiles/desert_castle_interior_x5.png"/>
-        <file name="graphics/tiles/desert_city_indoors.png"/>
-        <file name="graphics/tiles/desert_city_indoors_x3.png"/>
-        <file name="graphics/tiles/desert_city_x2.png"/>
-        <file name="graphics/tiles/inn2.png"/>
-        <file name="graphics/tiles/inn.png"/>
-        <file name="graphics/tiles/inn_x2.png"/>
-        <file name="graphics/tiles/inn_x3.png"/>
-        <file name="graphics/tiles/inn_x4.png"/>
-        <file name="graphics/tiles/wood_lab.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-    </atlas>
-    <atlas name="interiorwoodland">
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-        <file name="graphics/tiles/potsx2.png"/>
-        <file name="graphics/tiles/woodland_village.png"/>
-    </atlas>
-    <atlas name="interiorsnow">
-        <file name="graphics/tiles/inn2.png"/>
-        <file name="graphics/tiles/inn.png"/>
-        <file name="graphics/tiles/inn_x2.png"/>
-        <file name="graphics/tiles/inn_x3.png"/>
-        <file name="graphics/tiles/inn_x4.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-    </atlas>
+  <atlas name="interiordesert">
+    <file name="graphics/tiles/barbarians_outdoor.png"/>
+    <file name="graphics/tiles/cave2_bilevel.png"/>
+    <file name="graphics/tiles/cave2.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine_x4.png"/>
+    <file name="graphics/tiles/cave2_x2.png"/>
+    <file name="graphics/tiles/desert_castle_interior.png"/>
+    <file name="graphics/tiles/desert_castle_interior_x2.png"/>
+    <file name="graphics/tiles/desert_castle_interior_x4.png"/>
+    <file name="graphics/tiles/desert_castle_interior_x5.png"/>
+    <file name="graphics/tiles/desert_city_indoors.png"/>
+    <file name="graphics/tiles/desert_city_indoors_x3.png"/>
+    <file name="graphics/tiles/desert_city_x2.png"/>
+    <file name="graphics/tiles/inn2.png"/>
+    <file name="graphics/tiles/inn.png"/>
+    <file name="graphics/tiles/inn_x2.png"/>
+    <file name="graphics/tiles/inn_x3.png"/>
+    <file name="graphics/tiles/inn_x4.png"/>
+    <file name="graphics/tiles/wood_lab.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+  </atlas>
+  <atlas name="interiorwoodland">
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+    <file name="graphics/tiles/potsx2.png"/>
+    <file name="graphics/tiles/woodland_village.png"/>
+  </atlas>
+  <atlas name="interiorsnow">
+    <file name="graphics/tiles/inn2.png"/>
+    <file name="graphics/tiles/inn.png"/>
+    <file name="graphics/tiles/inn_x2.png"/>
+    <file name="graphics/tiles/inn_x3.png"/>
+    <file name="graphics/tiles/inn_x4.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+  </atlas>
 <!-- Underground Atlas -->
-    <atlas name="desertunderground">
-        <file name="graphics/images/ambient/spotlight.png"/>
-        <file name="graphics/tiles/barbarians_outdoor.png"/>
-        <file name="graphics/tiles/cave2_bilevel.png"/>
-        <file name="graphics/tiles/cave2_bilevel_water_lava.png"/>
-        <file name="graphics/tiles/cave2.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine_x2.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine_x3.png"/>
-        <file name="graphics/tiles/cave2_sewer_mine_x4.png"/>
-        <file name="graphics/tiles/cave2_sewers.png"/>
-        <file name="graphics/tiles/cave2_transistions.png"/>
-        <file name="graphics/tiles/cave2_x2.png"/>
-        <file name="graphics/tiles/inn.png"/>
-        <file name="graphics/tiles/woodland_ground.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-    </atlas>
-    <atlas name="woodlandunderground">
-        <file name="graphics/images/ambient/spotlight.png"/>
-        <file name="graphics/tiles/barbarians_outdoor.png"/>
-        <file name="graphics/tiles/cave_ani_wetwall.png"/>
-        <file name="graphics/tiles/cave_bilevel.png"/>
-        <file name="graphics/tiles/cave.png"/>
-        <file name="graphics/tiles/cave_x2.png"/>
-        <file name="graphics/tiles/desert2.png"/>
-        <file name="graphics/tiles/evil_obelisk.png"/>
-        <file name="graphics/tiles/icecave.png"/>
-        <file name="graphics/tiles/inn.png"/>
-        <file name="graphics/tiles/inn_x2.png"/>
-        <file name="graphics/tiles/mushrooms.png"/>
-        <file name="graphics/tiles/pots_x2.png"/>
-        <file name="graphics/tiles/woodland_ground.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-        <file name="graphics/tiles/woodland_village.png"/>
-        <file name="graphics/tiles/woodland_village_x2.png"/>
-        <file name="graphics/tiles/woodland_x2.png"/>
-        <file name="graphics/tiles/woodland_x3.png"/>
-    </atlas>
-    <atlas name="snowunderground">
-        <file name="graphics/images/ambient/spotlight.png"/>
-        <file name="graphics/tiles/icecave.png"/>
-    </atlas>
-    <atlas name="arenaunderground">
-        <file name="graphics/images/ambient/spotlight.png"/>
-        <file name="graphics/tiles/arena.png"/>
-        <file name="graphics/tiles/cave2.png"/>
-        <file name="graphics/tiles/cave_bilevel.png"/>
-        <file name="graphics/tiles/cave.png"/>
-        <file name="graphics/tiles/cave_x2.png"/>
-        <file name="graphics/tiles/woodland_ground.png"/>
-        <file name="graphics/tiles/woodland_indoor.png"/>
-        <file name="graphics/tiles/woodland_indoor_x2.png"/>
-        <file name="graphics/tiles/woodland_indoor_x3.png"/>
-        <file name="graphics/tiles/woodland_village.png"/>
-        <file name="graphics/tiles/woodland_village_x2.png"/>
-    </atlas>
+  <atlas name="desertunderground">
+    <file name="graphics/images/ambient/spotlight.png"/>
+    <file name="graphics/tiles/barbarians_outdoor.png"/>
+    <file name="graphics/tiles/cave2_bilevel.png"/>
+    <file name="graphics/tiles/cave2_bilevel_water_lava.png"/>
+    <file name="graphics/tiles/cave2.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine_x2.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine_x3.png"/>
+    <file name="graphics/tiles/cave2_sewer_mine_x4.png"/>
+    <file name="graphics/tiles/cave2_sewers.png"/>
+    <file name="graphics/tiles/cave2_transistions.png"/>
+    <file name="graphics/tiles/cave2_x2.png"/>
+    <file name="graphics/tiles/inn.png"/>
+    <file name="graphics/tiles/woodland_ground.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+  </atlas>
+  <atlas name="woodlandunderground">
+    <file name="graphics/images/ambient/spotlight.png"/>
+    <file name="graphics/tiles/barbarians_outdoor.png"/>
+    <file name="graphics/tiles/cave_ani_wetwall.png"/>
+    <file name="graphics/tiles/cave_bilevel.png"/>
+    <file name="graphics/tiles/cave.png"/>
+    <file name="graphics/tiles/cave_x2.png"/>
+    <file name="graphics/tiles/desert2.png"/>
+    <file name="graphics/tiles/evil_obelisk.png"/>
+    <file name="graphics/tiles/icecave.png"/>
+    <file name="graphics/tiles/inn.png"/>
+    <file name="graphics/tiles/inn_x2.png"/>
+    <file name="graphics/tiles/mushrooms.png"/>
+    <file name="graphics/tiles/pots_x2.png"/>
+    <file name="graphics/tiles/woodland_ground.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+    <file name="graphics/tiles/woodland_village.png"/>
+    <file name="graphics/tiles/woodland_village_x2.png"/>
+    <file name="graphics/tiles/woodland_x2.png"/>
+    <file name="graphics/tiles/woodland_x3.png"/>
+  </atlas>
+  <atlas name="snowunderground">
+    <file name="graphics/images/ambient/spotlight.png"/>
+    <file name="graphics/tiles/icecave.png"/>
+  </atlas>
+  <atlas name="arenaunderground">
+    <file name="graphics/images/ambient/spotlight.png"/>
+    <file name="graphics/tiles/arena.png"/>
+    <file name="graphics/tiles/cave2.png"/>
+    <file name="graphics/tiles/cave_bilevel.png"/>
+    <file name="graphics/tiles/cave.png"/>
+    <file name="graphics/tiles/cave_x2.png"/>
+    <file name="graphics/tiles/woodland_ground.png"/>
+    <file name="graphics/tiles/woodland_indoor.png"/>
+    <file name="graphics/tiles/woodland_indoor_x2.png"/>
+    <file name="graphics/tiles/woodland_indoor_x3.png"/>
+    <file name="graphics/tiles/woodland_village.png"/>
+    <file name="graphics/tiles/woodland_village_x2.png"/>
+  </atlas>
 </maps>
diff --git a/monsters.xml b/monsters.xml
index 1e874c2f..a267f5cc 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -3,11 +3,10 @@
   See here for documentation: http://manaplus.org/monsters.xml
 -->
 <monsters offset="0">
-    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-        <its:translateRule selector="//monster/@name" translate="yes"/>
-        <its:translateRule selector="//*" translate="no"/>
-    </its:rules>
-
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//monster/@name" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
   <monster id="1002" name="Maggot" targetCursor="small">
     <sprite>monsters/maggot.xml</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
@@ -215,7 +214,7 @@
     <particlefx>graphics/particles/wisp.particle.xml</particlefx>
   </monster>
   <monster id="1041" name="Snail">
-    <sprite>monsters/snail.xml</sprite>
+    <sprite>monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02</sprite>
     <particlefx>graphics/particles/monster-snail-trail.particle.xml</particlefx>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
   </monster>
@@ -321,11 +320,11 @@
   </monster>
   <monster id="1064" name="Bandit">
     <sprite>monsters/bandit.xml</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </monster>
   <monster id="1065" name="Bandit Lord">
     <sprite>monsters/bandit-lord.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1066" name="Vampire Bat">
@@ -485,7 +484,7 @@
     <sprite>monsters/skeleton.xml|#D9BFFF</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#333333,555555,444444</sprite>
     <sprite>equipment/legs/shorts-male.xml|#333333,555555,444444</sprite>
-    <sprite>hairstyles/hairstyle05.xml|#333333</sprite>
+    <sprite>hairstyles/hairstyle05-male.xml|#333333</sprite>
     <particlefx>graphics/particles/monster-souleater.particle.xml</particlefx>
   </monster>
   <monster id="1098" name="Copper Slime">
@@ -495,7 +494,7 @@
   </monster>
   <monster id="1099" name="Sleeping Bandit">
     <sprite>monsters/sleeping-bandit.xml</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </monster>
   <monster id="1100" name="Azul Slime">
     <sprite>monsters/slime-littleslime.xml|#3080e4,d2f4ff</sprite>
@@ -505,7 +504,7 @@
     <sprite>monsters/spirit-demonic.xml|#444444,9933ff</sprite>
   </monster>
   <monster id="1102" name="Luvia">
-    <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>
@@ -521,7 +520,7 @@
     <sprite>equipment/chest/demonwarlordplate-male.xml|#444444,979797</sprite>
     <sprite>equipment/head/bull-male.xml</sprite>
     <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx>
-    <sprite>equipment/weapons/dagger-male.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite>
   </monster>
   <monster id="1104" name="Demonic Mouboo">
     <sprite>monsters/mouboo-demonic.xml</sprite>
@@ -587,16 +586,16 @@
   </monster>
   <monster id="1115" name="Sea Slime Mother">
     <sprite>monsters/slime-mother.xml|#4ca1a0,ffffff</sprite>
-    <sprite>equipment/weapons/bow-slimecovered-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;|#4Ca16e,ffffff</sprite>
+    <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#4Ca16e,ffffff</sprite>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
-    <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml" action="attack"/>
+    <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml|#4Ca16e,ffffff" action="attack"/>
   </monster>
   <monster id="1116" name="Undead Witch">
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
     <sprite>hairstyles/hairstyle08-male.xml</sprite>
     <sprite>equipment/head/witch-hat-male.xml</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</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>
     <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/>
   </monster>
   <monster id="1117" name="Undead Troll">
@@ -605,12 +604,12 @@
   </monster>
   <monster id="1118" name="Green Slime Mother">
     <sprite>monsters/slime-mother.xml|#72982c,ffffff</sprite>
-    <sprite>equipment/weapons/bow-slimecovered-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;|#72982c,ffffff</sprite>
+    <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#72982c,ffffff</sprite>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
-    <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml" action="attack"/>
+    <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml|#72982c,ffffff" action="attack"/>
   </monster>
   <monster id="1119" name="Thug">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/sailor-hat-male.xml</sprite>
     <sprite>equipment/feet/boots-male.xml</sprite>
     <sprite>equipment/chest/tanktop-male.xml</sprite>
@@ -618,16 +617,16 @@
     <attack id="1" type="direct"/>
   </monster>
   <monster id="1120" name="Swashbuckler">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml</sprite>
     <sprite>equipment/legs/pants-male.xml|#212121,555555</sprite>
     <sprite>equipment/head/bandana-male.xml|#212121,555555</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121,555555</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <attack id="1" type="direct"/>
   </monster>
   <monster id="1121" name="Grenadier">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#5178a0,1a294c;#d5b02c</sprite>
     <sprite>equipment/legs/pants-male.xml|#5178a0,1a294c</sprite>
     <sprite>equipment/head/piratehat-male.xml</sprite>
@@ -636,21 +635,21 @@
     <attack id="1" critical-hit-effect-id="31" hit-effect-id="402" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
   </monster>
   <monster id="1122" name="The Dread Pirate Marley">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/assassin-male.xml</sprite>
     <sprite>equipment/legs/assassin-male.xml</sprite>
-    <sprite>equipment/head/eyepatch.xml</sprite>
+    <sprite>equipment/head/eyepatch-male.xml</sprite>
     <sprite>equipment/feet/assassin-boots-male.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1123" name="The Dread Pirate Marley">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/assassin-male.xml</sprite>
     <sprite>equipment/legs/assassin-male.xml</sprite>
-    <sprite>equipment/head/eyepatch.xml</sprite>
+    <sprite>equipment/head/eyepatch-male.xml</sprite>
     <sprite>equipment/feet/assassin-boots-male.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1124" name="Wight">
@@ -675,7 +674,7 @@
     <sprite>monsters/demon.xml|#444444,979797</sprite>
     <sprite>equipment/feet/warlordboots-male.xml|#333333,878787</sprite>
     <sprite>equipment/hands/generic-male.xml|#242424,626262</sprite>
-    <sprite>equipment/chest/demonwarlordplate-male.xml|#ea0000979797</sprite>
+    <sprite>equipment/chest/demonwarlordplate-male.xml|#ea0000,979797</sprite>
     <sprite>equipment/head/bull-male.xml</sprite>
     <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx>
     <sprite>equipment/weapons/dagger-male.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite>
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>
diff --git a/paths.xml b/paths.xml
index 2bc08f95..d037d4b6 100644
--- a/paths.xml
+++ b/paths.xml
@@ -42,10 +42,10 @@ Also, don't forget to add the '/' path separator at the end of folder values.
   <option name="minimaps" value="graphics/minimaps/"/>
   <option name="maps" value="maps/"/>
   <option name="sfx" value="sfx/"/>
-  <!-- default sounds if no sounds are defined for the hit and miss events of a weapon
-       disabled for now because the current sound is too specific and loud  -->
-  <option name="attackSfxFile" value=""/>
-  <option name="missSfxFile" value=""/>
+  <option name="newQuestSfx" value="system/levelup.ogg"/>
+  <option name="completeQuestSfx" value="system/levelup.ogg"/>
+  <option name="attackSfxFile" value="weapons/knives/knife-hit1.ogg"/>
+  <option name="missSfxFile" value="fist-swish.ogg"/>
   <option name="music" value="music/"/>
   <option name="wallpapers" value="graphics/images/"/>
   <option name="wallpaperFile" value="login_wallpaper.png"/>
diff --git a/skills.xml b/skills.xml
index fd6d3b05..3f4966fb 100644
--- a/skills.xml
+++ b/skills.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!-- Copyright 2011 The Mana World Development Team -->
 <!-- See documentation at: http://manaplus.org/skills.xml -->
-
 <skills>
   <set name="Basic">
     <skill id="1" name="Emote" icon="graphics/skills/basic/emote.png"/>
diff --git a/status-effects.xml b/status-effects.xml
index 3e508a83..e33ccbf7 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <status-effects>
   <status-effect name="item-healing" id="70" block-id="24" persistent-particle-effect="true" start-particle="graphics/particles/circle.particle.xml"/>
-  <status-effect name="speed" id="37" block-id="21" icon="icons/haste-potion.xml" persistent-particle-effect="true" start-particle="graphics/particles/pink-violent-glow.particle.xml"/>
-  <status-effect name="strength" id="185" block-id="23" icon="icons/iron-potion.xml" persistent-particle-effect="true" start-particle="graphics/particles/orange-violent-glow.particle.xml"/>
+  <status-effect name="speed" id="37" block-id="21" icon="icons/haste-potion.xml|#da69e5,ffdaff" persistent-particle-effect="true" start-particle="graphics/particles/pink-violent-glow.particle.xml"/>
+  <status-effect name="strength" id="185" block-id="23" icon="icons/iron-potion.xml|#c05000,f0a000,f0f09f" persistent-particle-effect="true" start-particle="graphics/particles/orange-violent-glow.particle.xml"/>
   <status-effect name="invisibility" id="4096" block-id="12" icon="icons/invisible.xml" start-message="You are now invisible." end-message="You are no longer invisible." persistent-particle-effect="true" start-particle="graphics/particles/sphere-white.particle.xml"/>
   <status-effect name="poison" id="132" block-id="16" icon="icons/poison.xml" persistent-particle-effect="true" start-particle="graphics/particles/green-bubbles.particle.xml"/>
   <status-effect name="slow-poison" id="14" block-id="25" icon="icons/slow-poison.xml" persistent-particle-effect="true" start-particle="graphics/particles/small-green-bubbles.particle.xml"/>
@@ -10,7 +10,7 @@
   <status-effect name="hide" id="194" icon="icons/hidden.xml"/>
   <status-effect name="flying-backpack" id="196" icon="icons/feather.xml"/>
   <status-effect name="barrier" id="197" icon="icons/green-barrier.xml"/>
-  <status-effect name="phys-shield" id="199" icon="icons/red-rotating-hex.xml"/>
+  <status-effect name="phys-shield" id="199" icon="icons/red-rotating-hex.xml|#ff0000"/>
   <status-effect name="spell-attack-generic" id="2000" icon="icons/spell-attack-generic.xml"/>
   <status-effect name="spell-shearing" id="2001" icon="icons/spell-shearing.xml"/>
   <status-effect name="spell-protection-generic" id="2002" icon="icons/spell-protection-generic.xml"/>
diff --git a/weapons.xml b/weapons.xml
index 051e1f59..99d35836 100644
--- a/weapons.xml
+++ b/weapons.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <weapons>
-    <swords>
-        <item id="571"/>
-        <item id="570"/>
-        <item id="579"/>
-        <item id="867"/>
-        <item id="536"/>
-        <item id="758"/>
-    </swords>
-    <bows>
-        <item id="545"/>
-        <item id="530"/>
-    </bows>
-    <shields>
-        <item id="601"/>
-        <item id="602"/>
-    </shields>
+  <swords>
+    <item id="521"/>
+    <item id="522"/>
+    <item id="536"/>
+    <item id="570"/>
+    <item id="571"/>
+    <item id="579"/>
+    <item id="758"/>
+    <item id="867"/>
+    <item id="1201"/>
+  </swords>
+  <bows>
+    <item id="545"/>
+    <item id="530"/>
+    <item id="878"/>
+    <item id="903"/>
+    <item id="1200"/>
+  </bows>
+  <shields>
+    <item id="601"/>
+    <item id="602"/>
+    <item id="603"/>
+  </shields>
 </weapons>
-- 
cgit v1.2.3-60-g2f50