65 files changed, 52 insertions, 52 deletions

diff --git a/graphics/sprites/monsters/monster-goblin-fire.png b/graphics/sprites/monsters/goblin-fire.png
index b52d274e..b52d274e 100644
--- a/graphics/sprites/monsters/monster-goblin-fire.png
+++ b/graphics/sprites/monsters/goblin-fire.png
diff --git a/graphics/sprites/monsters/monster-goblin-ice.xml b/graphics/sprites/monsters/goblin-fire.xml
index a2183fe9..b2d09320 100644
--- a/graphics/sprites/monsters/monster-goblin-ice.xml
+++ b/graphics/sprites/monsters/goblin-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-ice.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/goblin-fire.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-goblin-ice.png b/graphics/sprites/monsters/goblin-ice.png
index cbba8f3e..cbba8f3e 100644
--- a/graphics/sprites/monsters/monster-goblin-ice.png
+++ b/graphics/sprites/monsters/goblin-ice.png
diff --git a/graphics/sprites/monsters/monster-goblin-fire.xml b/graphics/sprites/monsters/goblin-ice.xml
index 5b6045c1..bbc90d27 100644
--- a/graphics/sprites/monsters/monster-goblin-fire.xml
+++ b/graphics/sprites/monsters/goblin-ice.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-fire.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/goblin-ice.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-lizard.png b/graphics/sprites/monsters/lizard.png
index a5fc6edd..a5fc6edd 100644
--- a/graphics/sprites/monsters/monster-lizard.png
+++ b/graphics/sprites/monsters/lizard.png
diff --git a/graphics/sprites/monsters/monster-lizard.xml b/graphics/sprites/monsters/lizard.xml
index ec0dfeab..d3bf2964 100644
--- a/graphics/sprites/monsters/monster-lizard.xml
+++ b/graphics/sprites/monsters/lizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-lizard.png|W" width="80" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/lizard.png|W" width="80" height="56" />
 
 
 <action name="stand" imageset="base">
diff --git a/graphics/sprites/monsters/monster-logmonster.png b/graphics/sprites/monsters/logmonster.png
index 183faf69..183faf69 100644
--- a/graphics/sprites/monsters/monster-logmonster.png
+++ b/graphics/sprites/monsters/logmonster.png
diff --git a/graphics/sprites/monsters/monster-logmonster.xml b/graphics/sprites/monsters/logmonster.xml
index 664e9301..65b10bcb 100644
--- a/graphics/sprites/monsters/monster-logmonster.xml
+++ b/graphics/sprites/monsters/logmonster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/monster-logmonster.png" width="45" height="43" />
+  <imageset name="base" src="graphics/sprites/monsters/logmonster.png" width="45" height="43" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" delay="100" />
@@ -64,4 +64,4 @@
       <end />
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-maggot-giant.png b/graphics/sprites/monsters/maggot-giant.png
index a9bf0fb7..a9bf0fb7 100644
--- a/graphics/sprites/monsters/monster-maggot-giant.png
+++ b/graphics/sprites/monsters/maggot-giant.png
diff --git a/graphics/sprites/monsters/monster-maggot-giant.xml b/graphics/sprites/monsters/maggot-giant.xml
index a4f77936..77e14bb2 100644
--- a/graphics/sprites/monsters/monster-maggot-giant.xml
+++ b/graphics/sprites/monsters/maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-maggot-giant.png" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/maggot-giant.png" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-maggot.png b/graphics/sprites/monsters/maggot.png
index 64474f94..64474f94 100644
--- a/graphics/sprites/monsters/monster-maggot.png
+++ b/graphics/sprites/monsters/maggot.png
diff --git a/graphics/sprites/monsters/monster-maggot.xml b/graphics/sprites/monsters/maggot.xml
index f603b8db..da1d2a22 100644
--- a/graphics/sprites/monsters/monster-maggot.xml
+++ b/graphics/sprites/monsters/maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -63,4 +63,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-moggun.png b/graphics/sprites/monsters/moggun.png
index 9645ff0c..9645ff0c 100644
--- a/graphics/sprites/monsters/monster-moggun.png
+++ b/graphics/sprites/monsters/moggun.png
diff --git a/graphics/sprites/monsters/monster-moggun.xml b/graphics/sprites/monsters/moggun.xml
index 36b0708f..ff9125a6 100644
--- a/graphics/sprites/monsters/monster-moggun.xml
+++ b/graphics/sprites/monsters/moggun.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-moggun.png" width="77" height="76" />
+	<imageset name="base" src="graphics/sprites/monsters/moggun.png" width="77" height="76" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-skeleton.xml b/graphics/sprites/monsters/monster-skeleton.xml
deleted file mode 100644
index 1eef0ca5..00000000
--- a/graphics/sprites/monsters/monster-skeleton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monsters/monster-skeleton.png|W" width="64" height="64" />
-
-	<include file="player_male_base_old.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/monsters/monster-mouboo.png b/graphics/sprites/monsters/mouboo.png
index 813176bf..813176bf 100644
--- a/graphics/sprites/monsters/monster-mouboo.png
+++ b/graphics/sprites/monsters/mouboo.png
diff --git a/graphics/sprites/monsters/monster-mouboo.xml b/graphics/sprites/monsters/mouboo.xml
index 3ab9c3ba..38e65be4 100644
--- a/graphics/sprites/monsters/monster-mouboo.xml
+++ b/graphics/sprites/monsters/mouboo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mouboo.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/mouboo.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-mushroom-red.png b/graphics/sprites/monsters/mushroom-red.png
index 743d83e7..743d83e7 100644
--- a/graphics/sprites/monsters/monster-mushroom-red.png
+++ b/graphics/sprites/monsters/mushroom-red.png
diff --git a/graphics/sprites/monsters/monster-mushroom-red.xml b/graphics/sprites/monsters/mushroom-red.xml
index 1e2876a3..f8e152ba 100644
--- a/graphics/sprites/monsters/monster-mushroom-red.xml
+++ b/graphics/sprites/monsters/mushroom-red.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-red.png" width="42" height="33" />
+	<imageset name="base" src="graphics/sprites/monsters/mushroom-red.png" width="42" height="33" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-mushroom-spiky.png b/graphics/sprites/monsters/mushroom-spiky.png
index 78ac875d..78ac875d 100644
--- a/graphics/sprites/monsters/monster-mushroom-spiky.png
+++ b/graphics/sprites/monsters/mushroom-spiky.png
diff --git a/graphics/sprites/monsters/monster-mushroom-spiky.xml b/graphics/sprites/monsters/mushroom-spiky.xml
index 514704a5..0e57cc55 100644
--- a/graphics/sprites/monsters/monster-mushroom-spiky.xml
+++ b/graphics/sprites/monsters/mushroom-spiky.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-spiky.png" width="42" height="40" />
+	<imageset name="base" src="graphics/sprites/monsters/mushroom-spiky.png" width="42" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-pinkie.png b/graphics/sprites/monsters/pinkie.png
index ec5ae768..ec5ae768 100644
--- a/graphics/sprites/monsters/monster-pinkie.png
+++ b/graphics/sprites/monsters/pinkie.png
diff --git a/graphics/sprites/monsters/monster-pinkie.xml b/graphics/sprites/monsters/pinkie.xml
index a080ea3e..03aa2ef5 100644
--- a/graphics/sprites/monsters/monster-pinkie.xml
+++ b/graphics/sprites/monsters/pinkie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-pinkie.png" width="50" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/pinkie.png" width="50" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-reaper.png b/graphics/sprites/monsters/reaper.png
index 2e5de375..2e5de375 100755
--- a/graphics/sprites/monsters/monster-reaper.png
+++ b/graphics/sprites/monsters/reaper.png
diff --git a/graphics/sprites/monsters/monster-reaper.xml b/graphics/sprites/monsters/reaper.xml
index b098a750..00f667c7 100755
--- a/graphics/sprites/monsters/monster-reaper.xml
+++ b/graphics/sprites/monsters/reaper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-reaper.png" width="100" height="100" />
+	<imageset name="base" src="graphics/sprites/monsters/reaper.png" width="100" height="100" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -102,4 +102,4 @@
 		</animation>
 	</action>
 	
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-scorpion.png b/graphics/sprites/monsters/scorpion.png
index 0bd693fd..0bd693fd 100644
--- a/graphics/sprites/monsters/monster-scorpion.png
+++ b/graphics/sprites/monsters/scorpion.png
diff --git a/graphics/sprites/monsters/monster-scorpion.xml b/graphics/sprites/monsters/scorpion.xml
index ab1986a3..120bc5e1 100644
--- a/graphics/sprites/monsters/monster-scorpion.xml
+++ b/graphics/sprites/monsters/scorpion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-scorpion.png|W" width="48" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/scorpion.png|W" width="48" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-serqet.png b/graphics/sprites/monsters/serqet.png
index 3432dcf4..3432dcf4 100644
--- a/graphics/sprites/monsters/monster-serqet.png
+++ b/graphics/sprites/monsters/serqet.png
diff --git a/graphics/sprites/monsters/monster-serqet.xml b/graphics/sprites/monsters/serqet.xml
index d5fafc13..5c80fd92 100644
--- a/graphics/sprites/monsters/monster-serqet.xml
+++ b/graphics/sprites/monsters/serqet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-serqet.png" width="60" height="47" />
+	<imageset name="base" src="graphics/sprites/monsters/serqet.png" width="60" height="47" />
 
 	<action name="stand" imageset="base">
 	<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-silkworm.png b/graphics/sprites/monsters/silkworm.png
index b5a78964..b5a78964 100644
--- a/graphics/sprites/monsters/monster-silkworm.png
+++ b/graphics/sprites/monsters/silkworm.png
diff --git a/graphics/sprites/monsters/monster-silkworm.xml b/graphics/sprites/monsters/silkworm.xml
index c1388bae..6fdeca04 100644
--- a/graphics/sprites/monsters/monster-silkworm.xml
+++ b/graphics/sprites/monsters/silkworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-silkworm.png|W;R" width="32" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/silkworm.png|W;R" width="32" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-skeleton.png b/graphics/sprites/monsters/skeleton.png
index 53438cf3..53438cf3 100644
--- a/graphics/sprites/monsters/monster-skeleton.png
+++ b/graphics/sprites/monsters/skeleton.png
diff --git a/graphics/sprites/monsters/skeleton.xml b/graphics/sprites/monsters/skeleton.xml
new file mode 100644
index 00000000..cd8fe678
--- /dev/null
+++ b/graphics/sprites/monsters/skeleton.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/skeleton.png|W" width="64" height="64" />
+
+	<include file="player_male_base_old.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-skull-fire.png b/graphics/sprites/monsters/skull-fire.png
index 843a7a5f..843a7a5f 100644
--- a/graphics/sprites/monsters/monster-skull-fire.png
+++ b/graphics/sprites/monsters/skull-fire.png
diff --git a/graphics/sprites/monsters/monster-skull-fire.xml b/graphics/sprites/monsters/skull-fire.xml
index 44751124..97f26716 100644
--- a/graphics/sprites/monsters/monster-skull-fire.xml
+++ b/graphics/sprites/monsters/skull-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-skull-fire.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/skull-fire.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-skull-ice.png b/graphics/sprites/monsters/skull-ice.png
index dcc66922..dcc66922 100644
--- a/graphics/sprites/monsters/monster-skull-ice.png
+++ b/graphics/sprites/monsters/skull-ice.png
diff --git a/graphics/sprites/monsters/monster-skull-ice.xml b/graphics/sprites/monsters/skull-ice.xml
index 14375a0d..92651925 100644
--- a/graphics/sprites/monsters/monster-skull-ice.xml
+++ b/graphics/sprites/monsters/skull-ice.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-skull-ice.png" width="45" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/skull-ice.png" width="45" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-skull-poison.png b/graphics/sprites/monsters/skull-poison.png
index 5d1b3a48..5d1b3a48 100644
--- a/graphics/sprites/monsters/monster-skull-poison.png
+++ b/graphics/sprites/monsters/skull-poison.png
diff --git a/graphics/sprites/monsters/monster-skull-poison.xml b/graphics/sprites/monsters/skull-poison.xml
index a769e74c..b2fe31e9 100644
--- a/graphics/sprites/monsters/monster-skull-poison.xml
+++ b/graphics/sprites/monsters/skull-poison.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-skull-poison.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/skull-poison.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-slime.png b/graphics/sprites/monsters/slime.png
index ab14bbb5..ab14bbb5 100644
--- a/graphics/sprites/monsters/monster-slime.png
+++ b/graphics/sprites/monsters/slime.png
diff --git a/graphics/sprites/monsters/monster-slime.xml b/graphics/sprites/monsters/slime.xml
index 220a8e25..1940157d 100644
--- a/graphics/sprites/monsters/monster-slime.xml
+++ b/graphics/sprites/monsters/slime.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-slime.png|W" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/slime.png|W" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation>
diff --git a/graphics/sprites/monsters/monster-snail.png b/graphics/sprites/monsters/snail.png
index 2e974de2..2e974de2 100644
--- a/graphics/sprites/monsters/monster-snail.png
+++ b/graphics/sprites/monsters/snail.png
diff --git a/graphics/sprites/monsters/monster-snail.xml b/graphics/sprites/monsters/snail.xml
index 530345ed..efa46dba 100644
--- a/graphics/sprites/monsters/monster-snail.xml
+++ b/graphics/sprites/monsters/snail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-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:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-snake-cave.png b/graphics/sprites/monsters/snake-cave.png
index ea4045d1..ea4045d1 100644
--- a/graphics/sprites/monsters/monster-snake-cave.png
+++ b/graphics/sprites/monsters/snake-cave.png
diff --git a/graphics/sprites/monsters/monster-snake-cave.xml b/graphics/sprites/monsters/snake-cave.xml
index e7140451..4cffbb8d 100644
--- a/graphics/sprites/monsters/monster-snake-cave.xml
+++ b/graphics/sprites/monsters/snake-cave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-snake-cave.png" width="96" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/snake-cave.png" width="96" height="56" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -75,4 +75,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-snake.png b/graphics/sprites/monsters/snake.png
index 2164d69b..2164d69b 100644
--- a/graphics/sprites/monsters/monster-snake.png
+++ b/graphics/sprites/monsters/snake.png
diff --git a/graphics/sprites/monsters/monster-snake.xml b/graphics/sprites/monsters/snake.xml
index 027242f3..af59e4ae 100644
--- a/graphics/sprites/monsters/monster-snake.xml
+++ b/graphics/sprites/monsters/snake.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-snake.png|W" width="48" height="29" />
+	<imageset name="base" src="graphics/sprites/monsters/snake.png|W" width="48" height="29" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-spider.png b/graphics/sprites/monsters/spider.png
index b6f455a8..b6f455a8 100644
--- a/graphics/sprites/monsters/monster-spider.png
+++ b/graphics/sprites/monsters/spider.png
diff --git a/graphics/sprites/monsters/monster-spider.xml b/graphics/sprites/monsters/spider.xml
index 4fc336d5..ad0cde1a 100644
--- a/graphics/sprites/monsters/monster-spider.xml
+++ b/graphics/sprites/monsters/spider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png|W;R" width="35" height="35" />
+	<imageset name="base" src="graphics/sprites/monsters/spider.png|W;R" width="35" height="35" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-spinning-scythe.png b/graphics/sprites/monsters/spinning-scythe.png
index 1c5e0b45..1c5e0b45 100755
--- a/graphics/sprites/monsters/monster-spinning-scythe.png
+++ b/graphics/sprites/monsters/spinning-scythe.png
diff --git a/graphics/sprites/monsters/monster-spinning-scythe.xml b/graphics/sprites/monsters/spinning-scythe.xml
index ede84840..5f3cfa60 100755
--- a/graphics/sprites/monsters/monster-spinning-scythe.xml
+++ b/graphics/sprites/monsters/spinning-scythe.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-spinning-scythe.png" width="100" height="100" />
+	<imageset name="base" src="graphics/sprites/monsters/spinning-scythe.png" width="100" height="100" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -35,4 +35,4 @@
 		</animation>
 	</action>
 	
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-squirrel.png b/graphics/sprites/monsters/squirrel.png
index 0a1f1d36..0a1f1d36 100644
--- a/graphics/sprites/monsters/monster-squirrel.png
+++ b/graphics/sprites/monsters/squirrel.png
diff --git a/graphics/sprites/monsters/monster-squirrel.xml b/graphics/sprites/monsters/squirrel.xml
index 478e611a..d138b97a 100644
--- a/graphics/sprites/monsters/monster-squirrel.xml
+++ b/graphics/sprites/monsters/squirrel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/monster-squirrel.png" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/squirrel.png" width="32" height="32" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <sequence start="16" end="19" delay="375" />
diff --git a/graphics/sprites/monsters/monster-terranite-mask.png b/graphics/sprites/monsters/terranite-mask.png
index 3ec1653b..3ec1653b 100644
--- a/graphics/sprites/monsters/monster-terranite-mask.png
+++ b/graphics/sprites/monsters/terranite-mask.png
diff --git a/graphics/sprites/monsters/monster-terranite-mask.xml b/graphics/sprites/monsters/terranite-mask.xml
index f60b3819..46818d81 100644
--- a/graphics/sprites/monsters/monster-terranite-mask.xml
+++ b/graphics/sprites/monsters/terranite-mask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-terranite-mask.png" width="19" height="28"/>
+	<imageset name="base" src="graphics/sprites/monsters/terranite-mask.png" width="19" height="28"/>
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-terranite.png b/graphics/sprites/monsters/terranite.png
index 77f808b2..77f808b2 100644
--- a/graphics/sprites/monsters/monster-terranite.png
+++ b/graphics/sprites/monsters/terranite.png
diff --git a/graphics/sprites/monsters/monster-terranite.xml b/graphics/sprites/monsters/terranite.xml
index 7c0a287b..4a3e8c8e 100644
--- a/graphics/sprites/monsters/monster-terranite.xml
+++ b/graphics/sprites/monsters/terranite.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-terranite.png" 
+		src=      "graphics/sprites/monsters/terranite.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-vampire-bat.png b/graphics/sprites/monsters/vampire-bat.png
index 1e92e9ba..1e92e9ba 100644
--- a/graphics/sprites/monsters/monster-vampire-bat.png
+++ b/graphics/sprites/monsters/vampire-bat.png
diff --git a/graphics/sprites/monsters/monster-vampire-bat.xml b/graphics/sprites/monsters/vampire-bat.xml
index 450340e8..73102034 100644
--- a/graphics/sprites/monsters/monster-vampire-bat.xml
+++ b/graphics/sprites/monsters/vampire-bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-vampire-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/vampire-bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-wisp.png b/graphics/sprites/monsters/wisp.png
index c0641cae..c0641cae 100644
--- a/graphics/sprites/monsters/monster-wisp.png
+++ b/graphics/sprites/monsters/wisp.png
diff --git a/graphics/sprites/monsters/monster-wisp.xml b/graphics/sprites/monsters/wisp.xml
index 4ca542b3..68bb72dc 100644
--- a/graphics/sprites/monsters/monster-wisp.xml
+++ b/graphics/sprites/monsters/wisp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-wisp.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/wisp.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -74,4 +74,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-yeti.png b/graphics/sprites/monsters/yeti.png
index 5ccfe7b7..5ccfe7b7 100644
--- a/graphics/sprites/monsters/monster-yeti.png
+++ b/graphics/sprites/monsters/yeti.png
diff --git a/graphics/sprites/monsters/monster-yeti.xml b/graphics/sprites/monsters/yeti.xml
index 78c696f3..817bcee8 100644
--- a/graphics/sprites/monsters/monster-yeti.xml
+++ b/graphics/sprites/monsters/yeti.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-yeti.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/yeti.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-zombie.png b/graphics/sprites/monsters/zombie.png
index bf1f1818..bf1f1818 100644
--- a/graphics/sprites/monsters/monster-zombie.png
+++ b/graphics/sprites/monsters/zombie.png
diff --git a/graphics/sprites/monsters/monster-zombie.xml b/graphics/sprites/monsters/zombie.xml
index bb930af7..fda5fff7 100644
--- a/graphics/sprites/monsters/monster-zombie.xml
+++ b/graphics/sprites/monsters/zombie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-zombie.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/zombie.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">