139 files changed, 390 insertions, 375 deletions

diff --git a/graphics/emotes/afraid.png b/graphics/emotes/afraid.png
index b79a7a76..b79a7a76 100755..100644
--- a/graphics/emotes/afraid.png
+++ b/graphics/emotes/afraid.png
diff --git a/graphics/emotes/alien.png b/graphics/emotes/alien.png
index c6df714f..c6df714f 100755..100644
--- a/graphics/emotes/alien.png
+++ b/graphics/emotes/alien.png
diff --git a/graphics/emotes/angel.png b/graphics/emotes/angel.png
index 1046e9ce..1046e9ce 100755..100644
--- a/graphics/emotes/angel.png
+++ b/graphics/emotes/angel.png
diff --git a/graphics/emotes/angry.png b/graphics/emotes/angry.png
index e98e2c33..e98e2c33 100755..100644
--- a/graphics/emotes/angry.png
+++ b/graphics/emotes/angry.png
diff --git a/graphics/emotes/blah.png b/graphics/emotes/blah.png
index 5009b534..5009b534 100755..100644
--- a/graphics/emotes/blah.png
+++ b/graphics/emotes/blah.png
diff --git a/graphics/emotes/blush.png b/graphics/emotes/blush.png
index 76ce80f7..76ce80f7 100755..100644
--- a/graphics/emotes/blush.png
+++ b/graphics/emotes/blush.png
diff --git a/graphics/emotes/bored.png b/graphics/emotes/bored.png
index cc225e4b..cc225e4b 100755..100644
--- a/graphics/emotes/bored.png
+++ b/graphics/emotes/bored.png
diff --git a/graphics/emotes/bothered.png b/graphics/emotes/bothered.png
index 6b0f05d9..6b0f05d9 100755..100644
--- a/graphics/emotes/bothered.png
+++ b/graphics/emotes/bothered.png
diff --git a/graphics/emotes/cheerful.png b/graphics/emotes/cheerful.png
index f5cf2cc5..f5cf2cc5 100755..100644
--- a/graphics/emotes/cheerful.png
+++ b/graphics/emotes/cheerful.png
diff --git a/graphics/emotes/clever.png b/graphics/emotes/clever.png
index 0cbaf2e9..0cbaf2e9 100755..100644
--- a/graphics/emotes/clever.png
+++ b/graphics/emotes/clever.png
diff --git a/graphics/emotes/curious.png b/graphics/emotes/curious.png
index 8fefd6cb..8fefd6cb 100755..100644
--- a/graphics/emotes/curious.png
+++ b/graphics/emotes/curious.png
diff --git a/graphics/emotes/dead.png b/graphics/emotes/dead.png
index e3e4fae6..e3e4fae6 100755..100644
--- a/graphics/emotes/dead.png
+++ b/graphics/emotes/dead.png
diff --git a/graphics/emotes/disgust.png b/graphics/emotes/disgust.png
index 0bfcec54..0bfcec54 100755..100644
--- a/graphics/emotes/disgust.png
+++ b/graphics/emotes/disgust.png
diff --git a/graphics/emotes/empty.png b/graphics/emotes/empty.png
index 12cf2bf6..12cf2bf6 100755..100644
--- a/graphics/emotes/empty.png
+++ b/graphics/emotes/empty.png
diff --git a/graphics/emotes/evil.png b/graphics/emotes/evil.png
index c5b42f98..c5b42f98 100755..100644
--- a/graphics/emotes/evil.png
+++ b/graphics/emotes/evil.png
diff --git a/graphics/emotes/facepalm.png b/graphics/emotes/facepalm.png
index 1f936f95..1f936f95 100755..100644
--- a/graphics/emotes/facepalm.png
+++ b/graphics/emotes/facepalm.png
diff --git a/graphics/emotes/grin.png b/graphics/emotes/grin.png
index b99b6303..b99b6303 100755..100644
--- a/graphics/emotes/grin.png
+++ b/graphics/emotes/grin.png
diff --git a/graphics/emotes/halloween.png b/graphics/emotes/halloween.png
index bd8bd9d1..bd8bd9d1 100755..100644
--- a/graphics/emotes/halloween.png
+++ b/graphics/emotes/halloween.png
diff --git a/graphics/emotes/happy.png b/graphics/emotes/happy.png
index eb4ff755..eb4ff755 100755..100644
--- a/graphics/emotes/happy.png
+++ b/graphics/emotes/happy.png
diff --git a/graphics/emotes/headache.png b/graphics/emotes/headache.png
index 46f13e20..46f13e20 100755..100644
--- a/graphics/emotes/headache.png
+++ b/graphics/emotes/headache.png
diff --git a/graphics/emotes/heart.png b/graphics/emotes/heart.png
index b1118eb8..b1118eb8 100755..100644
--- a/graphics/emotes/heart.png
+++ b/graphics/emotes/heart.png
diff --git a/graphics/emotes/joyful.png b/graphics/emotes/joyful.png
index eb45c5cc..eb45c5cc 100755..100644
--- a/graphics/emotes/joyful.png
+++ b/graphics/emotes/joyful.png
diff --git a/graphics/emotes/laugh.png b/graphics/emotes/laugh.png
index af123ad5..af123ad5 100755..100644
--- a/graphics/emotes/laugh.png
+++ b/graphics/emotes/laugh.png
diff --git a/graphics/emotes/love.png b/graphics/emotes/love.png
index b4cf3826..b4cf3826 100755..100644
--- a/graphics/emotes/love.png
+++ b/graphics/emotes/love.png
diff --git a/graphics/emotes/melancholy.png b/graphics/emotes/melancholy.png
index 30a2c480..30a2c480 100755..100644
--- a/graphics/emotes/melancholy.png
+++ b/graphics/emotes/melancholy.png
diff --git a/graphics/emotes/meow.png b/graphics/emotes/meow.png
index 01dc9c49..01dc9c49 100755..100644
--- a/graphics/emotes/meow.png
+++ b/graphics/emotes/meow.png
diff --git a/graphics/emotes/money.png b/graphics/emotes/money.png
index ca73ae53..ca73ae53 100755..100644
--- a/graphics/emotes/money.png
+++ b/graphics/emotes/money.png
diff --git a/graphics/emotes/pain.png b/graphics/emotes/pain.png
index f2743ea7..f2743ea7 100755..100644
--- a/graphics/emotes/pain.png
+++ b/graphics/emotes/pain.png
diff --git a/graphics/emotes/perturbed.png b/graphics/emotes/perturbed.png
index 8b18197f..8b18197f 100755..100644
--- a/graphics/emotes/perturbed.png
+++ b/graphics/emotes/perturbed.png
diff --git a/graphics/emotes/rest.png b/graphics/emotes/rest.png
index 231fd267..231fd267 100755..100644
--- a/graphics/emotes/rest.png
+++ b/graphics/emotes/rest.png
diff --git a/graphics/emotes/sad.png b/graphics/emotes/sad.png
index 3870b0db..3870b0db 100755..100644
--- a/graphics/emotes/sad.png
+++ b/graphics/emotes/sad.png
diff --git a/graphics/emotes/shy.png b/graphics/emotes/shy.png
index bf1415e8..bf1415e8 100755..100644
--- a/graphics/emotes/shy.png
+++ b/graphics/emotes/shy.png
diff --git a/graphics/emotes/sleep.png b/graphics/emotes/sleep.png
index 8d8b04e1..8d8b04e1 100755..100644
--- a/graphics/emotes/sleep.png
+++ b/graphics/emotes/sleep.png
diff --git a/graphics/emotes/speech.png b/graphics/emotes/speech.png
index 2a1068be..2a1068be 100755..100644
--- a/graphics/emotes/speech.png
+++ b/graphics/emotes/speech.png
diff --git a/graphics/emotes/surprise.png b/graphics/emotes/surprise.png
index 51ff9202..51ff9202 100755..100644
--- a/graphics/emotes/surprise.png
+++ b/graphics/emotes/surprise.png
diff --git a/graphics/emotes/suspicious.png b/graphics/emotes/suspicious.png
index c74409a4..c74409a4 100755..100644
--- a/graphics/emotes/suspicious.png
+++ b/graphics/emotes/suspicious.png
diff --git a/graphics/emotes/swear.png b/graphics/emotes/swear.png
index 94783f78..94783f78 100755..100644
--- a/graphics/emotes/swear.png
+++ b/graphics/emotes/swear.png
diff --git a/graphics/emotes/tears.png b/graphics/emotes/tears.png
index 2cb5de81..2cb5de81 100755..100644
--- a/graphics/emotes/tears.png
+++ b/graphics/emotes/tears.png
diff --git a/graphics/emotes/tongue.png b/graphics/emotes/tongue.png
index beda1eaf..beda1eaf 100755..100644
--- a/graphics/emotes/tongue.png
+++ b/graphics/emotes/tongue.png
diff --git a/graphics/emotes/upset.png b/graphics/emotes/upset.png
index 7fd12127..7fd12127 100755..100644
--- a/graphics/emotes/upset.png
+++ b/graphics/emotes/upset.png
diff --git a/graphics/emotes/vicious.png b/graphics/emotes/vicious.png
index 111e2022..111e2022 100755..100644
--- a/graphics/emotes/vicious.png
+++ b/graphics/emotes/vicious.png
diff --git a/graphics/emotes/wink.png b/graphics/emotes/wink.png
index 1bc3bd10..1bc3bd10 100755..100644
--- a/graphics/emotes/wink.png
+++ b/graphics/emotes/wink.png
diff --git a/graphics/skills/basic/emote.png b/graphics/skills/basic/emote.png
index 5ce4b801..5ce4b801 100755..100644
--- a/graphics/skills/basic/emote.png
+++ b/graphics/skills/basic/emote.png
diff --git a/graphics/skills/basic/party.png b/graphics/skills/basic/party.png
index 2746751a..2746751a 100755..100644
--- a/graphics/skills/basic/party.png
+++ b/graphics/skills/basic/party.png
diff --git a/graphics/skills/basic/trade.png b/graphics/skills/basic/trade.png
index 25227baf..25227baf 100755..100644
--- a/graphics/skills/basic/trade.png
+++ b/graphics/skills/basic/trade.png
diff --git a/graphics/skills/focus/astralsoul.png b/graphics/skills/focus/astralsoul.png
index 1f541c87..1f541c87 100755..100644
--- a/graphics/skills/focus/astralsoul.png
+++ b/graphics/skills/focus/astralsoul.png
diff --git a/graphics/skills/focus/brawling.png b/graphics/skills/focus/brawling.png
index 890559e3..890559e3 100755..100644
--- a/graphics/skills/focus/brawling.png
+++ b/graphics/skills/focus/brawling.png
diff --git a/graphics/skills/focus/focus.png b/graphics/skills/focus/focus.png
index b40461cd..b40461cd 100755..100644
--- a/graphics/skills/focus/focus.png
+++ b/graphics/skills/focus/focus.png
diff --git a/graphics/skills/focus/mallardseye.png b/graphics/skills/focus/mallardseye.png
index 34d6e838..34d6e838 100755..100644
--- a/graphics/skills/focus/mallardseye.png
+++ b/graphics/skills/focus/mallardseye.png
diff --git a/graphics/skills/focus/raging.png b/graphics/skills/focus/raging.png
index a6e8e481..a6e8e481 100755..100644
--- a/graphics/skills/focus/raging.png
+++ b/graphics/skills/focus/raging.png
diff --git a/graphics/skills/focus/resistpoison.png b/graphics/skills/focus/resistpoison.png
index 9449f342..9449f342 100755..100644
--- a/graphics/skills/focus/resistpoison.png
+++ b/graphics/skills/focus/resistpoison.png
diff --git a/graphics/skills/focus/speed.png b/graphics/skills/focus/speed.png
index 2bc2b06f..2bc2b06f 100755..100644
--- a/graphics/skills/focus/speed.png
+++ b/graphics/skills/focus/speed.png
diff --git a/graphics/skills/magic/astral.png b/graphics/skills/magic/astral.png
index ba5bfde2..ba5bfde2 100755..100644
--- a/graphics/skills/magic/astral.png
+++ b/graphics/skills/magic/astral.png
diff --git a/graphics/skills/magic/basic.png b/graphics/skills/magic/basic.png
index 00ba54aa..00ba54aa 100755..100644
--- a/graphics/skills/magic/basic.png
+++ b/graphics/skills/magic/basic.png
diff --git a/graphics/skills/magic/life.png b/graphics/skills/magic/life.png
index c3e7dca6..c3e7dca6 100755..100644
--- a/graphics/skills/magic/life.png
+++ b/graphics/skills/magic/life.png
diff --git a/graphics/skills/magic/nature.png b/graphics/skills/magic/nature.png
index f29b603e..f29b603e 100755..100644
--- a/graphics/skills/magic/nature.png
+++ b/graphics/skills/magic/nature.png
diff --git a/graphics/skills/magic/transmutation.png b/graphics/skills/magic/transmutation.png
index 6bd82403..6bd82403 100755..100644
--- a/graphics/skills/magic/transmutation.png
+++ b/graphics/skills/magic/transmutation.png
diff --git a/graphics/skills/magic/war.png b/graphics/skills/magic/war.png
index b84fa5e9..b84fa5e9 100755..100644
--- a/graphics/skills/magic/war.png
+++ b/graphics/skills/magic/war.png
diff --git a/graphics/skills/skill-icon-ring.png b/graphics/skills/skill-icon-ring.png
index ed77ad84..ed77ad84 100755..100644
--- a/graphics/skills/skill-icon-ring.png
+++ b/graphics/skills/skill-icon-ring.png
diff --git a/graphics/skills/unknown.png b/graphics/skills/unknown.png
index c397391c..c397391c 100755..100644
--- a/graphics/skills/unknown.png
+++ b/graphics/skills/unknown.png
diff --git a/graphics/sprites/emote.png b/graphics/sprites/emote.png
index 6698c91c..6698c91c 100755..100644
--- a/graphics/sprites/emote.png
+++ b/graphics/sprites/emote.png
diff --git a/graphics/sprites/monsters/accessories/mouboo-antlers.png b/graphics/sprites/monsters/accessories/mouboo-antlers.png
index cab475ca..cab475ca 100755..100644
--- a/graphics/sprites/monsters/accessories/mouboo-antlers.png
+++ b/graphics/sprites/monsters/accessories/mouboo-antlers.png
diff --git a/graphics/sprites/monsters/mouboo.png b/graphics/sprites/monsters/mouboo.png
index 6629f45d..6629f45d 100755..100644
--- a/graphics/sprites/monsters/mouboo.png
+++ b/graphics/sprites/monsters/mouboo.png
diff --git a/graphics/sprites/npcs/childoutfits.png b/graphics/sprites/npcs/childoutfits.png
index 29cda7ce..29cda7ce 100755..100644
--- a/graphics/sprites/npcs/childoutfits.png
+++ b/graphics/sprites/npcs/childoutfits.png
diff --git a/graphics/sprites/npcs/childposes.png b/graphics/sprites/npcs/childposes.png
index d7bfde30..d7bfde30 100755..100644
--- a/graphics/sprites/npcs/childposes.png
+++ b/graphics/sprites/npcs/childposes.png
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index b0fdc4b2..272b1c1b 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -5,31 +5,31 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="South Tulimshar"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="545" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="551" name="Tulimshar1" tilewidth="32" tileheight="32">
+ <tileset firstgid="551" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="807" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="807" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="935" name="Tic-Tac-Toe" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="tictactoe" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tictactoe.png" width="128" height="96"/>
  </tileset>
- <tileset firstgid="947" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="947" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="167" height="114">
diff --git a/maps/001-2.tmx b/maps/001-2.tmx
index 200b21f9..5847f035 100644
--- a/maps/001-2.tmx
+++ b/maps/001-2.tmx
@@ -4,13 +4,13 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="South Tulimshar Indoor"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="160" height="100" opacity="0.99">
diff --git a/maps/001-3.tmx b/maps/001-3.tmx
index 29997e42..d6895fcd 100644
--- a/maps/001-3.tmx
+++ b/maps/001-3.tmx
@@ -4,10 +4,10 @@
   <property name="minimap" value="graphics/minimaps/001-3.png"/>
   <property name="name" value="Tulimshar Arena"/>
  </properties>
- <tileset firstgid="1" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="cave_x2" tilewidth="32" tileheight="64">
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index 3415c29c..dbf529b8 100644
--- a/maps/002-1.tmx
+++ b/maps/002-1.tmx
@@ -13,22 +13,22 @@
   <property name="overlay1scrollX" value="8"/>
   <property name="overlay1scrollY" value="-2"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
  </tileset>
- <tileset firstgid="515" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="515" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="531" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="531" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="547" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="547" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
  <tileset firstgid="553" name="tulimshar1" tilewidth="32" tileheight="32">
diff --git a/maps/002-4.tmx b/maps/002-4.tmx
index 303fc301..eb4665fe 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.tmx
@@ -8,7 +8,7 @@
  <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="131" name="cave_x2" tilewidth="32" tileheight="64">
diff --git a/maps/003-1.tmx b/maps/003-1.tmx
index f85a7d36..a5d242ab 100644
--- a/maps/003-1.tmx
+++ b/maps/003-1.tmx
@@ -5,25 +5,25 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="Beach"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="515" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="515" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="531" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="531" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="547" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="547" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="675" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="675" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
  <tileset firstgid="681" name="tulimshar1" tilewidth="32" tileheight="32">
diff --git a/maps/003-2.tmx b/maps/003-2.tmx
index 61949f6f..d1b0656a 100644
--- a/maps/003-2.tmx
+++ b/maps/003-2.tmx
@@ -3,19 +3,19 @@
  <properties>
   <property name="name" value="Beach House"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="75" height="50">
diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index 00c2ff45..3e1a1028 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -5,31 +5,31 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="Beach"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="545" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
  <tileset firstgid="551" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="807" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="807" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="935" name="Tic-Tac-Toe" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="tictactoe" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tictactoe.png" width="128" height="96"/>
  </tileset>
- <tileset firstgid="947" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="947" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="117" height="133">
diff --git a/maps/004-2.tmx b/maps/004-2.tmx
index 3b0f10ef..dfe87dfd 100644
--- a/maps/004-2.tmx
+++ b/maps/004-2.tmx
@@ -3,19 +3,19 @@
  <properties>
   <property name="name" value="Beach House"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="98" height="87">
diff --git a/maps/005-1.tmx b/maps/005-1.tmx
index 21c9c46c..a4bd75ce 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -23,16 +23,16 @@
  <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" trans="ff00ff" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
- <tileset firstgid="515" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="515" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="531" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="531" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="547" name="Mountain" tilewidth="32" tileheight="32">
+ <tileset firstgid="547" name="mountain" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/mountain.png" width="416" height="448"/>
  </tileset>
  <layer name="Ground" width="200" height="130">
diff --git a/maps/005-3.tmx b/maps/005-3.tmx
index 6bbb68bb..4df3d545 100644
--- a/maps/005-3.tmx
+++ b/maps/005-3.tmx
@@ -10,10 +10,10 @@
  <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="indoor2" tilewidth="32" tileheight="64">
+ <tileset firstgid="129" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="145" name="indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="145" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="401" name="collision" tilewidth="32" tileheight="32">
diff --git a/maps/006-1.tmx b/maps/006-1.tmx
index 270a611a..1856c934 100644
--- a/maps/006-1.tmx
+++ b/maps/006-1.tmx
@@ -11,13 +11,13 @@
  <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" trans="ff00ff" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
- <tileset firstgid="515" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="515" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="531" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="531" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="547" name="mountain" tilewidth="32" tileheight="32">
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index 457a978a..dea0237b 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -11,7 +11,7 @@
  <tileset firstgid="129" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="131" name="cave X2" tilewidth="32" tileheight="64">
+ <tileset firstgid="131" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
  <layer name="Ground" width="150" height="150">
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 0e016d87..921252f0 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -9,22 +9,22 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="449" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="449" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="705" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="705" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="144" height="124">
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 7e735aeb..7cda4713 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -9,28 +9,28 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="577" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="593" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="849" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="849" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="865" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="865" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="162" height="120">
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 46af4758..5675b566 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -9,25 +9,25 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="577" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="593" name="Woodland indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="849" name="Woodland indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="849" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="865" name="collision" tilewidth="32" tileheight="32">
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index 21b81a7c..491237c2 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -4,16 +4,16 @@
   <property name="music" value="Magick - Real.ogg"/>
   <property name="name" value="Hurnscald Indoor"/>
  </properties>
- <tileset firstgid="1" name="Woodland indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Woodland indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="289" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="291" name="Pots_x2" tilewidth="32" tileheight="32">
diff --git a/maps/009-3.tmx b/maps/009-3.tmx
index 539cc3ee..b7fe6ade 100644
--- a/maps/009-3.tmx
+++ b/maps/009-3.tmx
@@ -5,31 +5,31 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Hurnscald Cave"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="129" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="145" name="Cave Bilevel" tilewidth="32" tileheight="32">
+ <tileset firstgid="145" name="cave_bilevel" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_bilevel.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="401" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="401" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="657" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="657" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="673" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="673" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="689" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="689" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="945" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="945" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1201" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1201" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="151">
diff --git a/maps/009-4.tmx b/maps/009-4.tmx
index 438c4612..efcc5358 100644
--- a/maps/009-4.tmx
+++ b/maps/009-4.tmx
@@ -12,7 +12,7 @@
  <tileset firstgid="131" name="cave_x2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="163" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="163" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="419" name="cave_bilevel" tilewidth="32" tileheight="32">
@@ -27,7 +27,7 @@
  <tileset firstgid="995" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1251" name="indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1251" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1507" name="woodland_indoor_x2" tilewidth="32" tileheight="32">
diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index 55904c98..f2408ba7 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -9,28 +9,28 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="577" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="593" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="849" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="849" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="865" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="865" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="150" height="120">
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index 2b9a690f..6243e2ac 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -4,19 +4,19 @@
   <property name="music" value="Clouds Calling.ogg"/>
   <property name="name" value="Dimond's Cove"/>
  </properties>
- <tileset firstgid="1" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="289" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="291" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="291" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="107" height="110">
diff --git a/maps/011-1.tmx b/maps/011-1.tmx
index 0fd95f34..a2f6f0df 100644
--- a/maps/011-1.tmx
+++ b/maps/011-1.tmx
@@ -9,28 +9,28 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="577" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="593" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="849" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="849" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="865" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="865" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="154" height="124">
diff --git a/maps/011-3.tmx b/maps/011-3.tmx
index dde15318..348d371f 100644
--- a/maps/011-3.tmx
+++ b/maps/011-3.tmx
@@ -8,13 +8,13 @@
   <property name="overlay0keepratio" value="true"/>
   <property name="overlay0parallax" value="0.0"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
- <tileset firstgid="131" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="131" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
  <layer name="Ground" width="60" height="60">
diff --git a/maps/011-4.tmx b/maps/011-4.tmx
index ef3328e9..987d4b99 100644
--- a/maps/011-4.tmx
+++ b/maps/011-4.tmx
@@ -5,13 +5,13 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Lake Cave"/>
  </properties>
- <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff" width="512" height="256"/>
  </tileset>
- <tileset firstgid="131" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="131" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="387" name="cave_x2" tilewidth="32" tileheight="64">
diff --git a/maps/011-6.tmx b/maps/011-6.tmx
index 88f72731..1d10e9d5 100644
--- a/maps/011-6.tmx
+++ b/maps/011-6.tmx
@@ -7,7 +7,7 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff" width="512" height="256"/>
  </tileset>
  <tileset firstgid="131" name="cave_bilevel" tilewidth="32" tileheight="32">
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index 56a9bbca..e566bd70 100644
--- a/maps/012-1.tmx
+++ b/maps/012-1.tmx
@@ -9,25 +9,25 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Water" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_water" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_water.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="369" name="Wooland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="369" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="625" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="625" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="627" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="627" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="168" height="188">
diff --git a/maps/012-3.tmx b/maps/012-3.tmx
index dc4d063e..a5410ce5 100644
--- a/maps/012-3.tmx
+++ b/maps/012-3.tmx
@@ -13,13 +13,13 @@
  <tileset firstgid="129" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
  </tileset>
- <tileset firstgid="131" name="cave X2" tilewidth="32" tileheight="64">
+ <tileset firstgid="131" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="147" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="147" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="403" name="animated wetwall" tilewidth="32" tileheight="32">
+ <tileset firstgid="403" name="cave_ani_wetwall" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_ani_wetwall.png" width="512" height="512"/>
   <tile id="0">
    <properties>
diff --git a/maps/012-4.tmx b/maps/012-4.tmx
index 876e2551..ae3893a8 100644
--- a/maps/012-4.tmx
+++ b/maps/012-4.tmx
@@ -6,7 +6,7 @@
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="cave_bilevel" tilewidth="32" tileheight="32">
@@ -15,7 +15,7 @@
  <tileset firstgid="385" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
  </tileset>
- <tileset firstgid="387" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="387" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="643" name="set_cave" tilewidth="32" tileheight="32">
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 8f6f3c27..34184259 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -9,19 +9,19 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="154" height="124">
diff --git a/maps/013-2.tmx b/maps/013-2.tmx
index 37ed2d61..a97c7828 100644
--- a/maps/013-2.tmx
+++ b/maps/013-2.tmx
@@ -4,22 +4,22 @@
   <property name="music" value="Magick - Real.ogg"/>
   <property name="name" value="Magic House"/>
  </properties>
- <tileset firstgid="1" name="Woodland indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Woodland indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="289" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="291" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="291" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="547" name="Woodland village" tilewidth="32" tileheight="32">
+ <tileset firstgid="547" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="88" height="63">
diff --git a/maps/013-3.tmx b/maps/013-3.tmx
index ae41d6d0..52876a10 100644
--- a/maps/013-3.tmx
+++ b/maps/013-3.tmx
@@ -5,43 +5,43 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Woodland Hills Cave"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave Bilevel" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="cave_bilevel" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_bilevel.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="385" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="401" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="401" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="657" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="657" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="913" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="913" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="945" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="945" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="977" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="977" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1233" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1233" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1249" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1249" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1505" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1505" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1521" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="1521" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="1537" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="200">
diff --git a/maps/014-1.tmx b/maps/014-1.tmx
index 6f99d809..f06926be 100644
--- a/maps/014-1.tmx
+++ b/maps/014-1.tmx
@@ -9,22 +9,22 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Water" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Woodland_water" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_water.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="625" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="625" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="140" height="120">
diff --git a/maps/014-3.tmx b/maps/014-3.tmx
index f19772e6..669206d2 100644
--- a/maps/014-3.tmx
+++ b/maps/014-3.tmx
@@ -7,13 +7,13 @@
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave X2" tilewidth="32" tileheight="64">
+ <tileset firstgid="129" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="145" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="145" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="140" height="200">
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index b16cc881..e1803687 100644
--- a/maps/015-1.tmx
+++ b/maps/015-1.tmx
@@ -9,40 +9,40 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="woodland village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="579" name="woodland-4" tilewidth="32" tileheight="128">
+ <tileset firstgid="579" name="Woodland_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="595" name="woodland-5" tilewidth="32" tileheight="160">
+ <tileset firstgid="595" name="Woodland_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/Woodland_x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="611" name="woodland-8" tilewidth="32" tileheight="256">
+ <tileset firstgid="611" name="Woodland_x8" tilewidth="32" tileheight="256">
   <image source="../graphics/tiles/Woodland_x8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="627" name="forest-cover" tilewidth="32" tileheight="32">
+ <tileset firstgid="627" name="Forest_cover" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest_cover.png" width="320" height="320"/>
  </tileset>
- <tileset firstgid="727" name="trans-woodland-desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="727" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="855" name="woodland-village-2" tilewidth="32" tileheight="64">
+ <tileset firstgid="855" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="871" name="woodland-swamp" tilewidth="32" tileheight="32">
+ <tileset firstgid="871" name="Woodland_swamp" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_swamp.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1127" name="Forest" tilewidth="32" tileheight="32">
diff --git a/maps/015-3.tmx b/maps/015-3.tmx
index 743d622c..2f7e882b 100644
--- a/maps/015-3.tmx
+++ b/maps/015-3.tmx
@@ -15,16 +15,16 @@
  <tileset firstgid="401" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="657" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="657" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="659" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="659" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="915" name="Woodland Indoor x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="915" name="woodland_indoor_x2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="947" name="Woodland Indoor x3" tilewidth="32" tileheight="32">
+ <tileset firstgid="947" name="woodland_indoor_x3" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
  <layer name="Ground" width="64" height="64">
diff --git a/maps/016-1.tmx b/maps/016-1.tmx
index d3f0621e..62942d2c 100644
--- a/maps/016-1.tmx
+++ b/maps/016-1.tmx
@@ -9,46 +9,46 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="545" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="545" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="561" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="561" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="817" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="817" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="833" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="833" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="835" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="835" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="867" name="woodland-4" tilewidth="32" tileheight="128">
+ <tileset firstgid="867" name="Woodland_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="883" name="woodland-5" tilewidth="32" tileheight="160">
+ <tileset firstgid="883" name="Woodland_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/Woodland_x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="899" name="woodland-8" tilewidth="32" tileheight="256">
+ <tileset firstgid="899" name="Woodland_x8" tilewidth="32" tileheight="256">
   <image source="../graphics/tiles/Woodland_x8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="915" name="forest-cover" tilewidth="32" tileheight="32">
+ <tileset firstgid="915" name="Forest_cover" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest_cover.png" width="320" height="320"/>
  </tileset>
- <tileset firstgid="1015" name="trans-woodland-desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="1015" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1143" name="woodland-swamp" tilewidth="32" tileheight="32">
+ <tileset firstgid="1143" name="Woodland_swamp" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_swamp.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1399" name="Forest" tilewidth="32" tileheight="32">
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index f6f36677..188d328d 100644
--- a/maps/017-1.tmx
+++ b/maps/017-1.tmx
@@ -9,19 +9,19 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="154" height="124">
diff --git a/maps/017-2.tmx b/maps/017-2.tmx
index 43c6c0d1..5405454e 100644
--- a/maps/017-2.tmx
+++ b/maps/017-2.tmx
@@ -3,10 +3,10 @@
  <properties>
   <property name="name" value="Theater"/>
  </properties>
- <tileset firstgid="1" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="53" height="51">
diff --git a/maps/017-3.tmx b/maps/017-3.tmx
index 29f9bdfa..3138a876 100644
--- a/maps/017-3.tmx
+++ b/maps/017-3.tmx
@@ -5,43 +5,43 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Woodland Cave"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave Bilevel" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="cave_bilevel" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_bilevel.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="385" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="401" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="401" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="657" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="657" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="913" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="913" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="945" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="945" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="977" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="977" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1233" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1233" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1249" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1249" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1505" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1505" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1521" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="1521" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="1537" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="110" height="100">
diff --git a/maps/017-4.tmx b/maps/017-4.tmx
index 0a166fe6..26f8a100 100644
--- a/maps/017-4.tmx
+++ b/maps/017-4.tmx
@@ -5,22 +5,22 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Hideout"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="129" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="145" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="145" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="401" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="401" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="417" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="417" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="433" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="250" height="75">
diff --git a/maps/017-9.tmx b/maps/017-9.tmx
index 4c6b623e..65f0cc75 100644
--- a/maps/017-9.tmx
+++ b/maps/017-9.tmx
@@ -3,10 +3,10 @@
  <properties>
   <property name="name" value="Backstage"/>
  </properties>
- <tileset firstgid="1" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Base" width="53" height="51">
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index 18c6702a..39987b73 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -9,28 +9,28 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="289" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="577" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="577" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="593" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="849" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="849" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="865" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="865" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="120">
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index fcbecc47..2cbd8965 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -4,19 +4,19 @@
   <property name="music" value="Magick - Real.ogg"/>
   <property name="name" value="Woodland Mining Camp Indoor"/>
  </properties>
- <tileset firstgid="1" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="289" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="545" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="146" height="70">
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index edbd639f..317673f4 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -5,43 +5,43 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Northern Mines"/>
  </properties>
- <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Cave Bilevel" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="cave_bilevel" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave_bilevel.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Cave x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="385" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="401" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="401" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="657" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="657" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="913" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="913" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="945" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="945" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="977" name="Woodland Village" tilewidth="32" tileheight="32">
+ <tileset firstgid="977" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1233" name="Woodland Village x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1233" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1249" name="Woodland Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1249" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1505" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="1505" name="woodland_indoor_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1521" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="1521" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="1537" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="200">
diff --git a/maps/019-1.tmx b/maps/019-1.tmx
index f173d5f7..2356249d 100644
--- a/maps/019-1.tmx
+++ b/maps/019-1.tmx
@@ -8,10 +8,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/019-3.tmx b/maps/019-3.tmx
index 08abf2fe..7cbcaa65 100644
--- a/maps/019-3.tmx
+++ b/maps/019-3.tmx
@@ -7,10 +7,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="icecave" tilewidth="32" tileheight="32">
diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index 257e8606..0237b676 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -8,16 +8,16 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Snow x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="Snow_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Snow_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="289" name="Snow_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="545" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="547" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/020-2.tmx b/maps/020-2.tmx
index e5c270ef..5692b338 100644
--- a/maps/020-2.tmx
+++ b/maps/020-2.tmx
@@ -4,19 +4,19 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Nivalis Indoor"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Inn_x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Inn_x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="160" height="100">
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index 3125a599..2962accf 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -8,7 +8,7 @@
  <tileset firstgid="1" name="icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="160" height="160">
diff --git a/maps/021-1.tmx b/maps/021-1.tmx
index ee28a8b5..aec80607 100644
--- a/maps/021-1.tmx
+++ b/maps/021-1.tmx
@@ -5,34 +5,34 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="North Tulimshar"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="545" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="551" name="Tulimshar1" tilewidth="32" tileheight="32">
+ <tileset firstgid="551" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="807" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="807" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="935" name="Tic-Tac-Toe" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="tictactoe" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tictactoe.png" width="128" height="96"/>
  </tileset>
- <tileset firstgid="947" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="947" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="949" name="Docks" tilewidth="32" tileheight="32">
+ <tileset firstgid="949" name="Tulimshar_Docks" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Tulimshar_Docks.png" width="512" height="320"/>
  </tileset>
  <layer name="Ground" width="178" height="168">
diff --git a/maps/021-2.tmx b/maps/021-2.tmx
index f8333ee5..2354b00e 100644
--- a/maps/021-2.tmx
+++ b/maps/021-2.tmx
@@ -4,19 +4,19 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="North Tulimshar Indoor"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="200" height="200">
diff --git a/maps/022-1.tmx b/maps/022-1.tmx
index 36b1e290..0b31d38d 100644
--- a/maps/022-1.tmx
+++ b/maps/022-1.tmx
@@ -5,34 +5,34 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="Tulimshar Port"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="545" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="551" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="551" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="679" name="Tulimshar1" tilewidth="32" tileheight="32">
+ <tileset firstgid="679" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="935" name="Docks" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="Tulimshar_Docks" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Tulimshar_Docks.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="1095" name="Tic-Tac-Toe" tilewidth="32" tileheight="32">
+ <tileset firstgid="1095" name="tictactoe" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tictactoe.png" width="128" height="96"/>
  </tileset>
- <tileset firstgid="1107" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1107" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="150" height="129">
diff --git a/maps/024-1.tmx b/maps/024-1.tmx
index 52526f92..0b2588d6 100644
--- a/maps/024-1.tmx
+++ b/maps/024-1.tmx
@@ -5,31 +5,31 @@
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="Tulimshar Canyon"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="545" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
  <tileset firstgid="551" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="807" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="807" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="935" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="937" name="Tic-Tac-Toe" tilewidth="32" tileheight="32">
+ <tileset firstgid="937" name="tictactoe" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tictactoe.png" width="128" height="96"/>
  </tileset>
  <layer name="Ground" width="119" height="122">
diff --git a/maps/024-2.tmx b/maps/024-2.tmx
index ec071e0c..d4c04238 100644
--- a/maps/024-2.tmx
+++ b/maps/024-2.tmx
@@ -4,19 +4,19 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Tulimshar Magic School"/>
  </properties>
- <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground1" width="200" height="200">
diff --git a/maps/025-1.tmx b/maps/025-1.tmx
index 2932b02d..c8d47461 100644
--- a/maps/025-1.tmx
+++ b/maps/025-1.tmx
@@ -8,37 +8,37 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="259" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="259" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="291" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="291" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="323" name="woodland-4" tilewidth="32" tileheight="128">
+ <tileset firstgid="323" name="Woodland_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="339" name="woodland-5" tilewidth="32" tileheight="160">
+ <tileset firstgid="339" name="Woodland_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/Woodland_x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="355" name="woodland-8" tilewidth="32" tileheight="256">
+ <tileset firstgid="355" name="Woodland_x8" tilewidth="32" tileheight="256">
   <image source="../graphics/tiles/Woodland_x8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="371" name="forest-cover" tilewidth="32" tileheight="32">
+ <tileset firstgid="371" name="Forest_cover" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest_cover.png" width="320" height="320"/>
  </tileset>
- <tileset firstgid="471" name="trans-woodland-desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="471" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="599" name="woodland village" tilewidth="32" tileheight="32">
+ <tileset firstgid="599" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="855" name="woodland-village-2" tilewidth="32" tileheight="64">
+ <tileset firstgid="855" name="Woodland_village_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="871" name="woodland-swamp" tilewidth="32" tileheight="32">
+ <tileset firstgid="871" name="Woodland_swamp" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_swamp.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1127" name="Forest" tilewidth="32" tileheight="32">
diff --git a/maps/026-1.tmx b/maps/026-1.tmx
index 76ce4b80..09a8fcaa 100644
--- a/maps/026-1.tmx
+++ b/maps/026-1.tmx
@@ -12,28 +12,28 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="259" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="259" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="291" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="291" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="323" name="woodland-4" tilewidth="32" tileheight="128">
+ <tileset firstgid="323" name="Woodland_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="339" name="woodland-5" tilewidth="32" tileheight="160">
+ <tileset firstgid="339" name="Woodland_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/Woodland_x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="355" name="woodland-8" tilewidth="32" tileheight="256">
+ <tileset firstgid="355" name="Woodland_x8" tilewidth="32" tileheight="256">
   <image source="../graphics/tiles/Woodland_x8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="371" name="forest-cover" tilewidth="32" tileheight="32">
+ <tileset firstgid="371" name="Forest_cover" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest_cover.png" width="320" height="320"/>
  </tileset>
- <tileset firstgid="471" name="woodland-swamp" tilewidth="32" tileheight="32">
+ <tileset firstgid="471" name="Woodland_swamp" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_swamp.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="727" name="Forest" tilewidth="32" tileheight="32">
diff --git a/maps/027-1.tmx b/maps/027-1.tmx
index 50389048..b36136db 100644
--- a/maps/027-1.tmx
+++ b/maps/027-1.tmx
@@ -16,46 +16,46 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="259" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="259" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="291" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="291" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="323" name="woodland-4" tilewidth="32" tileheight="128">
+ <tileset firstgid="323" name="Woodland_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="339" name="woodland-5" tilewidth="32" tileheight="160">
+ <tileset firstgid="339" name="Woodland_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/Woodland_x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="355" name="woodland-8" tilewidth="32" tileheight="256">
+ <tileset firstgid="355" name="Woodland_x8" tilewidth="32" tileheight="256">
   <image source="../graphics/tiles/Woodland_x8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="371" name="forest-cover" tilewidth="32" tileheight="32">
+ <tileset firstgid="371" name="Forest_cover" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest_cover.png" width="320" height="320"/>
  </tileset>
- <tileset firstgid="471" name="woodland-swamp" tilewidth="32" tileheight="32">
+ <tileset firstgid="471" name="Woodland_swamp" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_swamp.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="727" name="Forest" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Forest.png" width="608" height="672"/>
  </tileset>
- <tileset firstgid="1126" name="Graveyard x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="1126" name="Woodland_graveyard_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_graveyard_x3.png" width="512" height="480"/>
  </tileset>
- <tileset firstgid="1206" name="Graveyard x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="1206" name="Woodland_graveyard_x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tiles/Woodland_graveyard_x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="1222" name="Crypt Outdoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1222" name="Woodland_graveyard_crypt" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_graveyard_crypt.png" width="224" height="288"/>
  </tileset>
- <tileset firstgid="1285" name="graveyard_ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1285" name="Woodland_graveyard_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_graveyard_ground.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="1349" name="woodland village" tilewidth="32" tileheight="32">
+ <tileset firstgid="1349" name="Woodland_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="150" height="120">
diff --git a/maps/027-2.tmx b/maps/027-2.tmx
index 82b8337d..0084a54a 100644
--- a/maps/027-2.tmx
+++ b/maps/027-2.tmx
@@ -4,13 +4,13 @@
   <property name="music" value="InquisitiveInn.ogg"/>
   <property name="name" value="Graveyard Indoor"/>
  </properties>
- <tileset firstgid="1" name="Woodland indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="woodland_indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="woodland_indoor_x2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="289" name="Woodland Indoor x3" tilewidth="32" tileheight="32">
+ <tileset firstgid="289" name="woodland_indoor_x3" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="337" name="collision" tilewidth="32" tileheight="32">
diff --git a/maps/028-1.tmx b/maps/028-1.tmx
index 6703b46c..2fe71eaa 100644
--- a/maps/028-1.tmx
+++ b/maps/028-1.tmx
@@ -7,7 +7,7 @@
   <property name="overlay0scrollX" value="0.1"/>
   <property name="overlay0scrollY" value="0.05"/>
  </properties>
- <tileset firstgid="1" name="Woodland Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="Woodland_x2" tilewidth="32" tileheight="64">
diff --git a/maps/029-1.tmx b/maps/029-1.tmx
index 813e6de1..945fd4ce 100644
--- a/maps/029-1.tmx
+++ b/maps/029-1.tmx
@@ -12,13 +12,13 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="Woodland_ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="259" name="Woodland x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="259" name="Woodland_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="291" name="Woodland x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="291" name="Woodland_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
  <layer name="Ground" width="100" height="100">
diff --git a/maps/029-3.tmx b/maps/029-3.tmx
index 217fe681..81390b08 100644
--- a/maps/029-3.tmx
+++ b/maps/029-3.tmx
@@ -5,13 +5,13 @@
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Candor Cave"/>
  </properties>
- <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="3" name="Cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="3" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="131" name="Arena" tilewidth="32" tileheight="32">
+ <tileset firstgid="131" name="arena" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
  <layer name="Gound" width="100" height="100">
diff --git a/maps/030-1.tmx b/maps/030-1.tmx
index 02f0b431..4841f414 100644
--- a/maps/030-1.tmx
+++ b/maps/030-1.tmx
@@ -15,7 +15,7 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="273" name="Snow_ground" tilewidth="32" tileheight="32">
@@ -24,7 +24,7 @@
  <tileset firstgid="350" name="Snow_village2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow_village2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="606" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="606" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
  <tileset firstgid="608" name="Snow_tree_x3" tilewidth="64" tileheight="96">
diff --git a/maps/031-1.tmx b/maps/031-1.tmx
index 4ab813f4..1082e48d 100644
--- a/maps/031-1.tmx
+++ b/maps/031-1.tmx
@@ -7,16 +7,16 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Snow x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="273" name="Snow_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/Snow_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="289" name="Snow_village" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="545" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" trans="ff00ff" width="64" height="32"/>
  </tileset>
  <tileset firstgid="547" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/033-1.tmx b/maps/033-1.tmx
index 9af7d31e..e0447077 100644
--- a/maps/033-1.tmx
+++ b/maps/033-1.tmx
@@ -7,10 +7,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/034-1.tmx b/maps/034-1.tmx
index 52b768ff..400adb3a 100644
--- a/maps/034-1.tmx
+++ b/maps/034-1.tmx
@@ -19,10 +19,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/041-1.tmx b/maps/041-1.tmx
index 38595e49..76fdb68d 100644
--- a/maps/041-1.tmx
+++ b/maps/041-1.tmx
@@ -4,28 +4,28 @@
   <property name="music" value="faith.ogg"/>
   <property name="name" value="Beach"/>
  </properties>
- <tileset firstgid="1" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="385" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="641" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="897" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="897" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="903" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="903" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="919" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="919" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="935" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="150" height="125">
diff --git a/maps/042-1.tmx b/maps/042-1.tmx
index fdfa610a..1d40b33f 100644
--- a/maps/042-1.tmx
+++ b/maps/042-1.tmx
@@ -4,34 +4,34 @@
   <property name="music" value="The Mana World - Peace.ogg"/>
   <property name="name" value="Tulimshar Suburbs"/>
  </properties>
- <tileset firstgid="1" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Desert2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="desert2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Tulimshar1" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="tulimshar1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/tulimshar1.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="769" name="Trans woodland desert" tilewidth="32" tileheight="32">
+ <tileset firstgid="769" name="trans_woodland-desert" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="897" name="Desert x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="897" name="desert_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="913" name="Desert x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="913" name="desert_x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
  </tileset>
- <tileset firstgid="919" name="Desert x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="919" name="desert_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="935" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="935" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="937" name="Docks" tilewidth="32" tileheight="32">
+ <tileset firstgid="937" name="Tulimshar_Docks" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Tulimshar_Docks.png" width="512" height="320"/>
  </tileset>
- <tileset firstgid="1097" name="Desert1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1097" name="desert1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="160" height="170">
diff --git a/maps/044-1.tmx b/maps/044-1.tmx
index 7100203c..8216fb7e 100644
--- a/maps/044-1.tmx
+++ b/maps/044-1.tmx
@@ -19,7 +19,7 @@
  <tileset firstgid="376" name="Snow_tree_x3" tilewidth="64" tileheight="96">
   <image source="../graphics/tiles/Snow_tree_x3.png" width="256" height="96"/>
  </tileset>
- <tileset firstgid="380" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="380" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="396" name="Snow_village2" tilewidth="32" tileheight="32">
diff --git a/maps/045-1.tmx b/maps/045-1.tmx
index 195c722f..ad780963 100644
--- a/maps/045-1.tmx
+++ b/maps/045-1.tmx
@@ -21,7 +21,7 @@
  <tileset firstgid="513" name="Snow_tree_x3" tilewidth="64" tileheight="96">
   <image source="../graphics/tiles/Snow_tree_x3.png" width="256" height="96"/>
  </tileset>
- <tileset firstgid="517" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="517" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="200">
diff --git a/maps/046-1.tmx b/maps/046-1.tmx
index d90565f2..c3873820 100644
--- a/maps/046-1.tmx
+++ b/maps/046-1.tmx
@@ -31,10 +31,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/046-3.tmx b/maps/046-3.tmx
index b3af29e5..d4a10c37 100644
--- a/maps/046-3.tmx
+++ b/maps/046-3.tmx
@@ -7,10 +7,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/047-1.tmx b/maps/047-1.tmx
index 6531fb88..46c2d562 100644
--- a/maps/047-1.tmx
+++ b/maps/047-1.tmx
@@ -31,10 +31,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/maps/048-1.tmx b/maps/048-1.tmx
index 8e76cf87..890ea7f3 100644
--- a/maps/048-1.tmx
+++ b/maps/048-1.tmx
@@ -31,10 +31,10 @@
  <tileset firstgid="1" name="Snow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Snow.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Snow x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Snow_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Snow_x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="273" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="273" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="275" name="Snow_ground" tilewidth="32" tileheight="32">
diff --git a/tools/edit-map-tileset-names.sh b/tools/edit-map-tileset-names.sh
new file mode 100755
index 00000000..6c359e29
--- /dev/null
+++ b/tools/edit-map-tileset-names.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+for MAP in maps/*.tmx
+do
+    grep '<tileset\|<image' "$MAP" |
+        while read TILESET && read IMAGE
+        do
+            LINE=$TILESET
+            TILESET=${TILESET#*name=\"}
+            TILESET=${TILESET%%\"*}
+            IMAGE=${IMAGE#*source=\"}
+            IMAGE=${IMAGE%%.png\"*}
+            IMAGE=${IMAGE##*/}
+            sed "/$LINE/s/$TILESET/$IMAGE/" -i "$MAP"
+        done
+done