diff --git a/AndorsTrail/res/xml/fallhaven_ne.tmx b/AndorsTrail/res/xml/fallhaven_ne.tmx
index 1327e69a4..32139ab78 100644
--- a/AndorsTrail/res/xml/fallhaven_ne.tmx
+++ b/AndorsTrail/res/xml/fallhaven_ne.tmx
@@ -125,12 +125,12 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztl9ENgjAQhkECPDURxtINdA7dwLiAUUZxARIXMHEEn01IeJRaLhyl7dFWTDQ+fLmipX//H8JBmQRBacEs648f8/5vL5iBds6F2WHaD98DH1+ZHph/Y3aMyWSR6XH1K/sGj5hVs/4pFlXG1a/se3BtR+Lr1xVfv65QvnZ5EOzzYZ3a76HRODZsYlHh2FdX5wdqlQiKtBtXnpoc2L+uwjyu66uFqQjeqfXnyyB6ndO5I9ajep0JU6+k1ltmaqb2u277Ha8Ycl1Pv645mrKyys8mM9ZlpYP3gm0s5ed5j4DfsHnu3iNRYQycUwH8p9O1yQznVkfdGDRrpEtdS5yR6j5T3nfJUPMe0VqYEGVSpP1jFfL5ddTh+gyj+iV//1S9g04JfFt8Wlf7XfODfrEmr0+Ryqe1
+   eJztl9ENgjAQhsEGeGoijKUb6By6gXEBo4ziAiQuYOIIPpuQ8GhruVBK26OtmGh8+HIHlP79j4aDKo2iyoFZ3s8f8/65F9RCO+ZC3bCth6+B51dqBsbfqBtjarLIzfj6VX2DR5kVm/+UiKji61f1PXi2Iwn160uoX18wX7siivbFME7t98A0joxNIiIch+qa/ECsU0GZdXkdqMmB9ZsijOO6oVoyNcI7tf58GUiv87p3xHxYr7Nh65XYfMtcz9R+122/41EGnTfQr28dbbVyqp9LzWhXKxO8F2wTpX6BewT8xuy9eyciQg6cMwFcM+m61EyuW0O6HDQbSRd7lnKNdPtMu+/Soead4FoysVSTMusf61Dvb0iH7zsM65f8+1P3DTol8G/xaV3jf82P++X5E5FPqDY=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1V8FOG0EMHbTAKVE24RuA/kC/AaXQSsAJLqiIcMuhSMAn0Csn/qTtFwA/UCFFSKzgmAPhyiHqWGt33jieJZvAk6zxzu6Mx/ZzPHGO0XZuoe1i6DnWX/KgC2hulPO7jwCeRXQ4w8TZFeY5G679r6vYXCyV4+9OPJpxrQFaO8qD/tCY/OZqwbkbtifj8Xvkoe655/Q1tde+8uWJY/AI81Zc6uL7snM7LLteNv3+2zCXksPl6W0cM0/+dMLcEa//xT5s5vDMcZB3g0bQj2rYFdwadj83Y7sIeUdYb8brxAf0BXXiJYJ4TLyk9QPI15af+1Ih/Ty2Kz6gL6I/WTzgGFbG2aV1Waf90c8EzVVcvw5xJv8/QWwvYa9ViPOZl3Mvp5BreR42wjPteQpxpbkfCT4LXweJmiG7VflA2UroKAcqfxLXn8xlGnt5zGc626MRSwvIW/FpCL7Jvl/5u7Vmqa9BnK3fjzHMDdVvTrtp1wvirfqcpX4Jb9nFvFtyUtPug6oXAvW7bsu/83VXdOLvdQ2O5/xtJrt6j2dvc/SevS5hV7DIXOmuOHedOfc3izlWhY2VSf2bj11vqZQuvC+gjvof5JcG+UP1h/6+zpCzaeMhGACvCra9k5Xjvc/tXivcq4RnyDfUe3kYU3wjntxy7grl7yHbHSouC8+Qb6KbvYbRWAz6XVaKAO2e8LzVK+memeqhd1nwOYUx3B/EbgFrpK6jeKk7XBt6VOr+WZV3HedZ8DJlL6rqTak7RXA0/Z8C+6zVh7GPYi9OfWf1b7zjWyCuYS40JM40Wvmw1lo2/wE4E7Rr
+   eJy1V0tOAzEMDRpg1arTcgY+F+AMqPwkYAUbBKLsugAJOAJsWXET4ATABRBShcQIll3QbllUxBqbvLjJ0GnhSVY8mUkc2891agyjbsxU3fjQc6z3U6cLaK6X8rv/AJ5FdDjD0NkVJjkbrv3RVWwuZ/LxruGPwbiWAK3tpU5/qwx/czNlzCPbk/H4L/JQ9twT+hrba0/58sExeIf5UFzK4mDWmG2WHStrdv8tmIvJ4ezoNo6ZJ/cNN3fE62/Zh7UUnjkO8q5TcfpRCbuCp4Dd5apvFyHvCItVf534gL6gTrxEEI+Jl7S+A/lat3OrBdJOfbviA/oi+keIBxzDwjibuC7rtD/6maC5iusXIc7k/xLE9hr2moc4n1u5sHIGuZbnbsU9055nEFeaO4nwWfjaidQM2S3KB8p6REfZV/mTuF4xl2lspT6f6WzvgViGgLwVn7rgm+y7wd8tVHN9AeIc+v0YwFxX/ebUq+F6QfxWn+PUL+E3u5j3kJyWtPum6oVA/a5Zs+9s3WUN/3tdg4MJf5vJrt7j09rs/WWvi9gVTDNXmnPGPCTGPCc+x4qwMjesb9rYtWZyacL7DOqo/U9+aZA/VH/o79cYORs1HoIO8Cpj29tJPr7a3O7W3L1KeIZ8Q72VujHGN+LJE+cuU/4est2u4rLwDPkmerDXMCrTTn9JchGg3VOeD/VKumfGeuhL4nyOYQD3B7GbwRqpay9e6g5Xhx4Vu38W5V3HeRz0R+xFRb0pdqdwjsb/U2CfDfVh7KPYi2Pfhfo33vFDIK5hLjQkzjSG8hFaK/wQkO1vOU60hg==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -138,7 +138,7 @@
    eJzNVsENwjAMLKroiwcfWI0JYATEJoxUnohJygPeECELU8U+NzZRT6rSxnWu5zp2miYWj6VufwJ7qd+m0+1bYI/2I+zWPv+SeA1vzruTl+tGa92cXByl+eEF+s/emEq6tPw4L8r5CJIub14i8PX5vTcvp/Ae/szFUYPr2H0u6VmaQzitfscxIvd3FObyTVq/i65lfD2t33l7Vul60TXFGr/oM0fSezVoiT5z5OKHtOUwVS/nJd1IWw5IL/HQmGqmJc4IWt4lG9Xmvv3O74N4L61s4xifHzTdaB9pPVTqQ5Y4S75DxVpLcarJqYH6qdZ3+TsU5zRa/eaEF+MlO5Y=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztk0sKwCAMRD1CL+X9ryRdCBJivmPsooGAYuozmWl/Wut/hvONG8zJreBbo4q99n2aXe0jaZ4Z3Xf1kfg6V/pu7um5tI76lLvTU4P26lqTfW8k6Pw9uiC40rmV5dXJwkX4+nTe4O5mX82tmnvEX5n+tJ5Pc5Ha0tlp/XJ87j6PVzz9ZrlWHblabq29VfPKLrz1CGaWhfA5+t+p4g66zMg4
   </data>
diff --git a/AndorsTrail/res/xml/fallhaven_se.tmx b/AndorsTrail/res/xml/fallhaven_se.tmx
index 88f09d151..924f9a814 100644
--- a/AndorsTrail/res/xml/fallhaven_se.tmx
+++ b/AndorsTrail/res/xml/fallhaven_se.tmx
@@ -125,17 +125,17 @@
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcJRO+JMAAwOTIIQeCDtBNFZ1vHgwmtoTvJgYm5m4/PmCGUFf5cWN0fXd4MXEuPyM7s9fQLt+INnrLYgbo5tFjBpi/A2yH2R3tCCCBuHprBAaXT2yHAwTE8/Y5GB+h9HUxPROz8j+pZZZhuyomJwwJgcbAe1yYofQRnjsJZh/ScQwO50I2Etp/KLrc2RHxcSkLXqnK2qnLUrdMVBhQK/wx2YHLn9TMzzQzcJVTxJVf5LoX3QzSaWJ8Re2NEwNu7GZiy+/AABt6riE
+   eJw7ysbAcJRO+JMAAwOTIP3sQ7YTr928eDCa2hO8mBibmTA70cVfMCPoq7y4Mbq+G7yYGJef0f35C2jXDyR7vQVxY3SziFFDjL9B9oPsjhZE0CA8nRVCo6tHloNhctMWzO8wmpoYl3/pka6pZZYhOyomJ4zJwUZAu5zYIbQRHnsJ5l8SMcxOJwL2Uhq/6Poc2VExvdPMUMMDUV+gx/1A2IHL39QMD3SzcNWTRNWfJPoX3UxSaWL8hS3PUmo3PjtxyQEAnga5Tw==
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy9VrFOwzAQdZXSCkhQLJD4D0D8AGKhTIwMMJWhVRck6CfwIXwC/AGImTmRKBJISO3CAhVM2Imveb44lrvwpMhxfH5373znVgghZrEoMO4IcdURC9A8i+1vvdRvR3Pk/UyFF2/KVibN669p6VePs7i+7tuLeHHs9eHZ+OXY2ajep4ZzQtyyWmvJar4VGKMG6vUh43qk06xAH7j2N+3xZqUcn6K6Xlo7NLYfUYMDh+9JYL4vIM/DjttmHpUatH+yqek30OeMdULafw3HqZljnjVn3K7WvpXtF2idRyw2ab+3PLknnCnuI/Mcs/Ec8o6xnxi/OdNK/qgX9Tr13pT1Yg5z4u+ltp7brhDbqkZ/1lWe1HPJ9TLfob1U1ADkh/slrCq7NcO5WGc5fTfrVi8B99QTE/klfRpas95zp8b7rud8Pcig73kN6Dn5RX2EB+XzsWvX80ECvpHTvOeuHAjbhup6aM7/2vBjPehv44bztXQBZh6tBKrxUcD9lTO+kB4i0N1CHOhr0BCDKx6LR9p3Nsbp2svrDX+fBtDrI/jelJN24p87wXKWxXW9mIsgziVg3e8N54cx/CesWJaoqxBe3Xu76tlLwJe0R/2f5g8PZnQw
+   eJy9VcFKw0AQ3ZKaoiaSoOB/qPgD4sV68uhBT3po6UXQfoIf4ifoHyiePSdghQpCe/GiRU/uNjPN28lmSS8+CJvNTN7Mm51JlFJqGqk5hqFS16FagPdZZD/rJn4/3iPvZ6K8GGvfNK63vyVFXLNOo6rd9y7i1fGuDy8UV2Jno7yfEOeIudPS1krL/VbDHA1Qrw+Z1JM63ea4AK79TXu9XSnW56Cql22H5PsR1ARwxB41rPcl1Lkfun1mQaHBxGefin6COWfsE9b+SxyntMc6G86oXdq+te8XaJ0FIrfUvm95as8409xHdB2L9RzqjrmfUNxcaOV4PIvGzrM3EbOYw575u4mt566j1Lbu0Z91XSd9XUm9InbTWZr3ANRHxmWsar814lzYRU3fyW7NEnBPPDlxXNZnYDSbd+71+tDxnK8HGcy97AGz57ioj/GoYz517H4+iIELOek+d9VA2T7c1306/xvix34wz4aOcxhHQhdg6tHK4B4fNPh+5YKvyQwx+NvCHBirV5ODKx+LJ7W/2Zin613Zb/h/6sGsD+B5XU3asX/vhKhZFlX1Yi0acS4B6/tec36Yw3/CymWJvvLykUYze7v62ourNl7NHP0Bbeh1VA==
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzVVsENgzAM5EPffMpqTAAjMCej0Ed5g1UsWdFdbFJK25MiwHaM75IYxltVjftQsGcZU/OyyTU671uYGz/mWef9y+4Xvix2cXIg3B1dWuNnsW0mxyPAHaHb5vXO3K4wdw52XzEMxGfXWe5Luf8LLF/lGj2Lpfqgd6KYX9A+reOMumyOSL45sJ/PQJSb9msF68ta9zv6Mc7W7umS228RTY/GMH7IjvRAtijfVOsjdgS2XqgGiUPfSc8ereETPYHlTeu9oh95/xgrgCFb2Q==
+   eJzNVUESgjAM5KJnLvI1XqBP4J0+BQ9y1gx0JhN320UoujMdIEnT7BLCcG6aYVkJ7NnWvZ1tdlX3RTzaT1sNjMI5z1PePy1+48tip0IOhAvQxaNzfhbbZXKYxgr/iP6951rY11d4f76vGG7E53na/VH99St4vomr+i1+qw86E8X8g/axjj3q8jmUfKPQz3tA5ZbmdQKayz7fFv0YZ28v6ZLrN0XTtTGMH7IjPZBN5Ru1XmNHYO8L1cD+EyW7WkONmcDyxnqPmEdII3/uC109YNw=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="20">
diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 39f5056d0..b8b9d07f0 100644
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -125,17 +125,17 @@
  </tileset>
  <layer name="Ground" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJztlFkKgCAQhqWot0BP34mi5T2qC3QAT5C20FQuY0pQ9PAhLvDNr4OcEhIxQor0SLkC1+Q5Tvc5p/saHM/7qj2TZyZzA9aAdbSZG/AeLvVqPJU4WwsaZs9QKe4O4+jEuV4wMHuGjl3fDpvlnElFA2o2vbvNsWXKk2WEyJxjrO9LF08ovuK44zG9cQiPrVexHozvTg6d56l+eLPL9MeFcj3xN/j0zc+PDxO3zOnK
+   eJz7JMDAwCTIwHCUDRUfh2JkMZC6TwII/icBhBgyjSyPrI9Ye8CYl0SMxX2E7LjKSxpGDgcM9+Kw5wRQ7UkgPiVI2A8n0MKO2PC6DlR3A4hvChL2w3VBzLgj1i/ofsKGTyG5GV+8E7ID5qfprBAaGYP8+YwZd7okxR5q4eFiBzn24ItjathDKK0Saw8x9pHjD1z20Cs9DGW78JVx1LKLHmUDJelmFI9iSjAAiejqSw==
   </data>
  </layer>
  <layer name="Objects" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJylVT1PAkEQnYtI4yF7aKGJlZX+FDgaLVG0IjEkxMpObU2Mv5AGa0Gw0oQEcEd22Nlx9sA4yYTddfe9efNxAoQ2TAEujN8/2vUD7jN/lmTwb3u2mLeM55LWWYhf2/07Nr7vp8u1puWuEt4/3pDjJy4W29hxxLRQDIMawGttPT7e26/of2sZXctRabmf2LcfG3DgvUEanlG+2ybUgvpIy4HlObR+Yv09AbiqAjxte21c4+cWBHniGtBmsR5zdmo5ZonfIx9qUzWKvswZTqwuNzb2DjvHuOp7v3WSTVMI+jI3ft+phlqQo2u9Ifza+H4g+9oBSEu/76I32boXqT3O6lkZ4HwDR1vxZ/oMy3wRj+wXej8W5wsDcXNvsPYaz71z5JtKPmYTE/LM7HrO9m/sreSRfKuey8LZRnzJM4/E1Ff0FHI5PsKXPJomrufF+TpdGBfhI5bEHDI9PN84C9jTnK+IS4tf9rm01YyyHizi4nmaKLkhbbxP2+JOsoYrhh+rBfVZS/xvHIlvBeeS9SbskcOK9VjuZp3j8m9Mz3guXu+ieeS6sP5UE5zPLsNE64teWSh545jDiI6miFczyoGcD9Kl9RY/yxXs2KzJ+dB08X6g2HKmV8PgbyWnpgt/6/Yb3XCel5ccdFYUG/5+A90X1pA=
+   eJyNVbFOw0AMvYjShZQmhQEkJib4lDZdYCwUpiJUqWJiA0aQEF/YpcxtaZhAqpTCWT03L66vjSUr58vZz8/2JcYUZRIacxXl9otdP5Md53tBbEqL7+y7jfkAONe8jos+jf2SQCK/Ybhca1wea0XX05IY47CIM3MYPi6cw6hhzGdje3w6d1jT33UinctJZWmn1ve7BAadkz1huxsVuRA/5nJkcY6tnln9Coy5qRvztptzQ44/O6ZQJ+RAkvlmzMm5xciC3CY84qZyFH1PII6vL/c29x7sU17Ng3WeLHPXd65TEuV2r17kQhh9qy2ht1E+Dyy/e8aElfWzpG1YDzy9p7t6UTXmsoSSrPBj/V7KejHOSOTN/jOx/+qZXfSh3ms4T04Jby7xQDL7/i8q2guwx+ArcSTeaua4HlATibPw5DRU+GzEcniccypwNE7I58PpNl6UFynHkjEnwAfrTXeBZhrxNmEtoF93rv9yzqUkUHfJzVdHrlOq1Ia54Zx2xZlgC1bmie/rBc9ZR/wbp+JbgVhUc+w3x566WL4ZS5wvxsVvzCDKsbDfcq5QkBf1j3tC97MPMUmGYla4zvSv0vhMPDzaIl9NuAbYD+yLNlu4lyixUxELsVJPvbR549wS4ItntJwx7lS5j/xs2m90y2lSXWLwnpxB6fsPLdjU7g==
   </data>
  </layer>
  <layer name="Above" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJzFUssKgzAQ3IOG9iCIYH/KD+gf9O/rC/TcBg2EJY/ZJOJcxGQzszO7RAeWlkSY//Vr477TXLOHD9HZalkvKehV3ntpXoin/ayxs0N0HhXRs8I8vZR/NqXwdvBL87IxdcfX+NT4BPi0vxy9O5HbO39v/seL8uK7ZOt8I7op/C6dK8F1SnhCdO6GdCd0/65skLxSdw/h5vuD+kqZszSvktoxndJ7a+bNdaQwfUn6Q97YNRy+89hdDmK8Ie+DCnP8AFYjUkA=
+   eJzFldEKgzAMRfOg4h4GY6A/tQ/YH+zvu7mBe57FFULX1BsT2H3RUntubhqQaNXzRCpNy/evY3kvsiaBh/jMra6WPRo623ltv5BM7/a3d4hP3xAdGizT2Ml346Vrga/tF9fjvD5TzqhbhRfzWfz+KWvt+XmEZ/HksxSW93tlbeVzWbk1cXbu45GJsyQfD1mYmplIPSn1BunXlk8Q9hF2Pj9orj33rMlRY3vOWOJ4z22679zHwkIZyJlSjbzWsLHnLUvvL9//upT7A6QkWyo=
   </data>
  </layer>
  <layer name="Walkable" width="25" height="25" visible="0">
@@ -143,7 +143,7 @@
    eJzdlNENACEIQx3Bpdh/JR1AoJRqLteED3OhT6qnzTFsVyabmvoKp8tC9Ze8XpzHiRWxT99YZX7ZmmWqPCr5M3c46kfy78wazXM7wxtSnw/LUUjxn1cZXl6eF8Lp3C+0x3u7UHXmYLxQBjtPlaHab8TIepA9KqrivwCmO1n8
   </data>
  </layer>
- <objectgroup name="Mapevents" width="25" height="25">
+ <objectgroup name="Mapevents" width="25" height="25" visible="0">
   <object name="west" type="mapchange" x="0" y="224" width="32" height="128">
    <properties>
     <property name="map" value="wild15"/>
@@ -178,11 +178,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="25" height="25">
-  <object name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+ <objectgroup name="Spawn" width="25" height="25" visible="0">
+  <object name="ff_outsideguard" type="spawn" x="640" y="224" width="32" height="32"/>
   <object name="forestserpent2" type="spawn" x="128" y="544" width="224" height="224"/>
   <object name="beetle2" type="spawn" x="544" y="608" width="192" height="128"/>
   <object name="beetle2" type="spawn" x="64" y="352" width="224" height="352">
@@ -191,5 +188,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="25" height="25"/>
+ <objectgroup name="Keys" width="25" height="25" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road2.tmx b/AndorsTrail/res/xml/road2.tmx
index c5d3c8c67..86eba0ec1 100644
--- a/AndorsTrail/res/xml/road2.tmx
+++ b/AndorsTrail/res/xml/road2.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="20" height="19" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwMAEpI+yQTCID2MzIcnjE4fRuNQgm41uFrp6ZD4uvbjMwGYmNn9hs49YjM1fpOon5HdKMcys41QyD4aPY8G0MBMfprX5lPqN2uaN4lFMLQwAidki6A==
+   eJw7ysbAcBSImQQhNAh/EkCwQeIgPozGJY6sH2YGNjlsZqGbeRSLm7DZh80MbGZi8xc2+4jF5OrD5iZ8YpRgmPuOU9FMmHnomNrmEcL0sIMSv1HbvFE8iqmFAc2lI7U=
   </data>
  </layer>
  <layer name="Objects" width="20" height="19">
   <data encoding="base64" compression="zlib">
-   eJyVVMEOwiAMxTuJ8JGe9wPqBxj/z8TE6MHbjOy8DBUc1e5RHDbpXNvX10dHVEq2hQ0PW5//F/PBkVnIV/RzLHFd9fh70gUOm/NzjrueGQicx4Tv9VRHTX+r89zaKLUxU8yFxZMzlOJklNuakZf8zZ96hqThgDNU/bmQHz3O69heV8vve5Pm3oS9S7m5ebvge+ZN4Vy11oMG5EfHeaUzxHvaCjUfcme287l53LrCt/IB94A9051CDS7kn8LOsjsINgCPT3Hk4pxcC9+tuAtBi0v9VOsE/Q+T99P/AuVIE9Xjzh3UHMyIGNLPtXO8xMH1Yh0N8aUe/0NvaUaMX8LmhaI=
+   eJyVVEEKwjAQrPeAySM9+wHrA8T/CYLYg7eK6bm01YRm6WayaeNCKNmd2ZlsQqvKhamS2Jn/8lG9MCKsgXzYd6pAzyy9Xmr+PjI8j2u0rOe/H7VhGnj3gO9V7KOE36o0d3Leah1jGrYnPM5O0qXcWc99adV64QzBww01qvJzYX9cXq9jcz3s0x5vYe5SbkvvCuuYOVdp9ODhImis6eXO4N9pK9RGl3uymW/p8egydzU63KRjP/Sm0MMEd0WRvEGIATgj21vH/erUC5+tOAvG4znPpxp6taw/59N/gXLkid69n7mFmgUNjyH9XjifFbgW/GIdA/E5zrjiV8Lfwv4HoFKG3Q==
   </data>
  </layer>
  <layer name="Above" width="20" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYECAjwIMDB8EGGgCKDGbUndRoh+k7yOJei+gqcdmBqlmoptxHI9+WsXhKMANyEknuPS9BfLfoYmhpyl8avGpJxbAzMRlPiluQTcTlx5c+kFixMi9xWE3Iffj00vIfnz6iAHEuB+XHlLtAAEALgo7Kg==
+   eJztU8sNgDAIdQT3X8iri9TIBi2JNYTwLYkn36lQ3idNgX17AeN8kzoLeLiSxqo28s5Cpoo3AnmQ5PK8koakaflwjcOZ/fEtVv6JxmujvlhP2wE+581HQP2lLBEe7U1IOhEv7M07/u/pXUu+EfXUuNxD4leg5bf228trzXexikK1
   </data>
  </layer>
- <layer name="Walkable" width="20" height="19">
+ <layer name="Walkable" width="20" height="19" visible="0">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB1ADAPUNIsSMwkBfOqJMQOfPlx6CdlDjluwmUGKm0kFlOofSYCU9EiMPlxi+MzAJk4OQHcTKf4ilFcI+ZVY/cSWC4TsHKgyixQMAF5COHM=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="19">
+ <objectgroup name="Mapevents" width="20" height="19" visible="0">
   <object name="west" type="mapchange" x="0" y="128" width="32" height="288">
    <properties>
     <property name="map" value="road1"/>
@@ -159,9 +158,9 @@
   </object>
   <object name="sign_road2" type="sign" x="544" y="224" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="19">
+ <objectgroup name="Spawn" width="20" height="19" visible="0">
   <object name="forestserpent2" type="spawn" x="192" y="384" width="352" height="192"/>
   <object name="forestwolf1" type="spawn" x="192" y="96" width="352" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="19"/>
+ <objectgroup name="Keys" width="20" height="19" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road3.tmx b/AndorsTrail/res/xml/road3.tmx
index dd2c95252..bc382e203 100644
--- a/AndorsTrail/res/xml/road3.tmx
+++ b/AndorsTrail/res/xml/road3.tmx
@@ -1,142 +1,141 @@
 <?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="25" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="25" height="15">
   <data encoding="base64" compression="zlib">
-   eJz7JMDAwCTIwPAJSh9lg+BPaOLo8rjEsOmHiWHTi00em1pi3UUOxuU3XHxCmBj1uMKFEn8QMh+GjyNhatmHzw5iMb3to5Wb6OnvUTyKcWEAQS0fvQ==
+   eJw7ysbAcBSKmQQR7E8CED46jawWmxi6/qNsmBjdXGxq0NUS6y5yMC6/4eITwsSoxyZPqT8ImQ/Dx5EwtezDZwexmN720cpN9PT3KB7FuDAAxCIf0A==
   </data>
  </layer>
  <layer name="Objects" width="25" height="15">
   <data encoding="base64" compression="zlib">
-   eJydU80OgjAMHveRjGfR9+IFxAcwvp8JB+HACY16Jhm4hjaUjs1Jk6Zb233ftz+ldliRmEPLirlO8VcdYqPXvVkEX1qnfbxB+32PjZzHKXh7sYYw7pTf0iy0yPqL7fVkFq+ct2bO34yvk2PVGvet8OxU4MxE7mzWnCGvIvyg7aNnDf/ak61J1UJ+RS+Nj7VXQ8gujC/mpTynRM7QW5R3CO8hVQt3MuvGE847dmeQH51bnMOd9uxNkw6ps2XYExu/zXq+10gX8RIujyPy8D8O/VZoGPSCF9Mo8SE2DJtjxHBIm93QHKtN+J8OuVLHPNzDeUGfzH8BItR/aA==
+   eJylVEsOgjAQLfua1LPgvbiAeADj/UxYCAtWYMS1CWpHO/Ex/YA6yUthZvrmdTqQr5TaWKi1Wm6h3NR+G8ssrjqcRzHO4bUWudkX+lrt8920n9cHfF5NUbcTe5jjxP6QZqFFxi9w1q35oLRozNt/NL5O5Kq0O7dyvVORngnfzkxrxlAm6pM2utsq1M8ZO8OepVoYB4fC+Fy/aojZHuqlUMg+LawZm0V5hzQPS7Ug2Eb7/HDvLdwZ+e8Wo3unO+1gplmH1NkAN87oAHX+MdbFdYmT5pvPMbg4GX7jvZ6eleMj5Mc0op85auBGjjmeV09Bq1ylFl7pe8rdvzm1n+uSPsn7BA6zfqc=
   </data>
  </layer>
  <layer name="Above" width="25" height="15">
   <data encoding="base64" compression="zlib">
-   eJztktENgCAMRDsC+y/kL4tgYAMlsUm9XJFK/PP+KNz1URC5qyWRmsRVI3u29uRf0Wpu9yufMldgjyhf57eg76v5sPwo26852T+kyouzLqd/JxlYt2/KOBgP5rI+UTHevi6DviOvrXmzeMvEziEzsmOGxxzJmVXk7l6/A0KUO9c=
+   eJztktENgCAMRBmB/Rfyl0UwZQMxsUlTrpXaXy8xgdI7nxWqpYz5sO41ib3WAGeeH/V/lce162c+5sqwtqf/CPqy3xHJj7L92hPV9b605Kz79J8gQ9flP0UciEffA/SeqDQXrzuovXl1zZqFl2n5rJnKc/ZZ7LInmmMJzctj9nJQxgXQyUKp
   </data>
  </layer>
  <layer name="Walkable" width="25" height="15">
@@ -144,7 +143,7 @@
    eJxzFWBgcB0GGB0Qksenllg7iDGLkPno+rCZh0wTUo9uHy7zKAXY/DcKqAuwhSul4Uwov2Czh1BaI1UPKQBXPiEmb+IKP0LpltS8Sqo59MIAomI0zA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="25" height="15">
+ <objectgroup name="Mapevents" width="25" height="15" visible="0">
   <object name="west" type="mapchange" x="0" y="64" width="32" height="288">
    <properties>
     <property name="map" value="road2"/>
@@ -158,10 +157,10 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="25" height="15">
+ <objectgroup name="Spawn" width="25" height="15" visible="0">
   <object name="beetle2" type="spawn" x="160" y="320" width="512" height="128"/>
   <object name="forestboar3" type="spawn" x="512" y="128" width="32" height="32"/>
   <object name="forestserpent2" type="spawn" x="96" y="64" width="192" height="96"/>
  </objectgroup>
- <objectgroup name="Keys" width="25" height="15"/>
+ <objectgroup name="Keys" width="25" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road4.tmx b/AndorsTrail/res/xml/road4.tmx
index d98b266d4..3eed420db 100644
--- a/AndorsTrail/res/xml/road4.tmx
+++ b/AndorsTrail/res/xml/road4.tmx
@@ -125,22 +125,22 @@
  </tileset>
  <layer name="Ground" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJztU0EOgDAIIxw86//fY/yPL9CDxsWUUg2ZFw8NYSkrg84ns3U08z3OwwU/zu95yzvzlof4EY/dx+paPtJV+kARaaDzjJ/Ng9WhuSP+G0TvzebA+lb3xvyk7OOJH5k/s/lmflT2ivLIt0xf9Yfyryp8k/VV5VOGBaCHhoKvdKv76fnmH7XYAMjna2Y=
+   eJztUkEOgCAMWzx4xv+/x/gfXkC8zbmWTQlePDSEsK5baS0i+3rHsonUcr3bmvPd1lm+5tk6713zWH+vnzcn6uedyAe0d8Q35gfi9Xx/Cq3PfM/si/4N+Z/5l2geEY/psrx4+crmvJf7iD7LMZurp/8mN9lcj8bhYIZGBF/pjp5n5s4/xqIBM4xu2g==
   </data>
  </layer>
  <layer name="Objects" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVUEOgkAMlDsmy5s8+gbf4AfUBxj/R8JFD57EIGfNqjShsZSpW4mTLJtNO+3sUGU2G2IZukfxOWfF8GyB81L5FF+FdD3Eu+S+vi3nOXQjlKzPwa/ycX9LF0KT4zjiNeJemYrVSoeOWygnvItfYPniRaX88fKPalZcOv4454gn53fAB/WqPrd1zgedG/D7kKi/zE8E87OYG4WM+2/CeG3DeMbOWmdqblW/q+LvQF+ko1aeUk32mTTeE/6l4NHB66DWOuC7IXhyJNj/Pehr6Zjak7ylOSdfT8JzCY8OuQj8bm7d+WVolLHY50eV/+h16W8Jc62d/k+o1jOM9zJgXaQ5VVfvzNO6I8iLoP4bqHF79Q==
+   eJydVUEOgkAMLHdM1vgS/YJH3+Ab/ID6AOP/SLjgwZMY5KxBpYbVMrSwOMmyWdptZ7pdICKKpkRlTB+sXP2Y0hdsk2sL3k/zjyDe2g3H0+JfYjvvB83stYTw1pB4foqOM3BIY1J199VDooh1u7avELoisOXAA+0tCFvyx1mEoByhqw8pxJH7+zRmcE7W+bSgxMuM/GN1YP+ijgTuXdr4htaR14VyPyT6+qdS+mc5MQIZ+reuO3au22N4hwb7FvJdYf9eyavxyKGmHNPXmTneB+o3hBAefhxhbJyuTUOIDyMX2hgHJa/FY0xOWTeuLfc51/Ukai4RwkMOiVu9fhkcpa1q8lbg/2h44b/kWb+bTX4xcObvAMdiP5wTp/Piusg4kqM1+33IuwK/ec11AXyZyxu50X9i
   </data>
  </layer>
  <layer name="Above" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJzVUkEOgCAM4wn8/0Nc/QhGf6AeFkntpCDG2Bsba7ulIZxYY5Bw/FvEvx7K+Ra+FK/zCHUPdc78oc/ROgjbtdRHeHXss3vV6mxf1Huagzv05rE1n6jTm2/Fh8LbmyvkV/ZIlf6IvLcCM1bz+Gd8tdv0gm7eOWeHl/VYjfmyf7no2dvmvZ7dl/livB7KefSN2qyuAn169/R8b5QNWp4=
+   eJzVUlsOgCAM8wjc/0L+ehGM3MBHXDKbNnMGY+wPsEdXCq0MB5ZtbedeYc9b3RLUIrDenzN8o9OL2tg+A9Xn9aHunnOQ3+7qfWf1EZ/yN4pjnulQ7/bUmyyHepfM/8Q5vn/fjze5lF9Mb0ZPBlkforv1+O9Z4B+76/8f8dXdphfm1o1zFrwsx2JMl9XUco35fpUzf5kuq6mEQ2lgunE2i0f8rJ+dfZzxraxOZHU=
   </data>
  </layer>
  <layer name="Walkable" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcIViGHAVoC0m1x50QEgtJe4iRj89/IFPPSFzSLWHVPvI9T+t08lQt4fcsMWnh5L0Q6z78aUPfICUdEsNgMuPwxXQ02+0DlN86YDYtE5M2qc0j1PbXGLzOgDed1yk
+   eJxzFWBgcIViGHAVoC0m1x50QEgtJe4iRj89/IFPPSFzSLWHVPvI9T+t08lQt4fcsMWnh5L0Q6z78aUPfICUdEsNgMuPwxXQ02+0DlN86YDYtE5M2qc0j1PbXGIxAOzzXU4=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="25" height="20">
@@ -171,5 +171,5 @@
   <object name="beetle2" type="spawn" x="544" y="64" width="192" height="128"/>
   <object name="shadowgarg1" type="spawn" x="128" y="64" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="25" height="20"/>
+ <objectgroup name="Keys" width="25" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road4_gargoylecave.tmx b/AndorsTrail/res/xml/road4_gargoylecave.tmx
index 24f26b22c..756afd7c9 100644
--- a/AndorsTrail/res/xml/road4_gargoylecave.tmx
+++ b/AndorsTrail/res/xml/road4_gargoylecave.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="15" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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">
-   eJydkNENwCAIRAkf/W4XcQZdwa7gql2oE1QSTZAAVj9ejOQO7wwIEH6SKnflOQDec66PDe4j8Jrrc4P7OhFHpL40ek7uzTgi9Ra0p+CItt+COu/O6A1tvqLz/N1ndZFzftd81j6Zz/PJvCv5ZF/P5/2Xl0M7d3rQ/QNwqIei
+   eJydkMENwCAIRQ2HnttFnMGuYFdw1S7UCSqpJvKDqD28g+Q/BDw55yc5M1fm3j5G+VBAj45xPhZarxJIgvlU4OyzSzeSBPM9uE8iida/B+/8t8Z/aPWVnOVXr7cL1tu35vX64XyWh/OuzIf7Wp51r5k5tNzonsgLCnaJ3Q==
   </data>
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJydUssJgDAMjaK3CHYP9xEcQBzBTQUvvVuQjmBbD41JROo7iI3v1yBAOeb+hyhgqMPD/NN5BLBYpk95AZWiWdr8PvaZnzLgzok6h0IKayv9t7edmJwf79B0ea5xObjvwfpFnErHAwmH+O4Kl4LuyqKceyRnI79rfnyH8U6W+Hx1EjlG5j3mSpe3fhxp3wrXFf57HBPzpT0vMk8Xcg==
+   eJxjYCAdpAmQoQkIdJiAhCB5+j7wMDDc5yFNP9g+IGCE6rmO5O4MVgQ7XAChHmwHA8QekL7XPAwYoIIV0/zruMJEEGE/yA8svAhxbGrRAbq5r9DcBwLvsLjxFQ+SGiRzb2FRiwyQ3XqfB7s4nC+IKY/NPPQwBPnpPpI5hNyEYY8gpn0o4ljcgst9IIDsPnB4Y1H7Gi3t4bIHl71RAqjuRo4fAIQTG4k=
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJyVUdsJADEIc4Ru1w1u1a7TbnAUKogYo/75iAmJSK/mENmjCXq4r4Gb5vbyHYK198rjdSLd+n8l+1teQ/Qv0roAvjKzHJkHlTv/9yRZor32zCumr5INyxzhrN8Rj59rX/EtK+Qnw/87wzP6
+   eJyVUtsJACEM6wjdzg1uVdfRDbyfQgh9FkRa8tCoyKyWipx/XZ3zvgFnARb9dqCBePM5hOWe9SNt4/GdPT0vmx3wOzP0yDLv4Fj3ap1JlGGVVXW+ztt0/pjHw7w9H55b38ktqyxP9sb9AR8JOtQ=
   </data>
  </layer>
  <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0BGAaIVYtPHy5zsAFC7sCmFpd+YtUSsptUNxLyN7H20ksfMWFNyC/kph1y9AMAGog4Hg==
+   eJxzFWBgcB0BGATIUQsDxJiFDeBSg00PPjFS1BKymxg3khOGxPqZ1vqICWtCfiHFHkr1AwBvyzjI
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="15">
+ <objectgroup name="Mapevents" width="15" height="15" visible="0">
   <object name="south" type="mapchange" x="224" y="448" width="64" height="32">
    <properties>
     <property name="map" value="road4"/>
@@ -158,12 +157,12 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="15" height="15">
+ <objectgroup name="Spawn" width="15" height="15" visible="0">
   <object name="shadowgarg1" type="spawn" x="256" y="384" width="64" height="32"/>
   <object name="cavesnake2_boss" type="spawn" x="352" y="320" width="32" height="64"/>
   <object name="shadowgarg1" type="spawn" x="384" y="192" width="64" height="64"/>
   <object name="shadowgarg1" type="spawn" x="160" y="256" width="32" height="32"/>
   <object name="shadowgarg1" type="spawn" x="224" y="192" width="64" height="64"/>
  </objectgroup>
- <objectgroup name="Keys" width="15" height="15"/>
+ <objectgroup name="Keys" width="15" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/road5.tmx b/AndorsTrail/res/xml/road5.tmx
index 628ff26a3..10af6b52a 100644
--- a/AndorsTrail/res/xml/road5.tmx
+++ b/AndorsTrail/res/xml/road5.tmx
@@ -1,142 +1,141 @@
 <?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="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwMAEpY+yQTA2PjY2sl5sNEwdCubFgdlwm4XVHCi+yosdo6vD6R407C+IHROjFxuOF0Tg6awINrnmYcO/mLGLH8eDybEHn3nkYGrbRc0wHcWDDwMABP/jcQ==
+   eJz7JMDAcJQNgj8hsZkEMfnY2CA1MLXYxGF8FMyLA7OhmoVsPz58lRc7RleH0z1o2F8QOyZGLzYcL4jA01kRbHLNw4Z/MWMXP44Hk2MPPvPIwdS2i5phOooHHwYA/F3l4w==
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYEAFjIJAQhA7/6MAqhyx4D4PRB/IrHs8CHEhPjSFeMyGuQPdjNdIbCU0875zI/TAzYbxsQARXgaGIGYIe6sQhG5nhdAzGRkYngHNewe0T5kX1b2vgGIPBCDsX0h+BYEiqHlHhRD2vGOE0N+4Md1QI4Ab10LtuA6lnwL1s/Ai9KYKQNwCA/eR2NhAHR67cGEYeEPAbGLlewSw43wBwnrxAVi6gMVLFw57COH3QPwfh1teobkDlC7/oInB7Ie55z+amSD1f4Hsf1D+Xyz2vYfK/0Iz+7oAQg5ZH7o6dPP/YTEfphfZbpjZILfD1DzBEvb3keQJ0fd5EG4lRg+y30B8AB2MdXs=
+   eJyNU0EOAUEQ7A1OdmVsvIAf+YOzxBlXifiAh3iCN7hZBxwQ4kKyscu0maa3zaCSTo/uruqKmQUACOrwwvPs+X1WxZ4LOL8Oi7UkNDzsLVkvrgmyQ3vJuC6NPTs3hd61WuSSv4Vye29EAO2SOc9ik0cVk6cBwFbrHfW+VlT0u9O1ldVMuV+NntWbx+89x8DkS/XTQ1/5Y2B3kP+N5pejN7ejjBdCIu5BYvhlly8Ihx/a//Ynyh1dzx39o42gd0H3Mvbs+RW58v+PO1HHd3kTNdpPfvB9nHTtbus4n9k9iIz1CCfbT4U2vgOa55pyTurnDn3irpk/2rtnNfltIxLB4Vn6S8LP2recC40H9Lp6QA==
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYCAefOJFsD8KMDB8ECCs5yOamq+suNV+wyOHC4iy4ZYTwyN3AcldIH+guxMbCCdCDTZwHIe+NDLNG87gAoVh8hao/x0FZuCyH9lMZDuw2YfLDejpAJ87kc1HB/j8iM9d2MxANh+mHl0cXQ2yXnS1hAAlcQMCAFBJLA4=
+   eJz7KMAABh+gND7wiRfB/iiAWw+y+Ec0NV9ZcZv/DYscSP9xPG4TZcMtJ4ZH7gKSmSD3orsTGwgnQg02gMv9aWSaN5zBBQrD5B2F+rHZ/1YA1VxkProcLjEQAKWDt0ji+NyKbD4h9+DSh898mDy6e95isRebGnQaHyDWz8QAAL+fMuA=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="15" visible="0">
@@ -144,7 +143,7 @@
    eJxzFWBgcKUjBgFqmIEMqGEGsWbB1CDT2Ni4/IouRg4gZD8+sZEGKA0DSuIJm/3Y4h5b2iDGDcSma1LMJ5Rn8ZlPDwwAaA4uKA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15">
+ <objectgroup name="Mapevents" width="20" height="15" visible="0">
   <object name="west" type="mapchange" x="0" y="128" width="32" height="192">
    <properties>
     <property name="map" value="road4"/>
@@ -158,9 +157,9 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15">
+ <objectgroup name="Spawn" width="20" height="15" visible="0">
   <object name="beetle2" type="spawn" x="64" y="288" width="288" height="160"/>
   <object name="forestboar3" type="spawn" x="288" y="320" width="288" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="15"/>
+ <objectgroup name="Keys" width="20" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/vilegard_n.tmx b/AndorsTrail/res/xml/vilegard_n.tmx
index 29e21aa17..c5d340b46 100644
--- a/AndorsTrail/res/xml/vilegard_n.tmx
+++ b/AndorsTrail/res/xml/vilegard_n.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="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="21" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="20">
+ <layer name="Ground" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQUD0p8ihcTU2LeLV5MTImdqYKYmBw7YbhUEIGns0JocuwkBSPbBcMDFbeUxDG2cCYU3vgwtnCmJLyRwxc9zOkR3sMNn+AljEkx7wYvYYxNHwAkvDc0
+   eJw7ysbAcHQUDxl8ihcTU2rmLV5MTKm9qYKYmBx7kXGpIAJPZ4XQ5NhLKka2D4YHOs4pjXtsYU9MHJAa55TGAXKYo8cDPeNguOITvIQxqWbe4CWMcekFAN4sRxA=
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJyVVL1OwzAQNnLogoEovAFvwSM0RbwCEwuIlQHBDKpg7hN1Z4ZCEGM9hIkhkgs+2SefL44bPul0+Wm/u/u+c9pSiF8bLcvTiRC1jxkEeWYG/pPLGxsUM3Y/lsMwri8V+G4O3fXY/ig+M/1pFepybsP6WivRQ6ccn0nU5f1uA86O/XE9EDntUwC+hvVeHfT7Qy7tf7uqXH7YdXkphbgo+/4Cjj3fS0YLbfkWO+FeFbam169TcS2sDd6dFI4TZ9/4eeDd9EiIYr8/7zebd+7rUg9TuwK4tM9qEqfk+hrmY9w471ifUT96Dmt2Jtt/+gu4mrj8Kl28yXhOygX6cn8Ba+8HaAt8yIXB9/nDawHe6irwUJ9T/UFvKxvvMtYP8bgX3qO/nYr5bm2+s3Hv73+k2xWcmep3xjylcV66nZ/b/GTjuXR7CWhU3F/DehjyMBcpf1FzQzTYBvyutUw/7T0EvfmuDgHPPP22/AHEEL62
+   eJyNVLFOxDAMNWphIYWofAH3F3zCtYhfYGIBsTIgmEEnmPkidmY4uBNjO3ATQ6VwxCRWXDcp9yTLTS737PjZ6RT84bAAmBTue2X3pjsAlbcaTYc9xMKe+bJ7ax1867n4Hvc/GnqoxTr1n2Vkzwi+TxU4r/bdt4nwocfc5W8cy5E8WxVixziMyK9RMECnHKeJxJZ5y5rFQGdqkYME5dmozblrXy+Ocm+Y55rxUR/MS+fvtp1/zgDO9FB3xMRzvoi6diJ2azmftsJa5TauryedpXgUH/U8yvv1pvvj3fD36QFAXgzvvhLxZz4219Uk+ghxbvcqZsfs+xLvKvhjPfsfqJ58Zisxv2NzOMZ54ef9NXP2lrl1ig9rLnVHNF4jrDVyEh9ZbJY+fG1Q87YMXFz/WJ6Y49zae4IXcb8bzpDunepzXlt/Y+3Wr78z10ep+58IrbmdajcXM+sfrD1q17eI2Hu0ELmktB2zlO6kg9mgDwj0Jsq3FOej9dqiBrKfU6A3Qub3CxoYzg8=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJylk1EKwkAMRCuif4IU9FIewBPUK3knUegN9F+qIui3G0rodNhk1+2DUmi6k3Qmrao4j7VRCOyWdq2Ezull0RacYbxvFGSu1Dsl5z1NPfNZxOtf47nwXg0azMbIbAvPS3oye+id01NAnzjXQ4b/2LNkl5R7PfTk7KbsAYM+a2ZIzO/TvL+ULsNnRf1Wb1GHtTyuwZ9bPfYb5xPO4X4BffTtOBvXn0HrVedl3CSyaP7MZ8qepMD52sgueWhG3nzWf8roHrEWz5LaH0X2iLV+bRg7hQ==
+   eJyllV8KwjAMxieyvQlScJfyADuBXsk7icJuMN/FKYI+2zE+FmPSZPUHpdDmT5sv6/p1Udzi6IVZY1uNNpzBp034pZDiefZy8kl3S90XZ7BscmN4/V6lvP9W1geeqymGlG9TyX41Wc/JK9HMzAto3bjee4f+DbNJ9ZPFNUx5JT0tLedCaw8tKZIGx+U4AL+vVnsADVBrGkuKl6KL9bqEXw1o3FOczywHreNh8W1zj/Eewaf9zqEPt7H4p3+80HO2jjeZAt2sc2rfNQc9pr35FKu3QK38Qz5E2UhI
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="21" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy9ksENADAIAh2hS7n/Sk3/ElGpJP2RK6J+zJx4T4wvYyB1WRG3k0eVj2GoZlcwJzl+MtFsyrtDt830W9V2fxNe5qtmi7yo28r/iNHZw0SbO1SwlLwLJidaUQ==
+   eJxzFWBgcCUCgwAx6ogxBxegxDxsZpPrLmq6kxhzqBkO1DKXUvfQ2lxc/qR2usRmHz47KQUDFZ6UmklILTluxKYePU6QzSXGfGx+o0bcUAIGIm6pZR61zQQAskBg9Q==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="21" height="20" visible="0">
   <object name="south" type="mapchange" x="64" y="608" width="64" height="32">
    <properties>
     <property name="map" value="vilegard_s"/>
@@ -177,10 +176,10 @@
   </object>
   <object name="sign_vilegard_n" type="sign" x="352" y="64" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="21" height="20" visible="0">
   <object name="vilegard_villager_1" type="spawn" x="192" y="96" width="192" height="160"/>
   <object name="vilegard_villager_2" type="spawn" x="448" y="480" width="96" height="64"/>
   <object name="vilegard_villager_3" type="spawn" x="224" y="384" width="160" height="160"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="21" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/vilegard_s.tmx b/AndorsTrail/res/xml/vilegard_s.tmx
index ad9afdb11..120d33842 100644
--- a/AndorsTrail/res/xml/vilegard_s.tmx
+++ b/AndorsTrail/res/xml/vilegard_s.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="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="21" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="20">
+ <layer name="Ground" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBQLvsFLGGPThwuf4CWMSTGP6u4TJIxJMe+6IAKXsqLyYZgU85jYEXgGOyofhkkxDxnPoEDvQONTvKiYFLXY9N7iRcX4zENXi01vqiAqxmceulpsekuB9HRWCF1KwDyYGhhG1kdI72CKU2Lilpx4Itc8fPFDDh5q8YOMAdXbMlk=
+   eJzV0VEKgCAMBmAJzKc9eMiO4FnyQkJ0gaLTFISoc0xmBPXwMYT9P8LCqFQg7NBG5TgLtEk7X/mnbZN2bjZxunxH0s7BJN6U70jamfMP81+wQk26j7MH1LhOah9nJ1vjOql9nHXXnPU9I64z35Nmv4C7WS/uZr24m/X6682wEw2fQcM=
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJyVVEtOwzAQNUrKyoCVI7CCI3AEmlas2XTZDeIc3ABuwBk4AktO0HQdU2XHIiIJnsajPP/a8iRrYsfz8sZvnEGJPbQUojTPT+dCdFKcBG33NSZvUGOk0VtO5vsPOuAa7CBsQN+XOo1rp0LOmL6tnX8UY1zP3DnHzuZW0tVXS5evsvPPwtXDc1yn3Ji+Fup9tXxvZ2GNuNaCb8zJtVKNzPcu0zm0f5s4X3qvYf/CzOfeeFZTXQzMaTxNCNJ3b/TND4wS+qmL6BzgDEvonZt82lNcxuv7mYVr7DNhBXU+wLevE3yMF8P7eBXqI2jonVgeovLuJXmP+hjcO3v9RZijYY08yC/G5+/MvXvIXYJnt+Ys7/K4/9gDTYSL4yqStzhyr3u4fxS5X/1/BoM0t1mabwc+EJZQI3L3avo/bsAD3x/auzxQg/8u5jmB7/Q6cXZYZy3TZ8o+/GZpjmORwH1XR/73f3aEr8g=
+   eJyVVEtOwzAQNUrKyi1RjsAKjsARaFqxZtNlN4hzcAO4AWfoEVhygibrGNQdi4gUPNRPeXbttowUjcfxe56fpy+U2trPaKUqqx/Olert+hQRTO/w0CIbWoPzPyJcPw7f2Tsastfk53txGt9n4fNuSId+Ns5elTu9HPk2NOKttc8nutU+Z+3st9L3CzbvtzrtZ0exPzvOl7P9eHmvo1r2kbglXnC+6jROzjeJfOO/IczM2tPgeyyGGCGMCf0yQR+Kn7fWz+mBr6Je6xP+cg4q6qurfDhTTuLYr1F8H7USWVDMd+TDZYIT8mS57y/ifooY6qsYlqUOcoee4LcFQV/9xVHu4wztSV3y8W79kQ348A2wn4K5trm9yeN9wb2BeGNvQPQigp0dmQPozca9V55X4T0Q8b3L0pyYKVvCzCnecC5ivq6pLmHNcHZ+IJ7wX6wXRFDvpZsbsVxyzK1O5xi1+c58rDnCG7sHfYkZEM64X/rhvhk=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJylVMEKwjAM7UVvYhi4X+tNPPm9foAw7+Imgt5EG1ywzdImtA962Hh5L9nL6pxzI7gEu7UzoQ+8G+i858qm98rwWvrjtS3wsxafudbDF+pOiibWYh/oTdxjw6y5WvKw9KRB2pURUg8Jj83yHfZi3SuEhVvaq5od7Bnn3Ok1Q+Bcwtlvl3Ue0gyukV7uOyL/nvHlmef+5Zr91u6FXL9STpQ/3g/Ifwszcm1CKac4H20HOQ5zPpQXwsN/rimcD8hzlrym7peXpR/Sjp8lWO5ozYO0udYXdH1Mhw==
+   eJylVMsKwjAQzEVvYinYX8tNPPm9/QBB7xIrgt5Es5iFdbrphmQgl3Z39jGThM65WzwSu7UrwhDjAuSPCh/huSrjfKU45pX8LX1qPbXAJ76g8NbW8kbeaPz3Yl8ce2ycO5cvdbH6KoG2RwJ6QMNjM/9GPZV6jlESb3muxqMDxJx6O4dwjnGXePbbea7v/nW5Amdur5Rzz9RHL8g7iqi5A5In56lc35p27At+UyjnrcyL/Iwl7fBNsTyKOCTNWEMC33+ecYrno7yDVr2p/2m4pI8ExuR4kQd3aQHn0Pr6AvsbWjk=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="21" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcAViGHAVoA6mpnnIYCi6D584uXKkuAPGRxbHBnCZhSxPKcDlJmxuoDTucPmN0jimlZmk6CPHfehixIY9LjMJAVLDkxbhSq14INVfxIYRulpy/EnILkrDEp//ATuRWfw=
+   eJzVUckNACAIcwSWYv+V9ENCCIhCfdjED2jtwTQGryNgwh00p8bPOnfznY4Op7eXmd55iPjsvgvPi9boeej2GflEdP+S9+ZdVaed3XQR8Wao5PsqZ2Q3FY+nmdm7Vc/Zf4hssywmgalgoA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="21" height="20" visible="0">
   <object name="west" type="mapchange" x="0" y="544" width="32" height="32">
    <properties>
     <property name="map" value="vilegard_sw"/>
@@ -182,10 +181,10 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="21" height="20" visible="0">
   <object name="fallhaven_priest" type="spawn" x="224" y="192" width="32" height="32"/>
   <object name="vilegard_villager_4" type="spawn" x="64" y="288" width="160" height="192"/>
   <object name="vilegard_villager_5" type="spawn" x="416" y="128" width="192" height="160"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="21" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/vilegard_sw.tmx b/AndorsTrail/res/xml/vilegard_sw.tmx
index 4fbee1947..e979566cb 100644
--- a/AndorsTrail/res/xml/vilegard_sw.tmx
+++ b/AndorsTrail/res/xml/vilegard_sw.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="10" height="10" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="10" height="10">
   <data encoding="base64" compression="zlib">
@@ -131,12 +130,12 @@
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJx7L8CAAf4BxV7xQNh/gez/UAwCXYwIdW+BYu8FIOpf80DY76HqzIQZGNpZGRjeMULMAKm5D1WDbN50qHn/kMyFqf+LZD4DC0QuC8j2guJcqBm+SObB9P7iQfgBBGD2wmiQW15zMzC84Ua1F1kN3G4kc0HgFw+meSDwGsk+bHbC6LdYxGA0ACn0RU4=
+   eJxtj8EJgDAMRSPoyR4Ed3EIwUUE5xBcwPH0bNXeC1obmtKv+CGkNL/vN2dFv9pU6Jef31KsKUuew98ZmWnvX4HV1ERjQXRmibGo4HdSrFl4N3Cj/wI+5WHW+3MrNQijA158a1XagbUCz8lfdEm0l+9cnvE7h9nAZVnYw0C2hjzW1xP78XMXsx4zg0MU
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJz7ysqAAb4Bxd4KMDC8E0CIibJhqhNDEnsrgCkPA+EC2NW8Q+On4TED3T3YxGH0bW4Ghjvc+N32DslN2MzFB4gxD1944LMPAM51GKU=
+   eJz7ysqAAb4Bxd4KMDC8E4DwLwBpUTZMdWJIYjD1MD3IIFwAoQYZoKtNw6IX3Xx0AHIbzFyY/G1uBoY73Pj1vhMgLIfPLegA3TxsaogxHwCVRB1f
   </data>
  </layer>
  <layer name="Walkable" width="10" height="10" visible="0">
@@ -144,7 +143,7 @@
    eJxzFWBgcB1gDAIwGsbGpQ4XIKSWkP2E7CWklhg3EYMBIicZPQ==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="10" height="10">
+ <objectgroup name="Mapevents" width="10" height="10" visible="0">
   <object name="east" type="mapchange" x="288" y="128" width="32" height="32">
    <properties>
     <property name="map" value="vilegard_s"/>
@@ -158,6 +157,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="10" height="10"/>
- <objectgroup name="Keys" width="10" height="10"/>
+ <objectgroup name="Spawn" width="10" height="10" visible="0"/>
+ <objectgroup name="Keys" width="10" height="10" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild0.tmx b/AndorsTrail/res/xml/wild0.tmx
index 8a84e5dea..1c7db9198 100644
--- a/AndorsTrail/res/xml/wild0.tmx
+++ b/AndorsTrail/res/xml/wild0.tmx
@@ -125,20 +125,20 @@
  </tileset>
  <layer name="Ground" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJytlEEOgDAIBIkmPev/39P0P77AePCiy+5SPTQmFGGhA71FHFvEsuff3t6H+aE46L9nTJbfzZfpZLrZPaq9Um+mw6n79lf9QnaVd8aO4jt6sqM4czhUXF62IbhV8Ss6nfdWc8Q4d3ureFb6KvOfceJw7vDn+M/sK4erL3Or4v6pk/FR3cNQ56rf3+1Hdf87/WB5TxRtKOw=
+   eJytVNEKgDAIlII91/9/z+h/+oIYIYyh3mk9SOT0PN253kTuQ2Q7RXp7Tf9X/2zzOcofXytvxbTyNI6t5/GMeEfnVu+Zfj0eTN8aj+Zl+VHdit/CZ/h4hnTG6BDpcvguoFuEn+HJ3Dfao0jn7GyRnhG/zP57OmF0zuiPia+8V4yuvuwtwv2TZ6SP7Dts8tx93Ow8qvcUzSOq+wDtdCnu
   </data>
  </layer>
  <layer name="Objects" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJyNVDsOwjAMDRITKiIcALGycgQkJirBzkfsHAHBBRCcjb2AUNULwMiG3SaQunaSJ1VqHdfvOX6JUvFItVJ5Ai99Oeeq+Xirz/+HNe+Jn/ct1JR4sOZD1/kk/tA6xudQawtPFtDZqAe4kf3COMbSyJ5aRNPDo8GtSfux37Re7Zvk51ansC/YB+ZMu/W1wsR/+2V4MS/z9L6H+AGeY8Te0FlIOlcQ7wHvWljnsIPcmZk5hxPEz/BcmHVu35dOnvVDyI8S8D/0dulxyQue+qwvFJlLSBf1pG763AJrUn9QPa5PLF66Ovcv3cyP0WnvlJI70M8z+d8ZuTAfem5CwPwNnbsyM3NqDdpKDZn+JdgzhLA+XZBz/+lU/Y8FXTE87nkqDN8ItE4YndycON7YOy8Whed+cnm/efI6Kw==
+   eJyVVEsKwkAMHcGVVBwPIG7degTBlYLu/eDeI4heQPRs7qsipRfQpTsTneg0TTpjoNBm0ryX5GWMibexNSZL4KWtx5ys7K+15f8w5yWpxn0oOTUczHm1RTwNP3SO/gnkWsGTBniW8oGdWb/Qj75xZE01xulawcHPyeuhb56v8M3iM+Kp9AXrwJhhs3iWO/+3Xw4X49KK2jfg38Kzi+gNn4XGcw7+FuAulHPJ1hA7cjOXbA/+AzxH4Vzq+8yLIz2E9KgZ/ofafmtc00JFflEXhs0lxItr0pZ1ToY5uT44H18nZHf72fu7LcfH8KQ75Y0dqOeW/O6MTJkP35uQYfySz924mXm5OnVjukL9mtEOoZFOp2zvn41P/X2FVwyOv0+5w+sB14Hj6fdDmpOEG7rz8j/uV4rX9t7HfQHYFTss
   </data>
  </layer>
  <layer name="Above" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJytVMkNwDAMajZo958puyQbtJ9IUeQLCp9+sA3E9bivFLPAQXgnv3/fAdaueqbuD/Z5ivlI/Z7vqYPphyLy6+nxYPXJfKz5yJ61p861+mY6sry74D2y3JFcGD1o7hZfvZeRD/YOIVD4Ueqs/JdR32iPmHw8WPeTvaNVXS9IYEKo
+   eJytVMERgDAI0w10/5m6C26gfjyuVyCJ5NVSSkMK2LF9uJ61ub23I0D9Zv8RvIvcV+79gQF6qfEqeH1nHko8Flm+EZ8IVZ1F56+dqbP9xH1XcSseld6j4T8q3RldFD6s7iv/7rrM8lDnEIOOfDp5In2Zxc3qSNEnwmp+Kn3N8LoBVDJFqg==
   </data>
  </layer>
- <layer name="Walkable" width="21" height="21" visible="0">
+ <layer name="Walkable" width="21" height="21">
   <data encoding="base64" compression="zlib">
    eJzNksENACAIAx3Bpdx/JV9+iOIVNErCSzjbaqulNNCjyCxtWye5P+hczWd5dk/l2Rlvz+ONs51PqlM9p76VXAiX3nvzn0dyiOrL+t3tqbopT+FGfJ3MIcObcV/qpO+m5hnV0wF6pWaa
   </data>
diff --git a/AndorsTrail/res/xml/wild10.tmx b/AndorsTrail/res/xml/wild10.tmx
index 5c1ad54e4..455183ab2 100644
--- a/AndorsTrail/res/xml/wild10.tmx
+++ b/AndorsTrail/res/xml/wild10.tmx
@@ -125,22 +125,22 @@
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwHCUjTBmgqpFp5HVEGsWLrPJ0TuQGORuapoHC1dquo+a4ToU3DfQaYKWbkM2g9J4QI9LSuMWW/lArfQxVMuH4Y4Bztg0ZQ==
+   eJw7ysbA8EmAgeEoG3GYSRCiHkajy5NiFjazydU7UJjaboaFLTXdR0mcDEX3DXSaoCVG9h+lfkWPSxCbkrhFLhsGa/oYxdTFAJRqNjI=
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJyVVMsOgjAQLInHGuk/eVK/wMSjFxN/mAvEqwdIuILYTVsYl20rk5QWOrudfRSlHApjH8bNvV7WhHPp3mMgXqcXTpHgzv4UnAF8bovvTbmsKy34Q3jfNfAaxntrtcJuL/urGFeylUA8Ud8WmN88rPKXsAtI8VDfAHG9NujuWT3uhzSf8oz+ub6H3Tv5cYF1bqAvqhnV/PpHHLFYua7QH6MdH7TJ1YIB++eW0cd7jd+ZGEJMvHc5usR+Lndz3WN6IC+Dvwu1cN4qnymfAMxdK/kA1Phf8zP2ztPbUr4lPeEb/48EUHxSbBKwJpRDSfvR9tpUur1pw11EPmkKNWrBV2wONmNiH8/4ApiNVBw=
+   eJyVVEsOgjAQrYnLEuUofk6hnsDEpRsTL8wGdOsCEraidtJSHsO01JfUknbmzZuPVcpikZuffLy32t4d10o9tD3nQPtGw1kExOcBMQk9x+jOoQK/AuxGfIg8ruWlp2fLTOYrmK3kG4oR1JcKlofnm8kP+xWzQ31vyOvJdDeRnFvWj+sqokvZOsf03QzHwa0TfM8t5KKe0cycE+rPcw3p6uejM+sjzXFiDJyfy4w+Pmv+v5kYj88uRxPhmqud77vkj2+KsrNFtSsFPZN6Mk7ikPywdrXEASj1WA994+zcnS/VW9LTn1WBGJRfm/guYE/IR9LeuVrR/v3jDanBHjVRnylGowcbvu/MfO+zISa/35i7bTbo+gFQqFfn
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYKAduCAwsPqxgY90MPODAHZ7cIkjy+MykxhwiQZ+w2U+LcIRBIiNc1L9+hao/h2SHkJxAVNDKYDZQ4xZhPyEzQxy4wE9rZGa9tDDkxxADTOQzcJlPi3KEVxuB4mR6i9c6tH9hGw2uh5kcWT1uMzCBQjpQbcDAH1rOsY=
+   eJy1VFsOgCAM8wjc/1TGe2DwBsoHSVM7ZBP6Rba13SNa0jYNhbT2gPYFnAjfo79Ks+5B+VhxzFuaIzgWzIb4298IRm/unTU/9Sdwvm4R8VBAH/4+vH4lvd/RO6hbejR5n4wZGoze/rLINf0V/xHVe+vBO1evHuP13WqZg3HF5f4ssKbKo/cN0NNCww==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVMERACAIaoSWav+VevXxhIDirk+KmKZrjrHIOWA+jMegcGsOKtAbfuN3TFSDTudW66Qnla9qpvFf8mMx3byQH7vv5iPRcODUTLGns1s1nH2g/is3N3ceFF/EZzwXLG7SFzQDzt5W7RvU/iqB
+   eJytlMsRACEIQy1hm7L/ljztDAcIeWhmOIAYgh/2t9YW9kPlqH0dnJrRJ6BaJnjNn2mu+uj6m95J3F/xdbku/40+xUl1VXkqrt4q4SIgZ+as3/zdWIPMA/ctU23kP1Q6XD2T+q6uLD6ZqdHP+F7YAdagK9U=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
@@ -175,12 +175,15 @@
     <property name="place" value="east3"/>
    </properties>
   </object>
- </objectgroup>
- <objectgroup name="Spawn" width="20" height="20" visible="0">
-  <object name="fallhaven_bandit" type="spawn" x="576" y="544" width="32" height="32">
+  <object name="east2" type="mapchange" x="608" y="64" width="32" height="96">
    <properties>
+    <property name="map" value="wild11"/>
+    <property name="place" value="west2"/>
    </properties>
   </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20" visible="0">
+  <object name="fallhaven_bandit" type="spawn" x="576" y="544" width="32" height="32"/>
   <object name="forestserpent1" type="spawn" x="64" y="224" width="288" height="384">
    <properties>
     <property name="quantity" value="1"/>
@@ -197,5 +200,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="20" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild11.tmx b/AndorsTrail/res/xml/wild11.tmx
index 4fd471747..07e2db02d 100644
--- a/AndorsTrail/res/xml/wild11.tmx
+++ b/AndorsTrail/res/xml/wild11.tmx
@@ -1,147 +1,146 @@
 <?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">
  <properties>
   <property name="outside" 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="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAwCTIwPBJgIHhKBv5mBpmYDOTmubR0+34MMgubH6DuYFUf8Pcj42mVpgM5filRVxRK1xHgvsGOg5HMe0wAJTxNEE=
+   eJz7JMDAwCTIwHCUjTAGqfskQJxaYjA1zaIEU9tfxPgbW5jjEifW/bhoaoQJLcKIHL/SG5MbJ8SG60hw30DH4SimHQYAwZo1Zw==
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1U8EKwjAMrfcIHfhV7g/8BMEfruCG3nbYDrsN5lywsWmW1U7wweiaJnkvSWsK88EO/wu/Evi+iH3u1pgK3vsIMseMK5ht8PH1zHHY5/lzTuJrIfZp/N5BsBGk5hSGVD1K/S63fhGHPb5BgjNHs6JHA/asEfOkeXM9rdBBMcSBPhytOHeM42h/+y6eYxDz5dD65YSWqAaPM+P5F9be2OKdJGbXZeirUnfHhFlhronli2a1EaPPRfqk/lFwEQfZ8c2jjXrRQzjjuWob53wq/Viz01kP331Rx2klB90b1PKAuC4C9Z73uLTLPkh0NsTI+XA7ai6VOWJtMn5ScsoV47i+lP8LlGJv7A==
+   eJy1VEFqwzAQ3NwlkCEfSL/QvqL5QR6QQ6HfyCNdqENz68EO5GZwWq+rqVbrVZIWMiCEVquZ2ZVlqmjCyhM9jIPG9aKyZ6C0v9AxgTdHJnSeRBPPLH055xdKE3qty3M+47p2KXaLF41+PH8q1GTVX5dyDTQi9yMQvbukaWldA3thnmvgnk39Me5arlvlA2dQs9Zq1X4tNJ7D/8Zr1OjV/UpY/aqVl6yGiBehcy9k+sLP7J0YXoHuBn/NpW+H0l0x15fgy+7qjxgiF/xp/4PSggbi+/ATQy/4nWFPcu1Dznk2+lGKY0++4VIu+9gUOPDdsJeDy+sC0HvZ43WY90GjC+lMp7zBK+Z1mNcg+wYeyXV0Kf44/mOffNpjvq3P9Xne+Vz7G4OKbkI=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzFU9kNgDAI7QjuP5Vxjxq6gfpBQgi3GPks76K0Y/TWvsVwcONWECvxqvxKaV4g5DicTED6dA5gvK7ZtDw0t5f578rs+qt3QTUtD6s3G3LhrrjWm5m9XE//FDB4Hv3zHCdpWufRXJksFp/re36TaEpcLK4heWg7sXrco/reMnd6AcKrQ8g=
+   eJy9UkEKwCAM6xP2/1eN/cMxfzDKKJQQW8VpLkJsk9Qq8qEeshVPhx+rUU6z2rkDLS/GX0kmP5OfA/lMZxY++2qvWYzsetW/8JqRR3RXfshlu0KtmZmzXHp/kxrjz05vrGOaEd+bayRL1I/6mV9xmqzXgBrMo7WTLJPvz94GM6Eny4CaLwbwSdY=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytlNEJADEIQztCl+r+K93XQZFUn20EP0pCTFVcc4wl8o/9rXhZvkRXh3AV7vRMvZzwU/9JLec8bnTinmS4ejvCuSs33I4e7QXBql2r/ESt1z9XWp39V3rRO9HMfBJuFXQWnXrkLjvvddQjvA8glDIk
+   eJy1lMkNACAIBCnBpuy/Jf8G2FkPEh8aGBZB54iYn5Yy5UcYlFXxXM1EH6lLaVE5spjbflCmqqmrrdq/MMpzcr/WWfX4ZJZIb+mbuJmXTlfGcuY/4+3aCbPTSXyV0V44+bp7VOdVvPNXEL8F+jEzeA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
@@ -163,6 +162,12 @@
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="west2" type="mapchange" x="0" y="64" width="32" height="96">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" width="20" height="20">
   <object name="pack1" type="spawn" x="256" y="480" width="128" height="96"/>
@@ -182,5 +187,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="20" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild11_clearing.tmx b/AndorsTrail/res/xml/wild11_clearing.tmx
index de30eb3ca..ba4a81ed9 100644
--- a/AndorsTrail/res/xml/wild11_clearing.tmx
+++ b/AndorsTrail/res/xml/wild11_clearing.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="outside" 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">
@@ -131,12 +130,12 @@
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJyNUlsKwzAM8wEC2712hl5oR9xPf/afQv4KyRpDzFShdBMYgy35ESffzVq32u3TLQ9fktlDxNlvnefAuNdzrYqrehFvQ6P6zvoE3iO/jFj90Q85jleyE/b05aCe8wisV8S8qI9c8BvV+3fuGarQ8Y48I3JCX0ATb7xPboEa3jf28xzexv3zdu6p3iu4uAPfIIv/yVjF3TL1vfo3uBt67LcJDt8E/QHSXJ0m
+   eJyNUlsKwzAM8wEC6716hl1oR9zPfvafQv4KyRaziKlG2SowDn4pipMXs9atdnt1y8OXZLaKOLzD/ZY+Z877vHXRcTUP8TZ6FO+MB3iO/HXE6h8+rnHckx2wp29N1M15Bs8r4r7cjxzqW5h39t4zVNEXNcY7cg36C/XgjffJLrgn6oU+z/Fu3N8uR071XqhlDXEHefJPGQ+xtxx4f/0b1sae+TZRE3fC/g2Ji5wn
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJytkFEOADAEQx1h97/jnGHZh0RE1WTvs4oikqMLFBLfBl6kT0B7rtbN2oHNi7XKn+U178/fsBysz7Afa9BYXwT1TzJ2/SiPv8nv99oLzI9mVnccUUMpmQ==
+   eJytUEEKADAI2hP2/z+uN4wOQUTminkJ1MpaK4dsIARd6wFexE+A9ijHsnbA5kWt8md5zfvzNywH6zPYjyVwrC8C9U8yvvpRHn+T3++5DpgfzazuuJbIKpc=
   </data>
  </layer>
  <layer name="Walkable" width="15" height="15" visible="0">
diff --git a/AndorsTrail/res/xml/wild12.tmx b/AndorsTrail/res/xml/wild12.tmx
index d929663d7..588c335d4 100644
--- a/AndorsTrail/res/xml/wild12.tmx
+++ b/AndorsTrail/res/xml/wild12.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="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjEmRgOMoGwUxA9icBBB9ZHMYGycPUYaOR9WEzC90udDtxieMyA5eZ2NyArp4QxuYuYv1HyL2EwpkUM7GFPXp8keJnfGYSEy/ExDO57iPkbkLhQWoYUBo/+OKI1PSDzX3E5hVi3UeN8CMmLCl1KzXMGsWUYwA+8Cdx
+   eJw7ysbAcBSKmQQZGD4JIPjI4jA2SB6mDhuNrA+bWeh2oduJSxyXGbjMxOYGdPWEMDZ3Ees/Qu4lFM6kmIkt7Mk1F198kuNvQvFJyO2kxhUx4UFsGFAjfnClHXLSDy59xOQVQu6jll+JdfMoHh4YAD4cLDE=
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJyNU8sKgzAQTO+Bxt9q+wUFj70I/nCFKnhTqIfepC9Ts800mVgHgrLZnWwms0o5ZOqLzfR/1XF8FbK5HrkQleacnzwS76f8Vse8Ue5Cn4x7dPdrTLp3Vhvu78y8SuA5axUD6mrtuc4Jna1ORcDL+k1hTOhswXiXIF5o4V6iA95VeMcF74T6RYA36BzP0fVaoQ/IWzH05C1yk86J3i6LPVARP0qPrD5ETXQU3N3e/o8vGZZyctDwgj2umW84v0n4hs4RmyX16yOBfQOr4WnrY9ZHFeQy/wlE987NjZ3Jg/HzmVqhtkWwX6L3FHhb8TlntSx/mPZexn9v2sef03q4OJ45QExg65ALayVeQ314LvuG57N+5fsGvN9h7Q==
+   eJyNVMtqw0AM3N43dP0pzWe0/YJCjr0E8sMxxAHfEmgKvpmmrRWvsmN5ZDJgNugxO9JKCSGjCnc8Db9fViGsV1P7Q6jGfORC1JFz3uKI/TzEt3HOO4td0Mm4+ziex+RrZ7nW/5rGbwc8+0hEQF4TC9c9lvRpa3iZXg+99pnEMN4lfGWNLdSlfcBalbd3asI8wbfTJ405Zf9H1lrjHHhvZXAmd2ySH4P13HpdzWegJvOoGmdvb2ZHOBvSR8VP9r09MJeN2SVWv2IDPTygxpyj89Ky/YT7j87csD0SLq0Z9bXkTeQNpIefz8UmmmrzHh37Lwil76e8N7KT76nsp/dZnq3x73D2Asx24HvOcln8ZfD9pXJ2sdh/07gblzS9U2MRXZxySe7VcMucWNvSiRye3n3m/Adl6mtn
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzdU0EOgCAM2xP4/6v8iEZ/gBwWl4bRCp7shQBt14xhZnYVo2icU+A5kNv2Sh2GDTwyz7d5EUyrevfyjrQrfRrpFM9eLqabzYu6ldnI+hk91ZzsXVWPjOd3s7Op6GJ9nD9Hdh7xxX/9C/a7F0d5VnYe73peCPcY1UVuplG9FTBtBc3xQlg=
+   eJytVEEOgCAM4wn8/1V+RDN/IB4aSbNBZTQxEmi7gkOrpdztmeHlmMADmGtinRkO8og8/+ZlzLSqt5d3pM2c00ineHq5WLfru7Iu0xvINOoNNadRJrXf2CPiYW21N63646g+5weiffV7zt5X+GTuIWPHP2QFZ6t71e/N8xh7Gs+LAW/m9HWZy/MRvAwqohrwfABUsE3c
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcMWCYQCbHKkYHZCqF5+7SDUTm1tINRObXkKAGLOIMQ+f+/DZSa47iZUjxix84YsuRqr7iIlrYgEx6YfSMCAnHElxH638issOUtxHbtxQK36xmUlvQExZhyv/ETKHnhgANeNBvw==
+   eJxzFWBgcKUxRgek6sVmFi4+OW4h1UxsegkBYswixjx87sNnJ7nuJFaOGLPwhS+6GKnuIyauiQXEpB9Kw4CccCTFfbTyKy47SHEfuXFDrfhFN3MgADFlHa78R8gcemIA4lBCFA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="20" height="20" visible="0">
   <object name="nw" type="mapchange" x="0" y="64" width="32" height="128">
    <properties>
     <property name="map" value="fallhaven_se"/>
@@ -165,7 +164,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="20" height="20" visible="0">
   <object name="forestwasp" type="spawn" x="96" y="128" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
@@ -181,10 +180,7 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="fallhaven_bandit" type="spawn" x="544" y="96" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="fallhaven_bandit" type="spawn" x="544" y="96" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="20" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild13.tmx b/AndorsTrail/res/xml/wild13.tmx
index 16a17eb8a..e3d8127ea 100644
--- a/AndorsTrail/res/xml/wild13.tmx
+++ b/AndorsTrail/res/xml/wild13.tmx
@@ -1,142 +1,141 @@
 <?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="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwMCEgz7KBsHEiuNTA+OjY5A8jI2uD5deZD24zETXh88NxJiP7k5CbiCE8YU3ORhbHFJiHqHwpIaZ1DRvFA9/DAB1iOCn
+   eJw7ysbA8EmAgYFJEDt9lA2CiRE/yoZfDYyPjmF6YfrR5bDpRdaDy0x8dhLC2MzH505yMHp4U2oetjik1ExqhSexYTyKRzE+DADRDeIq
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJyVUksOwiAQLfsxgTu58igmXtgmaqKrmtiuSaqWCOX1ZSh2khYGeJ9haJr1MG76uf/X186EfJCYuG3cJuad1HVZ8ynLPUN4L7RO+y/SvALfHeYX1FE8sa4WB/v7Tjavof9zSa/CnXBHhb8YSo8+jIO6NO5bnHvw+oD77Kf9N5zHmsJbCfhWMrd2P3N9TvG3MVgn+Wupt17p9Ui1pMD+ob/AXcpTvwbAMn9vMyb5HCHHUfMSYr9bajMmvPUSd60O9sfYTsr7pfELfd9iRg==
+   eJyVU0EOgjAQhPuatH/y5FNM/LAkSoInSMRzE1Q2UjqMW9BJoLTbmZ3tlqJYR+nHl/9t/SHre3Q+7/Hb2iVxFa3YnAWI1005a/etqwhC6xS/U86rJO0Gar5Q/eyJ81o4uM9zcmmtA91zLt+GduQdDf0sjB69mAd1Wdr19B3A6w3Osx/jT9iPNeldUX4lSds6n7k+b/j7E5wn+quot8Ho9UC1RGD/0J9q5+axX/hPsX7vEif6HGCOo+VFsd8tczNH73pOe6sO9sfcVvJxa1QPb9/VZFU=
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYBgc4KMAA8MHAdL1gABI30cCekk1G9l8dDFyzKKGe8gB79DsIRRWF4hwF7qZpOqnNcDnPmTwVoB4tdjUE9KPTT3MfW+RxLHxiXELKQCfu3GZhe4uQvKE1JNiNi4AAKQsK30=
+   eJz7IMBANfCRArNAej+g6b9AwDyYfSB9hOwmRg0u89HF0N1JDsBmBiXhhwu8QzOTUDgQCnNsZpKqn9YAn/uQwVsB4tViU09IPzb1MPe9RRLHxifGLaQAfO7GZRa6uwjJk+IPQmbjAgCRHDFe
   </data>
  </layer>
  <layer name="Walkable" width="20" height="15" visible="0">
@@ -144,7 +143,7 @@
    eJxzFWBgcKUzBgFy9SHrxQVIMQubmdjUkGIWPjcRMpNcQInbKDGTmLggxmx8akh1LzUBpXGMTQ0u9bjCl5B6ctI7LrdTIz/SsuwAACPCM3g=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15">
+ <objectgroup name="Mapevents" width="20" height="15" visible="0">
   <object name="east" type="mapchange" x="608" y="288" width="32" height="64">
    <properties>
     <property name="map" value="wild14"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15">
+ <objectgroup name="Spawn" width="20" height="15" visible="0">
   <object name="forestboar2" type="spawn" x="32" y="256" width="256" height="128">
    <properties>
     <property name="quantity" value="2"/>
@@ -168,5 +167,5 @@
   <object name="forestserpent1" type="spawn" x="320" y="352" width="256" height="96"/>
   <object name="beetle2" type="spawn" x="288" y="224" width="96" height="64"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="15"/>
+ <objectgroup name="Keys" width="20" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild14.tmx b/AndorsTrail/res/xml/wild14.tmx
index 3d3ae3c28..ec4454cf7 100644
--- a/AndorsTrail/res/xml/wild14.tmx
+++ b/AndorsTrail/res/xml/wild14.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="20" height="16" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" 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="20" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwHCUDYKZoHxcNCF1MDZMHT49MHF0jCxPrB5CGNlN+MSIxej+pBQT8h+2cMVnP7Huwxff6GYRG/6E0go54Y/LPbjSGiVxgM1sWsfvKB4YDAAebOp3
+   eJw7ysbAcBSImQQZGD4JEKaP4lEPE0dXg0sPTBwdI8sjm00JpoYZyJha7sIVVoTsI2Q/PrOw2YsrPsnxK7HxTqqZ6O7B5k5qxAE2s2kdv6N4YDAAg6nrCw==
   </data>
  </layer>
  <layer name="Objects" width="20" height="16">
   <data encoding="base64" compression="zlib">
-   eJyVk8EOgjAMhrs7xu2dPJHwIiQ+iK8oF028YcSzycQ1rEn9t8H4D5BB++1f2xEtMi48HG2qNq4mx8Rvr2b5j3FmJWeAHH5/mv9Yjrk3sHdmH9QVOGNcX45pbGuJzhbYSk9gvWEteahec3cIvU+BMStOZ6mqBiUxi5lfZFKsP/av1EOX+tPee6jrXn8z1I77wH3ssFcbtRAWnlmLvcocDPEMj8JMo7/TgcgD24VvN7XWfNao2OLLZ86cVWZGhd8qBs+pt6lfvGMsnDkt7MWUYWIcny93l1k6F3uDftf2kPUPm8NYSQ==
+   eJyVU0EKgzAQjPdIkz/1JPgRod8o9Iv10kJvluq5YK1DE9yMK6YDQRJnh9nZxJgZ3mSj8Pv8waacrZoinL0Cn3kF1/jlrKUafN82pYNzF17gS/LPpe7/Sjpd2F8Oa27ljDm5tb+IJ2kNtI91jEbq/gHpHV4+s8ZN6NTOqFnnAPlije6nm2iG/9lzD+fQiZlI7w3lmgv02s9rouwwB8yx5lntZBG1eupZAl7jPWhDD4+NOz2Rv2O5ztOX6cykPtAJ7ehrVHpWodzRqF8JjcEumtIvvzGA34sEz6JXNJnXWf0tA7KWZ8N+c3hfwdZf+A==
   </data>
  </layer>
  <layer name="Above" width="20" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYKAN+CjAwPBBgEaGkwk+YnEPNjFCgBh/gdQgm43OxwXeAtW8Q1OHbB96uML46HahA3QziQH0jENi3IfLPbjEyfEzMQBbHF0gwy5i3EdsukE2E5v7qOEuZHFS7YC5i5A4Pjuw6SfHbmQ+AO2ZM60=
+   eJytku0NgCAMRB2h+0/lIhDYQIlpUi8Xbcm9P8SC18fHtEPGtPeoRJGJGcP2ckfiH8zO9ur3mpN4OiuDfWOvSLMntwrrtZPzxdpr1g99WL2FebWrw3zxzjJk/KpvtBfOs+oV69Ue7vVXj/5sVHMByFc8aQ==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="16" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB1ADAPU0IMNEGsWqQCbfnLNJMY9uPxOjJm43Elp3BBjL6l2DWUzSbUDXR26XnLMJtZN5LiZHEBJGJBjHil2gNgAuHQ7xQ==
+   eJxzFWBgcB1ADAPU0IMNEGsWqQCbfnLNJMY9uPxOjJm43Elp3BBjL6l2DWUzSbUDXR26XnLMJtZN5LiZHEBJGJBjHqkYANAcPRk=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="16">
+ <objectgroup name="Mapevents" width="20" height="16" visible="0">
   <object name="west" type="mapchange" x="0" y="128" width="32" height="64">
    <properties>
     <property name="map" value="wild13"/>
@@ -164,7 +163,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="16">
+ <objectgroup name="Spawn" width="20" height="16" visible="0">
   <object name="caveboar1" type="spawn" x="160" y="96" width="384" height="96">
    <properties>
     <property name="quantity" value="2"/>
@@ -177,5 +176,5 @@
   </object>
   <object name="forestwolf1" type="spawn" x="288" y="384" width="288" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="16"/>
+ <objectgroup name="Keys" width="20" height="16" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild14_clearing.tmx b/AndorsTrail/res/xml/wild14_clearing.tmx
index e13f57329..91953b83c 100644
--- a/AndorsTrail/res/xml/wild14_clearing.tmx
+++ b/AndorsTrail/res/xml/wild14_clearing.tmx
@@ -125,17 +125,17 @@
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJz7JMDAcJQNgpkEGRg+CUBomNgnJHli1WGTx6b/BTMCY1OHC4P0/4Dq+4Gk9xUR5sDc+YNEO7GFA7H60MOBGHcSE47E6idHL0w/uXoJuZsYd+FLP+TGFy53wcRJlYfZgyv94xOHmQMAVummpg==
+   eJw7ysbAcHSA8AtmBCZV7w+ovh9Iel+RYM4PMuykFibFnaN4+GMAuDezwA==
   </data>
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYGBgYBQEEiCMA8DkiVWHC9ziwS8vw4JqDyOS2k5+KAOLfkYkdiw3drNf86C5EwjMWDCNuw1Th2Y/sj5kwM+DKYYNWLJA6EcCEDpVANMekNwtJPsJAZjaN9jcgKQfZD5IjSaOsEEGj5Dchc1MkFm30eyD6bmFJyxA4Q83G8ldMLkd6OGOy/9YxH0FMMWQzQe5C1sYvSIy7ggBmD243E0oXwAAfzsX3w==
+   eJx9UtsNwjAMDFL/iNTyzwIsgMQQjMAnw7ARs6QfoH5CpUyQQNzG4uranBTl4cvdxUrqnMtlpDI+ZTy8mxDrPkIdeYRnnZmP9Qg8RvDLusS+Wfpk4NzaeU6K7gbWl+1al/CGd7HusfjtBK/3P5+svE+i9bof3qO8p2beD1Xj2q19qBbA3+ojg7mjkgHvkz5xDkZvEAPkkr6ctff6nQDnMjf1fzD6SbW76Lvmb+U6KzzUp1yj+NeEl5LX6rdVZx/r//87Z50v45pxkg==
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJylU8ENACEIYwSWdGEnOTa4+DAhPQro9YWBlkJQJIapyKMkeVBnDY0beN1B4uXL4O0xmt6QN/Wb330m6fd3Dyd89OeBO6k4WIvzRVrV3J27yviZbnaPzFdUv3WYXvd/VFg6L/9HK94=
+   eJy7IMCAAt4B+W/RxLABmDpC6t8RYRY5ANncVBxsmPuQ+cgglUi3oeu7JIApD7PnEg77KA0HUvSjuw8ZoIcJIT3oatH9h80sQv4mJn3h04/PXHzpEZe7sKknlL6JzSeEAMgcAPfGLkc=
   </data>
  </layer>
  <layer name="Walkable" width="15" height="15">
@@ -143,7 +143,7 @@
    eJxzFWBgcKUhRgf41JGrH10OHyBkPi6z8LmHWPsImYtNnBg/EbKXFP243IlLDN3d+NTiC09caYAYc7HJk6qf1HSHS5wcDAA/kSaF
   </data>
  </layer>
- <objectgroup name="Mapevents" width="0" height="0">
+ <objectgroup name="Mapevents" width="15" height="15">
   <object name="down" type="mapchange" x="384" y="64" width="32" height="32">
    <properties>
     <property name="map" value="wild14_cave"/>
@@ -152,9 +152,9 @@
   </object>
   <object name="sign_oluag" type="sign" x="384" y="352" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="0" height="0">
+ <objectgroup name="Spawn" width="15" height="15">
   <object name="oluag" type="spawn" x="160" y="96" width="32" height="32"/>
   <object name="forestboar3" type="spawn" x="64" y="320" width="192" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Keys" width="15" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild15.tmx b/AndorsTrail/res/xml/wild15.tmx
index bb9f74e68..16071e1a9 100644
--- a/AndorsTrail/res/xml/wild15.tmx
+++ b/AndorsTrail/res/xml/wild15.tmx
@@ -125,25 +125,25 @@
  </tileset>
  <layer name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwHCUDYKZ0Pi4xHDJg2gQH5daZD2E1BBjN6mYmmaNYhpjXiyYAvOu8mJiSszzF8TElJgXD9Q/nRVCw/CAx8EgwwAjNedC
+   eJw7ysbAcBQJMwkyMHwSQBUDYWxihPTgwyA9pKgfxSMQ82LBFJh3lRcTU2KevyAmpsS8eKD+6awQGoYHPA4GGQYANmjpRg==
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJyVU0sOgjAQbRPd0aSNnsUTuOIoJJ7DIxgvpy7caWThzgSFCR0ZHjMYXwJtp+/Nj8G5Hj51r+S+8Lw3bLP3EoL7KKYaFVmzDrbva/aVwlhDOOe7WzHwKTbbiSfv5nAHXgryoNScbSfQveB8ieMz11NG/dllfqXYEL9iM6weVEYOJcTjGupu/UR7RTTCTpx33lNvG6HVYPlmnRZPxkBgvsTjftVxqsW4+2W/blbOHX2fB/Eb0HF+mg19Hvywx/nDuhjbMK6V4y/EvGrfOwkd9g/zsubI6lEd7Zl45v/x3/sWcNpw7w==
+   eJyFVEsKwjAQTUB3CTToRXThCVz1KAXP4RHEy1kX7pR24U6oNWMzZvqa1Adlksm8+VOlPJxS2g2SwXeSaxt133PQP82Uo8VdSd8ejYm6WYi4tRn7YNyCL2encerwdjfRvgE/8m0OD7D7xfO4FrE3mPsFeC+4E1eC6ymL9HcI9lVCh/gXm5HrQZXJoYR4XEPrZV/kJaIT+rd4p952gptCzjfxyFedqKktxnEkMF+y437RbJGLcY/LQe5WSp11zKMDHteV0qHPk45n3D+si7G341o5/kLsZ2reTvB6yAPzyu1RrkftzE7Qv4NmlXvf+Ly2djqbDw8icAU=
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYKAN+ChAHTXUBB+w2AcSI8YdF+jsVloAmB/eAul3ArhpdIAsjq7mLRHhgstsbHbBwFdW7OLfWFHtxGYGNveJsmE3TwyHODZ/EbIXBMIpSCfYzEzDYR7MLaTGBUwdPn2w+MLmLmxpBpu7CAFseomRBwBPgjVe
+   eJz7KMBAEHwgQg26+o9E6CGkhlhziAUXsJhFrB3Y9A41APPDWyD9TgA3jQ6QxdHl3xIRLrjMxmYXDHxlxS7+jRXVTmzuQRaDqRVlw26eGA5xbO7FZy8MhFOQTrCZmYbDvLdY4oOYuICpw6cPFl/Y3IUtzWBzFyGATS8x8gCTXDs+
   </data>
  </layer>
  <layer name="Walkable" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcMWBQQCfGDZ5ZDl0tfjEsMnjMhOfHhibkLnUAOT4DVndUAeE0gCusMCVlogxi1A6w2cfNcyktVmE/IIt/PH5lVhAbN7FpxeXG6iJAQneLtI=
+   eJxzFWBgcKUBhgF0Pi4xbPK4zMSnB8YmpIYagBy/Iasb6gA5vIlJC8j6cMUVpekMn33UMJPWZhHyC7bwx+dXYgGxeRefXlxuoCYGAJIMLyc=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15">
+ <objectgroup name="Mapevents" width="20" height="15" visible="0">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="96">
    <properties>
     <property name="map" value="wild14"/>
@@ -163,7 +163,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15">
+ <objectgroup name="Spawn" width="20" height="15" visible="0">
   <object name="beetle2" type="spawn" x="64" y="96" width="96" height="352">
    <properties>
     <property name="quantity" value="2"/>
@@ -175,5 +175,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="15"/>
+ <objectgroup name="Keys" width="20" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx
index 99321b9e0..03d1065dc 100644
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -125,12 +125,12 @@
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcJQE/EmANPWjeBSP4qGLfZgQmFKzfIFmRLIjzPMmw0wmQYRZMPPimCDYm0wzYeYdZ4OYB6JhmFzzjrKhmkMN87CZSal52MwkRS8Ax3UzdQ==
+   eJw7ysbAwCTIwPBJAEIfZYNgEB/GhmGYOnRxdAwzC50mpI8QRjeTUvNI8dMopg8ebvFBjXSPjCkNG2Lcg6zGhwmBKXW7L9CMSHaEed5kmAlzG8gsmHlxTBDsTaaZMPOOs0HMA9EwTK55R9lQzaGGedjMpNQ8bGaSohcAYogsQw==
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJydlE9qQjEQxseHyFu8h8kh7EWEFpUuRRRcakHp0kO0J+o5XHYjFHfSjSdoviYxkzDR6AdD/s4vk2QS0kSVsbOypRfaHdOeKNehwzj60ebluiXa9oIvZ3K25+mWMSipO/3z2DopE/1LRUXSLj7EGTpj1r0CD36/DdF3E+/jZNqrvhSIHb/MT3hjZe29cF85vuel2qiwhmS5dXc9OeYSXVszjT17H0J+XIZaGx90jx9X7j68762961bqjN+UdB/dJB9vxfporkrx8Fzl+evnjGrzXpiNa5l5LZ61e+dgvSX+qxyzQDPm99kJ9WldcD7CvwPeUxWmHMx5DCrLk/QjvBOfAzjPufGbsTkffftPgPeVySWJyQXmi7Ej8wfvlfnlGP5+MQ7buxLMZ2aLOs71QxPvDRqy+h87/j7O
+   eJydlEEKwjAQRaNI6aLB5hB6EUGx4lKKgstWUFx6CD2R53DpRhB34h3MmMRM00lN/TA0mWReJsmkTDCvOnJsluqOqPqhj78lZ2wX+VlGhic4YjCnrfXhoXWo/NZp3U9J6PwgT+t09tRSwIO4V8LYNbFM8D1lv+hTiajx73yHl6XK9oH78vENz9U2tWtQ5lv3ENE5h6hpTTd3o9p9EPXxHeIqv7ZxWL77MLG/9i445azzXPWcegzJ9Z9apfLBtYrr12gay/eCLItpZlM+pX7nwNo48YWPGaAcxZ06tr2IA86H+O8Ab9i1U27yPAZdxaN0J96JqQE4z6WMy9GcY1/9J4B39tQSxcQC5kTaA8UDb47ifAxzvzAOdtFfYI6RreJqrd+S6t5AI9R+A30tM8M=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx
index 62f2b0df6..cb57e2406 100644
--- a/AndorsTrail/res/xml/wild6.tmx
+++ b/AndorsTrail/res/xml/wild6.tmx
@@ -125,17 +125,17 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0MOC9YH4KBt5mEmQgeGTAILGpgabnZTai243NezF5X5SMS57HSn0Lzn2gvwaTKK9uMKTVHtp6dehai+pYUsteylJ27RKyzIEzKBGWsZnJi77SQljYsJVF0d5QMheSsPYnshyiNphHMgEsdsBCTtiMRfdTalMlJfBILuDkDA2vyDbSalfkXEKEwLjSlekhC816yN6lIvY7KVanceLBeNQixzGlJS3IHyVFxPjs5daYecviInpYW+8IAJPZ4XQ9LCXFDxQ9mIrs+ll70Dl31F7h6+9AKneauw=
+   eJztlcENwjAMRaNIcKtE7qxAGQE6ASoMwAVmYiJGYBEmAKuqYrU2rWOTSIjDUy5RXvzlOLV3ribYvrkv0/DBuecqrtQeyqn1Dt0WXu7+Ujhvo6w3xQu1noReLk+p95u1lvJCNhqvNNse6E2NN7W3uXotenk9cYZFL386k/NLMp6T64aZB1Nebca7mXPIOuPWd+49oiHOHd7p6vUzGNxHBFULdmprxVx8hOsrSb6W/1GOeUx5zf68ioDZizNOnbc9j2oMtQ88lhkfwhiuRyy95xC5Lbo1R70SSnmpmZ3LW+r9/r2/630B2oBoeg==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJylVj1PAkEQXRAbI/EgdmqMttL7B6wk1iYmlDQm/g7/nBUlMX7QEhWluwR0B3e4x9zs3K2+5HJfu/fevJnZPefiGGXO9f0x3vU3Heca/niG65O2c6ft4n6FTvk79G4G81bXBiaBNxkKd9J798ubC30NmDePaWcPwIvjMPZhx+YkTzfi7WxypoC1U84eK3gJyLsUsV20Cz2IiZGbw1Z5PKLXLHijXiISvLC+x778qa4sLTX1Ie9E5FpibMRBtUL9M9/V5zJGgWMAXE/hu1jfyXVWEa+MrY5fCz9n6Y+DUBtHzXIt8lwLN4H7uU5dBTAngvhxjVr3gQDWsgTHqGk5b8X1HIVvWj3GejbWKiMv5O93luaLhllW8MbWcK5d7kXO7X85KTbNZ7VOAGdKfgk9fK75Bn4OauqfBi3sjeQmzinolfnoKVo1/1iX5e2LoRnfMSfljfTcaPP+sB/lIv/7oodmgid1XV7UGK/2rYiDea1+o3dPqb0Dnq3zCs+seLXeIv/eG869dr0ef9xv/z7Pt5wbZvqe8iY4cvjPGO4Vuanah5ee99NzfnWLZ6U1rFOuyxb4zz1068+XynEHWnPRI1dbtr46/3VViOmS2ggL4dc1vJ9DD9HaRL02FeNj+zvmAXtU04bgsbGa4nykrP/yH9gC8/I+8xHOjKp7glbz7BPq5v8armWO/SPEKDVUnS1NmA/qL95r+ll5Dum3uFK1MTD2flbk0jrjt9jXupp+AOSlzHw=
+   eJylVj1PAkEQXRAbI/EwdkqMttL7B6wk1iYklDQm/g7/nBUlMaK0REHtLgHdgR3uMTc3d4svudzX7r03b2Z2z7liDBPnuv4YHfqblnM1f4zh+qLp3GUzu1+hlf8OvZvDvNW1gUngjYbCHfXerXlToa8G836KtLMH4MV5GPt8YHOSp1vxtrY5Y8DaKWcvJbwE5F2K2G6amR7ExMjNWSM/HtGpZ7yFXiIivLC+x77sVFeWlorakHcici0xMuKgWqH+KfNuGDj6wPUa5mB9R9dZyXgZm+aXfLbwc5b+OA210a7na7EKdy9wj6vUVQBzIogf16hNHwhgLUtwjJqW60axnnb4ptVjrGdrrTL6hPz9TeJ80TBPMt6iNZxrl+uTc/tfTopN81mtE8CVkl9CB59rvoGf/Yr6p0ELeyO5iXMKemU+OopWzT/WZXn7ZmjGd8xJeSM9PW3eDvtRKvJ/InpoLnhi1+VFhfFq34o4mNfqN3r3Gts7wLPJK/hoxav1Fvn3WXPu/djr8cfT/vp5uufcINH1f4hnKfxnDI6y3JTtJUvP++U5v4+zZ7k1DOLl7zbAf+6hB3++VY5H0JqKHrnbs/VV3YMtFOmS2ggL4dc9vP+BHqK1iXptKsYX7e+YB+xRTRuCxxbVFOcjZv2X/8AWmJf3mVk4M8ruCVrNs0+om/9ruJY59lmIUWooO1uaMB/UX7zXdJP8HNJvccVqY2Ds3STLpXXGb7GvVTX9AeEOzBI=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VksOgkAMRRPYaYyJ7tx4KW6gR/Jaxntg0ETXSsiEUvuZ0uLb4DDTea9vOsWi4FFvhEkHWmVfireLeRj1WNdjXk1nFHJ9xh7clDhJf8d5mtlPjtcLqha0+qB4oX9T6gvGWngpWLkt+XJ+YTTfd/cMHRH5RoKrZc+ZJkh3jOtTHHL91TDVY437nNEvInoAtW8Hyru56knqfVQ94bODtSWd61XggXM5/djzPeI0ev1N+z5XtriaqSXpvsG5V9k/t+vxmnc5HsNzgh5PreNd1T+PiHdf/WpsAa8ET1+g/rPAfCP6TcJlMfzm+i2l6V+QeKV7KCEn7rDMWxvV/yGonp14MJ82tgB7TeWeNGhjiybqjBuHp5Im+B7zSnlFwnuXrNo+i291gQ==
+   eJzFVksOgjAQRRPYaYyJ7tx4KW6gR/Jaxntg1ETXSkjjMM6XaePbQGnLm76ZeVBVPNqVMBnATXkvxdvvuTvj8a7HvFqcuWDVGWtwUfZJ8fech8J6crxRULWg1QfFC/WbUl8WWM/r5fb0EKcXRvd5dg1qUMozNE6qlnPkVOoxzqc45NCX47VA4z4a/CJ3j8DcUdqVqifJ+6h6wrmDtSXl9SzwwDmLH0e+R1yMUX3Tex8L376WqSWp3+Dcsx6u6+V4zasej2GeoMZT63jTDNc94t02vzEmaBpHfEH6Z2kz+U3Cafa91/rnH5B4pT6UYNm3m9vW5vJ/CMqzEw/m08YeYK2ps6cYtLEnJirHXUBTKSb4HPNK58qJaC95Y3sDyqtvfw==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/wild9.tmx b/AndorsTrail/res/xml/wild9.tmx
index 511df1d29..628c85fc1 100644
--- a/AndorsTrail/res/xml/wild9.tmx
+++ b/AndorsTrail/res/xml/wild9.tmx
@@ -125,25 +125,25 @@
  </tileset>
  <layer name="Ground" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBQHZhJkYPgkQJjGpR/ZDGQxmF5S9BFjFyFMrBnIbiPHTkJ+o4YbqeVWfO7GFt/ocYgtLskJY2LsJpT2iAl3QmZgEyeU3on1L74wIyeMCYUhse4nRR2yHCn+poY6SvLVYMfElIm0wJTkYVq5Z6DCf6DTwCgexaN4aGEAkpUfNA==
+   eJw7ysbAcBQHZhJkYPgkQJjGpR8fBuklJI9sNiV2kWoGstvIsZOQ36jhRmq5FZ+7scU3sl3YxIl1BzazKE17xIQ7ITOwiRNK78T6F1+YkRPGhMKQWPeTog5ZjhR/U0MdJflqsGN88UdLTEkeppV7Bir8BzoNjOJRPIqHFgYAvMkffg==
   </data>
  </layer>
  <layer name="Objects" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJy1VUFqwzAQVCBHF5zX9A95SqAftqlz7MFgH3IzcVNtmyXj0a6kQDogZEm7q9FqVv5qQwiHEHax7d/CL/rmb64WO7W9x8E+sakB+xljjHdpHt+dft9tehhbXKYm9eM1tdf8dLAfYjLyNjRbvoPju5Av52shv4HsR+KKfC0ka+BXuv+zcwbkOZJNj2Mjxx6XElB7COuOLg5vT5usPZzn8wnMsxjcSusSp8/kmLk8E1t9JqoTz25Ta0bNoU2SX0fPaOfpnvUegIPYeHV0pXO97207wRlq09NGl6kF1dhn6+/xKtTqQe3WyOkW2xzbN/EbIUc54J1pvA0Otv5W2lPyMxh3ntOXQvw4ns6XoLmw3gKsX70/5XE17BeKhe+nxPL0gzwscP5yWvL2OEWf45NNwf+BmlgfDkfmzjUs9VYby4OlZwHf8Qz6T3QLPsoR/2n8tqv+hoyNaIb3nNsyD2ve0p8HzccK/c3ggW/B6qyXuNXYW3vmYryq/4+YNf0PGU7KQw==
+   eJy1VUtOxDAMTaVZdqTpEeAS3IGjIHHhVrRLFpXaxexGUyCGGtzX5yQjDU+K0ia2489z8n4KITQhVHEcjuEbXf2zVopKZVc7Og/13/e5Lrdnz1Z7+F+ZNWu7Xb8fYiyPxzUWZnPFVG/1AtlTec1P68Qykbz1Jge//wQX0K0ask/sKkbw1frLsNszern6D4laqp8jyHT2n+TY8yUHyz0LViOPg5jrzTrZk3WMT0BjIb7l9sVOV9gvnu+ps0VnMnxPxbnpNdJzVmaXX4fPVs7jPfI9GB9ExuujK8T1dOBygpL7qU30gnLs7eSfcS+U8kHllujTZxxzHB/g32hylIKtmdrboOH8W+BMyU9Pap7il0L00J6u56C5YHeB7V+tn/pxJfIXsGXvT7GVet9StcP8pbjknfESdZ5vHAp8B0psvTo+ou/Yw9JvpbY8MD4LsMaz4f+Ot0ZHfbRvGt7tyr8+ISOcwTNlXjJ+sHXGPw+aj8XMYu9c78+eQSaXI1y/Rd6Lm+XoXrPENjh1+K/5C2rUy10=
   </data>
  </layer>
  <layer name="Above" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJzdlNENgCAMRB2B/XdiFA1soHwQSdPSkxZIvB8+bO9eGzCHY6lSk5cnZpcci3/pTWA/l+U1W/WmJ8Kq8Y9wS1m1D90Z52XdGTKv5Xuvp50fnUOqQ3dMz56nt0Z2NVvRgcn636A6H68rvKeUWUWzKQ/ngzJr+0HesDSDhyJ5SzvlcZd2aQV77z5zdWi95jVap3FY+VC2lqHt+cLG9XtIY0Pre95/0w0uWGn6
+   eJzFlNENgCAMRB2B/XdiFA1sICYSm6alBxS8Hz689l4bMIdjq1LJy29mXphNc0b01CawXsrymq325ifCavGPcGtZtQ7dmdRrdmfIvDPfWzV0fnQOzYfumJ+tnt4a2dVqRQem2f8G11l6XeE7tcwqns15pD4os7Uf5A1rM3gosrf0pzzu0l/awd66z5IP9Vu9Rn0WxywfykYZaE0Pm1Qv5fTKYuvxa97V2pFBdQPDr230
   </data>
  </layer>
- <layer name="Walkable" width="30" height="24">
+ <layer name="Walkable" width="30" height="24" visible="0">
   <data encoding="base64" compression="zlib">
    eJzdVUEOwCAI8wl+iv9/aZctWcyAlmK2rAk3aFGK2hzDzrjDJhdIzcrtgdG88j0Oj5PVRhHdJVrL5rM6DBc655VL6VvxHqKLeBP1HnPebk1vJru0lR6jfUV8X92NKBflROarQtndiK96p9mORj1n8/a0Ub5uML6KODrqFB++jS/tSeW96NbM3keGW9Gs/C9PvXVq/SUOUOlr6g==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="24">
+ <objectgroup name="Mapevents" width="30" height="24" visible="0">
   <object name="west" type="mapchange" x="2" y="548" width="32" height="96">
    <properties>
     <property name="map" value="wild6"/>
@@ -199,7 +199,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="24">
+ <objectgroup name="Spawn" width="30" height="24" visible="0">
   <object name="bandit1" type="spawn" x="64" y="512" width="832" height="96"/>
   <object name="fallhaven_bandit" type="spawn" x="416" y="288" width="32" height="32"/>
   <object name="forestwasp2" type="spawn" x="160" y="352" width="736" height="352">
@@ -224,5 +224,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="24"/>
+ <objectgroup name="Keys" width="30" height="24" visible="0"/>
 </map>