From 6bd1dcf77dbfe3d5e5dc13c29791a15b59241cb4 Mon Sep 17 00:00:00 2001
From: Ian Haase <ian.haase2@gmail.com>
Date: Thu, 24 Jul 2014 15:34:45 +0200
Subject: [PATCH] Blackwater mountain fix released.

Now this area can be browsed in the world map!
Most of the maps have been edited and four new maps have been created for aligning purposes.
---
 AndorsTrail/res/xml/blackwater_mountain10.tmx |  13 +-
 AndorsTrail/res/xml/blackwater_mountain12.tmx |  95 ++++---
 AndorsTrail/res/xml/blackwater_mountain14.tmx |  21 +-
 AndorsTrail/res/xml/blackwater_mountain15.tmx | 119 ++++----
 AndorsTrail/res/xml/blackwater_mountain16.tmx | 128 ++++-----
 AndorsTrail/res/xml/blackwater_mountain17.tmx | 131 +++++----
 AndorsTrail/res/xml/blackwater_mountain18.tmx |  29 +-
 AndorsTrail/res/xml/blackwater_mountain19.tmx |  99 ++++---
 AndorsTrail/res/xml/blackwater_mountain20.tmx | 121 ++++----
 AndorsTrail/res/xml/blackwater_mountain30.tmx | 134 +++++----
 AndorsTrail/res/xml/blackwater_mountain31.tmx |  95 ++++---
 AndorsTrail/res/xml/blackwater_mountain32.tmx |  78 ++++--
 AndorsTrail/res/xml/blackwater_mountain33.tmx |  91 +++---
 AndorsTrail/res/xml/blackwater_mountain34.tmx |  93 ++++---
 AndorsTrail/res/xml/blackwater_mountain35.tmx |  96 ++++---
 AndorsTrail/res/xml/blackwater_mountain36.tmx |  91 +++---
 AndorsTrail/res/xml/blackwater_mountain37.tmx |  95 ++++---
 AndorsTrail/res/xml/blackwater_mountain38.tmx | 132 +++++----
 AndorsTrail/res/xml/blackwater_mountain39.tmx | 114 ++++----
 .../res/xml/blackwater_mountain39a.tmx        | 249 +++++++++++++++++
 AndorsTrail/res/xml/blackwater_mountain4.tmx  |  89 +++---
 AndorsTrail/res/xml/blackwater_mountain40.tmx |  89 +++---
 AndorsTrail/res/xml/blackwater_mountain43.tmx |  41 ++-
 AndorsTrail/res/xml/blackwater_mountain44.tmx |  28 +-
 AndorsTrail/res/xml/blackwater_mountain45.tmx | 112 ++++----
 AndorsTrail/res/xml/blackwater_mountain46.tmx |  91 +++---
 AndorsTrail/res/xml/blackwater_mountain47.tmx |  10 +-
 AndorsTrail/res/xml/blackwater_mountain48.tmx |   8 +-
 AndorsTrail/res/xml/blackwater_mountain49.tmx |  89 +++---
 AndorsTrail/res/xml/blackwater_mountain5.tmx  | 112 ++++----
 AndorsTrail/res/xml/blackwater_mountain50.tmx |  39 +--
 AndorsTrail/res/xml/blackwater_mountain51.tmx | 128 +++++----
 AndorsTrail/res/xml/blackwater_mountain52.tmx | 160 ++++++-----
 AndorsTrail/res/xml/blackwater_mountain5a.tmx | 234 ++++++++++++++++
 AndorsTrail/res/xml/blackwater_mountain5c.tmx | 207 ++++++++++++++
 AndorsTrail/res/xml/blackwater_mountain6.tmx  | 108 ++++----
 AndorsTrail/res/xml/blackwater_mountain7.tmx  |  36 ++-
 AndorsTrail/res/xml/blackwater_mountain7a.tmx | 224 +++++++++++++++
 AndorsTrail/res/xml/blackwater_mountain8.tmx  | 122 +++++----
 AndorsTrail/res/xml/blackwater_mountain9.tmx  | 259 +++++++++++-------
 AndorsTrail/res/xml/worldmap.xml              |  71 ++---
 41 files changed, 2688 insertions(+), 1593 deletions(-)
 create mode 100644 AndorsTrail/res/xml/blackwater_mountain39a.tmx
 create mode 100644 AndorsTrail/res/xml/blackwater_mountain5a.tmx
 create mode 100644 AndorsTrail/res/xml/blackwater_mountain5c.tmx
 create mode 100644 AndorsTrail/res/xml/blackwater_mountain7a.tmx

diff --git a/AndorsTrail/res/xml/blackwater_mountain10.tmx b/AndorsTrail/res/xml/blackwater_mountain10.tmx
index 98b99b459..b26240e48 100644
--- a/AndorsTrail/res/xml/blackwater_mountain10.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain10.tmx
@@ -138,12 +138,12 @@
    eJxjYCAPvBUgUyOS/ncUmkEtQC23pFPZP2mDJHwGExhM6YZSAEsvqWj+uc3NwHCHm3TzwqkcLiPNPFkm6ppHawBzr/QAuhsADE4MjA==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJzNk1EKACAIQzuCl/L+V+pXQuQtRjTwr71SV8ZaWYoqg9XpcfI6v8JTpPAI3/0+cs8vetEjmX/1diy6I9VDd939H5q/zjfNTeFNcuSZztbNq2dUtrpjR2ac+bvlbUOjRBI=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="256" y="608" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain9"/>
@@ -171,7 +171,7 @@
   <object name="exit" type="mapchange" x="96" y="96" width="32" height="32"/>
   <object name="sign_blackwater10" type="sign" x="288" y="224" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="forestboar4" type="spawn" x="320" y="64" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
@@ -182,10 +182,7 @@
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object name="tonis" type="spawn" x="160" y="64" width="96" height="64">
-   <properties>
-   </properties>
-  </object>
+  <object name="tonis" type="spawn" x="160" y="64" width="96" height="64"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain12.tmx b/AndorsTrail/res/xml/blackwater_mountain12.tmx
index 625153f9a..f4868e22b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain12.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain12.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="28" height="27" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJzVldEJgzAQhiVQwYfSBVzBZAR1BOsK7tSJpGtVqYHz966XpCrtwwcKid/5J7lYk2VWwMF7N3EX6MmcMZfhPI3gmxkEbKCvMWvapd56ecYaLIzHOlvFx+UyLNnRjGgNdHwNdfaKT8oF15HWQMd3Zl3nJxddP8wVM9Zq1jzUhxlxGT9zmVDXjIOMHpdtxiPz3VgP9YV8h/Ol/Kcz2/khvlQc5LXXOsX49vjut+v3677SvPHn279r/TUF3+OwxzYH+fDeon33CN8M9ljfU+xBPomQO/JffH5Pok+7b1L/g0LPg3Ynx1IJ93Zqltciy27Feb5qcrkTfd/kqZ0/bo/F7hWOkiFkjDYHeQHgTMgX
+   eJzVltEJgzAQhkOggg+lC3QFkxHUEVpXcKdOJF2rSg38njnvEhXahw8qRL/zz3mps8Y4Bk+uHyNPhg7uGQqemKdhfBM9g1P6Grukneut59+0BkfW0zpbwRfLpZ+zw4ywBlxfkzo7wcflQvcRa8D1D7usc8uF+0dzpRlLNUse9NGMYhm/Cx6ta8KTjF6XdcZD5LmpHvRpnhPz5bynt+v7Nb5cPMnrqH1K8R3x3L379+u+u/0Svu9wLc3XHMKMozO2OclHzy2cu2f4JuiMDTPFneTj0JyR/+ILPUl90nmT+x4Ifg/SmZxKxZzbuVleS2NupeyLeXN81ejyCh9mucenyZM68b9lao9pemXLh/2DcD22BdcngQ/F4MgE
   </data>
  </layer>
  <layer name="Objects" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJy9VktKA0EQHYNCND3a+5ATJCdRZ6EIAT/gKotAIIIHiArxCG492OQIJmuH9GgX02VXF9WTj8YHRWf6U1WvXn+SJH+PD50kC2tfri2tGfe9CbqN+FiPjBkSC9q59jnsApwfbXcBzo+2HFgXqF2vpn4S3vaqNTH9yi30A38zlST3qe+jeUr8UL85idd3v18P5FgPdvyC2JVrL3UVm+Y/TcOYEr9BDVfIfWzHz6yfc2ufR9U34LDl50FcnEN5cn7gD3zAWvAztDaytm/XlaqaA/039vvW+XpifJEnzjFunbQ/wSfW69H1ZbZttqocQK+xix8D5YWQ9inWAfwBxxeWN9qzln0gfnihXjX8IN5EVzypTtc6zB19SDELO5a7cawDv8sWzF+zFep0p8PcKWL7DmoPedO90mmE86i/CdE0VZWOqQoNefF+tPaKe2Ka+rqiAY5dfTKSv2G8sF2q9e+QQsn9EG9GYqJ+S+VrNyW60rE65Ereu5grnMdTZiPCY8j66t4tQF+Huvz27YD8B+Su4He/UXFdAJn2a2P3olF+DsQbCjUYMQ5wbnJSf64rainxp2tzt0dRy06kvqWgNfooXI3qdEasOg80f14vAJ4Hzo/y3OQ88Hec++H5xHTeBLRekh/k+H4SrqNnb5vYhpxl7iNjvnid10Wf8SncvdFueF+4x/j/hoLlte5e+S98A6ZSEto=
+   eJy1Vt1Kw1AMrkVhulPt/dgTuCdReqEIA3/Aq10MBhN8gKkwH8FbH6wFX2DbtWWtntDEk8ac2un8IJztpCfJl+SkDYIgWJhgq1jEQbCy8oFraaXA/4R1C5/HoV83CF3cBfMF6zJ2MfwY6y+4S358/Q9IfnyVGGDOIHeDhvxpeNnBvHrqV27Ij2LIbI5vI7fH49T4Uf2WzN8Qfz/v6b7urP6MyQWu53Hlm8c/j+o+NX6jBq4Q+5Tp3w/c//2u2yfOkqfkB/bABpwFO2MrEyu79nyJ/Qn7V/b/Ndp8EHyJJz1T4DmtP8Em5ese9xK7drpVDFCvKfrfBFqfUh7AHnB8EnGTPMa6DcIXL6pXAz/wN4srnrxOl6KmhWd+AHKrS1FPeZCzjPidor7TrdfpJq7HzuHrO8g9xM17pR/Wn+P2ZqymkanqGJm6EC+5T9JT5gSfi/PI5ZUEcIjPJCz+QvCidW3az5DcM5PBX8Z8Uv3oXQK6Oet9rmtCavTepVjhPp4ImTAeY7HX9N4CDON6Xf767oD4R2xWyNlfGH9dAEnszvrmYmHcM+BvrORgIjjAvUlZ/mVdqZYaf342xR6lWvY9+S2VWpONHHPUVGeCdh80ZOZ7vgB0HzKWU/kNpN0HOie/SeR7fCXs8Hg43pT5IpF4dDxf2pyic69H9XP87skea+O3YHe5rQ3J+ycMBZ8c50YvdLaox+R3Qy7i4r2y7e9oH3y5g/1P210U7Q==
   </data>
  </layer>
  <layer name="Above" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJy9VkESgzAINJ578N7xXf1B+hZf0D82o2+oHJhBDAgJdk+JBjYshGQYdLymiwUEeV/7ffhsanzgw2vTul6y5Xugcy9fns5jyx7we+7Qs8YB/j7p+H9JMTyo05VG6/5/C+BDROwdAXtf0vk71yyS7w6sF3Vl9QF5kvJlyWNPfJrvWnxrZ/+ROCUtAV4+zRfHczzOizM+ysXzSMe0vxUyjtDTA4yP1110vwBgXHfFx3sI9qh5rNeAdr5adcC8vv+YQ4BVU60+W/h66oXbFOEdAlzW+8aaZ9GenT+ulwc0Ph5bMb5vWvMjaYl8Vr8t9xB/y81jfV0ktHjvxA+eu18z
+   eJy9VkESgyAMRM51hnuHfqi9+wP7Fl/Qb/UdOvYNbUYzDTFgENq9KEgSNhuCxoQYT8tzWp+dM2r0brHPseHo3HcPOTYxSL7o+pgtt6PjXH69275r9oDzfUE+pRjg79GE34dGH2dK6DMq62b+fH9V4IWokSME7H1otvM8Z9fWmFub9qVZU3JeUph36krrA3TieiEvjY4l/FK+JX6z0H+4BnuaSDFjuQRAvD2Ntb44zjYcT5n9lcbiOtJ32t/o+Zby+UsgP153tfsFAHn9ih/vIdijvJVrIFZ3JXlAXe9/1BCgzWmqPo/EK6kXbhO75yDWkfvmudrE9nWx2zl+/ni+ckD5ITdvwzEgpd1RfXgf82TcZegVW5ey5/9yXshzbaT+kUrBc4kAXm/2+mZ+
   </data>
  </layer>
  <layer name="Walkable" width="28" height="27">
   <data encoding="base64" compression="zlib">
-   eJztU0EOwCAI8wn7lP//0rLDEkOktKCebEKiRmmL0J/W+o0bi+ODXY9nO/g8rPKB/EW8kQ4GKh/SXsUsV9XfLId6jnRFe6W+iDPaM5yZnt85YzbvyMfoVnSh+kfI1DLSraJS4yy8fsv0UEVbxgvzhp01JYfnT/krpk7sW1Wf4lHxh+4hTlaL0luVfqr8o52ff53hOBkvrbqlsA==
+   eJztU1sKwCAM8wi7lPe/0tiHIGW1ebh9GSi4ok3apf1qrZ84sTkexPOcG98x5/BlyHSxfaB8M2+mQ623uovO9iu4/b3VYPNKj+hbtL9MI8OpeF7xt7oHMx+im9G1mn8FZZaVbhbOjFVkflM85Ghz9g+5g+wWWqPaX+Q+Mif0LauP6ZPpD61T6dnhe8dPzn+M+zPOCsefcQM8v6C1
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="east" type="mapchange" x="864" y="544" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -164,7 +163,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="restless_dead_1" type="spawn" x="352" y="704" width="128" height="96"/>
   <object name="forestboar4" type="spawn" x="480" y="128" width="288" height="288"/>
   <object name="forestboar4" type="spawn" x="704" y="576" width="32" height="32"/>
@@ -174,5 +173,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain14.tmx b/AndorsTrail/res/xml/blackwater_mountain14.tmx
index 7790c8349..81122ce85 100644
--- a/AndorsTrail/res/xml/blackwater_mountain14.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain14.tmx
@@ -125,25 +125,25 @@
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzllcENwzAIRa0e0iWyQuIR0oyQZoWs0tGyV40EkkXBkISceviSD8CzP8beu5T2AA2PlMaGtmoNsRFM0FRqvVAtfjR3KbXeKOvskVzQhn4SNxd9nr/7iOZyz2fk8h7cxSXPV+TyHtzFJc+1HoB6VKuGJ8Yr4lKvs1LXE/NP3KP+R3CHEz5AzuTg1rM3B3EX9o5IcfXsrQFc6d3U8mn2tB54udq7ffS+RnE1ry3PrnB7trZ0xifpX6J868+W9un1SfqHJa51Vi2+Zkn+gL4CME27
+   eJzllc0NwyAMRhGHdomsQDJCSzfIzwhdpaNlr2LVliwHB0rNqYcnEcnwwudA9otzuwHBOzcybomI4zmxJFZ8hloLJwCeO0KulY0fnby0pwXX5V5gY2NLL/D0HyjzKfG6Hntg7ZWZR/TKHvTy8u8IvLIHvbyUudYDYEDO1qipqYW81OtJWbem5p+83+Zv4Q0NOQS8Q0tefvaikXcW90iujp+91cA7+iPafDp7Wg9qvfK+bP1erbxa1qXMfvEOYlyiJafcf4nmazmcvWdtTnINzVvaq1bPXbl8gDcZQE8n
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1VUFqwzAQNG6OCuge8oL2JTWlx0DA1xwK+UYeGScfaEnzASeuB2vQdrsrU2gHhGVptbsz2rWHWFXXcQzj+BzHLc2xdlfvtLmId9pJPNZV9VRP8yZO7wDXgKvy+7DMsbwYVi4eGmdvMPwew+TbigGcw09d5uK+h+l5CZmv9A/0aQ/cLb5YP4ncqK3ER/BzAXDuYPgBOocX8+pC5r9LPpCTB5kLND0LP5yfhI3UGDgI372yP8/wlGffRp/75Hcb89ne4etpg3PgIetX1rOF9bi3WOY6OKbYq/q7jeR0NDjqWmhjtvOA/TaWtaKu0OhZjFen9gmtj4Vt9O3kPUAfzqmT5kubrlBzvfKxM+y4B1vewTrdo64FxJnTmEDNwEcX7DONcw+ar0RJP+CQNKGPRYGvRmvcL3nzjFc3m5h9eDZNIXf9/STvJtU078Xqq07Ek70IoB9bhy9s+e3w+JaAWtA9wrEXenWGHlulNYG4/Ux9bZLG8ptF9CH/E1ZKK/a+5CvXrd74C9Cv/H/eE4eT0xu/hexbYhOz9i+CK+dan/8A8ynF+gKpyd68
+   eJy1VUFqwzAQDGmOCuge8oLmJTWlR4PB1xwK+UYeGScvKGk+4MbVEA3abncVAu2AiGytZjWjXWeKs9kljSmNzzS+8hzvruqZMWfxzDgPjbN2UbxPy5LLy2Gd5dG8k8F7CDduKwdwCr99qeV9nt/mm/R7DkWv5AfGvAbtll68P4qzAeQm8LwR77ZqHfv2Bg8wOLp4riEU/dvMgTN5+AhlDk9Pgofzo4iRHgN7wT2q+JPYZ0HufU+cu8zbxbJ3dPR63mAfdMj7lPdrYZ3WFstSf4ecezX/GSM1HQyNuhb6WOI8YL2Pda/oKzx6EePNqX1C+2Ohi36cvAf4wzl90noZM1RqblQcWyOOa4jlHazzPepaQJ57HhOoGXAMwd7TOPeg9UrU/AP22RNyLCp6NXrjfqmbe7y6aWPh8GKaytn195O6m1zTvBerrwaRT/YigH7sHb2I5bfD01sDakH3CMdO+DUYfnTKawJ5xzv11WaP5TeLGEP5T1gpr9j7Uq98b/XGX4C88v/zmjUcnd54FLJviTYW71+FVs61P/8BnqeW6xvR2N03
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzFVMsKAyEMlJ572PvS79oPKNRPLyj2E5Y2YMBNkzgV2w7sYX0kM+NoCPNQziGk13c9Hcflv4bHMpHIRHyL1+y68U/+bYN9S7Ov9YLGEW9uP9LLfHq8KPseUp2/A7yL10fhkWvtCPj4SU7QjFoZYK2k3cuJp1cDe6nVzOIc5Bo573E65LLZZ2mhNazZ4haX9+yjmUfu2mbUQ+9p6w/7fAHeb3kfvTMiIHrZrxFw3162mGcvNz1kR+8uxqy3grggXmvQ9PY8Xmsvr2cx/OG5kVy1kOebwPuJ+mTVY94rWKeXQ0vfEyR9STY=
+   eJy9VkEKwzAMCzvn0HvZu/qD5emDhewJYzPU4HqR7ZoxndqksSVFCS3ldxi1lEc9jm2L/c54gvEsZJ/2eb4l65/lJfsgrZm6Hpqol9WagaXRwhDrpBc0HvHmXxqZj8drVDxH4HNxD/AeVp8Jj77XbgEf2wnfohlFGWCtpN3KiaV3BvZyVrM794+etzgdcinWIS30DWtG3Nrynf1o5iNnbQP1oudU+sM+Xy/+On0erT0iRPSyXxlwXy9bzNPLjYdu6H2pMXRXEJeI1zPM9Hoer3svq+cA/vBcJlcSen/1/wNC1CddT+dyDdbxcoj0vQFed0zX
   </data>
  </layer>
- <layer name="Walkable" width="30" height="20" visible="0">
+ <layer name="Walkable" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy9klEKwDAIQ3uEXar3v9LYx6CIqUnVCjLorC+xzmeM2ZhfdPb/GUx0aTzhMrqsNlu73l+/Xl/bB7F3HjwtiMsE8hHV796MZXps7/7JrihcVSf6X8HN7GhUl/HL9lS0MfVsjaLfnjE8RZ/qt2rW0awqdkv1G91RZ42i0m/ERbP2+ivMTGb9ZrjMm9z2vuYLXfB72g==
+   eJy9klEOwCAMQj3CLuX9r7T4Z4wIrLgm/dmQV6r9aa1f7FE3/RPc5Iyq11yq30nr+iA2KsRAXKVWLTuX4CI9Ov/lfh2uOyf6n+BW3ijTVfKqns5sil7VOPOv3xSeM5+bN7VrtqvE23LzsjPurlEl8zIu2vXO32FWupq3wlXu5O/sc7+gZoQn
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -163,16 +163,13 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="primwolf1" type="spawn" x="96" y="64" width="192" height="384">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="bwm_agent_3" type="spawn" x="768" y="192" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="bwm_agent_3" type="spawn" x="768" y="192" width="32" height="32"/>
   <object name="primwolf1" type="spawn" x="384" y="416" width="32" height="32"/>
   <object name="forestboar4" type="spawn" x="352" y="96" width="320" height="320">
    <properties>
@@ -185,5 +182,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain15.tmx b/AndorsTrail/res/xml/blackwater_mountain15.tmx
index 8e754db80..13e0f8090 100644
--- a/AndorsTrail/res/xml/blackwater_mountain15.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain15.tmx
@@ -1,164 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNldENgzAMRFE+OgUrBEagHYF2hezatVClnmqd7iznrx8nCPjZPiWGrS3LRtpp3UWM04PWh4l7Cr0o5jRxrGFqDKHIjElvYMF8vN2DMpbrsbesD+TuIh9yvm8/cc89yZ+xyH007S9j8f5s2l+FjT3g+fq9OnY1eWKOrO4/sXy+lBxbmR3HutmJ4tqzcxTjM59qjiKb+VQ98TPnr8I6qe8Cs+4csJ/ZMxQ9gN2LrPLL/4LKHjGL+5k9YnZmj5jNZgy6AB7XeZw=
+   eJylk9ENgzAMRFE++tEZskJghNARUlZgV9YqkbB6OtmOaT9OiMA7cvgyp2maf1S+pN3nm+9H/KP7YSYbGnmNntdTKyiyx3Jd26k3qDjMSmzXDurrx+MrZMXb8vdY8a5Jz+ex8rwlPZ/FFrruxMpcLJbnxn4ea81qxNY/2Oaw3K9Iz6x+icTz5bDcL5F4bso+vP6iJ3YS/5+WU8vKfbByWmeK17Sc/I07GfHMYgZmtTPT31koQ6RDyGIGXPfY6vRhSXou/P/bgJX941yeoAgr2YqSMcKO5vcBeEZxug==
   </data>
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJydVTFOw0AQPLmgsoV7xIcIggcQQYFICT0CpaNApPUT/BWe4f6s+wO3yo0yGa/jiJFOTuKd25292UsIIaQ6hCEvxao9fLaYTRNCLHEWH4XD35kLjE4ODx53CS/VMfe5Op9rukzfY+belHWfV9ccv+d4YJQ+2DuroS+90h7N4T1zPvL6vdg/P50eYC/V9iCx63ZfF84UfU9OLR73FHhPj9sV3V/NlMu98Li9cFTnVTWfN9aHc2GfjdKDc/SaxiS8YSYvdOk88DzFE1zr09JcfOfYt+KN1/zctVNOknyK7nL6GzhRtGrfe4frwfq/ET2YR+Ti2eEecf13ZQafqGeqKc3MFuv0fMC+XNKJ+07P0oB5xaxCZ+f43jAQb0u61sRV/wPm++tq6qHb0iNoUj3s423xEOc16P2lc2vvrD7z4E9ZO6mDva93zH/ucuyxcnyuGOvl/y7EeHuh7j9DbHNm
+   eJyFVEtKA0EQHQYiiDOYveQE8SRGvUACLoTgQtSNEkSJqyzEbHOEuYrHmOXAjHMHu5gq+vWzTB4U0596XfVqqjvLBlyNB+uKOEf0ur4p0/1l6fvzmo1fgn8zTvfaIu5hLMRTmc4bisfxbW7fD+Lbnpho8GIaeB9jSb3aIvUVVOWw3u45F/EaznwDe3fqaWfd5un6nHzvw/xCzXIUeBqFizkuqG6Muohnclzh7lT3xqk3xplTbsKtiMM6z/L/4wqs9h3EaSiOcH8cvQjR2Bcpr6a4z2XKbaiONYzbPTlzvh4+g+9jsO+jLHsI363e0ynUp6d4jN3p3zXjtKSV6145XA9SfzHUM1Odlus5nI01wvyvtXdvnDcC/Q/pxDxsjH15SOdSe1nytD6ymHhf5a6azp3T94IaeGvQtQAu9v/dKI6l7yd57CHr30utEd+11SjGtLqutYcwroDfL9NtkD3JT3rwS22r3Mb5P/zGzMBnovU+prqf0NzOQK5hSr7ST6KT3yvkdvoPvXtmvF84PnP3
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYMAOwgVwSBAB6K23kxFCp+HQC5MfaDBY3DEKRgExgBrpdRs/5WYgA1rkocHoT3IBLr+kU1gmSzMxMMgykaeXXDcg64WxiY0rbHrxAQDzCAsa
+   eJxjYIAAaSYGBlkmBjiQQ2JjA9JM+PkggGweMeopAejmwezGZw9IDT75abzE2UUs6GQkT99AAGrHzygYeoAa6XUbP+VmIANa5KHB6E9yAS6/pAuQb2a4AGb9QIpeSuxFBiA/4PIfenmFrheXO2D6APWyCo8=
   </data>
  </layer>
- <layer name="Walkable" width="15" height="30" visible="0">
+ <layer name="Walkable" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVk0sOACEIQz3CXMr7X2m2hJTaoi5swgZ8/CLzG2MCi0JxZq+zMccqF2OcXirF+Atsjp9mmdg/WCnXrXw362bfzrxob92bcVm1Z2W37rzKO5Vl+dQe1b2gftxb7bBKLjRXZiremavLOv7KfuGYVFc=
+   eJzdk8ENwDAIAzNCl8r+K/UbITDnRnxqiQ+KwZiwn7X2T+JEzDvcCId39qM1SH9VY4JLvFO8KW43a+V7h9i3yk32jbmbeTPfnJu54Sqtlc8ERDN5R7mqHtVId5npcW9V7eurZtfTLN/NpfwiXOfPVvECjSNW/w==
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="96" y="928" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="192" y="0" width="96" height="32">
+  <object name="east" type="mapchange" x="448" y="160" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain16"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object name="east2" type="mapchange" x="448" y="832" width="32" height="64">
+   <properties>
+    <property name="map" value="blackwater_mountain16"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="416" y="768" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain17"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="gornaud_2" type="spawn" x="96" y="864" width="32" height="32"/>
   <object name="gornaud_2" type="spawn" x="288" y="576" width="64" height="64"/>
   <object name="gornaud_1" type="spawn" x="32" y="224" width="128" height="544">
@@ -166,12 +177,16 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="160" y="128" width="288" height="384">
+  <object name="gornaud_1" type="spawn" x="160" y="96" width="288" height="416">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="192" y="64" width="96" height="64"/>
+  <object name="gornaud_2" type="spawn" x="96" y="704" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx
index 7ce285d38..54a98edad 100644
--- a/AndorsTrail/res/xml/blackwater_mountain16.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain16.tmx
@@ -1,173 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJytlNENhCAQRA0fVnEtgCWgJei1cL3alppIbrOZgSH68YJGHgu7i1sYhq2DdLLcY49X+D5wLy/eY2Hq8JH7E0FueZ4dycFctHc/178vge8duSj3U2jvMbq10bmZm8Ec1V0fuJZ9/PO2m0mdFXcldbY+O28Cdfa9N5seQVi3dj8R2cRAd4R59ty1Xq/R6nWUQyUHrHa9rhLX5k+llj/lf8ny10Kty9t8DOy7so6/P5HEKBztx3Mh
+   eJyllNENgzAMRBEfnSIrJLBBGjag7QjdtWuVSFi6ng4nlI8TIvjZhy0njcMwbUqgQO8ojrV4ZoI4V+xR7Nl6PTIm/8Ga1k2RfN1Jnndk6/NBig6biX2TomDQ99zwxb4xbrnAvi6wrV6q75/br3rZOrsyttkMc7bvdXZPqq/YFeZcBGsqgk37nGeIN9Y8FZELtVCuAJ48DueI/St7Ho/jfbUdaNVTefJBb/AOwflw77km76z1gu8IzmdxuLPW05XOlB9vZ6Ooo+4sb989P95sVI14Iv7IY49XnqNiemtPxKt/QH0BLyJgsQ==
   </data>
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJylVLtqw0AQFIJUtsn1xh9g4i+JwPmA2G6MVSZtCHl0KUzS+hP0W+5l/A++RbdoMhkRKRk4hKSdm93Zvcuy/tjlWXYaDyD0wNPVMH1EEf6uO5R7hrqdu4zP27Tuws/4o/DKuah/uNaa7LXiVsRVmqiBXPag7uCaxiJv48uJ9u8s+OvQxK+Frop3PMeYF1ivUPvHROe9TfNxT7mtQqPFOZdpH/RMcTFn9mg+avukuIcOrwxY/z7GPKa4h/j8iqsi7pbmH2H8z8RzFKHVQM+shpI8ZGxorvuc+8U/z6f3wXpfQM+76racvC6r03jvifMGfN8X/fY+4hlGrOBdzSnOk+qd5YWe8R7ojeodgs90132hYDncgH98XwxBITzh3Hyuavr/212j5nSWf+dO8+Y8+XffoxZ9VTlX1BPM/QLpXVVn
+   eJyFVLtKA0EUXbc1S6YXP0DcL3GJlgExWghptUohCqkCijYWC/7AfoK/YylsTC127iFz2TMnd8mFIZO755y5M/eRZalNQpatR6lvWWx/W/EP+aBxX6S+39DvWX8S/e+C30TMivxT0gAPa0NaP04sxpkXu98mYdcHWxT7MbDz7ttZXBdyZ8T1JfGc5v2+It167OvbO5m+x22Ea2favRF/NcCt5G5eLoGxuCt6S+XCNsKfBX9vXMWzPXSYR1pPoeeuJJca91Riu4p1ojFbTWielMsx61knh31/wO7oDHDrgbeCIaaauC8d7jWut241wr3NU37j1DRbFfw+KvPt3Y+i3nGefkNd30jMOhNg34Qpo8ZM3on7Zx58LcaYpvmWzh3RnyXFzHyuKdv/Oe9/GXqe5vT5IP0PHfQAzmxHfu+uI+ZDuGrgWh6td3neWK/xLLEzrmneaH5gOqugpfOBcYrnOLD/HKczy3tn6x3LG+oKuJa+A7vY07NenaIu+UzUK/rF6tU0WMubYWboF6497vt/7hlhgA==
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYCANpAlA6HABhFgGK2lmIOslFYDsn8aLKpZOpHn3eRgYlqHpJeSWTkZU/lse4vUig1c8qHyYXmLdjk0vsv3o7gSB1zyYYsjxt40fvz3YzES3lxBAt4MYvW+xuJtUe+mt9z4FbkZPG6ToxQUozWOkAFzphNqAXvYMV4At/EgJU0LlxWADpJStALb+GDE=
+   eJxjYICAcAEILc3EQBDA1OIC6GbIIvHR9RJjX7oAqjnTeCH6ZInQi65mGS9uOWL0Y3MXPoBLDSwc8IUlLjlsejsZUdWA3P2aB9P9yHq38eO2G+ZuZPcT42Zc6kjR+5YHoS4N6P40Eu3FFmfE6gUB9DgjRS+6WlL0ppGgF+RGdPXEyBEyF58+XHrx5QPk/I0eL/jcia1cQE7jyO4gpgxBBjA7OUnUN5gAtrxLbDjA1JEabqSqpwagl50A4lwdQw==
   </data>
  </layer>
- <layer name="Walkable" width="15" height="30">
+ <layer name="Walkable" width="15" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzVlMkJwDAMBF1CmnL/LYV8xa53FD1CBAJjaXT52Nda+0N95K9sEpVH7dd1jUHZGuPEulo7eRPr5tBhla/rg7DKV80usdO86dwn7GnO5O47oW+DsqlfwtJ3SGokfIeZ5k7/T+evesvSPmvNzt7t19knrNIb8thPsQ==
+   eJzNk2EKQCEIgztCl+r+V3p/JTbbtOAJQZGfW5JrjrEerBhO7h4d9jaPzh32VDc7M1bVQl6R92yvsPHe1WUsq5f9P6Sb9e/EqrrOLNxg2d9kb3VmosK5TMWnkqv2qsIqnpFGZDN9lNdh3R65fWbv/PP6AMZpXKQ=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="128" y="928" width="96" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
-    <property name="place" value="north"/>
-   </properties>
-  </object>
-  <object name="north" type="mapchange" x="64" y="64" width="32" height="32">
-   <properties>
-    <property name="map" value="blackwater_mountain17"/>
-    <property name="place" value="south"/>
+    <property name="place" value="east"/>
    </properties>
   </object>
   <object name="sign_blackwater16" type="sign" x="416" y="416" width="32" height="32"/>
+  <object name="west2" type="mapchange" x="0" y="832" width="32" height="64">
+   <properties>
+    <property name="map" value="blackwater_mountain15"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="gornaud_1" type="spawn" x="32" y="832" width="416" height="64">
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="gornaud_1" type="spawn" x="192" y="672" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="64" y="128" width="32" height="96"/>
+  <object name="gornaud_2" type="spawn" x="32" y="288" width="64" height="64"/>
   <object name="gornaud_2" type="spawn" x="128" y="192" width="32" height="128"/>
-  <object name="gornaud_2" type="spawn" x="256" y="160" width="64" height="32"/>
   <object name="gornaud_2" type="spawn" x="32" y="352" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
@@ -179,12 +177,18 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="64" y="544" width="384" height="224">
+  <object name="gornaud_2" type="spawn" x="96" y="32" width="352" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="gornaud_1" type="spawn" x="320" y="160" width="128" height="352"/>
+  <object name="gornaud_1" type="spawn" x="96" y="544" width="224" height="128"/>
+  <object name="gornaud_2" type="spawn" x="64" y="672" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="320" y="160" width="128" height="352"/>
  </objectgroup>
- <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain17.tmx b/AndorsTrail/res/xml/blackwater_mountain17.tmx
index 83969fed3..57a9668fa 100644
--- a/AndorsTrail/res/xml/blackwater_mountain17.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain17.tmx
@@ -1,167 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5045" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../../../Project template/drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5685" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJyNksENgCAMRZUYzw7gCsAIoBfPqCMwrGNJYwlNLYHDO1A+v/8nGDUMBvGIYXgGn3E9YBMnUptndnbWFb+IOLKX+8H9TbRR8IO3W+KZPwK+dTinfllD0erf52Ja2Btw3vJzQk9Jl2n5BdLZNryAYynUNLTzitS001jo8TONrD35pD9Is/YgZXsBv7NUtQ==
+   eJyNksENgCAMRZUYzw7gCsAIoBfPqCMwrGNJYwlNhZTDO1A+r22CUcNgEI8YhmfwGs8DNnEirXpmZ2fd8EXEkb7cB/c3ycaKD95uiWf+CPjWYZ36coai1X+fi2Whb8C65HOVPWu5jOQLZGcruIBjKbQydGfJN42FHp80Y898/L/Qu1X1UZvtBT0cWT0=
   </data>
  </layer>
  <layer name="Objects" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAdmMaPXTxcgDgxdLCMCPM6GSH0Ly4Ixge2Eem+NCYGhqfcDAyveRgYzFhwm/cGKP8KiLWZEO4AgTABBAYBkBoYQGYj+0EHaIYvkjteQ80FiaObh2w/PrfBAMhcGF8QaJcQEAsDsQgQizJi6gXZiw3IIomD/OGLJw5BcjC/EgrD10huNQS6xwiIjYHYBIhNGTHVS+NwH6lAFos5ABNNHS8=
+   eJxjYKAtOMeIKRYuwMDQyYgpRgy4h8O8mVBxmLm/uIh3IzpwFWNgCINiEEhjYmB4yg1hm7Hg1veGh4HhFRBrM6H6L0wAgUEApAYfAOnVYUIVew01FySObh6y/fjcho0vCLRLCIiFgVgEiEWxhK82mluQ48oXyU++eOIQJAfzN6EwfI3kVkOge4yA2BiITYDYlBFTvTSa+2BuBNmJTQ4XkGXC9AMA1BUc5g==
   </data>
  </layer>
  <layer name="Above" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAdCBcYOPOIUUuKeWl41MLMwaUGn1585mEDjIwMDGECCMzKSJl5gkD9QkAsDMQiQCxKhHn4gCJQvxIQKwOxChCrkmheOppbDYH6jYDYGIhNgNiUQveRCgC+RAgB
+   eJxjYKAdCBcYOPOIUUuKeWl41MLMwaUmTAyBiQH43MXICDRHAIFZGSkzTxCoXwiIhYFYBIhFiTBPlgm3nCJQvxIQKwOxChCrEmEeCKTjcKMhUL8REBsDsQkQmxJpHj43kgIAR2gJDQ==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="10" visible="0">
+ <layer name="Walkable" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0iGASobR4hM5HliVFLrBpkQKxacs3DB8i1lxizSbGTEj/TMo0BAM1lMHs=
+   eJxzFWBgcB2hGAYIqcHGpsQ8dECsWnLNwweoaS+xgBTzyHUfMfFFjB4Aiz0vJw==
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object name="south" type="mapchange" x="512" y="288" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="south" type="mapchange" x="96" y="288" width="32" height="32">
    <properties>
-    <property name="map" value="blackwater_mountain16"/>
+    <property name="map" value="blackwater_mountain15"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="96" y="64" width="32" height="32">
+  <object name="south2" type="mapchange" x="512" y="288" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain18"/>
-    <property name="place" value="south"/>
+    <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="gornaud_3" type="spawn" x="256" y="224" width="32" height="32"/>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="gornaud_3" type="spawn" x="384" y="224" width="32" height="32"/>
   <object name="gornaud_2" type="spawn" x="96" y="160" width="128" height="128"/>
-  <object name="bwm_agent_4" type="spawn" x="384" y="224" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="bwm_agent_4" type="spawn" x="256" y="224" width="32" height="32"/>
+  <object name="gornaud_2" type="spawn" x="416" y="96" width="128" height="192"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain18.tmx b/AndorsTrail/res/xml/blackwater_mountain18.tmx
index d52edf5cf..9fae077c4 100644
--- a/AndorsTrail/res/xml/blackwater_mountain18.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain18.tmx
@@ -122,39 +122,39 @@
  </tileset>
  <layer name="Ground" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJydk8ENgzAMRZEPPXSGrlDDBindIIURGJaxysGWjPGPcA5fxEme0P92mIbh0yE+NB76degt7NYhZfdHXhH7pHtix05Jv+zYjF/77ynhvcW+6CzEzo4tpv9M11xszovsf+VbXR4tVuvVrLckizxFrO4jFvktLgufKxNmq/GD3pg9myn2G81ckftaL4CNZq7Kfa3vvKPsTGY5n2VrdlHPkXzPot79AewwkLU=
+   eJytk9ENwjAMRCN/8MEMrBDTDULYIMAIHZaxCJItmZMd1RIfpyRNnqo720yl3BLqU+9TKXWu16lHQk9g94S+nGX1nJHHnumYGNgt4bsKb9mjviv8e0t4X7EX+lXEdmCb9AEbYaaas9b7LuuAPFasnl9mvyfZyJPH6veIjfw2yAJzZYrZYfx4s8Zw18n36/Vck/c4e8h6PTfkPc7ev2ZwlXMkzHLVu1HNI2HNvNp9AIzrkow=
   </data>
  </layer>
  <layer name="Objects" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYKAvmMaPKdbJiF0tuvgyNL2+AgwMr3hQ+TDwmgdVbBsWe6WZ8LsVG3jDQ1gNLiDLhHAXDGDzO67wgAE/oJ+8oDgX6j90/6LbAxP3FsDub2xuQwexAvjlQQA9fF4RMFMWRxzooIlrM+EOF180d93kYmCIAoqlMUFobO6CuQ3kZ+TwALknDhq28VC95KQTQoCSdAQC2mS6CT2sYABfHtRBShvI8QnzA7IcyF0g9YT8BwrnNqQ8ic1dvkSGPywNEUq/lAAAIUUlFg==
+   eJxjYKAO+MSIYNtxo8odZmTACiZBxTvR5OciiV+GsnWYUNUk8DIw+AowMLziQYiB+DDwmgdTDB1IM+GWwwXe8OCWOwd16zQk/9gghYUsE8JdMADz+z1GTDFcwA/oJy8ozoX6D92/6PbAxL0FsPsbm9vQQSyesIQB9PB5RcBMWRxxgB7f2ky4wwU9jm9yMTBEAcXSmCA0NnfB3AbyM3J4gNwTBw3beKhectIJIQByz0wC8YwPaKO5aRo/hJ6FZuZHND62/LCMH3fYgsR1kNIGcnyC/LCNH1UO5C6Qenz5BATQ4x2bu3yJDH+YWYTSLyUAAOEOLdQ=
   </data>
  </layer>
  <layer name="Above" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYKAMhAsQr9aOm3y9lNhLTb1pSHrp7YZ0AfL1htNYbzoWOZD6NCL0YpMLJzKcsckhx1EaiXqJBYNJL6HwsYfmO2xhgU8vvrAjRn44AQD6XA5k
+   eJxjYCAdhAtgZxMD0ijQi8sN9NQ7kO5PFyBfbziN9aZjkQOJpRGhF5scsWkMmxxyHKWRqJdYMJj0Egofe24IG1tY4NOLL+yIkR9OAAD4lA8I
   </data>
  </layer>
- <layer name="Walkable" width="15" height="22" visible="0">
+ <layer name="Walkable" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0iGASQ2aQCdL3kuoFcveh+IFcvqf5F10vIb8NNLzZ5fHGJLxwHOg1RQy85+rHpxQbwyaHbSywg1X2U+BMXBgALAUy0
+   eJxzFWBgcCURgwCpemihl1SAro9cNwy0/0n1L7peQn4bbnqxyeOLS3zhONBpiBp6cYUVqXqxAXxy2OwlBpDqN1L1EoMB7RRMCg==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="64" y="608" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="north" type="mapchange" x="416" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain17"/>
-    <property name="place" value="north"/>
+    <property name="place" value="south2"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="416" y="64" width="32" height="32">
+  <object name="up" type="mapchange" x="64" y="544" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain19"/>
-    <property name="place" value="south"/>
+    <property name="place" value="down"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="gornaud_3" type="spawn" x="128" y="288" width="32" height="96"/>
   <object name="gornaud_3" type="spawn" x="64" y="224" width="32" height="160"/>
   <object name="gornaud_3" type="spawn" x="128" y="96" width="256" height="32"/>
@@ -164,6 +164,11 @@
     <property name="quantity" value="3"/>
    </properties>
   </object>
+  <object name="gornaud_2" type="spawn" x="128" y="576" width="160" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain19.tmx b/AndorsTrail/res/xml/blackwater_mountain19.tmx
index 48defb573..d3547159a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain19.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain19.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAcTOMnrKaTkYFhGZo6HSYGhjY0sdc8DAzbiDAPBN7wYOrFJuYrwMCgzYQqDhJDB6+Aas1ZUPkgANILcj/IvTB9r5HsCRdAmAmzHyYvjWYvIQAA4MoQWQ==
+   eJxjYKAcTONH5T9ixFTTCRRbhqZOh4mBoQ1N7DUPA8M2NDFc4A0Ppl5sYr4CDAzaTKjiIDF08Aqo1pwFlQ8CIL0g94PcC9P3GsmecAGEmTD7YfLSaPYSAgD5DBE8
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
@@ -136,27 +135,27 @@
    eJxjYCANhAvg54NAOlAsjQh1g0kM3b241GEDskzEqSMGAACGfQXw
   </data>
  </layer>
- <layer name="Walkable" width="10" height="10" visible="0">
+ <layer name="Walkable" width="10" height="10">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcKUTBgFCYjAw2MXwieNSQwwGAM1IGD4=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="64" y="96" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="down" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain18"/>
-    <property name="place" value="north"/>
+    <property name="place" value="up"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="224" y="64" width="32" height="32">
+  <object name="up" type="mapchange" x="224" y="64" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain20"/>
-    <property name="place" value="south"/>
+    <property name="place" value="down"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="gornaud_3" type="spawn" x="96" y="256" width="96" height="32"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain20.tmx b/AndorsTrail/res/xml/blackwater_mountain20.tmx
index 1ba6f5501..04116502b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain20.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain20.tmx
@@ -1,164 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="10" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="10">
+ <layer name="Ground" width="10" height="20">
   <data encoding="base64" compression="zlib">
-   eJzTY2JgcMCB9XBgfGr1gTgIB9bFYR6yHm92VLUguRQc2B6HWxyR1IDMS0EzL5EdOw7E4e5gJD3eUNoeyf24zEtkx+5uXHYT40ZSMLHmyTAhMKXmoccxsWqJNQ+fWnR1MlgwrjSNSx0Ai0I8Wg==
+   eJzTY2JgcMCB9ZCwPhAH4cC6aOpScGB7NHWJ7NhxIJqZuNSBMLrdA6EOnxvR1aGrlWGCYHQ1yPbb44gTdHWgcPNmx4wTPaheRyS7QepSsMQdSG8wmjqYG9DjmFDc4Qs/9LChdhzjMxNbGMqgYZg4AAqCOtA=
   </data>
  </layer>
- <layer name="Objects" width="20" height="10">
+ <layer name="Objects" width="10" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBj8oJMRO5sQmINDbRs/A4OvAIT9moc4s14B1b2BqWVBlZNlgsiDAEwNiK/NhHADsrt1mBBskHpsboCJwdwJA8j8LCDbC4hz0dSAgDYTphg6ALlRGk0dsl/wgZ9cEPoNkto3ePTB/MPJjbAbGYQLIMQIxQlIrTkLqn3o/qAWAAAORRpX
+   eJxjYCANzGJkYJjGiOB3MmKq6cQiPxOLujZ+BPs1D247wwUYGF5B5d9AaRBfmwlTLcwcXwHc5mEDFbwIO5DBTy5Ue9HZ2NyIzy8gIAt0dxRQvTQW96MDbyL9Qay6WAFEuM3FEicwAPIL3J8s2NXoILkfpJaQv5HjBD3ukMMPBkBxggvA7OLkRrgXHYDMNGdBjS9iwhwZAAA7lR1M
   </data>
  </layer>
- <layer name="Above" width="20" height="10">
+ <layer name="Above" width="10" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+CBegrh5qm5dGhnnk6KEEpFPZPnLCkFrmEeMXWSbizSNFLaUAAAmcBIM=
+   eJxjYCAehAsMjDpZJuLUgUD6EHAjKYAc/+BzMyF1MLE0JLk0POpIcRc+QIs4pkacAACtXQei
   </data>
  </layer>
- <layer name="Walkable" width="20" height="10">
+ <layer name="Walkable" width="10" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3GGASwiWEDhMzBp44S80hxI7GAEj8To5ba5lEahrRKPwDkWSwq
+   eJxzFWBgcB0gjAsQq5YSM6mtjhQ3wtQSG0a0UEdIPTF+wOZnaocfpWaS4hdsGACF1Swq
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="32" y="96" width="32" height="32">
+ <objectgroup name="Mapevents" width="10" height="20">
+  <object name="down" type="mapchange" x="32" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain19"/>
-    <property name="place" value="north"/>
+    <property name="place" value="up"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="512" y="64" width="32" height="32">
+  <object name="up" type="mapchange" x="192" y="384" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain39"/>
-    <property name="place" value="west"/>
+    <property name="place" value="down"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="10" height="20">
   <object name="wyrm_1" type="spawn" x="96" y="96" width="160" height="192"/>
-  <object name="wyrm_1" type="spawn" x="256" y="160" width="160" height="32"/>
-  <object name="wyrm_1" type="spawn" x="416" y="128" width="192" height="160"/>
+  <object name="wyrm_1" type="spawn" x="128" y="288" width="32" height="128"/>
+  <object name="wyrm_1" type="spawn" x="64" y="448" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="10" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain30.tmx b/AndorsTrail/res/xml/blackwater_mountain30.tmx
index 93ea105ba..d7b618039 100644
--- a/AndorsTrail/res/xml/blackwater_mountain30.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx
@@ -1,160 +1,174 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1lD0OwyAMhS0xZMqAOAFFbNmSS/QIlXrrHqEXaaLGqsOfXZMMnzzE8Mh7hmkAmCp4A3Az+grmtxeYIzXNjXn9vhh91eqmvRq0uj0e25Xn8MUJdbFv8+w15kg8DkQ3Jrq180ZyrveY0/KJ+oq6qc+t86Lu3eZIdUv5emYm3L7uYXM4XVv4X5pdazYiM3ctwr4H6npzzLg1G1pN9HUhurPgrl0BzQ6Ud7NU0UuuD73ueQdpRS+5vjPeQErpjvbiGO+scJ00C5pJy7sgXCfNAqtkViVZXpHFv2hyO2MmuNy095mbiQ/xS1uC
+   eJytlU0OgjAQhQtdsGLBzwlUXLk0vYNHMOHWHsG9V1AITHx5nSmNsvhCoT+vM69TnHfOAcX6PE6ciGEiEM1ES3S05quM12fwO2to4639Sb/sq6P124Su9Fvg/ma9fn1q/dIW/QPlCnNUKLEgGMv8fqb+dxnHJLm4Uq4GGjfv9VHHBJin+R4MXWlfqgXNw2Ltf9YxOE/ajKXbGnNY99bEWFoIn3XRFY94PHo9v9+bmBxdPutydtCjsVrgeshZPwX6jWdH9EUXx/2rafmHiO7eWqzL9Yv9ndfrtfd27bJHFlb9purxDG2uXfbIgvO8dQ9r92Tw3/twNPz7BaynnPtS+y/hOPTCigfnWHnnnG/9N9EL5/V4cE5ObnK8RC8K0uA87OGTBv4jOG7Ltxy2zoToctwp33LrNHUmPhiiWZc=
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzVVcsNwjAMtYCeSCXEFgyAxCZsgDJCNqAbwAjMwAhIQSBx4gYXziCuIBpaE2M5oT1UKk+K6qSOn+NPAgBwHMAbVgHoFGBTzpvEThVf5HLzY8O8yHn/wYV6FHcV1jF5zJapbMuU65btd/YknrpYBXiRg0LimzYQ8yziU1XeA/F1rfzcnWHc9f+eHS/H4kn1TkOAcz7miZcnvW99qT40OZd0RuRHPe7PNee55WORePnR91xbpo/rlEtHYqsTef3SL8bHLpGRE+P7qwcN43d1bxgvjXVd0NxSezzesbqXsFfFqIqm76K2gubOxZzWsCU9yKHTcP9h7njt8P34H2sc76/YvhBivv4bMCehM0k9w/dhDmYDb4e/SS7ONI8Zy4MD7zvL3kEJzl7Vfh2Ru8mSN9IIvqDtNuMFRehYuQ==
+   eJzVVbtNxEAQXRkcGUsn5CYoAN01cHQAdICckboDrgOuhKuBEpD4BETOICFCCOQUhEf2Y9+Ox2d8XABPsmzvzvfN7oxzzpUT9408de6a/i0s0+5aYayJ3EvU2HyNQpn7vVBW/iWOw52uj8+oea8MHxb65NjnokdGdCF3TjJVu4b4GIiP96dK7kblq+PZFu7IZjVgXzg4Hag1Y2bknqdhHsIFuGWumCPBOr/Qg85Vbf+hJxd9pk6y2nbm16dZV+dx37mn+rmI/fdsN5QpR/ACzMmX+GVepC5vtZ/3+rmM/fdH4n3dqhx1DHk8PibBc9I8OA9l4vfgE/yyT9ShMPzK3jK1z7Cu9W8gPOLcoS/x/T7Omppv+znK/DlmTua0/18w1M8ZVi+DDdmTt9Sce6PUB32A7y54A4/WjABEv2hnT97KVe1MkPWx9xH99qc9dpP7vinW8WABNenLyZpJWg81OJuEs0ifDdGB/QXVAdCzlW1xXrovr9Q87+P7gHqT2EYshRELbP9lfAH44nPL
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYMANwgXwSJIBQOYRY+ZItJdSu9OR9JNi71dWVDEnPgj9jRVTPS4zYCCNSHtB6kTZsMuJoYmfwmFeGpo4seGHSx1IHJdduMRh+ihJW+j+wGVnOhb/EhvWlAB0O4iNY0oBzN2n0NL1QABalAvEAErjjlx7qQ2o7Q8QINcv6PpINYdcv5BbXuECM3jpq28ogMFYPgAAwlAchQ==
+   eJzFVTsOwjAMzQITRV3gQL1EbtByJM7UjZV7wIyitlJq8uyHlYi3VHqO/fxrEsI3Yl8gV4yKjY2BbJoPi1J+U99OdyJ6xeiyOUQjZp4XmlXOvw5723Bevm/Bbz7W/Nk6LscyfxX8XGHfmHOJR1paDsmP0UZnUD+tupGu5Nj/lQWru4Gdn4UR6KL6noK/dSE8Tj5tz/2g9YiN55md1qMa9yuClmvtHUzw1iL9fo3jrUX6SV3tHSnh3vnyyP2i8ka0RKs9tOL+Q/cD3WYkhQ==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="20" visible="0">
+ <layer name="Walkable" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcKUhhgFa2jFq79CzF5ceZPPQzUZnU9NeZDPR7ae2vdj0YwPUDmdcfkMWIyecifUPMYBUe8k1l1j1tMgvtDJ7oO3FF5b0Dm9i7BhKcUFu2KHHASl2YbOXmLgk1Y3E+pMa5tMbAwB58pUW
+   eJxzFWBgcB3hGAZG7aWuHdS2lxj9+ACx5sPUUqIfnz58YYPNDZSEDbIYIb+hy+FzLzH2UguQGs/o/kA2g5r2Uitf0AMPtL3khDWl9hKyY6DDhFL/EBN2yGqItRddD7pd5ABq+JMa5tMbAwAuBpLD
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="west" type="mapchange" x="96" y="288" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="north" type="mapchange" x="800" y="256" width="32" height="32">
    <properties>
-    <property name="map" value="blackwater_mountain39"/>
+    <property name="map" value="blackwater_mountain39a"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="768" y="0" width="64" height="32">
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain32"/>
-    <property name="place" value="south"/>
+    <property name="place" value="east"/>
    </properties>
   </object>
   <object name="east" type="mapchange" x="352" y="224" width="32" height="32">
@@ -166,17 +180,23 @@
   <object name="sign_blackwater30" type="sign" x="256" y="576" width="32" height="32"/>
   <object name="sign_bwm30_grave" type="sign" x="608" y="192" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="bwm_agent_5" type="spawn" x="192" y="320" width="32" height="32">
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="bwm_agent_5" type="spawn" x="192" y="320" width="32" height="32"/>
+  <object name="wyrm_1" type="spawn" x="480" y="160" width="224" height="192"/>
+  <object name="wyrm_2" type="spawn" x="736" y="288" width="32" height="64">
    <properties>
+    <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="wyrm_1" type="spawn" x="480" y="160" width="224" height="192"/>
-  <object name="wyrm_2" type="spawn" x="704" y="320" width="64" height="32"/>
-  <object name="wyrm_3" type="spawn" x="768" y="96" width="64" height="192"/>
+  <object name="wyrm_3" type="spawn" x="64" y="256" width="64" height="96"/>
   <object name="wyrm_2" type="spawn" x="768" y="416" width="32" height="32"/>
   <object name="wyrm_2" type="spawn" x="704" y="544" width="32" height="32"/>
   <object name="wyrm_2" type="spawn" x="320" y="512" width="352" height="96"/>
+  <object name="wyrm_2" type="spawn" x="160" y="64" width="64" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain31.tmx b/AndorsTrail/res/xml/blackwater_mountain31.tmx
index 4a31f5007..9e8bd65e4 100644
--- a/AndorsTrail/res/xml/blackwater_mountain31.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain31.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="8" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="11" height="8">
   <data encoding="base64" compression="zlib">
@@ -128,20 +127,20 @@
  </layer>
  <layer name="Objects" width="11" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYMAPZFlR+a9ZGBj2CjEwvGGB8Jm5GRhYgNgOiHXR1P4GqjkLVPsHSLcAsTU3Qs4WTa0mEK9kZmCYwgLBZkBsCsSyUHvEeRBqLZH1IZn5BkkNOsAld4YLwZ7KDDUTZCcLpr47SGqJBQBOQA/t
+   eJxjYMAPZFlR+a9ZGBj2CjEwvGGB8Jm5GRhYgNgOiHXR1P4GqjkLVPsHSLcAsTU3Qs4WTa0mEK9kZmCYwgLBZkBsCsSyUHvEeRBqLZH1IZn5BkkNOsAld4YLwZ7KDDUTZCcQpwqg6rvDxUAyAABtRBBi
   </data>
  </layer>
- <layer name="Above" width="11" height="8" visible="0">
+ <layer name="Above" width="11" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYCANhAuQrraFhTbmDqRaYgEAW04C8w==
+   eJxjYCANhAuQrraFhXRzU/HYQ44bqK2WWAAAtqYDaA==
   </data>
  </layer>
- <layer name="Walkable" width="11" height="8" visible="0">
+ <layer name="Walkable" width="11" height="8">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB3kGAbQ+fgAsWqx2YVLLyE3YhMHAF3wFOw=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="160" y="224" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain30"/>
@@ -157,6 +156,6 @@
   </object>
   <object name="sign_bwm31" type="sign" x="128" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="0" height="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx
index f1f4561ea..6984aa732 100644
--- a/AndorsTrail/res/xml/blackwater_mountain32.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx
@@ -123,31 +123,46 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlj0OgzAMhZEYmBEngKpbt3Kc3v8cTSSsulbiOP4Jw5MlTPIp+MV4nafptfhra+z7SPmVeaeW4/bNuafgPBw7546kncTavlKmhH2m5+/5P3owpd+8VU8N08LWMEuMHraGmdfUGBK2lglrNGwrs8WA55/lJy+mhI25nswWG3O9mT2e8maW2NHnLLEPVFvao7lo6V1ZJ+LSHs1Fa42i5OEfbQ1Hs2FmGMmmPh/FLvm8NtNYI/R3biaT3pOeCP3deqc16u13UdpvOPt21WD0/cVzToSPqZ9Lno7wMfXzHZ6m//AvyHKs7Q==
+   eJy9lz1uwzAMhaVoyOy4F2jzMwVdXHQteoXMvf81EgvJg1mWpETWyPAAQRL1gRL1LA8lpfNW13WTUip/lRtxozI+zP27Wftyb2vxmMelrQvmURmvvENZ2hob87i0dS0m9Fl+r6+x6zyuKFPLzdrz1nlGmP9he5lZYXjYkTxHo5572DnIREyU3brDGjN11DP6f7aL4CXWHbaYPM5ic65njzlTitPYlDs4cqXMLOyz51z3nbny3DLxd2ttsJFntG49XLDfyNnCm3G+3LPpHGk/erlVH4QLbwaXezado63Xy5UErlR7rVjkHPkODMXvGZwb+Q4gxuMbnMtr18OOfPfGTp9cW5pXSW8a6Z54BH+3zkV600j3xCP4e/Q94vWstWLX1OsTakmq6elJdUyZ9ZzfN+06XlNgQrT+Xlg98n+VURinfZNR25RZ9T3r8tCpLO2LsB9HYZz3afp68G4frasA
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VtttwzAMNFr0T0azTIfpBh5BI2iUztIfW0C+Moe/i5awmZ7PRzlBixwQRLIoHl+i1HULptR1n6dlXPruio8+/rk87jE9iGH9fk57WUP+GV9Oy/q42lBTzG1w+TltbVDI/Xb+9rydu72mk2WHF63T7LwQ79fT4it+97H7ztyGWaxl4DW91+9kn1pjGbPV4rnRTzLvaT9nGeQ80zrmvMJ4XuOk/M5BvUScCI69YQz0KG73122wOdthnL5eRe0qGwxY54rbMQt72c+Z4jyInCiOifLN+cR8O2fp9z75XMXGbEEOPNMtv5ETEdWb2pP7mCP6jvvN9in95sDy63kbg9h4X2K/MWbM7fujWkF/lJ1qL3Nn6qWRXteTe51PlJvoDE+N/oXA2PkerIsS+In9xMd8no+4bwFyoi1VnEWMrXEf3TMMl+fYqjq/nPY2DEGfUT1gEHk2nElnFfeWw+Lh5+GoJ6s7LrItQoujVcdqrtb8v0AOlayKB9umevU9QG6MUZRjrn3Obw72Oazm6o1n9r9gnBbrvNZRafTov0Cdw09xfgwFeoqCerOiLOrEd4zHt3XWcM31HN0DEfLr/XtG6uGIKW3vA5ZBO4/uZZMtJNOKRWSjgfW09j4Clmd+Sz0SHo+a2m9Br19f97hi/Q5U6zP55ffUN1pZvQo=
+   eJy9VstNw0AQXUDcbJGDa6ADcAWhA4hSAMgluATDkVNEBemDWy62pZxyowdfQfiRnfh5Mmubj3iSZe/u7Lydz87YOefmiXOL9tnM3BeK2B2A73X7ZHH3jXced/K857bVc5N085mf30bHso64sV5Ge521l80V59rv28328o2X15yMPO6Pr86OuUWnls3ObZ04p+b8ON3buiOf4Jv5LO4mOl7LiRd6BRbnYU/cfwvAAX+G7AaWUX8Pxrn3t8W5jfo8FcYX3Rnvko5D+0DmZX+luMfsBNjHgjTp8obts7iXlF9ir8Up67WRu7tA3o1xCyTu6YCdjfJzZsTD4qiMeLMe1iGcRXzsVxmHcj1kH89Phc7bsVyfwp1TrBg4exV1MUB8tyM5IHUpZHcZhe3WcZ1qJ7712UN261wBeCx68sCdTlU+CKC3MmrUnPbLnR97LDtT77sV9QmcsVR1wYrrGHRtYdvE3rXvZXw3Ae4H4N4YNSePu/6mIfLMCZ33Lc814ubXJYa1Oms2kLsamRFngHsufCE2Sw3j/MGc3Af2W6POBbmF6nFDZwNS3wdWtK7rIWMsvryuz8drHONQD7J6idj/PnBvQ2iifk0HmBt8U+7Kdx7xo/A+UD5NqcVWD/4ukOfyXwgfFPHP+sAY5F7xmTFn5VJBNYUhOSLrrItl+U7yfwxsrX2/4P9XBueVvtu/AdfuoTtUDtxh2Mv9QMvw2WVd5/T8j3M49Fj2/BcQZ/0vFcJQzSrUWjKgj/85ZN/rSV/mRY01HtX6mx9fEu+Tn3smWfB9AqyZ26Y=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVsENgCAMdABNXMsJ3EBXcianUh4kpEpL2yt6CQ8D9HpHKQ6DjGN6joR15vdJ81ZwcdPcdo+zWHOC8tgqcTKnF8vIf3s4ER5QTm/MFr2STtTZajit4PSWnFRTTaP3fll0avfsZG0UJ/WIekN7AoLzjVubZ40zoq4lTi3o2UZwvvlgrXvJW8lzZE9AnG/EG/cV/pC/JocW76P+fzhEvV015B7QW2vms/RbT62hveVysdYjIh5yrxc9a6t803ryllw97y/lugDzPDaQ
+   eJy1V8sNwjAMjXpupa7FBBELNL31yijMxAX12iWYAER7iGosf5PwJARJXT/71XZKCHbch9/vOMr22vWMzWhn8Zv2a9P+eQCbh9M/hwn4gTFnzlpcenqd9YbwckINboQ/CfNAc9bqyuULoeXZ6tkeWJg8W0HKF3LinLgckzHGa8+vrT0KOT3aJKZeLLxrb+fEGlH+PbFDW0nnDc0ayn9UeuZJ5GmJVZubllwxj6cesC7vLoRPd+Zj5ZR4Kb04W2o/Es+Gq0NtlnB6arwUXt3523v+URw5dkufWOcGBxi7B5ImLee4hbeWT3q/yGutBnKfLMR5nHvpwAr6CdYKrpttLD+7vOdARjLm2po3OuqdQun5zr0DlkKqQ0+NWmz/0WOHBjOqXzz/OZ1WZMedG7XzqhRSjWgxUdfhXmlOJf+54J52/xcPWFd1
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzllFEOwzAIQ3uEXar3v1K/Jk0R2M+jW6UWKR8kgMEB9te27Tc7nSi7t07iUnwVU+VW6cqW1qviKb2KRTATPxKL5ufuVTxn/1lX5eNiVZLYdZiqbvJGeE76nv6Fk3TeyZ16V9zQeV91Uq/iUfFBhc7MZO+43eJ4WzlPcqVH5eXy/ha348f1ceeziqorxSNC8Sq/tG+nQvbFv3BV36ucEr7T3TU9FcaVuBVv3R+ns+TqdXHO6jUyQ5N3xVfVw0n/pna/7iM1m0/EPQD2rZ24
+   eJztlMsNhDAMRClhm6L/lva0F8sz85wlEkJYigT48+KJw/k5jvNhq7MU93sndSl/ssfqm8Q6o2ylBa1BuCRP1XD7TczuXLp6JL5qQ7ip70nchOn0U/OmeCtMl09shUe4yr+bu9qni3X16jfHJbUp1/Wr7hc9o8k5pZ6Sr8atcmtNes4THdKzy1exJDfxulzCInue5k77vprr5kHlV7/Tm8w/vSd03Y1b9VD6Ot3Vc+qX1LnCyEz+43d6dTOc7hTVP/2v3rV/fQGSTav/
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="832" y="928" width="64" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="east" type="mapchange" x="928" y="96" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain30"/>
-    <property name="place" value="north"/>
+    <property name="place" value="west"/>
    </properties>
   </object>
   <object name="north" type="mapchange" x="352" y="96" width="32" height="32">
@@ -156,38 +171,49 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="sign_blackwater32" type="sign" x="800" y="768" width="32" height="32"/>
+  <object name="sign_blackwater32" type="sign" x="832" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="wyrm_2" type="spawn" x="832" y="864" width="64" height="32"/>
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="wyrm_2" type="spawn" x="832" y="672" width="32" height="32"/>
-  <object name="wyrm_2" type="spawn" x="352" y="384" width="352" height="64"/>
+  <object name="wyrm_2" type="spawn" x="608" y="32" width="320" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
   <object name="wyrm_3" type="spawn" x="320" y="160" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="160" y="512" width="672" height="160">
+  <object name="wyrm_3" type="spawn" x="96" y="512" width="352" height="160">
    <properties>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="wyrm_3" type="spawn" x="64" y="704" width="704" height="160">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="wyrm_3" type="spawn" x="672" y="64" width="256" height="256">
-   <properties>
-    <property name="quantity" value="4"/>
-   </properties>
-  </object>
-  <object name="wyrm_3" type="spawn" x="576" y="128" width="256" height="288">
+  <object name="wyrm_3" type="spawn" x="64" y="736" width="704" height="128">
    <properties>
     <property name="quantity" value="4"/>
    </properties>
   </object>
   <object name="wyrm_3" type="spawn" x="288" y="448" width="64" height="64"/>
+  <object name="wyrm_3" type="spawn" x="480" y="224" width="320" height="224">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="wyrm_3" type="spawn" x="608" y="448" width="32" height="96"/>
+  <object name="wyrm_2" type="spawn" x="768" y="736" width="160" height="128"/>
+  <object name="wyrm_3" type="spawn" x="352" y="672" width="32" height="32"/>
+  <object name="wyrm_3" type="spawn" x="32" y="384" width="192" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2" type="spawn" x="480" y="512" width="416" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain33.tmx b/AndorsTrail/res/xml/blackwater_mountain33.tmx
index d8542aba0..a6db785af 100644
--- a/AndorsTrail/res/xml/blackwater_mountain33.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain33.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -128,12 +127,12 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBiZYAI/hL7JxcCgzYRbnQ5QbhsPA0OqAIR24cWvHgRAamAAWa0ODn0gc7GZ+QoorseNygdhEHjNgyoOAsug7sTnB2S3SSPZKcuE6XZ0N+ID+OSR/QALQ2S7YW6Duf8VDrPCsfhNmkBcEHIfsl2v8diLnAZAND57cYUhpQCUVqkNCKVlfACWnmHhBgtLXOmZGLNwAeQwRVYLCxNc+QymDz1voKcHQnGGK03iSjPz+VH1oqcXWaQ8iQ62oamHpXuQX/GlO1gehuUxdHNoAQD0Wy0E
+   eJxjYBgcYBIjaeo/AtXPJFEPMpjAD6FvcjEwaDNhyj+Emq0DlNvGw8CQKgChXXixq0cGIDUwgKxWB4c+kLnYzHwFFNfjRuWDMAi85kEVB4FlUHeiA2Q/ILtNGslOWSZMt6O7ER/AJ4/sB1gYItsNcxvM/a9wmBWOxW/SBOKCkPuQ7XqNx17kNACi8dmLKwwpBaC0Sm1AKC2DwGMc+QyWnmHhBgtLXOkZH8CVN2AAOUyR1cLCBFc+g+lDzxvo6YFQnOFKk7jSzHx+VL3o6UUWKU+ig21o6mHpHuRXfOkOlodheQzdHFoAADhTMOk=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKANCBdgYLDjJl4tNdTA1KVB1XYyUm5eGpq6VBz68JmHyx3TeLCbi+wHagBi/UqqecjuxwbScdiLHobEuk+WiTh1pPgXlxvJsZdUu+ltHq50hS19ErKXUBrFlp7x5Ud0s/ClLXLyGj4wmOMMBEhJfzCAq5yiNgAAZn8TvA==
+   eJxjYKANCBdgYLDjJl4tNdSAQDpQXRpUbScj5ealoalLxaEPn3m43DGNB7u5yH6gBiDWr6Sah+x+bCAdh73oYUis+2SZiFNHin9xuZEce0m1m97m4UpX2NInIXsJpVFs6RlffkQ3C1/aIiev4QODOc5AgJT0BwO4yilqAwBrzhQM
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
@@ -141,7 +140,7 @@
    eJxzFWBgcB2BGAZIUY9M4zIPHRCjjhTz8AF0fYTMJMVOavkBVxgS435i/ECK+4g1j9g0QKp5pKRTaphFa/dRaiYhgE0tvvSErpeQWZQCaqQ/XGrxmUFqGqUmBgCUyFdU
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain12"/>
@@ -169,7 +168,7 @@
   <object name="sign_bwm33_grave" type="sign" x="448" y="576" width="32" height="32"/>
   <object name="sign_bwm33_grave" type="sign" x="384" y="576" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0" visible="0">
   <object name="restless_dead_1" type="spawn" x="64" y="160" width="160" height="192">
    <properties>
     <property name="quantity" value="2"/>
@@ -183,5 +182,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain34.tmx b/AndorsTrail/res/xml/blackwater_mountain34.tmx
index fe28e1f9e..a718e5fe7 100644
--- a/AndorsTrail/res/xml/blackwater_mountain34.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain34.tmx
@@ -1,139 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0MOBHfDI4cOOQBwExPYk6tMH4mAgTgHiQCDWJaDeAU3vCTYExqcX3X249GJTh+w+e6gaZL0wMXR/6EP5MHWBUDXIerGJ6WJxH7EYppeXk4GBn5M4PTC1ML26QLY+kXphamHhhyyHL5zR1cGwDJHxi6xuNG2Mpo3RtDG80gYpYrjinJAYADi9ySU=
+   eJztksENgCAMRYkHEw7GBVwBGAEcAV3BYR3LHmhssEC5eeDwEi3vJ4XWTkrZAqFyVmMHDsB35hxwAhcQAdPwQ5a95xdT8Lj+SlnOo/355NAs1vJ7uPSPXkwOzXI1w/QnBbOLVmrVsgy6mDXw7YRZdPH96FntnXMP2YTzpd7YjbEbYze+uxGEc/rjbvTUSjNv1R58ysjW
   </data>
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg+QIeJgWE2DwODNhPpel14IXQ/P3l2v+IhrKYSqgbZfbN5UGkQ0GHCVNcJlO9C0q+DJAdyO7IYslpi3fiaCPdLA82XZUJVjyyGDkDiILdJE/AvSB3IPGkC8QazExZXpABi/IcPEBO/lABapQ10MVxpAwSQwwg5jInxO7Z0QChtoMc5rrSBnoawAZh7KY1nUgGt0wUIgNJGGS/5aaOZgrQxnx9iNyc3Qgw9jPGFeQIvZjp4xUM4bYAAcpzLQst2dDFi0gYxAAAkxSxF
+   eJxjYBg+QIeJgWE2DwODNhNhtZdYUPkuvBC6nx+/OhB4hEXsFQ9hdZVQNcjuA7k3VQBCw4AOE6a6TqB8F1QtSFwHSQ7kdmQxmFpk8JER1Y2lvKjyr7G4Hx1IA82XZUJVjyyGDkDiILdJE/AvSB3IPGkC8Qaz04UXvzp8eokBF4mMX2zqHmIRwwbQ1dEqbcDU4ksbMIAcRshhDPP7TEbc/sGWDgilDfQ4h/kTPW2gpyFsAOZeUuKZGgAWNs14woZSAEobZbzkp41mpLRFStroBPppPj/Ebk5uhDh6GMP4l5HCAJZWEngx08ErHsJpAwSQ41wWWrajixGTNogBALFDOnk=
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBhcIFyAPnovsRCnF5u6R0ToxaWuigfC7mSE0GlY9ILEKnkQatHtmMmI3a24AL3ClBiQPkBuIUXvBSLTxkUs6h4QmTYe4kkbMICeNkBphlDawAVwpZnRtEGa3k60cCRWL0gdehzgShvE2EFqueHASZw7CdlLit5pJJZTAwkA1Sofsg==
+   eJxjYKANCBcgT186UF8amXphdqYSoR/dfbjciy6OzX3Y9OJSV8UDYXcyQmhsfgWJVfIg1KLbMZMRu1txAXLjglK92EA61LxOEv1AqVtI0TvQaQMG0NWAwoxQ2sAFcKWZwZg2yAHDPW2gA1LLDVCZSEy5SMheUvROIyOPDxQAAKxEHzU=
   </data>
  </layer>
  <layer name="Walkable" width="15" height="30">
@@ -141,7 +140,7 @@
    eJxzFWBgcB3FKICeemH6yVGLzV58ZhEDaGEvJf4dDHE0UHpH08bgj6OB0kvtsMJlFrGA2vbSGwMAWx53NA==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="256" y="128" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain33"/>
@@ -155,7 +154,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="restless_dead_1" type="spawn" x="224" y="320" width="32" height="32"/>
   <object name="restless_dead_2" type="spawn" x="224" y="608" width="32" height="32"/>
   <object name="restless_dead_2" type="spawn" x="160" y="384" width="160" height="224"/>
@@ -165,5 +164,5 @@
   <object name="restless_dead_1" type="spawn" x="288" y="832" width="64" height="32"/>
   <object name="restless_dead_1" type="spawn" x="192" y="640" width="96" height="256"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain35.tmx b/AndorsTrail/res/xml/blackwater_mountain35.tmx
index 5adcf8ba9..a20343ce5 100644
--- a/AndorsTrail/res/xml/blackwater_mountain35.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain35.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
@@ -128,7 +127,7 @@
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKANCBPAxLjUgcBNLlR+Pz92dbj4yOIK3AwMq3kJq4MBPW786ojxB7UAAP3VCco=
+   eJxjYKANCBPAxLjUgcBNLlR+Pz92dbj4yOIK3AwMq3kJqwOBUqA6PW786ojxB7UAAEb3Ckw=
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
@@ -136,12 +135,12 @@
    eJwLE2BgCKMBxgaooW42L3XNo5Y6amEAe20cjQ==
   </data>
  </layer>
- <layer name="Walkable" width="10" height="10" visible="0">
+ <layer name="Walkable" width="10" height="10">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcCUSEwLkqsNlB7nqYGLUch+11BGDAZE9Dkg=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="east" type="mapchange" x="256" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain34"/>
@@ -150,11 +149,8 @@
   </object>
   <object name="sign_bwm35" type="sign" x="96" y="160" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="bjorgur_bandit" type="spawn" x="160" y="96" width="64" height="128">
-   <properties>
-   </properties>
-  </object>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="bjorgur_bandit" type="spawn" x="160" y="96" width="64" height="128"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain36.tmx b/AndorsTrail/res/xml/blackwater_mountain36.tmx
index b8d24b46b..d15705b97 100644
--- a/AndorsTrail/res/xml/blackwater_mountain36.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain36.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="11" height="10">
   <data encoding="base64" compression="zlib">
@@ -128,12 +127,12 @@
  </layer>
  <layer name="Objects" width="11" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAfSBMgTt0MJgaGbh4GhulMhNUhA2zq0dWgA2x6QHbP5oGwQXQ3D6aacDS/zEZT047F3E4mwmqwqcemDgBJQwri
+   eJxjYKAfSBMgTt0MJgaGbh4GhulMhNUhA2zq0dWgA2x6QHbP5oGwQXQ3D6aacDS/gNSlIom1YzG3E00Mmxps6rGpAwB6jwtX
   </data>
  </layer>
  <layer name="Above" width="11" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAMhAsQr66ahziz0giYCVJHSA26mTC709H42NTi4iODTibi7KcVAAD8+QZV
+   eJxjYKAMhAsQpy4dqK6ahziz0giYCTKLkBp0M2F2p6PxsalF56disauTiTj7aQUAZdwG6g==
   </data>
  </layer>
  <layer name="Walkable" width="11" height="10" visible="0">
@@ -141,7 +140,7 @@
    eJxzFWBgcB3CGBkQowYdYFOHzwx8dpPqFmL9h00cAOwqHI8=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="160" y="288" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain32"/>
@@ -155,11 +154,11 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="wyrm_4" type="spawn" x="224" y="224" width="32" height="32"/>
   <object name="wyrm_4" type="spawn" x="96" y="224" width="32" height="32"/>
   <object name="wyrm_4" type="spawn" x="64" y="192" width="32" height="64"/>
   <object name="wyrm_4" type="spawn" x="256" y="192" width="32" height="64"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain37.tmx b/AndorsTrail/res/xml/blackwater_mountain37.tmx
index b6303a448..b1ec37560 100644
--- a/AndorsTrail/res/xml/blackwater_mountain37.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain37.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
@@ -128,20 +127,20 @@
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYBi6oJORPH06TAwMFbwQNojWZoKYhSxOCkDWAzMLZg8yCBeAqJWGisuiyWMzDx+A6YeZiWyeNg6ziQGUhIE0mr2UxBGyucjhistuYtwHCxf0uIEBWByBALZ4QrYL3a/kAgBwUg2b
+   eJxjYBgc4CEj6Xpm8JJnlw4TA8MKqN4KIK0N5HcyQsQrkMx8TKSbkPXAzILZgwzCBSBqpaHismjy2MzDB2D6V0DNRDZPG4fZxIAMMsIV5mZpNHthYTGTxPiFhR3MLcjhig46iHBvBZI5yOajA1gcgQC2eEKOG3S/kgsA4qUQZg==
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYBhYEC6ASqOL49OXhkNvGhF6iVWLTy+pQJaJfL30AOk4/EaMn7GpQY4jcvQSA7CZP9TiCADqqQg/
+   eJxjYBhYEC6ASqOL4wLpQPk0HHrTCOhFVk9ILT69pAJZJtxyM3jJN5daIB2H34jxMzY1yHFEql5iwxmb+bSKI1oBAHFmCQQ=
   </data>
  </layer>
- <layer name="Walkable" width="15" height="15" visible="0">
+ <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3CGATI1QcDpJhHCJDqXkrMQtaPi0+NMCHHHdTQS4x7sMkTG6aE7CVkJrXSMAASNTkd
+   eJxzFWBgcB3CGAQo0Yuun5B5hACp7qXELHzmUSs8BlIvTAyfubj0EROm+OwlJp6okX5BGACE4zrG
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="96" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain36"/>
@@ -155,12 +154,12 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="wyrm_4" type="spawn" x="160" y="160" width="32" height="32"/>
   <object name="wyrm_3" type="spawn" x="288" y="192" width="32" height="32"/>
   <object name="wyrm_4" type="spawn" x="352" y="256" width="64" height="160"/>
   <object name="wyrm_3" type="spawn" x="256" y="416" width="96" height="32"/>
   <object name="wyrm_4" type="spawn" x="160" y="384" width="64" height="32"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain38.tmx b/AndorsTrail/res/xml/blackwater_mountain38.tmx
index bdb2535ab..5f1fd534f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain38.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain38.tmx
@@ -1,179 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="18" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="19" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="18">
+ <layer name="Ground" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJytVckNwjAQjPLgSwO0kOAO4pRgaIG+aIeyMBIrjYa9rPCYT1jP7DXLOk/T+kXt2DtugA1+H0E1wHGid+94AFrHMsCr5W7VcQW91+kXrOvxarlbdeyGnqa7B7xW7swntXpxOPsoNgPR9WI2mv1RzaxuC2YvuX16ciEc0c2gwZ6yXzK6ixOb0S7kl2rwrYau1rNM/wr5Bf0qb9G7mq51G7z+FfrO+tXQ3eb45uB7rt3aFa1+jG1zfHP4vegL1/NszwHvFeeYuTnyHvsjPfqXf6Md5ruc1c34xtvlkbssXNpuWTGI0b6whxDs0eh/3fN3hucNEhQLjA==
+   eJy1VcsRglAQYzh4tQFbAOkAsIMnlmBftmNZwmFnMnGzbxn0kAssyf6y9G3T9IQJwO/+gU1nXnEHjAe4MHdVh+ktK56AsqKr8DI495uo4wp679M3WJd5GZz7Q9QxCz1Pd3Z4GRGX8VmtURzOvhabgelGMSPN/qhmVrdUZm+5bT25EI7oZlBgT9kvGd0uiM1oD+SXSfD1QtfrWaZ/A/kF/Wrfonc9XXUbov4N9Jz1J6E7tvrmeP3j2tWuePVjbGn1zVH9M33jep31HPBecY6Zm2PfY3+sR7/yb22H+S5ndTO+iXZ5z102Lm+3VAxib1/YQwj2aO2/Hvk7w/MBR/cRMA==
   </data>
  </layer>
- <layer name="Objects" width="30" height="18">
+ <layer name="Objects" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJzFVEsKwjAQjdVdC7qXHkDsVl0IXsMjeBFXbgSpC4/g1doewjyawWE6+VQUHwRTk3nzMj9jdDwmnoMf4mZ9nmff48MbDrn//GLPq8xurM/arp1d6yzMx7EX3LeEmMHfc2pMW/TfnfttCv0+4nFa9Fo1ro0nXvIdnP8+fe+XynvBWyu8UjPfr/Khnyob3gfHSslJxXQQB7SVgXxIf2NRRbglNC3X+fA/TTfyQf5IcztCO/Gl2JTCTwyhmud8gKyXMfHnPFQTmu/Y7Ok+yHmp1BeAnt+6vqdeC82MGHzaS9erMn7IZx2ZOxxy5hC0+ZACxALzSPPfKjlCDSNexi3Yb0boR+74/CGk2MNWzhLN3hcjySVr97jw17PMG68nqR0xCvWpNnMBzMWuCN+RvgmyJ5oEnn/gBfybOXg=
+   eJzNVDFuAkEMXA46ToIe8QCUa0kKpHwjP4CPUNFEQpciUT7AO3hCnpCOo8kPsiO8wprz7u0JicTSij3ktcdje5z7X/Y+uH/Ovc+5Hd0W44NwP4/jvjvvWxX+4nPW/jz581DE/QMnwIn7imLvMzhDvsPQuaa8fJ/l91Ta/uBjM71gtWItFV9rhZ3r0PHfhtf7zKgXcWujD4xZ3xfjdp6qaPsjxsLoSaVwhBjANk/0g/P1taojNpuF5XXS/s/CjX6EfAGzxWdX7qaHby43PCs8x7oWnpc+/Os4oWZr37q0J4evVG6NGTv/KHsfdi2lGTE7CuYY9rnsKvOHftakO6n6WXO+xNfShxwDF9Ajqw8N9ehH9BJ8OTl4v+zQTW3ondafYDnv8Za1xHrPHMVi8ey+TOPzzH3T84Tcn8L/t3CU2lNLc2HQxXOZ9uHcwXgnThlx/sJ+AbvHQT4=
   </data>
  </layer>
- <layer name="Above" width="30" height="18">
+ <layer name="Above" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYMAE4QJYBGkIYPalQel0Cuwn1u0gdWloatH5pJiLTy82c1KJUI/NjeQAUsxBVkup3cTEBXrcUwMQYy817SPFXloAatpLilmj9pJuBi495JQ95KRhXGZhK4+I8Rcx5RixZpGjlhAgJYxkmahnL6mAkjpvKAEAlBkTSA==
+   eJxjYBg8IFxgYOxLg9LpFNhPrF6QujQ0teh8ZEAoTPDpxWZOKhHqsbmRHECKOchqKbWbmHSEHvfUAMTYS037SLGXFoCa9pJi1qi9pJuBSw85ZQ85aRiXWdjKI2L8RUw5RqxZ5KglBEgJI1km6tlLKqCkzhtKAADCLxOY
   </data>
  </layer>
- <layer name="Walkable" width="30" height="18" visible="0">
+ <layer name="Walkable" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3FdMfYAC3NQpcjxk5yATFmEGMfqe4gRj2l8UCMvbjCnFS3kRo+5MYdKWmMkBi5fiDHDErzCb3sJeSWgbKXkLnE2Etq+oGpx+cGcgAp/iXHblLDh1S3EusfUsOIGmmGmhgAIkF23w==
+   eJxzFWBgcB3FIwZjA5Sahc7GZR8+dYTcSAwgxgxi7CPVHcSopzQeiLEXV5iT6jZSw4fcuCM1jeETI9cP5KZ3etpNiZsJ5ceBsJeQucTYS2r6ganH5wZyACn+JcduUsOHVLcS6x9Sw4gaaYaaGADPmYEq
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="896" y="192" width="32" height="32">
+ <objectgroup name="Mapevents" width="30" height="19">
+  <object name="north" type="mapchange" x="896" y="224" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain37"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="640" y="384" width="32" height="32">
+  <object name="south" type="mapchange" x="640" y="416" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain43"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="sign_blackwater38_1" type="sign" x="832" y="128" width="32" height="32"/>
-  <object name="sign_blackwater38_2" type="sign" x="224" y="160" width="32" height="32"/>
-  <object name="sign_blackwater38_3" type="sign" x="96" y="512" width="32" height="32"/>
+  <object name="sign_blackwater38_1" type="sign" x="832" y="160" width="32" height="32"/>
+  <object name="sign_blackwater38_2" type="sign" x="224" y="192" width="32" height="32"/>
+  <object name="sign_blackwater38_3" type="sign" x="96" y="544" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="wyrm_4" type="spawn" x="576" y="128" width="32" height="32"/>
-  <object name="wyrm_4" type="spawn" x="256" y="256" width="64" height="32"/>
-  <object name="wyrm_4" type="spawn" x="32" y="256" width="64" height="160"/>
-  <object name="bwm_agent_6" type="spawn" x="768" y="448" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="wyrm_4" type="spawn" x="352" y="128" width="192" height="224"/>
+ <objectgroup name="Spawn" width="30" height="19">
+  <object name="wyrm_4" type="spawn" x="576" y="160" width="32" height="32"/>
+  <object name="wyrm_4" type="spawn" x="256" y="288" width="64" height="32"/>
+  <object name="wyrm_4" type="spawn" x="32" y="288" width="64" height="160"/>
+  <object name="bwm_agent_6" type="spawn" x="768" y="480" width="32" height="32"/>
+  <object name="wyrm_4" type="spawn" x="352" y="160" width="192" height="224"/>
  </objectgroup>
- <objectgroup name="Keys">
-  <object name="bwm_agent:60" type="key" x="640" y="352" width="64" height="96">
+ <objectgroup name="Keys" width="30" height="19">
+  <object name="bwm_agent:60" type="key" x="640" y="384" width="64" height="96">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_60"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="bwm_agent"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="60"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/blackwater_mountain39.tmx b/AndorsTrail/res/xml/blackwater_mountain39.tmx
index 931b8942b..185b94950 100644
--- a/AndorsTrail/res/xml/blackwater_mountain39.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain39.tmx
@@ -1,161 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJy9k9EJgDAMRIs/DucUrtUVpBOodII6ky0YiCFJEyl+PNCSHJf0GqcQ4s+kyo7w9NKe9p0rBbE5fOAe+F/nN6fB5/H4wD2Z0QI0n83HpfRKSD41Hz0Ko9fOF1LH1UjQubGetmNt7q85lDQ9eYTsaHv25LGXHW6H3Lvy3DvdIcyD35U3O6MyyOlZ66Raa7YsWbRmdkSdldF6oEnPbihM3S8=
+   eJy9k9EJgDAMRIs/DucUrtUVpBOodII6ky0YiCFJEyl+PGglOS7xGqcQ4s+kyo7w9NKeds6VgtgcPnAP3Nf5zWnweTw+cE9mtADNZ/NxKb0Skk/NR4/C6LXvC6njaiTo3FhP27E299ccSpqePEJ2tD178tjLDrdD7l15/jvdIcyD35U3O6MyyOlZ66Raa7YsWbRmdlSdJUuj9SRuAhfc+w==
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF6GAGE4Su4CVdLzY96GLnmUh3B0jPDCz6yHEjMfphdhJyFwi0Y1HXyURcWMDU4jIHmzpaA2LjBxcA+RHmT0riB1t8k+MWXGmHGu5B9h8yG1sY4nMDSC8o/rHFMbYwRDYLOaxxpUV0e9BBuACmPfjSI7HxCssHhNI2qeYSAiD/gACx9pILAM2iH6Y=
+   eJztk80JgDAMhSV3we1cwZtXN9Bu0BG6jSvJQwKhvtgf8OZ3qZQmeUmew/CTE+U+t7E9diExR3Z3SrsOxEQSlzo0WrwetWZJF9jJuyA8N7sL4udh776mdj8e6FF90OMhhe0b5H4qaWHeWTt0MT22P/vNZuj1AzAv7J/tmM3Q5rKz9ryoJOfNPD3rvPmxZq/B/Cclb7fkrQH9gNq6vVwaTCDn
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgYEC5AHX0wfhqVzSPXHHR3UMtdlACQWeS6AxsAmZVORfNAgJr+JQVQ6g9kd1MjnJHNI8cs9HCkxD3UTDfUToPUTi+dTKSpH+zpn1T/kAsAPOoN7w==
+   eJxjYBgYEC5AHX0wfhqVzSPXHHR3oPNn8JLnLkpAugD54YMNgMxKp6J5IEBN/5ICKPUHsrupEc7I5pFjFno4UuIeaqYbcs3ClV+onV46mUhTP1Dpn1h7ifUPpeEIAHSbEFc=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3FGBgZkKMPmzm0Mo8Yc8kBlIYPKeYSGy6kunMwmEeJmZSah6wWH6DUPcSaR4weYs0k115i3UZp+iclbZNiHjlxTyvzACa3Xk0=
+   eJxzFWBgcB3FGBgZkKMXnU2ueeh60AE2NYT8QyygNHxIMZfYcCHVnQNlHqVpiFruQ1aPbgY5ZhILKEkTxJqJzS/E5iNi3EZp+ifWXlLNIyfuqWEeNgwAbm9goA==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="480" y="608" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="south" type="mapchange" x="128" y="608" width="32" height="32">
    <properties>
-    <property name="map" value="blackwater_mountain30"/>
-    <property name="place" value="west"/>
-   </properties>
-  </object>
-  <object name="west" type="mapchange" x="64" y="256" width="32" height="32">
-   <properties>
-    <property name="map" value="blackwater_mountain20"/>
+    <property name="map" value="blackwater_mountain39a"/>
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="down" type="mapchange" x="64" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain20"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+  <object name="wyrm_1" type="spawn" x="64" y="416" width="256" height="160"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="wyrm_2" type="spawn" x="192" y="192" width="64" height="32"/>
   <object name="wyrm_2" type="spawn" x="256" y="96" width="288" height="128"/>
   <object name="wyrm_2" type="spawn" x="160" y="224" width="448" height="352">
@@ -164,5 +164,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain39a.tmx b/AndorsTrail/res/xml/blackwater_mountain39a.tmx
new file mode 100644
index 000000000..13db3dd27
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain39a.tmx
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJyllNEJgDAQQwX/HMEViiOcnUBw/2m0UOEIl2vUj0CxyWttrOs8TaugY9F8qhqv9PF2awcV8KOnwFzjWZ+rt06QgR895ti185pON0Y9vEo8D5vlGU/1Zxk8a5XDctlc5Mn6irQB0yAf9ZUxo058Ptq/Jbw3nXixPSo9Rs/Ye4+6HJ21kmF3LzrrEcv3ye6ewmPrZz1ne2Prv+Wo382X/+ZfRsT7mr8AxzJY6g==
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJzlk0EOQDAQRQWJdKuCsziCa7uCIzgCexomxk+nnbL0No3+9nfab7Lsv5Q2rHfFOfbHONd+jXBrmstvqZ+60xbYTwzXngrWa+B7jKdGYmrvujj0XQnnmULWDcxtebhWDatQ/xfojr68+HmoI5pM8H1jngTmKM2FcBm7/KUsJbQ1ahhtmqfUf7zftHfi/RfqPa1XDO07cy/8P1KzQtYXefv44rEDJb0V4Q==
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAOHBYjUiGZ5hFjPj416HKXCJh3WQy/GkL6STGLVEDtsOZkpq55xAJS/XGZgPrhFCcDHceEwhobwOVmcsIanx5qmkUqGGnphlLzAERkHUc=
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJEIDALEqCMWD0XzkAE+fYT0YgOkqsflBnLMIzdciTWD1HCnlnnEuI8U+0gF5LoNl9hgDWdapgVq6CHHbZTELbFmDYZwptQcAKp5720=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="north" type="mapchange" x="320" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain39"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="south" type="mapchange" x="128" y="608" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain30"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="wyrm_2" type="spawn" x="320" y="64" width="32" height="64"/>
+  <object name="wyrm_2" type="spawn" x="480" y="448" width="32" height="32"/>
+  <object name="wyrm_1" type="spawn" x="352" y="96" width="224" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2" type="spawn" x="32" y="96" width="224" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="wyrm_1" type="spawn" x="288" y="320" width="32" height="64"/>
+  <object name="wyrm_2" type="spawn" x="352" y="288" width="192" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2" type="spawn" x="128" y="448" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="wyrm_2" type="spawn" x="384" y="480" width="128" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Replace" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain4.tmx b/AndorsTrail/res/xml/blackwater_mountain4.tmx
index 940ba734d..a59157462 100644
--- a/AndorsTrail/res/xml/blackwater_mountain4.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain4.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
@@ -144,7 +143,7 @@
    eJxzFWBgcB1kGARorZdYQK4+bGbA2Mji6OoI6cVmDjKfUDjg0ktKGJKiF5s/8PmNkDpcgBZ6iQGkpDNcagDElCwq
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="192" y="448" width="96" height="32">
    <properties>
     <property name="map" value="blackwater_mountain3"/>
@@ -153,12 +152,12 @@
   </object>
   <object name="north" type="mapchange" x="224" y="64" width="32" height="32">
    <properties>
-    <property name="map" value="blackwater_mountain5"/>
+    <property name="map" value="blackwater_mountain5a"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="gornaud_2" type="spawn" x="192" y="224" width="96" height="96"/>
   <object name="gornaud_2" type="spawn" x="32" y="128" width="416" height="96">
    <properties>
@@ -171,5 +170,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain40.tmx b/AndorsTrail/res/xml/blackwater_mountain40.tmx
index d437ad07d..60cf3569b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain40.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain40.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="11" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="11" height="11">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="11" height="11">
   <data encoding="base64" compression="zlib">
-   eJxjYMAEUQJYBHEAbyLV6jAxMMQC1Woz4VZzl4eBYSsPqthfoJ5/aHbo4DEDBJDteIukV44NlRbkhdiJblc4D6paED8VKH4bzW0gPi616OpAACSXAlWbAlWL7r9wJHYhUE0QEBdB9dwBqpcm4HdsAACoRhY4
+   eJxjYMAEUQJYBHEAbyS1nYy41ekwMTDEAtVqM0H4M7GovcvDwLCVB1XsL1DPPzT36DDhd5M2kvxbJL1ybKi0IC/ETnS7wnlQ1YL4qUDx22huA/FxqUVXBwIguRSo2hSoWnT/hSOxC4FqgoC4CKrnDlC9NAG/YwMAX0oXXA==
   </data>
  </layer>
  <layer name="Above" width="11" height="11">
@@ -144,7 +143,7 @@
    eJxzFWBgcEXDIIAuhgtTUy02QIpaXHqQxZFpYuzAZgY11dIDAwCFFB7i
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="160" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
@@ -158,9 +157,9 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="kazaul_1" type="spawn" x="160" y="192" width="32" height="32"/>
   <object name="kazaul_1" type="spawn" x="224" y="128" width="96" height="128"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain43.tmx b/AndorsTrail/res/xml/blackwater_mountain43.tmx
index e36450bb0..e28bd1f93 100644
--- a/AndorsTrail/res/xml/blackwater_mountain43.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx
@@ -120,41 +120,62 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNlTsOwjAMhqtWomPp1KVXoFwBZjYYu/ZenAbBBWCCEcQRGGnUGllu7MR9AMOvVomTL4lfRRgEK6WKVn1tzPiy1tZTVftdtOs2KS/JBuYqpWBdmfKSbGDuNNMJ1sUxL8lmDO4hCYJj0v2fmvur+/7DO3+Da3Iwt0jDld6LW8fVC7r3M2oE44+oP1eqF9SGcu9Kbob+S7SfEa4J2MboFTWC8fOA+xrBfnhP13mNLgO5fXStmTeBy8WxNvZs8Z6jfqThYr/SmKFcrhfCOHcujej5gbsOu/0U5rR9n+vjttqwC/k+KuWjj2xxItVCn/7tIw23YN6nj3y5ONam4oIPMFfyyxAuraUl4Up+Geu+WKu5PcekvARbycblL44r5eZnrcNOy3XlL/jMJ4+1XCk3aZz42HLcjHD3STM3pbRxNYUM8w085/G1
+   eJzNljESgjAQRRmZ0RKpbLyC6BHs7WxpuZencfQCWmmp4xEsZSd8J8ZkswuiFm9gwmYfkGySYpAkSyVFQ9sYap/XrIVUzXXW9FvlYbgYPKuUoF+Zh+Fi8Gw/1IF+o1EYLuYT3m2WJLvs/b5v76++9x/+8ze8VINTDxov979C/ULrhZv7lhrQfk3be7n1wo1xvReld2Ldl1Y+wl4T7BjinhrQfujwvQTy2Tlj70scO3rbcKqd59TMA583NI+140Esx69sMrO3aL32uLpzxgd8dlvF1KGW0Hj5vERs/5aeA7Te2P4tgZufnJfbvyVovEXk/2jwedEGL9b0vr2LZvzgxXj04Z043tLylj163e8N7Z+Aq0vk4WJ87y/xcrX5nJeROInXrXeuNjFmkjqOeXH+h5erTeSR1HHMi3P/p+aVD59Xcj7rCpeXnj0AWTHyZw==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg48JKLvvrQwWlW/OxJjKSbWcqNyi9D4pfxMjBcB7r9NithNohGBt7MEIzOhoFWbgRuh9LI9k5mhJgP48PsAgEQGySPzU5C7Dc8+MMDZj46+zUPqji6vU/5GRie82OykcFzZkj4wjAyQDcfF/s1mvsJhTMIfAeKtXEjMDb/wszFZS+6ndjY6ECChYFBkgVBIwNBkF9YCbOJAcTEKb3AWyzhEYQUL5S4NZQft9xfoPmpAqhiSTjSA6XuIGRvER57iQHo5hELgtDstWZjYLAAYksotmKDiFEboIfzcWB5+BypzH8LZL/AUweQGxfI4XyTSnXMSAadOOpPJW5IHX4OiM8D8QUoGyTGCJRjwiPviKW8RY5vHSZUfj9SHteA6r0HNOc+ED/ggrDRASF5fABU7kszkaaHVmArtCzBRRNSgw88ZUGlkQFy/YlOw+IGnxp84CsLKk0v/4LAYKoXBxIgt79xscP4iVOHDJJ48POpDQZjfA60mwDWeYIB
+   eJxjYBg48JKLvvrQwWlW/OxJjKSbWcqNyi9D4pfxMjBcB7r9NithNohGBt7MEIzOhoFWbgRuh9LI9k5mhJgP48PsAgEQGySPzU5C7Dc8+MMDZj46+zUPqji6vU/5GRie82OykcFzZkj4wjAyQDcfF/s1mvsJhTMIfAeKtXEjMDb/wszFZS+6ndjY6ECChYFBkgVBIwNBkF9YCbOJAcTEKb3AWyzhEYQUL5S4NZQft9xfoPmpAqhiSTjSA6XuIGRvER57iQHo5hELgtDstWZjYLAAYksotmKDiJECiAkn9HA+DiwPnyOV+W+B7Bd46gBy4wI5nG9SqY4ZBZhAiRtSh58D4vNAfAHKBokxAuWY8Mg7opW3xMS1NBOE1oDqvQc05z4QP+CCsNEBIXli7RtosBValuCiCanBBZDbX9jaYsj1JzoNiy98asgFtPIvCJTy4pcfTuArCyK8vrJgyuOKf2R2GD9x6pDBK2jaoFf7Y7C0c5DboP142iT0AAAW6oGT
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg4EC7AwNDJCGG/5EJldyGxselj5mZgYOGGyCOzkdXA+OhmgORmQs0H2QNjzwHSs6DsTiR5ZH3E+Gkq0C3TgHg6EK/nxq6fGDap9hIjR6q90UD3h0P9EAGkY7kx1SCDb8zUsZcQgKlZA3TPSiBeR8dw5mBhYOBkQdDUsDcGS9gS6zZkuTQi2KQAYu2lFKCbRU17XfkhNHI5AGPDzALxPfkR4fQWKR2Tay8+QEp8oNv7nZWB4Qcrgg9i/2FloBicAfr5LI78CwLibJh6ZLCIUQpGmr20BtRMt8SaDxKDpfE5jITVU9NeUtTDgBU3BOOTp4W9pABy7dVE85cGEh9dDga08PgXVFbCxJ6yYG9fUQOgm1PEg0hTX1kgfHzqtfDEJy5/YzMniQc/n1qAlvUpKWrRw5VQOFPLXkrUk1KfktoWonX5OZgAACRsSzU=
+   eJxjYBg4EC7AwNDJCGG/5EJldyGxselj5mZgYOGGyCOzkdXA+OhmgORmQs0H2QNjzwHSs6DsTiR5ZH3E+Gkq0C3TgHg6EK/nxq6fGDap9hIjR6q90UD3hwNxOpAdAaRjoWxc+r4xU8deGEjDwYapWQN0z0ogXkfHcOZgYWDgZEHQ1LA3Bhq2+OwlRg5XeKUR4TdK7KUUoJtFTXtd+SE0cjkAY8PMAvE9+RHh9BYpHZNrLz5ASnyg2/udlYHhByuCD2L/YWWgGJwB+vksjvwLAuJsmHpksIhRCmhlbxEPdjat7U3iwc4eLgA93EgNZ2rZSyic8dlrxQ3B+OSJMQcboJV/iVWvieYvDSQ+uhwMaOHxL4hPj3oBm734yk109Vp44hOXv3HZSw+Abs9TFuxscswiRS0hvdSKe2raS0p9iq6WEnspAfRKV6QAAMWlS7A=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk1EKwCAMQz3CLuX9rzT2J9KksVoZm4EyndRXY61XKfXElnikjvt/SCq33ZeNR2q0atvJzTgvUjbX8zOD6+2FPFH8YnkKF72bCPtv3D5/pmZrDc2jYv6s4rK7GOl/9hZnuCvicPGdZXMZb1ZRbtur1petqT57/kQU5Wact89HOV6vjPaV4s/XuG/1ebeUM2TFDd8ssPo=
+   eJztk90NwCAIhB2hS7n/SqZvjeEOUMH+kZBaDXxwgXqUUn9P8dOs5/4OmZV7zcvOnhql2jK5Ef0ii+ZqekZwtVxIE4teLM7CRXszwv4at4+fqVl6Q/+jxvSJ5Ep8jcF2cYa7wnex787N1nl2LlA+dsdqRV/25t3FN/eL6vPMineudnK98U/vV+NGGMvr1XylN0L8qaw=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="west" type="mapchange" x="896" y="576" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="west" type="mapchange" x="896" y="896" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain38"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="32" y="896" width="32" height="32">
+  <object name="south" type="mapchange" x="896" y="448" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain44"/>
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="east" type="mapchange" x="928" y="512" width="32" height="64">
+   <properties>
+    <property name="map" value="blackwater_mountain52"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="blackwater_guest1" type="spawn" x="480" y="96" width="192" height="160"/>
   <object name="blackwater_guest2" type="spawn" x="512" y="96" width="224" height="192"/>
   <object name="blackwater_cook" type="spawn" x="832" y="128" width="32" height="32"/>
@@ -170,5 +191,5 @@
   <object name="blackwater_fighter" type="spawn" x="64" y="320" width="96" height="192"/>
   <object name="blackwater_entranceguard" type="spawn" x="704" y="736" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain44.tmx b/AndorsTrail/res/xml/blackwater_mountain44.tmx
index 9771a9fbf..85d4d905c 100644
--- a/AndorsTrail/res/xml/blackwater_mountain44.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain44.tmx
@@ -122,43 +122,37 @@
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzTY2JgcKAS1gNifSD2FqQO1oWaFy1IHQwzj52deOwggBujmydOpHm45Ehx3wtmBgYDJoh5MkCaCwvWI9M8AxxxSK77DHDEIbJ5hMIO3Txyw0+cRPP0cIQtNqxPpPuITf/o7stlgeA8IM5nwZ4/CoDiWUDcC8SFQJwDxEVAXMxCfPip8jMwqPETjmNqxAcu82B+hPmZkHlpQDXpUJwBxJkskDAEmQeiqeG+aKh50RSah5zWiSkP5vPjL4fQMT7zQOlZhgSMrB9dDmQWAOtiTOo=
+   eJzTY2JgcKAS1gNifSD2FqQO1oWaFy1IHQwzj52dODyfH+gvAdwY3TxxIswE6cMlR4r7XjAzMBgwQcyTAdJcWLAemeYZ4IhDct1ngCMOkc0jFHbo5pEbfuIkmqeHI2yxYX0i3Uds+kd3Xy4LBOcBcT4L9vxRABTPAuJeIC4E4hwgLgLiYhbiw08VmO7V+AnHMTXiA5d5MD/C/EzIvDSgmnQozgDiTBZIGILMA9HUcF801LxoCs0jppzAZp4dC/FuxZeeZaiEQWYBADx2SjY=
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+eMkFoZW5EWwhKFuEG6HGix8hj6wPnU1toI7E3s6MHacK4Dejnx/BNqeR+85w4WaTAmDuu8OFm40OVkDjC5mmxH1uLAwMfcBw7QfiCcwQPiXuC2OBxNF8oFkLmCF8StxHCxDLjIoHG6hlgeA6IK5nwa6mASg+F4obgbgGiJuAuBmHemzAFJhXzPgJqyMWEBt/HlA7w/kRfoT5GTl/Y0tfZUA15VBcAcSVJPiXXODNjIopBVuZUTE5QJYJQkszYZcHALy+ORo=
+   eJxjYKA+eMkFoZW5EWwhKFuEG6HGix8hj6wPnU1toI7E3s6MHacK4Dejnx/BNqeR+85w4WaTAmDuu8OFm40OVkDjC5mmxH1uLAwMfcBw7QfiCcwQPiXuC2OBxNF8oFkLmCF8StxHCxDLjIqRwUxG+rgBH6hlgeA6IK5nwa6mASg+F4obgbgGiJuAuBmHemzAFJhXzKD5pZMK/kaOP3zh6AG1M5wf4UeYn5HzN7b0VQZUUw7FFUBcSYJ/PzMTVoMNeDOjYhhgBtqtDrVfl4Vw2QQDW5lRMS0AAJ/jPGo=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+CBcYNW+omgdTi0/PYDFvHjMDgyY37d1HChhK4TdqHunmpQmg0pSaRwygtnnUBACRChCl
+   eJxjYKA+CBcY/OalU9FMkHnUdCO6eek42OSah4uNzMfnn8Fi3jxmBgZNbtq7jxRArH+HgnnEpDVSzEujsnnEAGqbl0aEXwZ7+UdNAAB6+xiZ
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB2BGAYIyeMDpKglxTyYmYTY2PiE/IqLTYp5w9F9hOKDlHRFK/Oole5JiRdq+pcQwGcnujixYUsr8/D5l1qAUvOokV4IpQMA2g1XqQ==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="576" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain43"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="32" y="576" width="32" height="32">
+  <object name="south" type="mapchange" x="352" y="96" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain45"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="416" y="608" width="32" height="32">
-   <properties>
-    <property name="map" value="blackwater_mountain52"/>
-    <property name="place" value="north"/>
-   </properties>
-  </object>
   <object name="rest6" type="rest" x="224" y="192" width="32" height="32"/>
   <object name="rest7" type="rest" x="224" y="256" width="32" height="32"/>
   <object name="rest5" type="rest" x="128" y="256" width="32" height="32"/>
@@ -167,7 +161,7 @@
   <object name="rest1" type="rest" x="32" y="128" width="32" height="32"/>
   <object name="rest3" type="rest" x="32" y="256" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="blackwater_sleephall" type="spawn" x="64" y="96" width="32" height="32"/>
   <object name="herec" type="spawn" x="160" y="288" width="32" height="32"/>
   <object name="iducus" type="spawn" x="64" y="448" width="128" height="64"/>
@@ -176,28 +170,28 @@
   <object name="blackwater_guard1" type="spawn" x="448" y="128" width="96" height="32"/>
   <object name="blackwater_guard1" type="spawn" x="448" y="512" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
+ <objectgroup name="Keys" width="0" height="0">
   <object name="nondisplay:16" type="key" x="224" y="160" width="32" height="160">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="16"/>
    </properties>
   </object>
   <object name="nondisplay:16" type="key" x="128" y="160" width="32" height="160">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="16"/>
    </properties>
   </object>
   <object name="nondisplay:16" type="key" x="32" y="96" width="32" height="224">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="nondisplay"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="16"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/blackwater_mountain45.tmx b/AndorsTrail/res/xml/blackwater_mountain45.tmx
index 0dd4171bb..2c277459f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain45.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain45.tmx
@@ -1,125 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
@@ -141,7 +140,7 @@
    eJxzFWBgcMWBQQCXHCFMa73oarABdHF0vdjUEKMXlxpCepHFifULMf4mRi8l9hIKB2z+x6VuoPXiikNi/EWMveRgACA0KC4=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="416" y="128" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain44"/>
@@ -156,27 +155,12 @@
   </object>
   <object name="sign_blackwater45" type="sign" x="96" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="blackwater_throneguard" type="spawn" x="224" y="224" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="blackwater_bossguard" type="spawn" x="64" y="256" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="blackwater_bossguard" type="spawn" x="64" y="384" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="harlenn" type="spawn" x="64" y="320" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="blackwater_guard1" type="spawn" x="256" y="352" width="192" height="96">
-   <properties>
-   </properties>
-  </object>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="blackwater_throneguard" type="spawn" x="224" y="224" width="32" height="32"/>
+  <object name="blackwater_bossguard" type="spawn" x="64" y="256" width="32" height="32"/>
+  <object name="blackwater_bossguard" type="spawn" x="64" y="384" width="32" height="32"/>
+  <object name="harlenn" type="spawn" x="64" y="320" width="32" height="32"/>
+  <object name="blackwater_guard1" type="spawn" x="256" y="352" width="192" height="96"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain46.tmx b/AndorsTrail/res/xml/blackwater_mountain46.tmx
index b1157a6e3..26dd00f05 100644
--- a/AndorsTrail/res/xml/blackwater_mountain46.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain46.tmx
@@ -1,129 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="9" height="7" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="9" height="7">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0COA9YHYWxA31oWqiRbEjWFqHARwY2qqAblbBoqR5WBiIHkA2IQRYQ==
+   eJzTY2JgcMCD9YBYH4i9BXFjXaiaaEHcGKbGQQA3pqYakLtloBhZDiYGkgcATLsR3w==
   </data>
  </layer>
  <layer name="Objects" width="9" height="7">
@@ -131,7 +130,7 @@
    eJxjYKA/6OaF0F1QuoeXdDNm8zAwpAoQp1aWCUJLM6GKAwAzEAMh
   </data>
  </layer>
- <layer name="Above" width="9" height="7" visible="0">
+ <layer name="Above" width="9" height="7">
   <data encoding="base64" compression="zlib">
    eJxjYCAOhAsMPTWEAAAaXwIE
   </data>
@@ -141,7 +140,7 @@
    eJxzFWBgcKUjxgeorQbdXnQxAOw1DZ4=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="exit" type="mapchange" x="32" y="160" width="32" height="32"/>
   <object name="entry1" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
@@ -168,6 +167,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="0" height="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain47.tmx b/AndorsTrail/res/xml/blackwater_mountain47.tmx
index e68fb5cc7..f2de549e8 100644
--- a/AndorsTrail/res/xml/blackwater_mountain47.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain47.tmx
@@ -130,17 +130,17 @@
    eJxjYKA/6OaF0F1QuoeXMvNm8zAwpAqQrg8AIQwC5Q==
   </data>
  </layer>
- <layer name="Above" width="9" height="7" visible="0">
+ <layer name="Above" width="9" height="7">
   <data encoding="base64" compression="zlib">
    eJxjYCAOhAsMPTWEAAAaXwIE
   </data>
  </layer>
- <layer name="Walkable" width="9" height="7" visible="0">
+ <layer name="Walkable" width="9" height="7">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcKUjxgeorYYQBgDyyQ3z
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="exit" type="mapchange" x="128" y="160" width="32" height="32"/>
   <object name="entry1" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
@@ -161,6 +161,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="0" height="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain48.tmx b/AndorsTrail/res/xml/blackwater_mountain48.tmx
index 32decd3bd..cd194ace2 100644
--- a/AndorsTrail/res/xml/blackwater_mountain48.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain48.tmx
@@ -135,12 +135,12 @@
    eJxjYCAOhAsMPTWEAAAaXwIE
   </data>
  </layer>
- <layer name="Walkable" width="9" height="7" visible="0">
+ <layer name="Walkable" width="9" height="7">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcKUjxgeorYYQBgDyyQ3z
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="exit" type="mapchange" x="128" y="160" width="32" height="32"/>
   <object name="entry2" type="mapchange" x="128" y="96" width="32" height="32">
    <properties>
@@ -161,6 +161,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="0" height="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain49.tmx b/AndorsTrail/res/xml/blackwater_mountain49.tmx
index 008baa152..2b0ee2b1f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain49.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain49.tmx
@@ -1,127 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="9" height="7" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="9" height="7" visible="0">
+ <layer name="Ground" width="9" height="7">
   <data encoding="base64" compression="zlib">
    eJybxcTAMIsIvBsPhqk5iwfD1Giy48bUVkMIAwCdMB/V
   </data>
@@ -141,7 +140,7 @@
    eJxzFWBgcKUjxgeorYYQBgDyyQ3z
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="exit" type="mapchange" x="128" y="160" width="32" height="32"/>
   <object name="entry1" type="mapchange" x="64" y="96" width="32" height="32">
    <properties>
@@ -162,6 +161,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="0" height="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5.tmx b/AndorsTrail/res/xml/blackwater_mountain5.tmx
index 52e39b771..9b9e488ee 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -1,151 +1,150 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0EPD+kB8gg2BdbGowYVJ1euAhB3R9NqjyaPbE4SEg9H0BqLJ66LpTUHCyPpgGFneHo//COFAJLvR/UcM1oXaie4/UvSSqm8g9cLCmRQ9MljSlQwaRlePTQ+hNE1KPiBFLwBzmG8e
+   eJzTY2Jg0MOCHZAwNnk9HPKOQByEhHVx6IXJ20PNAOkLBuIUJGzPhN0dMPlAqBkgfSfYUHEgDncgq0nBog9ZDtkd6HqJxYFQu8nRC8KU6tUnU/9A6dUjI6xlsKQvGSRMrB5sGN0fuNIzJXoB8Ax1pQ==
   </data>
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYMAO2ngZGKbxQmhSAUjfMqh+UgFM3zIq2ZvBSlifDhNEX5QAhE5mgohX4NHLCMSveCA0CHgLQOibXBC6DGgOBzd2vYJoNEwvCHAi6YG5Ax285kGwkfUi6zdnQYjp4DAHpvcVD6r4axz8qcy47YUBSxbs4ppI/gLpRbcDBKSR3BkugN0tyPaC5KRx+A0dyDJB9BKrHh3g8i819AIAAlgazw==
+   eJxjYKANmMbIwLCLF7+adkbs4pNwiKOD7UDzO6FqdZgYGEDMBF4IDQMZrAwM27C4QxuofiYjRB8ICDIg6GSoWAUrqh4vAQaGXAFUsTo0s29yQegyoDgHNwPDVix2+wpgisEAJzeCDXOHLBMkPGHgNQ+qObVIdsD0m7MgxNKA8m94cNv5CioHU/MaTS2MP5UZIRaFww+WLNjFNZH85S2AMLMUye3STAh2uAB2t3gj2QuSQ9aDC4DCr40XohdEE6MHGSQg6SUVpPGiuhkbAACF1R5C
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYMAOvHkZGHyAOIEXhwI8IBqoJ4ZMvSA9MLsJgXABTL0wu0HAlps0vQlEuhldLymAXL0gfWkU6CUXDJReWSby9Q41AACZDwoV
+   eJxjYKA+CBcgT186UF8amXqx6bPlJs+s4QbSyQxTECA3LinVK8uEKebNy8Dgw0ueedFAfTFk6gWFny9Qrx8Z+kFhEAvUF4dHLwCUogdh
   </data>
  </layer>
- <layer name="Walkable" width="15" height="15" visible="0">
+ <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3FWDEI4BLHBdDlSdGLzayB0IusH12MFHvJtZMU/dSIz4HWCwD0zTAm
+   eJxzFWBgcB1BGAbQxZBpdHF0vfgAujpS9GIzi1z9uPxNqn50MVLsJddOUsN7qGMAZL8uKA==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="224" y="448" width="32" height="32">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="west" type="mapchange" x="0" y="128" width="32" height="96">
    <properties>
-    <property name="map" value="blackwater_mountain4"/>
-    <property name="place" value="north"/>
+    <property name="map" value="blackwater_mountain5a"/>
+    <property name="place" value="east"/>
    </properties>
   </object>
   <object name="north" type="mapchange" x="352" y="128" width="32" height="32">
@@ -155,18 +154,17 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="bwm_agent_1" type="spawn" x="96" y="224" width="224" height="160">
-   <properties>
-   </properties>
-  </object>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="bwm_agent_1" type="spawn" x="96" y="224" width="224" height="160"/>
+  <object name="puny_caverat" type="spawn" x="320" y="192" width="96" height="96"/>
+  <object name="puny_caverat" type="spawn" x="64" y="160" width="224" height="192"/>
  </objectgroup>
- <objectgroup name="Keys">
+ <objectgroup name="Keys" width="0" height="0">
   <object name="bwm_agent:10" type="key" x="320" y="128" width="96" height="32">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_1"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="bwm_agent"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="10"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/blackwater_mountain50.tmx b/AndorsTrail/res/xml/blackwater_mountain50.tmx
index d052b10be..ee35fe2d7 100644
--- a/AndorsTrail/res/xml/blackwater_mountain50.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain50.tmx
@@ -122,7 +122,7 @@
  </tileset>
  <layer name="Ground" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0KMAOwKxtyDx2B6qTx+Ig4E4WpB4HAhUrwvV6yBAOh7VO6p3VC919OqRqRe57JAhAcP0AADSP1Zf
+   eJzTY2Jg0ANiBxKwHhJ2BGJvQeKxPVSfPhAHA3G0IPE4EKheF6rXQYB0PKp3VO+oXuro1SNTL3LZIUMChukBAFzzVyU=
   </data>
  </layer>
  <layer name="Objects" width="15" height="20">
@@ -132,15 +132,15 @@
  </layer>
  <layer name="Above" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKAchAswMDByMzAwAbE4G0TMkBtCy7BB5Jm4sesDYRiA6fVkRtWLy05kANMLA4NZbyAPhFYHqtWA6tcC0jpQvTB5bHoTkeQqoewqKJ0mgCqPy80g0AlV14VFPSG9xAJ0/+ICxPoXGyDWv8QCmF5uYFxoI8UPDGhBxbnYsOvVRorHSjS3VSHFuzYUY3MzKB470fTiiydK/UsofmAAXZ0sEwNDPpF6iVVHCAAA5DkY2A==
+   eJxjYKAchAswMDByMzAwAbE4G0TMkBtCy7BB5Jm4MfWlC0DkYACm15MZVS8uO9Ow6IUBQnqRAb31BvJAaHWgWg2ofi0grQPVC5PHpjcRSa4Syq6C0qDwSMSjFxl0QtV1YVFPSC+xAN2/uACx/sUGiPUvsQCmlxsYF9pI8QMDWlBxLjbserWR4rESzW1VSPGuDcXY3AyKx040vfjiiVL/EoofGEBXJ8vEwJBPpF5i1RECAPn/GV4=
   </data>
  </layer>
- <layer name="Walkable" width="15" height="20" visible="0">
+ <layer name="Walkable" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB2iGBnA+Og0sjw2fbjUYlMzGPQi+w8Xm5BedHNwyWNzDzGAmnoJmUOsf0nVSwrAlrZwpVF86RJXPCLzickLpLiXWDNIyYuk6iUFAwClnC/R
+   eJxzFWBgcB2iGBnA+Og0sjw2fbjUYlMzGPQi+w8Xm5BedHNwyWNzDzGAmnoJmUOsf0nVSwpAT1v40ig2N2JL1/jSN6G8QIp7iTWDlLxIql5SMACCAzB7
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="exit" type="mapchange" x="224" y="576" width="32" height="32"/>
   <object name="entry1" type="mapchange" x="64" y="512" width="32" height="32">
    <properties>
@@ -157,27 +157,12 @@
   <object name="sign_blackwater50_right" type="sign" x="352" y="512" width="32" height="32"/>
   <object name="sign_blackwater50_left" type="sign" x="96" y="512" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="throdna" type="spawn" x="224" y="128" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="blackwater_acolyte" type="spawn" x="32" y="128" width="160" height="320">
-   <properties>
-   </properties>
-  </object>
-  <object name="blackwater_acolyte" type="spawn" x="288" y="128" width="160" height="320">
-   <properties>
-   </properties>
-  </object>
-  <object name="throdna_guard" type="spawn" x="192" y="128" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="throdna_guard" type="spawn" x="256" y="128" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="throdna" type="spawn" x="224" y="128" width="32" height="32"/>
+  <object name="blackwater_acolyte" type="spawn" x="32" y="128" width="160" height="320"/>
+  <object name="blackwater_acolyte" type="spawn" x="288" y="128" width="160" height="320"/>
+  <object name="throdna_guard" type="spawn" x="192" y="128" width="32" height="32"/>
+  <object name="throdna_guard" type="spawn" x="256" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain51.tmx b/AndorsTrail/res/xml/blackwater_mountain51.tmx
index 4717617eb..bd23cd55d 100644
--- a/AndorsTrail/res/xml/blackwater_mountain51.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain51.tmx
@@ -1,163 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="14" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="10" height="10">
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0EPCJ9ggWI8JE3sLQjC6OmRxEI4WhGB0dcjiIHyXDYJBemHqQGyYOLq6aCR10TjUvWVDiKNjdPOIUfcWTZwY85DF3uIIS1wYAHcENh8=
+   eJzTY2Jg0MODHbBgmLgjENtjkQeJewtiYl2geBAQBwNxIJSNjEHi0YKYGKQvBYhPsEFwChMqvsuGHesi6cGGKdX3Fos+GTx68dkHC2+YWhhfBgnj04cP6zOhuplYfej2g/gAxDZDew==
   </data>
  </layer>
- <layer name="Objects" width="10" height="10">
+ <layer name="Objects" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYMAEr3iwCKKB10SoQQctLBAMA6ZAthkQW3MzMIQLQMy0A7KnsEAwNpAGVPcDh9wbHtx8dDlsYCUzA0OqAJIAC4Q/lRlVnSY3Kt8cyT0weybwE7YPGwAAZfIPIA==
+   eJxjYKAd6GRkYLDnRhWbxYgq/5KLgcEOTc1MqJoWFgiGAR0mBgZtJoi8Ly8Dgx8QTwPiABEGBlOgutc8DAxTmRkYprBAMDIoA6pbBsSxQBwHZYP0gcRBwIcZ0/0g80AgGqgmBojboPpB+tDBGx4EW5YJQr/igdgD049sHwisBNqZKoBqDkivNBOm+cjmanJjl8cHJvBDaHMW/OoIAQBY6hio
   </data>
  </layer>
- <layer name="Above" width="10" height="10">
+ <layer name="Above" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYEAF4QIMOAGyHC42ueqesTAwvGAhrO4bC4KdhkcdPkCJunQsYtjUEWsHOgAAGIcJxw==
+   eJxjYKANCBcgT18aEfqm8aLydZiIM9sbqM8HqtcXSPvx4lePbidMfxwJ+qSBbpOFui+NBH3UBulkxgc6AADaNgX6
   </data>
  </layer>
- <layer name="Walkable" width="10" height="10">
+ <layer name="Walkable" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcEXCMOAqgB/TUx0uOXRxQoCQOpgcuh3oNDb3YDOHWL8jYwBn3xSX
+   eJxzFWBgcB0mGASwicEAPjl0dfj04dKLTZ6Qe3CZT6p9xOqnNIwB96MkMg==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="east" type="mapchange" x="192" y="256" width="32" height="32">
+ <objectgroup name="Mapevents" width="14" height="10">
+  <object name="east" type="mapchange" x="320" y="256" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain31"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="128" y="0" width="64" height="32">
+  <object name="north" type="mapchange" x="0" y="128" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain52"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="restless_dead_1" type="spawn" x="128" y="64" width="64" height="64"/>
-  <object name="restless_dead_1" type="spawn" x="32" y="128" width="256" height="96"/>
+ <objectgroup name="Spawn" width="14" height="10">
+  <object name="restless_dead_1" type="spawn" x="64" y="128" width="160" height="96"/>
+  <object name="restless_dead_1" type="spawn" x="256" y="128" width="160" height="96"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="14" height="10"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain52.tmx b/AndorsTrail/res/xml/blackwater_mountain52.tmx
index 597a06620..24e03dea6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain52.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain52.tmx
@@ -1,175 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="9" height="30" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="9" height="30">
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="30" height="10">
   <data encoding="base64" compression="zlib">
-   eJy9k8EJwCAMRcVDXcIV1BFqR6iu0GE7VhUNhhBjD6WHj2AeJvkfvVbKd4UiY5Ry6I7qT+bozF7OOHkjd+YsZ9KNpcy9DV26sY70wQzIoXoWmCDUMTOrV3GzcrNIDLez1UOcLzNvMYO9jYTHvcDbRLLgZq4szULy583+OK9VFlJeqz7SXiDYa5X7l8zKw9mfoG+ALMNB7QGy64Cm
+   eJy9ksENgzAMRRGHskRWaBgh0A1CGYFhGQssJeLX2MY9wOEpVvztn1iObdNEYADiBV6dVUPxuDMBb+NNqE0OLzp7qMEe350FSIoP12bhjZVal0pca7DH+volKz6S9iP8u4e6XOKqp7uuO/fBvOTDmUtvPiNNT56W77/wGT3l65kR7UK4mPMd4A5omtAeeHOWXtr5wLA0Ws6r3wAg7Yv6
   </data>
  </layer>
- <layer name="Objects" width="9" height="30">
+ <layer name="Objects" width="30" height="10">
   <data encoding="base64" compression="zlib">
-   eJzdUkEOwyAMs1Bvy4F71QdM23/2gv2RN9E+YopQJA8CtNf6UhpsB2KA++MdgEOAVxiQFuAbyzINuLuUr/olafsYMvG8fcPzAaxVXTXWZ5dWk51a7dGrXYXX38Nwtie5n/j/n6WfBZ/Ly4LzZF6PY348szqvRo/S18tjplPwvRLlbfxc3avnw3Wbob4r81N4b2F2bsVGOvb4AXhzIrU=
+   eJxjYBg84CUXbdTC1M9kJF0/qfaAwCwke+ZC2Y+g9DReBgYdJgaGHTyoeg4zMmCALkaEWhDWZiLNHWW8ENpBhIFhGS9C/A3UbpB5l4F2fIba08aLaQYhAHMfyCwQ+xWSv0D2gsBroJgmN0IcWU0BL6bYGyR2GhPC3x8ZEfGBHn4gIM2Eai+xANlt6GEAshuUbiZBwwgGQGE7jRHVrdjshcmDwiANR/jC4uk1jjB4xYMpL42WFmSR0gk+NQwsEJwqgCnXwIuqRxaJjW7WQAEAzhErPw==
   </data>
  </layer>
- <layer name="Above" width="9" height="30">
+ <layer name="Above" width="30" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYEAF4QIMBMFgUgOST4OqeclF2IxORsrtIUeeGDvIVWPGQnu7cIUtshrksEVXD1NjzoKpFgZkmQi7BwTSqZxuyDUDlxr0+KBnfiE3DM2xpCF8AABQZRJ1
+   eJxjYBgcIFyANmpx6YHx0/CYha4Hn1pc+sgxg1h7kEG6AKo+ZLYOE+nmEQvIiQtqAHLCiNZAlobhTG0gPYTcigwAUpsHVA==
   </data>
  </layer>
- <layer name="Walkable" width="9" height="30">
+ <layer name="Walkable" width="30" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcEXCIOAqgB8PZzX41KEDYtSgqyNHnpCawRBulIYtNcOYFHWkylPLDHLswgeo7WZCcQcA6SQ6HA==
+   eJxzFWBgcB3FA4JhgF5mowN8+ohRS4p+cgEpdlHDfnQziPEfsf6nZvjQK11R0yxqYAAJcEVm
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="128" y="0" width="32" height="32">
-   <properties>
-    <property name="map" value="blackwater_mountain44"/>
-    <property name="place" value="west"/>
-   </properties>
-  </object>
-  <object name="south" type="mapchange" x="128" y="928" width="64" height="32">
+ <objectgroup name="Mapevents" width="30" height="10">
+  <object name="south" type="mapchange" x="928" y="96" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain51"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="sign_bwm52_grave1" type="sign" x="32" y="832" width="32" height="32"/>
-  <object name="sign_bwm52_grave2" type="sign" x="32" y="768" width="32" height="32"/>
-  <object name="sign_bwm52_grave3" type="sign" x="224" y="832" width="32" height="32"/>
-  <object name="sign_bwm52_grave4" type="sign" x="224" y="640" width="32" height="32"/>
-  <object name="sign_bwm52_grave5" type="sign" x="192" y="608" width="32" height="32"/>
-  <object name="sign_bwm52_grave7" type="sign" x="192" y="256" width="32" height="32"/>
-  <object name="sign_bwm52_grave6" type="sign" x="224" y="288" width="32" height="32"/>
-  <object name="sign_bwm52_papers1" type="sign" x="192" y="320" width="32" height="32"/>
-  <object name="sign_bwm52_papers2" type="sign" x="96" y="864" width="32" height="32"/>
- </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="restless_dead_1" type="spawn" x="32" y="736" width="224" height="160"/>
-  <object name="blackwater_guard2" type="spawn" x="96" y="256" width="128" height="160">
+  <object name="sign_bwm52_grave1" type="sign" x="96" y="224" width="32" height="32"/>
+  <object name="sign_bwm52_grave2" type="sign" x="128" y="128" width="32" height="32"/>
+  <object name="sign_bwm52_grave3" type="sign" x="128" y="224" width="32" height="32"/>
+  <object name="sign_bwm52_grave4" type="sign" x="800" y="160" width="32" height="32"/>
+  <object name="sign_bwm52_grave5" type="sign" x="768" y="192" width="32" height="32"/>
+  <object name="sign_bwm52_grave7" type="sign" x="480" y="128" width="32" height="32"/>
+  <object name="sign_bwm52_grave6" type="sign" x="512" y="128" width="32" height="32"/>
+  <object name="sign_bwm52_papers1" type="sign" x="416" y="192" width="32" height="32"/>
+  <object name="sign_bwm52_papers2" type="sign" x="128" y="160" width="32" height="32"/>
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
+    <property name="map" value="blackwater_mountain43"/>
+    <property name="place" value="east"/>
    </properties>
   </object>
+  <object name="restless_dead_1" type="spawn" x="672" y="160" width="224" height="128"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="30" height="10">
+  <object name="restless_dead_1" type="spawn" x="256" y="96" width="416" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="blackwater_guard2" type="spawn" x="64" y="96" width="160" height="192"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="10"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5a.tmx b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
new file mode 100644
index 000000000..7af07dd01
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="18" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJyllEEOhCAMRc3s5v5broC4mL3iDRg9whxkaqY/aRoolVm8ROH7C5/K/JimeYBtQA8ysRKJ2Jk3j3m8MuvBQRRiIU7mw2OrqNvyOlgPXs8fi3gGRdSNDS/9DYiNOdSV+08dL/glQ1OUn+V1Aa1Hk526Xu1abjp3mcvWqV3LbVfv6Av0kZVzbe1noy/QR1YunnPwEh3nNeInPcMf/vr/uNOLvZ7SSJ215msuOO4YrFHuISju3H81Pw9ftgoGXw==
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJzVk79LQzEQx6+xQUTwvaYQUHSooB38B5zcXB0EXQVxkoJoB8FN7D/gXCq0jrq46B8g9A9waFWcC11FBRfxzlzIvUdKQXDwC0derrlP7kcK8D+1kgBU0SYVwGI5+P33vPo9+xpjrzh+oJyRvK+KdyyX47E+voDratGt3kj3FmBHBx8xj9BmR+RLLOJUeF8R5nWAvJLwNVKAzTTOOi2G/RTu+xjYxvimuJ9y9LLK8XbTUL/XgwEw2IcL9L/PhBqakVrqGN8rxWv8qQs5b8io6+D7Mtl8pai+AeY5ROuh3bLJWkmHzOvweqmzvV7iOVJ9Hxj/yYxHkSuxnnh/rl2uJ9rVTKK+zCXue0GFu0nd1PV5TfT4FevaF/Px74tmsYfnatoxiXPD965znkPj1g3RJ5qXz+WFf7fMnE7CuS1kbIt3S3NtM6cmeKSWCvm2cvOkXJ4jsyReZwQvLx8/weyGyf5XCsw7Rs6Zjr8pKepB12ZzpiukjWPkdWfHn/lr3jd9CEeb
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgc4LAYddRfhopfIsE8kB5c6kl1F7pZa/ghtJIwhJ7LhJCbw0++u9DV9RAwCwRAfmESJqwO2Y0wII5FjJSwuUxALbpfYeq5cfgLn93Ywg2X+sNo6WWbAHF2wcRCWFHFiYkvbObB9ElCw/kiCWGLLb7oCbYLMTDsECJND670cAloznEgPkGiedjCYCfQjF1A/BCIP5Fo3mABAJYOKWk=
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEU0wSDADXNIcY8YtUgA0JqiHUjIfXYAC63E2M3KeYREzbUNA9ZPzZ16Hbg8i8uQKw6fICSNENt86iZT6iFB4N5APWD2OI=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="18">
+  <object name="south" type="mapchange" x="224" y="544" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain4"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="608" y="224" width="32" height="96">
+   <properties>
+    <property name="map" value="blackwater_mountain5"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="18">
+  <object name="gornaud_1" type="spawn" x="64" y="256" width="96" height="160"/>
+  <object name="gornaud_1" type="spawn" x="160" y="384" width="32" height="32"/>
+  <object name="gornaud_2" type="spawn" x="160" y="128" width="128" height="256">
+   <properties>
+    <property name="quantity " value="2"/>
+   </properties>
+  </object>
+  <object name="gornaud_1" type="spawn" x="352" y="160" width="224" height="320">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="gornaud_2" type="spawn" x="192" y="384" width="192" height="128"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="18"/>
+ <objectgroup name="Replace" width="20" height="18"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5c.tmx b/AndorsTrail/res/xml/blackwater_mountain5c.tmx
new file mode 100644
index 000000000..d751d14ec
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain5c.tmx
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="15" height="9" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="9">
+  <data encoding="base64" compression="zlib">
+   eJxbx8TAsA4NrwfiLZwIvBaLGlyYVL0HkPBBNL370eRhGGbPJSR8GU3vRTR5GIbpfYKEkfXB8BMmTIzNf8TigdQLwnOgGJ2PDwMAmr1itA==
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="9">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAOPgkxMFwCYiZhHArwgJNAfaeAWIgMvWeEIHbfESKs9hsbBH9ng/DZ2VFpfICNHYJBatcwMTC8gdoHsns1E6b6rVjc8wkqBnJrPtCvBcII/lEgPgYNw6M4/HIGyc7jQHxCCFUMBN5g0Tsb6L65TAg7QABkzyMhRNjDwpESAABJ5yQn
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="9">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAOdgoxMOwSwiFJABwWI08fst7vbKTbc4kEe7G5MV6YgSFBmDy9ILAdGF47CIQZMWGDK+wpCVdyAACXJQ17
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="9">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEUj2IsGAB9E2jy
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="15" height="9"/>
+ <objectgroup name="Spawn" width="15" height="9"/>
+ <objectgroup name="Keys" width="15" height="9"/>
+ <objectgroup name="Replace" width="15" height="9"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain6.tmx b/AndorsTrail/res/xml/blackwater_mountain6.tmx
index 2191fe048..05ece9a6a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain6.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain6.tmx
@@ -1,139 +1,153 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0EPDJ9gwxbBhaqrTh6rTxSHvAMWOUHX2UD66GUFQHAxVFwjl66KpS4FikBoYTsGiDlkeGeNSJ4Omh5AfZdD8AABNpSFE
+   eJzTY2Jg0EPC+kB8go2BQRdNHB3TW50DFDtC1dlD+ehmBEFxMFRdIJSvi6YuBYpBamA4BYs6ZHlkjEudDJoeQn6UQfMDAE29IUQ=
   </data>
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJwLE2BgCEPDUxgxxaiNsYFwHOK0BDpMEDqZCbeaMl5UNic3dnXSUDNkmVD5pAAAes8OkQ==
+   eJwLE2BgCEPDUxgxxaiNn4liYhDAJkYp6GTELafDBKGTgfRMHOrKeFHZnNzY1UlDzZJlQuWTAgDIExgh
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJwLE2BgCKMxBgFi1CnzYRdDx+FYxGEgXADBTkNiowOQukmMuOWxmUcPdQC+mRSC
+   eJwLE2BgCKMxfiZKnLqtWNSB9KLjcCziMACSg4E0JDY6AKmbxIhbHpt59FAHAKpeHTA=
   </data>
  </layer>
  <layer name="Walkable" width="10" height="10">
@@ -141,7 +155,7 @@
    eJxzFWBgcEXDIIAuhg2PBHW4ACEzcJlJyE0A1AIb5Q==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="64" y="288" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain5"/>
@@ -155,8 +169,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="puny_caverat" type="spawn" x="160" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain7.tmx b/AndorsTrail/res/xml/blackwater_mountain7.tmx
index ff79aff35..2a80b1163 100644
--- a/AndorsTrail/res/xml/blackwater_mountain7.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain7.tmx
@@ -120,27 +120,42 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlj0OgzAMhVGGzhygV4g5AmLqnl4hh+2xSodKED3/xG2SDh3eYmI+xdjPUJimzCjuus1nveIJKIJYBvlv0f7sccFaQR53NjLv8XAT4C7MecRF9bJwUZ16cFGdenBp0H0l7jWcRQHHNC4FLC5vlBZmjiVJda/hSv3I9cCn3M3BRT5Uq+TgHn2o/E6Spx6VHdxccMt9YOHWMksfQv3Ro69GcUuf2UDd0Qx8e47ugv+25FpzRnHRHtAk+b0n56920vagtnuQT1r8UutnC1fz0p7cX7+vd+6k/9KWfcn5TmufeAJh2p80
+   eJztljsOwjAQRCMX1DkAVwDnCFDRmyv4sDkWSWHJWc1+MP5IKMU0G09e4s+svZumyOi26TUftdcD0AJqEfiT/PZsvWAhLjc2MO8p4QbA5cZHUEffbeGieZLG1+KieeLGLxX/F/lGc6/uqLvDNY1LPZpvlDxzjiVJ8/4N17qvLev9j9w8h+g6SZn6KzcSLu0Hrbh5DiF/j/UdxaU58wTzjvZi7f38Zt7Xmmv1jOKiPqBJyvsSz6l24vpgymGtB6Cc3L0Pg69070p+dIftwdX6QyuultPSvcxy7jhujbuBpDx3ErNHTnwAfp2gXQ==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzllssNwjAMhqOeKFWV3tkh43QDTozAvSPABnDgDrOwDbJQpNSKXTuPVohfiqo6cb44jZ2OgzEj07C4sdAulvcP56HsWu65N+Zmv08pt+10XK/3fs5+Vo4XdOrnNsl3inEfvY6LbalcL9eln6scriTeEtwUv62kjbtUHNrvw/mkcCF/Qa5bj+tQrQlrCOUz2bntauNjOa4Xl/e4D+uewcV26T7D+8vqzlw4bkB2ri+2RmiHRs/N2WdqHVTu4fMM4uqrlBueVY5LrRnn1xL32ND3XGz+0vXaa0fsXS3uL9wR/6DcOy/Xr43k2xpcEOTbZPX+1DqkXCqGJX+oLbF/YQk3Z7+o+WpqqzrxAQP+gws=
+   eJzllssNwjAMhqueeKiCS07s0HG6ASdG4M4KjMChZ+gELRsgsQBzgAVW3eAY102FEL8UobpxPpL6kWKZJIUwfElzNf50HU6VC3OPj3c3Mk6vudvsOQd/NdzpXM89u/b5OmvnXlw7tFxfGu4m6861nnOZ9eP6cy3cLWHmc5lbu+6ZNkbuxb2PRuDGimeL37fUd9+x9sHlMeZyyB6LC3EN+Qsxmb/yH+LRj3e0x+RSYQ2RuLtF175ftO8t3JLUELRr6sFhIJeu79vhO4S4lZFL602Ii3bp+67SflyU9Zz9NengcoDGMwrrqzWewS8nfZHz4eo01teQXeKu03Cfk84kRr2m5zQJ9KYxuL/SI/5BQ3veED+IvymTb1p/rk9quSDIN+gzfblUlYHL+Wr8odZxd+FPfrVwjxxrv0NF/59/Fx5Td1gBwd0=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJwLE2BgCBsgjAuQoh4mjiw/2O2dzUuZvQMVzsPVXmqmZ1rbQU234gsjWoUhuWA42Iue7/HJDQf/DpS9wy2csamnhb3EqB8oe8mxm5y4ozQ9jOJRTCymJP2N6h38cTQU7QUAFm38tQ==
+   eJwLE2BgCBsgjAtgU3tcFLdaZLBdFIKpZS8u9ejixwjYiax+Ni/59oL8dg0NkxvOuMKJlLChRzjT2l5iwpAYTC1zhjsmFQwne9HzPjaxweLfZ6IQvI3EdE0qQC+HcInTOpypYS8xgNR4xBX+1LYXHTylg7346vXBYu8oHnmY1DKPHL3YACllD7l6R5q9lLbLKHEzNTAM0MMuAKUlGXw=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlFEOAiEMRPcIXmrvfyW/TAxpZ94UVkmIiLRvGFrv13Xdf5rdUL9VZz/nXRzlKp2K1d1xl9ut1V7FJb6qXN3e5H0rj1Jul9dxV+3qDqSGq7U6+xRXeVR9P8lNP5NxkpvwVf/u8JyGpK8I1/XE93pSC+ROZLj+VTGn6qrKS/ss8bljuJ47Wc+qrqoYwlP17ridR4TrtNP4ijuZKzftp1UTPbfDVf8xnS+ES/yme45bxSn/Jm+pcqf91A2iz8W7uqHerzkdT90n0Utqk+RR+dM3d3qpzokXv5hvQq+TGA==
+   eJzFk8sNwzAMQzNCl8r+K/XUSyBSj7KCGjBiOxIp6nN/ruv+01bL/atsf/adH+V1cToupfGUl+hS7wlOh6XeJvWtcpTyKtyO9xm700B6uDo727d4XY6q+yYv+Xb1UWuTN+F383uil84zmSvKS+KY9kKnl66J/3ZfVbgk/+rubCYzt9nPTlflk/KlvNV5kzf1cTEnNaM4Smdid8LrelzlhfCSfNO3jrfyc/lL69dhdzHRfib1o3pV39DcP7E7Xqenw057k+A4/EkNKd50KZxUw2R/AeI8lME=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="west" type="mapchange" x="64" y="448" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain6"/>
@@ -159,19 +174,20 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="640" y="32" width="32" height="32">
+  <object name="south2" type="mapchange" x="96" y="928" width="64" height="32">
    <properties>
-    <property name="map" value="blackwater_mountain9"/>
-    <property name="place" value="south"/>
+    <property name="map" value="blackwater_mountain7a"/>
+    <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="gornaud_1" type="spawn" x="32" y="64" width="192" height="160"/>
   <object name="gornaud_1" type="spawn" x="416" y="64" width="160" height="128"/>
   <object name="gornaud_1" type="spawn" x="480" y="352" width="160" height="160"/>
   <object name="gornaud_1" type="spawn" x="704" y="352" width="160" height="160"/>
   <object name="gornaud_1" type="spawn" x="160" y="512" width="160" height="128"/>
+  <object name="gornaud_1" type="spawn" x="32" y="768" width="160" height="128"/>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain7a.tmx b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
new file mode 100644
index 000000000..9a904065a
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbLMbAsBmI1zExMKwH4i2cELyWCSK2WYwwxqf3CRMqXstEvF6YGLIcMe6hVO8cJlRMbDgMVYzNv8T6+QATJiZW7yUmTExsPKGnK2xpi9i0QUr6oEQvejjDwhoAiN+sFQ==
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYICAQ2LYMTEAn15DSQaGJCSMbiY+vc6SEPq7EEItsQCmF9keYgG54TBQ4IYgZfppFffE6AWlDyYxVDF04CqMXS8ojoUI6MVlL0ivElT9QyHS9T6CpsnrJOrFhgHPgjVE
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYICAQ2IQzICDjw/A1AZJQjCyXmdJTLXY9KJjYvTiA5ToxeWewQoodR++OKClXlgcJUkiMDa92MTQ4xeXOnz20lsvrrACADyDK5w=
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsBEJw8BGMdIxNfUiAxifHL3Y3IRPnhT3E7KHkF5SzcLnH0rsI0cvOWFEql50+3CFCbF68QFc8UBILzlpHR0DAJctd7c=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="15" height="15">
+  <object name="up" type="mapchange" x="352" y="352" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain9"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="128" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain7"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="15" height="15">
+  <object name="gornaud_1" type="spawn" x="128" y="64" width="64" height="96"/>
+  <object name="gornaud_1" type="spawn" x="256" y="64" width="160" height="64"/>
+  <object name="gornaud_1" type="spawn" x="192" y="384" width="128" height="64"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="15" height="15"/>
+ <objectgroup name="Replace" width="15" height="15"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain8.tmx b/AndorsTrail/res/xml/blackwater_mountain8.tmx
index f4af76d32..25bdabe81 100644
--- a/AndorsTrail/res/xml/blackwater_mountain8.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain8.tmx
@@ -1,160 +1,174 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="20" height="22" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzF2BgcCcRpzChYlL1o+MTbKh4uJs3ikfxUMGjeX0U48MAKM6TkQ==
+   eJxzF2BgcB9gnMKEiik17wQbKh41bxSP4uGJR8uOwWXeYMMAWSik4Q==
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYCAfTOOnQDMWsIyK5lXzMjBso7L7RgF1wBuegXbBKCAlDgZzPgcBUD4H5fdRQH8AAGYLBz8=
+   eJxjYBg8YBo/dc3bRmXzqAmqeQfaBaMAF3jDM9AuGAWkxMFIKjdgYLT8IA4AANq+BdU=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYBg4ECaAG1NqFi4xariNWm6k1DxCZlICaG0eNQA1zUI2k5r6KI1XQmKkmkeNtIKuhxjzyMlPpJiFLo7L3fj8Q+3woUc+H2gAAAfOLdM=
+   eJxjYBh+4JooKiYXhAlA8FagGc+AeJsoQoxcs0D4ONRN20VRxck17yjUn8coMA/dTGyYHEBt8/CZS03zqAGoaRaymdTUR2m8EhIj1TxqpBV0PcSYBxNHLzuI0UPIL8SWH/jECZUfpAB089DLD3IALfI4NQAA9TU64w==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0gjA9Q0yxyzKS2ecSYOdBhSMhcappHzfRD7TRJTX2Uxiu1/EsIUOI2YswjBhAbv+SYRSiOyDGPHmFNyExqpn1yMADQul34
+   eJxzFWBgcB0kGASoYQY2QE2zyDGPGDCQ5hFj5kCHISFzqWketdIztcxCNpOa+iiNV2r5lxAgxW/oeogxjxhAbPySYxahOCLHPFqENalmUjPtk4MBSY1omA==
   </data>
  </layer>
- <objectgroup name="Mapevents"/>
- <objectgroup name="Spawn">
+ <objectgroup name="Mapevents" width="20" height="22"/>
+ <objectgroup name="Spawn" width="20" height="22">
   <object name="north" type="mapchange" x="480" y="32" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain7"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="160" y="448" width="32" height="32">
+  <object name="south" type="mapchange" x="160" y="480" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain7"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="20" height="22"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain9.tmx b/AndorsTrail/res/xml/blackwater_mountain9.tmx
index ce2551700..61b6480c0 100644
--- a/AndorsTrail/res/xml/blackwater_mountain9.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain9.tmx
@@ -1,167 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="17" height="23" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="19" height="12" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="17" height="23">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="19" height="12">
   <data encoding="base64" compression="zlib">
-   eJyllNENgzAMRFGQmCIrJB2Blg1aGKHD8sVMgGQL9+oEGz5OiRLnxboL5NA0T1IWc1QWI+qx6UMaxBzFe73C3hlf0kTj3B1ruPcGNjP2M6il/R2lJLvGsCo5GVGp9TCS0ncU2VgYGRgp/Ges9Snv4ixfVMcZa2+l1D9nOVINZ4z91BicJWbsYZx57WGgb1YGe46+ehmar1cYmq9exh1PawzrGysxSv80K0P7Xix1Zz1Y74qFs95+UStkW6+O
+   eJydkTsSgCAMRBk67996BT6FPXIE5AoeRBzJzJpJwLF4zbIsm+CtMX7ADoy0WUZuHIBrBKalSQ75a+MEKAu10nVtntx92/Im9TNJxxycpwr+m6KcUTfqgfNwb1CyETfpQR5pLo5XeiBx8NZqH2hPs/ei4pH+7sse/mRRZ+mOtB8On3mka17iAn5Zps4=
   </data>
  </layer>
- <layer name="Objects" width="17" height="23">
+ <layer name="Objects" width="19" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYKANaGOl3IxpZJrxmoeBIY0Jwi4QgNCpSDRIDqQmmQm3GRzcCDbIjDJeVPOxgVd4xEFm/ONGFZeG2i/LhNtMmDjIfphf8NknjeancKAeTjS/IJuNrh4fkEULU1x6cYUDDMD8ghym5AD08EAGOkTEMT4zkP2AK25AAFu8wABy/BICxIYHvrBtwBMexIAEXogbOLlxq9EhMr0kYPELejji8ksCATcgm4crDU7jRWB8AF/6X8aLwOgA5PY2fsJuxOeOcAL5iBh3EAuIDQ9kAACb3C42
+   eJxjYKAf4GRiYPBjQhVTFmZg+MRGvBlSUP2SQDoOiPmRzAOJMbEzMHAxQdjEgDVQdRsFIbQzkr47YhB6NQ6z8oDiisIQ9hkhhPg8qPpgKP2VD2LWdagdSsKYZtUxIdzzEGrWbCR7QW6AuRXmrhuCmG4DqUF2yxc+VPk9QL17kfA7MYj7kO3bJoSwSwjo1ktA/jWo28WQ7HuJZA+6e2HgGFDNSSA+JQRx1yckPXeEEG5+BnTHSyBmxhNvIP03hSDuOQ7EJ4D4DZobDgPN+AbEP4H4kRAiXrEBkFuQ3TwXyP4kiqpmLpI8Nv9RGwAAg2k2Jg==
   </data>
  </layer>
- <layer name="Above" width="17" height="23">
+ <layer name="Above" width="19" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYKAOCBfAZNty41dHjBnIoJORNDPS8KhDloOZS4wbiQUDYUY6FvWyTLS1kxwzsLkTXR++uMNnBynuH+xmoANc4UbIDGLDlZAZcxhxy5PqDlqb4c3LwOADxAm85JsRDdQbQ6EZIL0wt6ADYvMmyAyYW8gF+MIDFwAA7IEXXQ==
+   eJxjYKAfOCxGnBgxZlyiolmkymFTg809xMiBwGUxwmqIBSBzmIQpN2enEAPDLiHc8pfJcO92oHk7sJhJbLzh0o8M5jIRZ9ZxoDknCJg1EAAAawAURw==
   </data>
  </layer>
- <layer name="Walkable" width="17" height="23">
+ <layer name="Walkable" width="19" height="12">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB2kGATI0QPTh87GRuMzgxxAihm47KTEDFL9Q2qY49M7XMwgNqwImYErXZLjF3qYQYw8se4gNh2Sagex+ilNO/Qwg5g0OpAYAEPCW/o=
+   eJzbKMbAsHEYYRAgRw8M4BMj1hx0d6ADUswh1yxc6vABSsKInHCihlm4wotaZuESoxUGAGgrhbU=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="384" y="608" width="32" height="32">
-   <properties>
-    <property name="map" value="blackwater_mountain7"/>
-    <property name="place" value="north"/>
-   </properties>
-  </object>
-  <object name="north" type="mapchange" x="160" y="64" width="32" height="32">
+ <objectgroup name="Mapevents" width="19" height="12">
+  <object name="north" type="mapchange" x="448" y="64" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
     <property name="place" value="south"/>
    </properties>
   </object>
- </objectgroup>
- <objectgroup name="Spawn">
-  <object name="gornaud_1" type="spawn" x="416" y="288" width="32" height="32"/>
-  <object name="gornaud_1" type="spawn" x="448" y="480" width="64" height="64"/>
-  <object name="bwm_agent_2" type="spawn" x="320" y="128" width="32" height="32">
+  <object name="down" type="mapchange" x="192" y="320" width="32" height="32">
    <properties>
+    <property name="map" value="blackwater_mountain7a"/>
+    <property name="place" value="up"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" width="19" height="12">
+  <object name="gornaud_1" type="spawn" x="128" y="160" width="128" height="128"/>
+  <object name="bwm_agent_2" type="spawn" x="320" y="128" width="32" height="32"/>
+  <object name="gornaud_1" type="spawn" x="320" y="192" width="160" height="160"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="19" height="12"/>
+ <objectgroup name="Replace" width="19" height="12"/>
 </map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 71e363171..c720b23d4 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -1,42 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <worldmap>
-<segment id="blackwater" x="10" y="206">
- <map id="blackwater_mountain10" x="39" y="325" />
- <map id="blackwater_mountain11" x="39" y="294" area="prim" />
- <map id="blackwater_mountain12" x="10" y="315" />
- <map id="blackwater_mountain14" x="60" y="325" />
- <map id="blackwater_mountain15" x="81" y="294" />
- <map id="blackwater_mountain16" x="83" y="263" />
- <map id="blackwater_mountain30" x="130" y="237" />
- <map id="blackwater_mountain32" x="128" y="206" />
- <map id="blackwater_mountain40" x="77" y="346" />
- <namedarea id="prim" name="Prim" type="settlement"/>
+<segment id="bwentry" x="14" y="387">
+ <map id="blackwater_mountain5a" x="14" y="387" />
+ <map id="blackwater_mountain5" x="35" y="387" />
+ <map id="blackwater_mountain5c" x="35" y="403" />   
+ <map id="blackwater_mountain9" x="51" y="400" />
 </segment>
-<segment id="bwcave1" x="69" y="225">
- <map id="blackwater_mountain17" x="69" y="256" />
- <map id="blackwater_mountain18" x="70" y="233" />
- <map id="blackwater_mountain19" x="86" y="232" />
- <map id="blackwater_mountain20" x="97" y="231" />
- <map id="blackwater_mountain39" x="118" y="225" />
+<segment id="bwentry2" x="46" y="368">
+ <map id="blackwater_mountain7" x="47" y="368" /> 
+<map id="blackwater_mountain7a" x="46" y="399" />  
 </segment>
-<segment id="bwcave2" x="105" y="200">
- <map id="blackwater_mountain36" x="134" y="200" />
- <map id="blackwater_mountain37" x="136" y="211" />
- <map id="blackwater_mountain38" x="105" y="217" />
+<segment id="bwsettlement" x="0" y="414">
+ <map id="blackwater_mountain43" x="37" y="414" />
+ <map id="blackwater_mountain44" x="16" y="425" />
+ <map id="blackwater_mountain45" x="0" y="424" />
+ <map id="blackwater_mountain46" x="3" y="416" />
+ <map id="blackwater_mountain51" x="99" y="424" />
+ <map id="blackwater_mountain52" x="68" y="425" />
 </segment>
-<segment id="bwentry" x="14" y="342">
- <map id="blackwater_mountain5" x="14" y="391" />
- <map id="blackwater_mountain6" x="23" y="380" />
- <map id="blackwater_mountain7" x="34" y="366" />
- <map id="blackwater_mountain9" x="42" y="342" />
+<segment id="bwcave1" x="109" y="365">
+ <map id="blackwater_mountain17" x="109" y="365" />
+ <map id="blackwater_mountain18" x="112" y="376" />
+ <map id="blackwater_mountain19" x="112" y="399" />
+ <map id="blackwater_mountain20" x="123" y="399" />
+ <map id="blackwater_mountain39" x="134" y="403" />
+ <map id="blackwater_mountain39a" x="128" y="424" />
 </segment>
-<segment id="bwsettlement" x="113" y="158">
- <map id="blackwater_mountain43" x="150" y="158" />
- <map id="blackwater_mountain44" x="129" y="183" />
- <map id="blackwater_mountain45" x="113" y="197" />
- <map id="blackwater_mountain46" x="116" y="189" />
- <map id="blackwater_mountain51" x="138" y="235" />
- <map id="blackwater_mountain52" x="138" y="204" />
+<segment id="bwcave2" x="51" y="415">
+ <map id="blackwater_mountain36" x="80" y="415" />
+ <map id="blackwater_mountain37" x="82" y="426" />
+ <map id="blackwater_mountain38" x="51" y="431" />
 </segment>
 <segment id="flagstone" x="124" y="483">
  <map id="flagstone2" x="124" y="483" />
@@ -97,6 +90,17 @@
  <map id="blackwater_mountain2" x="11" y="430" />
  <map id="blackwater_mountain3" x="14" y="419" />
  <map id="blackwater_mountain4" x="14" y="403" />
+ 
+ <map id="blackwater_mountain10" x="57" y="382" />
+ <map id="blackwater_mountain11" x="57" y="351" area="prim" />
+ <map id="blackwater_mountain12" x="28" y="372" />
+ <map id="blackwater_mountain14" x="78" y="382" />
+ <map id="blackwater_mountain15" x="99" y="351" />
+ <map id="blackwater_mountain16" x="115" y="351" />
+ <map id="blackwater_mountain30" x="95" y="426" />
+ <map id="blackwater_mountain32" x="64" y="428" />
+ <map id="blackwater_mountain40" x="95" y="403" />
+ 
  <map id="crossglen" x="148" y="355" area="crossglen" />
  <map id="crossroads" x="179" y="300" area="crossroads" />
  <map id="fallhaven_ne" x="241" y="382" area="fallhaven" />
@@ -258,5 +262,6 @@
  <namedarea id="loneford" name="Loneford" type="settlement"/>
  <namedarea id="remgard" name="Remgard" type="settlement"/>
  <namedarea id="vilegard" name="Vilegard" type="settlement"/>
+ <namedarea id="prim" name="Prim" type="settlement"/>
 </segment>
 </worldmap>