Renamed the old itemXXX's to more fitting names. Deleted the now unused item002 stuff and made the goggles dyeable.

33 files changed, 459 insertions, 705 deletions

diff --git a/graphics/sprites/item012.png b/graphics/sprites/head-axehat.png
index a43e4d0e..a43e4d0e 100644
--- a/graphics/sprites/item012.png
+++ b/graphics/sprites/head-axehat.png
diff --git a/graphics/sprites/item012.xml b/graphics/sprites/head-axehat.xml
index 25f00c6e..608c5f4c 100644
--- a/graphics/sprites/item012.xml
+++ b/graphics/sprites/head-axehat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item012.png" width="22" height="22" />
+	<imageset name="base" src="graphics/sprites/head-axehat.png" width="22" height="22" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item018.png b/graphics/sprites/head-bandana.png
index 58156cce..58156cce 100644
--- a/graphics/sprites/item018.png
+++ b/graphics/sprites/head-bandana.png
diff --git a/graphics/sprites/item018.xml b/graphics/sprites/head-bandana.xml
index 5d1fae18..f3f01ce1 100644
--- a/graphics/sprites/item018.xml
+++ b/graphics/sprites/head-bandana.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item018.png" width="29" height="21" />
+	<imageset name="base" src="graphics/sprites/head-bandana.png" width="29" height="21" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item016.png b/graphics/sprites/head-circlet.png
index d8c5a74c..d8c5a74c 100644
--- a/graphics/sprites/item016.png
+++ b/graphics/sprites/head-circlet.png
diff --git a/graphics/sprites/item008.xml b/graphics/sprites/head-circlet.xml
index a4f27822..d61c37e0 100644
--- a/graphics/sprites/item008.xml
+++ b/graphics/sprites/head-circlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item008.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/head-circlet.png" width="32" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item017.png b/graphics/sprites/head-eyepatch.png
index b639f160..b639f160 100644
--- a/graphics/sprites/item017.png
+++ b/graphics/sprites/head-eyepatch.png
diff --git a/graphics/sprites/item009.xml b/graphics/sprites/head-eyepatch.xml
index 1bfee2c3..4a59321e 100644
--- a/graphics/sprites/item009.xml
+++ b/graphics/sprites/head-eyepatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item009.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/head-eyepatch.png" width="32" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item008.png b/graphics/sprites/head-fancyhat.png
index 492ac3ae..492ac3ae 100644
--- a/graphics/sprites/item008.png
+++ b/graphics/sprites/head-fancyhat.png
diff --git a/graphics/sprites/item006.xml b/graphics/sprites/head-fancyhat.xml
index ba76b055..fefc42c9 100644
--- a/graphics/sprites/item006.xml
+++ b/graphics/sprites/head-fancyhat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item006.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/head-fancyhat.png" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/head-goggles.png b/graphics/sprites/head-goggles.png
new file mode 100644
index 00000000..3b0394a0
--- /dev/null
+++ b/graphics/sprites/head-goggles.png
diff --git a/graphics/sprites/item014.xml b/graphics/sprites/head-goggles.xml
index f02e2606..b48ed193 100644
--- a/graphics/sprites/item014.xml
+++ b/graphics/sprites/head-goggles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item014.png" width="20" height="20" />
+	<imageset name="base" src="graphics/sprites/head-goggles.png|R" width="20" height="20" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item009.png b/graphics/sprites/head-minershat.png
index 3854c64e..3854c64e 100644
--- a/graphics/sprites/item009.png
+++ b/graphics/sprites/head-minershat.png
diff --git a/graphics/sprites/head-minershat.xml b/graphics/sprites/head-minershat.xml
new file mode 100644
index 00000000..229b646f
--- /dev/null
+++ b/graphics/sprites/head-minershat.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-minershat.png" 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="-1" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		</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="75"/>
+		  <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="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		</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="75"/>
+		  <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="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="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <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="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <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="0" 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/item013.png b/graphics/sprites/head-piratehat.png
index 99888900..99888900 100644
--- a/graphics/sprites/item013.png
+++ b/graphics/sprites/head-piratehat.png
diff --git a/graphics/sprites/item013.xml b/graphics/sprites/head-piratehat.xml
index 9f83cb11..2d1800e5 100644
--- a/graphics/sprites/item013.xml
+++ b/graphics/sprites/head-piratehat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item013.png" width="27" height="17" />
+	<imageset name="base" src="graphics/sprites/head-piratehat.png" width="27" height="17" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item011.png b/graphics/sprites/head-pumpkinhelmet.png
index cdce888e..cdce888e 100644
--- a/graphics/sprites/item011.png
+++ b/graphics/sprites/head-pumpkinhelmet.png
diff --git a/graphics/sprites/item011.xml b/graphics/sprites/head-pumpkinhelmet.xml
index 9162d4a4..0ef584f2 100644
--- a/graphics/sprites/item011.xml
+++ b/graphics/sprites/head-pumpkinhelmet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item011.png" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/head-pumpkinhelmet.png" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item010.png b/graphics/sprites/head-santahat.png
index 9cd575ca..9cd575ca 100644
--- a/graphics/sprites/item010.png
+++ b/graphics/sprites/head-santahat.png
diff --git a/graphics/sprites/item007.xml b/graphics/sprites/head-santahat.xml
index 44c60eb7..cc36e6cb 100644
--- a/graphics/sprites/item007.xml
+++ b/graphics/sprites/head-santahat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item007.png|W" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/head-santahat.png" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/item006.png b/graphics/sprites/head-silkheadband.png
index 4e69bd8c..4e69bd8c 100644
--- a/graphics/sprites/item006.png
+++ b/graphics/sprites/head-silkheadband.png
diff --git a/graphics/sprites/head-silkheadband.xml b/graphics/sprites/head-silkheadband.xml
new file mode 100644
index 00000000..6e9a2f78
--- /dev/null
+++ b/graphics/sprites/head-silkheadband.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-silkheadband.png" 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="-1" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		</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="75"/>
+		  <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="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		</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="75"/>
+		  <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="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="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <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="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <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="0" 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/item007.png b/graphics/sprites/head-standardheadband.png
index a3f3898b..a3f3898b 100644
--- a/graphics/sprites/item007.png
+++ b/graphics/sprites/head-standardheadband.png
diff --git a/graphics/sprites/head-standardheadband.xml b/graphics/sprites/head-standardheadband.xml
new file mode 100644
index 00000000..eaac9da3
--- /dev/null
+++ b/graphics/sprites/head-standardheadband.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/head-standardheadband.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="-1" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		</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="75"/>
+		  <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="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		</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="75"/>
+		  <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="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="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" 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="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <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="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <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="0" 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/item002.png b/graphics/sprites/item002.png
deleted file mode 100644
index 6aabeb2d..00000000
--- a/graphics/sprites/item002.png
+++ /dev/null
diff --git a/graphics/sprites/item002.xml b/graphics/sprites/item002.xml
deleted file mode 100644
index 9bbec951..00000000
--- a/graphics/sprites/item002.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/item002.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/item010.xml b/graphics/sprites/item010.xml
deleted file mode 100644
index 874fde8f..00000000
--- a/graphics/sprites/item010.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/item010.png" 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="-1" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		</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="75"/>
-		  <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="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		</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="75"/>
-		  <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="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="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <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="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <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="0" 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/item014.png b/graphics/sprites/item014.png
deleted file mode 100644
index 212851d1..00000000
--- a/graphics/sprites/item014.png
+++ /dev/null
diff --git a/graphics/sprites/item015.png b/graphics/sprites/item015.png
deleted file mode 100644
index e0e3d453..00000000
--- a/graphics/sprites/item015.png
+++ /dev/null
diff --git a/graphics/sprites/item015.xml b/graphics/sprites/item015.xml
deleted file mode 100644
index 4f5c9d6e..00000000
--- a/graphics/sprites/item015.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/item015.png" width="20" height="20" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-36" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-36"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-36"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-36"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-35" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-35" delay="75"/>
-		  <frame index="1" offsetX="-2" offsetY ="-36" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-37" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-35" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-35" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-36" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-34" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-32" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-37" delay="75" />
-		  <frame index="1" offsetX="2" offsetY ="-38" delay="75" />
-		  <frame index="1" offsetX="-2" offsetY ="-35" delay="75" />
-		  <frame index="1" offsetX="-3" offsetY ="-34" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-38" delay="75"/>
-		  <frame index="3" offsetX="2" offsetY ="-35" delay="75"/>
-		  <frame index="3" offsetX="3" offsetY ="-34" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-34" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="1" offsetY ="-36" delay="75" />
-		  <frame index="1" offsetX="1" offsetY ="-36" delay="75" />
-		  <frame index="1" offsetX="1" offsetY ="-36" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-37" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-37" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-35" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-36" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-36" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-37" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-37" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-24" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="2" offsetY ="-27"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-28"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-4" offsetY ="-27"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="19" offsetY="-15"/>
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/item016.xml b/graphics/sprites/item016.xml
deleted file mode 100644
index 84c67a89..00000000
--- a/graphics/sprites/item016.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/item016.png" width="32" height="32" />
-
-	<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="-1" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		</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="75"/>
-		  <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="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		</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="75"/>
-		  <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="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="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <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="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <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="0" 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/item017.xml b/graphics/sprites/item017.xml
deleted file mode 100644
index d59cfeb2..00000000
--- a/graphics/sprites/item017.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/item017.png" width="32" height="32" />
-
-	<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="-1" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		</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="75"/>
-		  <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="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		</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="75"/>
-		  <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="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="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" 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="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <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="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <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="0" 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/items.xml b/items.xml
index c3b483ad..24e74e00 100644
--- a/items.xml
+++ b/items.xml
@@ -195,7 +195,7 @@
         weight="15"
         defense="2"
         max-per-slot="1">
-        <sprite>item010.xml</sprite>
+        <sprite>head-santahat.xml</sprite>
     </item>
     <item id="512"
         image="use-food-gingerbreadman.png"
@@ -318,7 +318,7 @@
         weight="25"
         defense="5"
         max-per-slot="1">
-        <sprite>item008.xml</sprite>
+        <sprite>head-fancyhat.xml</sprite>
     </item>
     <item id="525"
         image="armor-head-minershat.png"
@@ -329,7 +329,7 @@
         weight="25"
         defense="4"
         max-per-slot="1">
-        <sprite>item009.xml</sprite>
+        <sprite>head-minershat.xml</sprite>
     </item>
     <item id="526"
         image="generic-coinbag.png"
@@ -510,7 +510,7 @@
         weight="45"
         max-per-slot="1"
         defense="3">
-        <sprite>item007.xml|#563f25,99784c,d8bd86,ffffff</sprite>
+        <sprite>head-standardheadband.xml|#563f25,99784c,d8bd86,ffffff</sprite>
     </item>
     <item id="544"
         image="armor-head-silkheadband.png"
@@ -521,7 +521,7 @@
         weight="20"
         defense="10"
         max-per-slot="1">
-        <sprite>item006.xml</sprite>
+        <sprite>head-silkheadband.xml</sprite>
     </item>
     <item id="545"
         image="weapon-bow-forestbow.png"
@@ -1162,7 +1162,7 @@
         weight="30"
         defense="4"
         max-per-slot="1">
-        <sprite>item011.xml</sprite>
+        <sprite>head-pumpkinhelmet.xml</sprite>
     </item>
     <item id="616"
         image="armor-head-axehat.png"
@@ -1173,7 +1173,7 @@
         weight="20"
         defense="4"
         max-per-slot="1">
-        <sprite>item012.xml</sprite>
+        <sprite>head-axehat.xml</sprite>
     </item>
     <item id="617"
         image="armor-head-piratehat.png"
@@ -1184,7 +1184,7 @@
         weight="25"
         defense="4"
         max-per-slot="1">
-        <sprite>item013.xml</sprite>
+        <sprite>head-piratehat.xml</sprite>
     </item>
     <item id="618"
         image="armor-head-goggles.png"
@@ -1195,7 +1195,7 @@
         weight="20"
         defense="2"
         max-per-slot="1">
-        <sprite>item014.xml</sprite>
+        <sprite>head-goggles.xml|#787878,f7f7f7</sprite>
     </item>
     <item id="619"
         image="armor-head-leathergoggles.png"
@@ -1206,7 +1206,7 @@
         weight="25"
         defense="3"
         max-per-slot="1">
-        <sprite>item015.xml</sprite>
+        <sprite>head-goggles.xml|#783c00,ff973b</sprite>
     </item>
     <item id="620"
         image="armor-head-circlet.png"
@@ -1217,7 +1217,7 @@
         weight="35"
         defense="4"
         max-per-slot="1">
-        <sprite>item016.xml</sprite>
+        <sprite>head-circlet.xml</sprite>
     </item>
     <item id="621"
         image="armor-head-eyepatch.png"
@@ -1228,7 +1228,7 @@
         weight="15"
         defense="3"
         max-per-slot="1">
-        <sprite>item017.xml</sprite>
+        <sprite>head-eyepatch.xml</sprite>
     </item>
     <item id="622"
         image="armor-head-bandana.png"
@@ -1239,7 +1239,7 @@
         weight="15"
         defense="3"
         max-per-slot="1">
-        <sprite>item018.xml</sprite>
+        <sprite>head-bandana.xml</sprite>
     </item>
     <item id="623"
         image="weapon-polearm-scythe.png"
@@ -2132,7 +2132,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#FFFFFF</sprite>
+        <sprite>head-standardheadband.xml|#FFFFFF</sprite>
     </item>
     <item id="725"
         image="armor-head-gmcap.png|R:#BF0E08"
@@ -3478,7 +3478,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#441111,aa3333,dd6666</sprite>
+        <sprite>head-standardheadband.xml|#441111,aa3333,dd6666</sprite>
     </item>
     <item id="2141"
         image="armor-head-standardheadband.png|W:#115511,22aa22,99dd99"
@@ -3488,7 +3488,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#115511,22aa22,99dd99</sprite>
+        <sprite>head-standardheadband.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2142"
         image="armor-head-standardheadband.png|W:#222255,6666ff"
@@ -3498,7 +3498,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#222255,6666ff</sprite>
+        <sprite>head-standardheadband.xml|#222255,6666ff</sprite>
     </item>
     <item id="2143"
         image="armor-head-standardheadband.png|W:#887722,ddcc66,ffffaa"
@@ -3508,7 +3508,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#887722,ddcc66,ffffaa</sprite>
+        <sprite>head-standardheadband.xml|#887722,ddcc66,ffffaa</sprite>
     </item>
     <item id="2144"
         image="armor-head-standardheadband.png|W:#223355,99aadd,bbccff"
@@ -3518,7 +3518,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#223355,99aadd,bbccff</sprite>
+        <sprite>head-standardheadband.xml|#223355,99aadd,bbccff</sprite>
     </item>
     <item id="2145"
         image="armor-head-standardheadband.png|W:#552255,ff66ff,ffffff"
@@ -3528,7 +3528,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#552255,ff66ff,ffffff</sprite>
+        <sprite>head-standardheadband.xml|#552255,ff66ff,ffffff</sprite>
     </item>
     <item id="2146"
         image="armor-head-standardheadband.png|W:#111111,222222,333333,444444,555555,aaaaaa"
@@ -3538,7 +3538,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite>head-standardheadband.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2147"
         image="armor-head-standardheadband.png|W:#80280f,b04810,ef681f,ffb830"
@@ -3548,7 +3548,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite>head-standardheadband.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2148"
         image="armor-head-standardheadband.png|W:#4f0a76,8010c0,d699f7"
@@ -3558,7 +3558,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite>head-standardheadband.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2149"
         image="armor-head-standardheadband.png|W:#155515,206620,409940"
@@ -3568,7 +3568,7 @@
         type="equip-head"
         defense="2"
         weight="5">
-        <sprite>item007.xml|#155515,206620,409940</sprite>
+        <sprite>head-standardheadband.xml|#155515,206620,409940</sprite>
     </item>
 
     <item id="2150"