13 files changed, 183 insertions, 183 deletions
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 398aa754..ca0cdb33 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="67" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -47,29 +47,29 @@
  <tileset firstgid="1027" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="75" height="66">
+ <layer name="Ground" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1jFug0AQhWFQyjgp3LjLVUgbxb4LZ8pRUqYGDuACbpC0wRIjv4x2cYqVF8FffAI8Y8Q87WLXRVHUAAAAAAAAAAAAAIC7exw9R+xu1P/Ts1vAjKlyeh2Vk8+H6/lFJfUvV7Pryt3D91YryetpdJIZD27mo9R97RDoCd3nUn9ZwKypsjpHWA696OTYSU8nNbOmrOqZnM6B+TunD5yH+nLPeI+sdO5mtC+vmkiWuq6+N5pVO2Wlxz7Cr6/cM6bOqhWalWkCQnvSavrd3DOmcorkcJQev1Y0h0tfOd2ndayWe8aUWfkZbU6fVeidrlmF8l5TVrbfdEb7zHo+ZryN3iVDy1rXYO4ZU2cVYj0/k0HOvdA7fku/gz4rb5D8Yv8btriubq0p/z5b4x6cyyu2rnxufi3pde7ZctA9NxR/M8v9bEukeeV+FgAAAAAAAAAAAADb9QuZj8k7
+   eJzt1jFug0AQhWFQyjgp3LjLVUgbxb4LZ8pRUqYGDuACbpC0AYmRX0a7kAJ5EfzFJ8AzRszTLnaZZVkJAAAAAAAAAAAAALi7x95zxGGm/p+ewwpmXCqn114++ny4nQ8KqX+5ml0X7h6+t9hIXk+9i8x4cjOfpe5rp0BP6D5D/WUFsy6V1TXCcmhFI8dGehqpmS1lVU7kdA3M3zht4DzUl3rGe2Slc1e9Y35TRbLUdfW906zqMSs9thF+faWecemsaqFZmSogtCetpt9NPeNSLpEcztLj14rmMPTl431qx2qpZ1wyKz+jzemzCr3TNatQ3lvKyvabzmifWc/HhLfeu2RoWesaTD3j0lmFWM/PqJNzL/SO39PvoM/K6yS/2P+GPa6ruTXl32db3INTecXWlc/NryW9Tj1bCrrnuuxvZqmfbY00r9TPAgAAAAAAAAAAAACY9wv1JOoL
   </data>
  </layer>
- <layer name="Ground 2" width="75" height="66">
+ <layer name="Ground 2" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1U1KAzEUwPHMbBTBRd34tdDqAUTEhbhS8ACjVCitCxUX7tQjeARvIN7Am9SeQKoHqNa9b0hGMyGdoCh0wv8Hj5nkZR7NI9NRCgAAAAAAAAAAAACA+piuyE0Fxl/zia4zk/zNb5pUxxW5VmBcWEh0bj7SXmVjIpQPrTmMrF8n1n0jVWpOYjfV44HJ9ySePNGX6Jo1e2m57qn06SzR+Zgsyj6XJJad/Q7M9Vli05yRK1kzK/dbyXfe51ryNyZi4p6bvpm3e9WQPa9Z4etVz1MjNh/OeGSudq+a0pt1c0aKe7dXdp2RitN24D0ZSrx54v2/f9gEOgj06q4ibBvO/11s8m/YqzP3osrfr/sxzz6Ya+apU9TI3IdqLP/Wu+9Y/m7tW2fksSLaEh2zbujU2In8nP3GrWfuSPp0IXFJv0rcXtn9aUfWq1XZT9PsaSXV459we3We6nMFAAAAAAAAAAAAAEBdfAKMJ05N
+   eJzt1U1KAzEUwPFkNorgom78Wmj1ACLiQlwpeIBRKhR1oeLCnXoEj+ANxBt4k9oTSPUA1br3DcloJqQTFIU2/H/wmEle5tE8Mh2lAAAAAAAAAAAAAAAYH5M1uYnI+GtemzpT+m9+06g6rMm1IuPSnDa52UR7lQ+JWD62Zj+xfp04941MqRmJ7cyMezbfkXgKRFfi2K7Zyap1T6VPZ9rkUzIv+1yQWPT227PXZ4l1e0auZM203G/o73zIteRvbKTEPzddO+/2qiF7XnEi1KtOoEZqPrzxwF7dXjWlN6v2jJT3fq/cOgOVps3Ie9KXeAvE+3//sBG0F+nVXU241rz/u9QU37BXb+5FVb9f90OefbDXPFCnrJH7D42x4lvvv2PFu7XrnJHHmmhLHNl1fa/GVuLn7DduA3MH0qcLiUv6VeH3yu1PO7FeLct+mnZPS5kZ/4Tfq/PMnCsAAAAAAAAAAAAAAJCeT1PHTk0=
   </data>
  </layer>
- <layer name="Fringe" width="75" height="66">
+ <layer name="Fringe" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1b1qAkEQAOC9iELKIFYKVpY2vkPSR7CzsjWVbyJ2PkK64NOZpMgIJ2iIeqbw5+77YNjb3eGYHfa4lAAAAAAAAADgfrwc2Xs+MS+6R3X0H4rlvRfM23jNUupk/6vnHo3zsR49akQM8rNvxseYt470rhs5/YhhifpV2znvOp4/I74ivn/1oZ3t721z/7L7nqoZ5XejmY9PJbor5+pV+Oxcz/zA+uKiVdymwZnf5CTt/yOq7OPA+ipiGT2aXbKYEpu4bydNo0dv+gQAAAAAAAAApfMDElkV+g==
+   eJzt1bFOAkEQANA9DCaUxlhpYkVJwz9ID4mdFS1W/omx4xPoiF+nUjAkR3JnBA4LlNv3ksne7k4us5O9XEoAAAAAAAAAcD5Ge/YeDsyb7pGPQadZ3qJh3sa4SOmu+F095+ipHLvRo8uIYXn2zdiL+c2e3t1HziBi0qJ+XVTO+xHPnxFfEatvfbgt6nvb3J9U35Obx/JuXJfjVYvuyrH6GZ+dv/O6Y/3tpFX8T8Mjv8lpqv8jcrbcsf4eMY8evZyymBabum8HzaJHz/oEAAAAAAAAAGRsDdTIFfo=
   </data>
  </layer>
- <layer name="Over" width="75" height="66">
+ <layer name="Over" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1s0KgkAYheHRllk3kEq7lkUFLYvqCqrbCLz9dn2CA6M5Of6Aou8DB4QZpm8OhSkFAAAAAAAAAAAAAACArgRe3xN0a1Fjryd3943ManQR155seOp09fGbf84YulpJdpa1rSQy1t+FrtZe+b6yM8K2gw7AXHKxrJ0lgar+7qX7lpZz9FrQbLxBqeohdtjjYgy/QbpyR1fu6Mpd1XswfX+17UqfMwZpX1GWjfGc3i9R//vU9H8D2zljkmQ5Gc9mdJ97yUFyVPluwsJ+85yp0fe+Sm6Su8p3g18PyVPy6nsQAAAAAAAAAAAAAJP2BbOIFOw=
+   eJzt1t0KgjAYxvFZh1k3kEpnHRYVdFhUV1DdRuDtd9YrOJjmcn6Asv4/eEDYWO8eClMKAAAAAAAAAAAAAAAAfQmDoSfo17zB3kDuPjEybdBF0niy8WnS1XvS/nN86Gop2VrWNpLYWH+VuloF1fuqzoi6DjoCM8nZsnaShKr+u5ftW1jO0Wthu/FGpa6HxGGPCx9+g3Tljq7c0ZW7uvdg9v7q2pU+xwdZX3GetfGc3S9Vv/vU9H8D2zk+SfMcjWczus+dZC85qGI3UWm/ec6/0fe+SK6Smyp2g293yUPyHHoQAAAAAAAAAAAAAICTDzmPFOw=
   </data>
  </layer>
- <layer name="Collision" width="75" height="66">
+ <layer name="Collision" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1OEKgjAUgFGj3v+RJfbPVtNdLC9tZ3Ao0KT7sbnel2UFAAAAAAAAAIAd2xW5t74/8px/FFm3x+tn3Wb0Vr29or/LnimrU9lHZ/Zk9oxXttrOW3+fqVXRev/0NNlrnz1XRqtyvWW2VvWqG/S2GvnstWaMnsFP+3LEZj0zHq2jMzyKX7TKnunKZpGeM7b6xv7jvVn2fwAAAAAAAIARPQG8PZIF
+   eJzt1OEKgjAUgFGj3v+RJfbPVtNdLC9tZ3Ao0KT7sbnel2UFAAAAAAAAAIAd2xW5t74/8px/FFm3x+tn3Wb0Vr29or/LnimrU9lHZ/Zk9oxXttrOW3+fqVXRev/0NNlrnz1XRqtyvWW2VvWqG/S2GvnstWaMnsFP+3LEZj0zHq2jMzyKX7TKnunKZpGeM7b6xv7jvVn2fwAAAAAAAADm9gSaaN1Q
   </data>
  </layer>
  <objectgroup name="Object">
@@ -81,9 +81,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="75" height="66">
+ <layer name="Heights" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1EsKgDAMBUDB3v/M4kKE4i9WF01nIOCiDbyHdJoAAAAAAAAAAOBaKftEztbnI3t6VGd/O/WurJ52EbmXUeS/+fJuj6J56++Rulrd5Yv0kLWjja6eu+tgLudztSej1jdmHuS9+iLjUVcZ/dFVdi1ZR+sKAAAAAAAAoBcLosUFfg==
+   eJzt1EsKgDAMBUDB3v/M4kKEoq3xszCdgYCLNvAe0mkCAAAAAAAAAIC2UvaJnK3PR/b8UZ397tS7srraReReRpH/5s27fxTNW3+P1NWqly/SQ9aONrq6rtfBXM6ntSejp2/MPMh79UbGo64y+qKr7J5kHa0rAAAAAAAAAPJZABLWBX4=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 45ec2084..e19049f2 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32" backgroundcolor="#000000">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="67" height="61" tilewidth="32" tileheight="32" backgroundcolor="#000000">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -40,39 +40,39 @@
  <tileset firstgid="1063" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1D0KwjAYxvGUbn6Bg6vQ0bEn0At4BsET9DSODh7KA3ToOUwxwde3qSAYUuJ/+GETaMn78MTGGNMAAAAAAAAAwB+ZW6svLSZw7lhZ3J2TVSmXcrjXu5bP9/eZZrO0bs7OKqzaWrvfjVrXYt9/YzuBOX7dlYPIZWZe3fEq8dwJfp1jLn1XjiKX1vFz987F+zqUT+o5UuTSmfFcZGdyI+fTeejnUD459qUxw3sxNnsoo5xzCd0Z3Q+djd5LPUPsXMb6EOqRlHqGGEL3yGfQCp+ySz1D7M7o/4tQLro7qc+egswl9VkAAAAAAAAAAAAAAAAAAEMPu68TnA==
+   eJzt0z0KwjAYxvGUbn6Bg6vQ0bEn0At4BsET9DSODh7KA3ToOUwxwde3qSC0jcT/8MMm0JLn8U1ljKkAAAAAAAAAAAAwmrm1+tLiB849ZP67c7IK5ZJ391rX/Pn+PqE+ltbN2VmZVVpr97tR61Ls+29sfyDHEDNxEF3MzGtGvEI8N4Jfp9JFOxNH0UXt+Kytc/a+DnUSO8dUXTSmvws5GymQmXQH+jnUSSpzUZnuzPflDfWSWheh+6DnQPeh92JnGKOLvv89NC9S7AxDCd0Rn7sWPvUVO8MYs6Hvf6gLPSOxzz4V2UXsswAAAAAAAAAAAPybB0/KKl0=
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0kFqwmAQBlCzKEK7qjfQHsETdN8uFMWNCuIJtDfpUXqT6glEPIJ7J5BF1Ei7iUmb9+AjzA+B4WNaLQAAAAAAmuwzS5GHyGNS/P5a3kq11o4+xvF9KuhlEulG3u68U1UGFxkm12/5NKGX98ghNy+yO1mmd1NwM6lp2UvVQNrLMTevoot15ONGJ//ZLPKVZf7Lf0YN7Oknz9FJJ9LXzZlu9NGLvDS0l+/IJpdttevUxu5i3leyRf3oBQAAAAAAAAAAgL/qBGHTFt8=
+   eJzt0sEJwjAYxfH2IIKedIPqCE7gXQ+K4kUFcQJ1E0dxE+sEIo7g3RfIIdSIXtKU9v+DR/kChS+PJAkAAAAAAAAAAAAQ1tnGp6V0Uv/5ONxKldNWB0t9u54uVkqmTEreqUyzQubp55mbunYxVZ7OvLPvYW/eh+dtGOvQS0Viung580H3PyqnLz3UzUa52Gz//GfRkG5+6amHvjKijyRTBwNl2KAurkru5BZ3najuhfkRZYtqoAsAAAAAAAAAAABUxRvyrhbf
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1E1Kw0AABeCxdOm+IojdaV16h9KdINptL2X1Av5cQOu+YLvxUj4xQmhRujHV+H3wyGRCYPLCTCkAAAAAAPx3V1/MD5P9nY/xNLlObpJRI6vavttvnvWqXu6S++ShgfX8Fqu9jNPFedXHRa6vnVKeMp4lz8k894tOs2vchvdezpLT2rfupo+DZFD185IskmXtvWXLu/nsZdVRt5TjZJCcdNfn2+4xmbT83/+Uy+ynw6Rf21sAm+jl3N1z9gIAAAAAAAAAAPDHvQHnYRRK
+   eJzt1D0KwjAAxfFYOrpXBNFN6+gdxE0QdfVSflxA7QX82AXbxUv5xAqholtTif8fPJq2FJJXEmMAAAAAAAAAAACA8i0/PB8qzdpzvFLWykYZOZlVNbZf3kV5FztlryQO5lOlYhdzrX+SdzDV9RYYc9T4pJyVi+7TwO0cXXl0MVYG1vrq6qClxHknVyVVMuu7zMM+Xl0UdUNjekqs9MP35z46KAsP/3FZZtorbaVj7RsA/ynS2dng/AQAAAAAAAAAAMCPuQNw3RRK
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt00sKwjAUheG0GXcF1s46VnxsQFyBugsnXbDOdKYznSl4g0FKjFC0j1D/Dw6l4RYuh0YpAAAAAAAAAPgPO63UXne9RXjcXrZxd7uE5CCdHPlf3pykk3OFXpKo+V1CcpFOrj/8L1l9qwTlJp3c6eUl+eKbSO5SLNGlO0UvfvTi17deBpKxc5bJ/Rh5zj8xs2mtW3WvUM9uhpLcPk1Sez6RTCUzz0xemi3aXrxhRSlz591kYeeWnhl3vk/cHtysJGvJpsIsAAAAAAAAAAAAAAAAAKB9D/iNH18=
+   eJzt080KgkAYheFR115B5c510c8NRFdQ3UUbL7h2tatd7Qo6lpAME0hpU/k+cJCGT/g6jMYAAAAAAAAAAACgCevImE3ke4vvYHexCv3t4ttWPey4Fzd79XCo0EUcNL+Lb0f1cHrjXiT1reLdWT1cWt5F/MI7gb6TUIlK30tbu3Chi4d/6KKjDKyzRHe/7zh/Jp/t1rqVH5m599FT0uKZp1ucD5WRMnbMpKXZ7NOLNyArZWL9zjMt5maOGXv+19n/3c5cWSjLCrMAAAAAAAAAAACo1xX5Jx9f
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt01EGgEAUhtFo/5sb2k+iyBjjTozLdH7OS3q4fVT2bSsAAAAAAAABx61+ln1XtqdLvV6n1juriXTpLfv+Ga69/6PI6obZ3zCrS3R/+pdGp8u3VqvQJdZmtFn27ZnNsm8AAAAAAAAAAACg7QSVm65r
+   eJzt00EKgCAURVGh/W9OaD8RNAgpURA/2XlwJtHgd6G8pZQBAAAAAAAAJtsv5bPouyJblKu1eXpnBS0taou+f5Rz93+kZWW36G8Y2aJ1q/8nvdOivc+XafHeo7dT9O2zO0XfAAAAAAAA8EcHOPny1A==
   </data>
  </layer>
  <objectgroup name="Object">
-  <object name="To Second level" type="warp" x="576" y="704" width="64" height="32"/>
-  <object name="To Artis" type="warp" x="800" y="992" width="32" height="32"/>
-  <object name="To Basement" type="warp" x="640" y="736" width="32" height="32"/>
+  <object name="To Second level" type="warp" x="832" y="864" width="64" height="32"/>
+  <object name="To Artis" type="warp" x="1056" y="1152" width="32" height="32"/>
+  <object name="To Basement" type="warp" x="896" y="896" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="67" height="61">
   <data encoding="base64" compression="zlib">
-   eJztw6ERACAMBLCK3wHYf1FEVR0CmdylCgAAAAAA4M1JZ9rpTCsdAAAAAAAAAAAAAIA/LvrqAKk=
+   eJztwzENACAQBLAbzgPg3yjDe2AgbdIEAAAAAAAA4L3TSbI7SVYnAAAAAAAAAMBvLquOAKk=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 11ecad22..4c66d317 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32" backgroundcolor="#000000">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="66" height="62" tilewidth="32" tileheight="32" backgroundcolor="#000000">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -41,33 +41,33 @@
  <tileset firstgid="1019" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt0MsJwkAABNCIRz/gwauQEqxAvccmrCAVWZYFWIkbsoFVEvygJMR3eOyyzGFnyizLSgAAAACAkZsFyxbzNzNjUvXdB6sgD87T+l7Zxd5NZhLfq8z2IdN3j29bBMfgEK2TexF775NM3pLZDKDHr3a5tCiiY5I5tGTGuEvZsUnau2u3Rt//72OXV/T9f7vYZQiqbtfEaVKfdrnfpWGX553/cZeu3p9kAAAAAAAAAAAAYAhufLkIKg==
+   eJzt0MsJAjEABNAVj37Ag1fBEqxAvWsTVrAVWZYFWIlZzEKQXfy7at7hkRDmkJmyKIoSAAAAAAAgM4Ng3GB4Z+aXVf1WwSSYB/v++V5Zxp51phffq8ziItN1j2eNgm2wjqbJfRN7rpLMvCEz+4Ier9rh0GATbZPMuiHzDzuULRukPdt2qnX9/0/scIuu/28HO7xrh2Ni1zufue9Qy3GHax1z2KGt5yMZAAAAAAAAyNEJcDUhGw==
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1DsKwkAUheEZIRaCtr52oyvQxsYULkHdhyC2NuKK1BWIK1A34BmMMMQQm5DE5P/gMAlzA3cuYYwBAAAAAAAAAMCYIKOaqtk00vc71piZ1rbNpZ3CTRLitOw7n5qp/a6pqlDZKrvoPdA/01TmsZqlZrJS1kpX+71YTdXsdb6D1mPCnjt3mHM/ZTFKmUudnZSzF3eHuPWS8k1fsxwowx/39D+7es+L6I4da70V0k15+HPx79a6z+WuPBLyLLIpAAAAAAAAAAAAAAAAAACQuRe+vh5d
+   eJzt1EsKwjAUheFEqANBp752oyvQiRM7cAnqPgRx6kRckboCcQXqBjzBCqGWOpGG6P/BIS25hZtLiTEAAAAAAAAAAACAMcmXamK3qpXvt6wxE61NW0k7lRsVxGnYZ141Y/te8ytSZa1ssvdE/0RdmeZq5prBQlkqbe13cjWx2+o8O637gj13zrTifkIZlMzhnxyUoxd3B7j1VPJNV7PrKf0P92pMzt7zLLsTh1ovQboJx5+Dfxf+2xyuyq0g95BNAQAAAAAAAAAAAIjOA5c4Hl0=
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1j0KwjAYBuBoJwd3RzfFG3gAcXIQ9QriFVw8gDcQDyd4DX8wYoYiVVzUWp8HQsLXFPK9lNAQAAAAAAAghMELe4ZvP0X5zJ48a9U+dozSaqYMdlkI7bQep3nyJ/ls6sX1Va6+TOtpzKQR152UTfbg3SpY53o7xO/jGMcpjnN2q43uei/aU0Xb2Pc8zotvH6TErnfIPvufO+RV3ZhHTyaFZnKBj+hX+L8FAAAAAAAAAADgl1wAivERhw==
+   eJzt1rsJAkEQANDViwzMDc0UO7AAMTIQtQWxBRMLsAOxOME2/OCKKxyiIoK/8z1Ydpjbg5k5WC4EAAAAAAAACKHzwJnuy6v4vNGdZ7XS28r4GtXU8yoLoZ7iftoHBZ3Honw9P8vlpykexhlUYtxIs8huvPuL5rleNvH7b+PaxbXPTrneRa/XzhTBMvY5jvvk04V8keMdsM6Kewc8qhn7b/35DM5G5gBPaRfovwEAAAAAAIDnHQCYlBGH
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt0EEKgzAQBdCga0+gdue63fRe3qdH7caKQotYjSK0xPdgICSfgfwQAAAAAAAA2KM4YMflgB3/ZtrLM9++4wy97KGXeWfs5fqa20omxV7K8P3ffSfVQuaRvTOpacPw73qc5uNcje8xmdS0k7nP3MVkUrTWQ8wAAAAAAAAAAADwGx1gXRY4
+   eJzt0DEKg0AQBdAlqT1BjJ110ngv7+NR0ySiYJCoaxDE9T0YkPUzMD8EAAAAAAAAAFrZBjuKDXbsbdzD67p+R4o9/EMPnTP08PjMcyGTQg+3MH1n20E+k2kuQ+bo6tDdee+n/PrO+/8xmaOrR1P9eIvJpGDp7pgBAAAAAADgnN6raRY4
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1FEGwDAQBcDQ+18w5C79aamwLaHZkFnmL+HlWalHKRUAAAAAAIBhz8nOspJo+nOtO5+d+2/tEnXzNtnZM/dmx15G576bnX9GLyN9Zeef1Uv/t+olfvOOvUTv/torAAAAAAAAAAAA8p1RYD/T
+   eJzt1FEKgCAQBUCh+19Q8C79VISggWQbOAvzp/B8LOYtpQwAAAAAAADA5T7RWf7SQ6+TUp2Pzv22cmh10Zvo7F/uxQo9jM55Nzr/jB5G+onOP6uH+i9csYfWG1foofXOp70BAAAAAACAHaVBd+U=
   </data>
  </layer>
  <objectgroup name="Object">
-  <object name="To First Floor" type="warp" x="576" y="768" width="64" height="32">
+  <object name="To First Floor" type="warp" x="832" y="928" width="64" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="1600"/>
@@ -75,9 +75,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1EEKgCAURVHB/a/UFhGO1ECJGuk/B5o5eVcpJQAAAAAAAP64cvto+i6rRiWP509X95ZFm1m3CG2q1f5oXb606N/RqWZ3772MG5//Vl3mmyN2qd7sjdICAAAAAAAAAABgJzfKbmAm
+   eJzt1DEKwCAQRUHB+5/UHCJsFRNQguXuDKSz+U9JawAAAAAAAADMrv58lc0ddk1Gf5/PJvaNTYtVp4wtwm5v9g4n2+d3ksXqbiu/h/D9F1bssNpYoUP4sy/rdgAAAAAAAM7d1HdgJg==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index a0e20f4f..e5c44f69 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32" backgroundcolor="#0e3a38">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="65" height="61" tilewidth="32" tileheight="32" backgroundcolor="#000000">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -26,7 +26,7 @@
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="597" name="Candle" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/candle.png" width="96" height="128"/>
+  <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
     <frame tileid="3" duration="100"/>
@@ -35,57 +35,57 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="609" name="Pavement" tilewidth="32" tileheight="32">
+ <tileset firstgid="621" name="Pavement" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="737" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="749" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="801" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="813" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="807" name="Cellar" tilewidth="32" tileheight="32">
+ <tileset firstgid="819" name="Cellar" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="871" name="Height Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="883" name="Height Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0zEKwjAYgNFgD6SbUgdFt3oSt27qEbyGN9IT2UCEEgrqUCP6hkdIpvwfSRtCaAEAAAAA/sisCqFOlkl/X2emVfk7j+nRYNHZJNukv99k5j/c5pLEOdedpmeXrf3zaJX6lJ5hzC5x3uskhNuLDmltfrzLqz3yLlHpGT7VJc587OwHzo4DjUrPMIZ338mQ0jN8Q5f4bk66DHY56+IfafK0zTvNSt8dAAAAAAAAAAAAcncqbhG9
+   eJzt08ENgkAQRuGJlKU3DR40eMM2uFiBWIIN2JfW4k4yJpvNkkBEx6zv8IXAaf8HdCLSAQAAAAAAAAAA/KhVJVKbrYnv68Sy8j/zXF57N0FjDia+bxLrQjrcjG7aB23kmFzj52pnLbw3zNVAt90XIo+RznZtC2owdnvaQHlv+EQD3dcHp8yzPtPDe8O7pr7/HO8N326g38OFBnL98wb8C+XtH+owpY/32QEAAAAAAAAAAJD3BPO9+8c=
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1TsKwkAUBdBROxeiG7CzUEGInd+NiDtzhb7BFCEYTApRk3PgQgamyLtMJikBAAAAAAB0s5ukdG7IqUz1uZh8+40/L895iEzHz7SxL/vpu030cRzFmRi12z9rue8f3Wvra8x6q81bRF+7yCqyrpylPvfSxTE6OenlrcUAelk23LX5zpm/mD9/U9sB9HKOOS8t/0NZ/a7ps67dAAAAAAAAAAAAwC96AA3iDZo=
+   eJzt1UEKglAUBVCtWQupDTRrUEFQU9NZUWuIdtYKe1IDkQSFIPmdAw8U/sB7v36zDAAAAAAAABi7appl1465vKd5XU5//cTfVWc6x8wmr+nj9O4iJdvIXuSxv3m/9fOe68bu0bq/Ra57K9s+ujnErGM2jXcklQ6GKCL/8c87aFsm1sGq4xysz4jFh6z1d7FLrIMyMlU9/we19tmQiqE9AAAAAAAAMF5Pc3MOZg==
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1L8KwjAQx/E0VUGcXcQH0GfQwUGcXPxT8P18A30nR0dH8YIJxIBGB2m5fj9wNLQdcj+OMwYAAAAAAAAA0FYXW/cNmunqcznWe43GuX3IpZBvHV/W/1dGZ83uUS59Oa+l5lKDTO8bl1dhTLf4+xVr0SufzzAvB+l3KbXP9Fv570OluTgnqbPU1Pe4SmZl4t+PkgzGijPJmUlGOzc/9jWvqsWZBG6XbN/sG637JRbm4lsLq3e/pFn8mo1mZAEAAAAAAAAAAAAAAAAA0OQBoIMQVA==
+   eJzt1L0KwjAUhuE01UHdBBfxAvQadHAQJxd/Ct6fd6B35tjJE0whBiU6lMjp+8ChpV3yfU1jDAAAAAAAAAAAAP7N3eZeQX617+CSdxlZ2fJ5fddBIf30/FjfVRncazEMOhhItp3MSmaUyLl33RTG9IvWl9i6cbQPzpJtI3NKZKv8+4mCDpyrzE1m4fNsoz0w98+nUd6ZkvwpS+nj6PaFfe2m6kj+hvv3Dx/OBw3nQaj53t9aWx3nQZz71x606GpuAAAAAAAAAAAAzR7yQQ6S
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0LEKwjAUQNFH+zFqcRH8sP61brrVTRNE0BKXVrCk58AbEjLk3QgAAAAAANbs1EScm3//YlmObcQlNblO7HJof/ufpchdhtTkpsuH3OWem0zcr+Yuc+hSpkuZLmW1dtmmvfaj3Xbp3BXux/K7TaVd+ni26d4m71q6H8/rXa36GVO7b7uuuQkAAAAAAAAAAMDSPQCG9xl/
+   eJzt0LEKwjAUBdBH46Z/oxYXwU/qv+umgwkiSKhLK1TSc+AOCRlybwQAAAAAAAD/6NpF3Lqlf7GcS4q45/6PiRuc02//s4SyQcrZTOzSygbbnN3KN5jDBjYobNDGBofc4VT1OOZzP3JfK+/2DWwwxGuH/iOl19h9nfe7Fgwz0pJvvdbSHwAAAAAAaMsTzlQYhg==
   </data>
  </layer>
- <layer name="Shadow" width="70" height="66">
+ <layer name="Shadow" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1rEKgzAUhtGL8f3fsXUrOpTiUhSagIKE0MUtnAP/A+RbbiIAAAAAAPr3GO6vR+VdQ4oYky5X59teec+86bJZl3jnfaotujS7rLroUtGl7V+XXZf4Hvc6HSt3e9PFv66iS5suAAAAAAAAAAAA9OYHfDuyIg==
+   eJzt1rEKwjAUhtFbA0WX1vd/x+omOkibYAdxEMHFes+B/wHyQUgiAAAAAAAAfsu0+35b184wlIhjyd2g7VJ3qjs/7Zqswb1uftlNg+g+vB9bp4EGzbsGh2QN+vJ4I8d17a3cJ2uQ/Y+kgQYAAAAAAAD/aAF57rW4
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt07EJwDAMBEBDNjF4/xXTpDLGViqF6ATXS8+rX611AAAAAACAgPHI3uNrVrlEJnvvjFzGIZsK/Vp1YNeLKn15+ysV+7LLJpLZn8w3zrdHe1RBtEMVRSZ7RwAAAAAAAAAAAJjde7qR2A==
+   eJzt0kEKwCAMBECh/xH8/+d66UnEpoeihgnMPdlsvUqpAAAAAAAAwJbaY/Ueu2UQmdV7/51Be8khW29Gv539O2MPvvY9ew9mOUTyOVV/T39ntB/ZRLuRXWRW7wgAAAAAAMDYDSb56cE=
   </data>
  </layer>
  <objectgroup name="Object">
-  <object name="To First Floor" type="warp" x="576" y="704" width="64" height="32"/>
+  <object name="To First Floor" type="warp" x="800" y="864" width="64" height="32"/>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJztwyEOACAMBLAl91jg/x9ATM0hkG3SKgAAAAAAgDcnnWmnM610AAAAAAAAAAAAAAD+uIvVAoM=
+   eJztw8EJACAMBLDCjazu76NLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCpQICyw==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 215f2c15..71c98947 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32" backgroundcolor="#aa00ff">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="62" height="72" tilewidth="32" tileheight="32" backgroundcolor="#000000">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -41,37 +41,37 @@
  <tileset firstgid="891" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1jFOwzAUxvEXMbYgMXRF6hG6sAJ7cpecCYkjcBPIATIkR8iKLT2LV+Ow1bbk//CTW3vI86dny6OIjAAAAAAAAACApIPzEDnurB1v8P0a+X2/Ohfn0Xm+E+nc+KI5+LUumm8hm3tn0EzOzkl/95rHoKOff9P5pwrqzpXLoibNwe//w6xNOraSy2j2bLPx42dibamg3lxsHsGSGFvNxWYT94jNqHS9ucQ9kuqX1nNJ9c0UzZeuN5fUWfmvb0rXW6JnbB5+fpA2z1Dg32z+PdcZg1y/X1rLJbxpzzpeTC7xGStda+5c5h3xfVO61pz2Mpnl791butbcuXwb/n8vv71kz1J/g+/XyufwZcS5vBut5RL3y6xrm1rVVkG9Jfsl5LLKdSat5ZIS+oVc9nPZpL1cUtnYtZDLWkGdNbF3TOlaAAAAAAAAAAAA0LYfTjgidA==
+   eJzt1jFOwzAUxvEXMVKQGFiReoQurMCe3CVnQuII3ARygAzJEbJiS8/i1ThMTh25/+EnN/aQ9/XZrXsR6QEAAAAAAAAAwMXdOveRw8raYYP3l8r86pycB+f5RqRx44vm9GtNNF9D9jun08xH51E/t5q309HPv+n80w7qzpV7UoPm9Pk+zNqgYy25e5PJZvfjZ2Jt2kG9udi8wZQYa81ts8c9tt9B6XpziXuc6nftuVN9H6L50vXmktrL//W9dL1b9Nzm9fOd1LnHA38n8feVxujk/P+7ttzhTnbU8WRyx2egdK25c48r4vNeutac1jKP8ve3rXStuXN/G/65ld+9YPd6u8H7S+b+MuLc70ZtueN+j7q2qFktO6h3y36H3LOcZ64td0ro9zXnXqS+3Knsdi3knndQ5yXZM166FgAAAAAAAAAAcH1+AN6r3iU=
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt10FKw0AYxfFJoFqMuCnYbqUL1z1KhCyk8RB6lNIeoFR6AM+gHsAbiHoB0b1vYMAxjCl10Ui//w8e0863yTzapnEOAAAAAAAAAIC/O1VGWXq/SOzvu344c6UM9XqudRHN/f6hwV7KKBc6/23YXzdmllwpvdy5A+VandwodTSL1c62e+VBeQzvK4PfIe8yb59P1Msgs9vPb87Ux9hoJ9MNnxkA2zky+lsSa+ug+f/FmjIR65348x/rXnSiFNyTfnhV3pW3xGwWxZqXsD4nZsuwrnZ0Lf+J7+U8++4lfm68i2LtufFDeVI+u74QAAAAAAAAAAAAAAA68AWCvh6u
+   eJzt10FKw0AYxfFJwVps6Uaw3YoL1x4lhSzEeAg9irQHKIoH8AzqAbxBaXsB0b0vMOBHGOMuoV/+P3hMOt9mHmlTEgIAAAAAAAAAAEA3zpR5lt4fJ/YP3Sh2KpSZrpdaV2Ze7R877J2bLNTvKe4/12ae3CpHgxCGyp063yulmVll8O1VeVPe4+fC4Xe8cj1onl+p92nmt/9fztX3wmnnm3/uOeDNidPfstXUsf7/7U2eiPfOVb+JnuVTZdyzZ/pO+VT2idmDiTfbuG4Ss3VcH1s6S5uq3pfZb2/7XvJi4u295Ev5UL67PggAAAAAAAAAAACA3vgB/Ugerg==
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1ssJwkAQANBNUoBn9aAWYAEWYAGCDfirQdsQwT5EsT5zyEFRMFFxo3kPloFhD5NldjYhAAAAAADA68YV8021j11ATUySEIbJba6fhjBI49QTUyu5z52KeP5qJfW1zkLYZOXz/2xe4o6s8j29B331zxb5Ny8bOD+emaXleqaJ9AzvWOkdZ0Bl04b9m3zCtoi7qFVQZ9nVLD4U8Rilknja+Rl08tUt+S4l3i+ggpGZAQAAAAAAwA+4AASHDNQ=
+   eJzt1d0JAjEMwPG0HcBn9UEdwAEcwAEEF/DjZtA1RHAPUZzPgn3wULCCvdj2/4MjEPqQkDYnAgAAAAAAAAAAoGP+Zb5UJ+0COrIwIlPTzo2tyMTq1JNSz7zmriHeOq1Ez86J7F18PmfriDvc+DOjN/ciZxvf07bA9/vJysbNvES1zhwPTQWzr6FHtC0L+zf/wiHEo2oVSMk97bpziBeVStLp+x4H/htG7nXD/geyMuPNAgAAAAAAAACAP3UHCncM1A==
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt18sKwjAQheEUl15wr9Wd4EpRcauoT6A+iO+/cgYq1DqtVawG5//gICQRkkNaaAgAAAAAAAAAAADfkSa/3kEcum/8Z/TxXcSnbi+J3KNWdpfoxUYvNg+9DCRzY3wmSY05HR82valIaDdpIXr2tmRbWOvhrtzo+XtGtsZaL71Yd6KKl15efe9676Xsveu9l41kHB6fMR3vNLmhSFQ9R9OScQ93hl5s9GKjF1vVd0DfmPP4HTAJ998Bl2xuIVlKVrlxL/Ss6+w3H7WT7CWHwvi/e3bWo+QkOddYCwAAAAAAAAAAADTpCprDEVg=
+   eJzt1ksKwjAUheEUhz5wrtWZ4EhRcWpRV6AuxP2PvBcq9JHWKm3E6//BQUgi5JC01DkAAAAAAAAAAACge3H07R2EMfzgP7PWdxFe096R3INeehf+qXcWvX/XRLL2jK8ksWdOx6ddbyoQ7R4Xot36kqSw1sJZP2m/kSeJZ62V3r4zrWOl97vvNeu9q95r1nsfJHNXfgZ0fNDlhgKpu+fLinELZ07vMnrnWehd95069sxZ/E5duPx36j2d20i2kl1m3Artsk9/s1FHyUlyLoz/ulddLpKr5NZgLQAAAAAAAAAAQNsemSIRWA==
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1sEKhSAQQFGhPw78/2gRWGTWphnwCGflZrxMj7cupawAAAAAAACkc5zoOTK9+3qiZ/27Se/t+6l25rFTTTBnxi4z7suozazfkS7jLr1W0fNlostzk5m7+G05t2j/t+nS35H2vjaiZ83SZead0eV9l+P9uujypcv1PnrW6D53d9HzAQAAAAAAwAaWuACA
+   eJzt1kEKhDAQRUFhbizk/uJCEEedjeYP6QrUKpt+SQTnzzTNAAAAAAAAQFfbSs/Rs+u40rM+3XzVtq5W4M7vzqH9wZyJ7hHv+1f7qO9c9/VZpOdLvYH0LInmkbsrfdvr2v+XVOq+62s76Vl7dY9857q/+3TX6j7up2d9u/9sLz0fAAAAAABQ0wJkBbkl
   </data>
  </layer>
  <objectgroup name="Object">
-  <object name="To Artis" type="warp" x="1280" y="1312" width="32" height="32"/>
+  <object name="To Artis" type="warp" x="1088" y="1472" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1EEKgCAQQFHBY9fhIyQMnaxlMO+BK1fz0SkFAAAAAACAP9prO9ms5r7usrUZ5x5nz9rlEvUZW+iiy92qTdZ/dNIl9rZ36XSZ+UON3dJ92bW6zPNvtZ9Msr+LJ7rE7JKYLjFd1jQBAAAAAADg7w7hETwF
+   eJzt1MsKgCAQQNHAz66PDwkpRKVVxMw5MBtdXXxsGwAAAAAAAPC1o1wTzaqr7UVr77v6tqjdzai/b9Udy6o96j2vsneP1qI2z2TsznDHq0xv+81flqX7aS/3RBL9XGd052rXnau7ydgMAAAAAAD83wn6gzwF
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 537ccd6e..75a7604f 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="69" height="65" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -43,29 +43,29 @@
  <tileset firstgid="999" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1U9KAzEUgPEUl/4B3bgTeoSewLosjnfpmQq6dOdNpnOEzBG69Q19D55xUjcNGaff4kdCQqHvI7TbEMIWAAAAAAAAAAAAwORci7sRNyfu7L72dy/pVqzEQryIz6vj/lms9fxDzu5lXSb3c2ozvIHOWWuXd23wqGsj3tzZ0u1Xev80gXnOaZhvp+swexRfyno17i7qWdTPWLdL6NK5NbeP4WenuXWJ2iV9C3/1SRvVnqNUFz/v3knnv6Qufr5WPCyOWj3L/b7YvpnAHKW62Iz78Pu9WJddxhy7dInWsVYb8Sp6cVB+v5nAHKW6nPrt6BO+jak9x7nl/nu8Xlf/TtJWteco1SX9Px5rlXsrc+yStsn1sS5jan//2mgBAAAAAAAAAAAA4D/7BponHdw=
+   eJzt1UFKAzEUxvEUl1pBN+6EHqEnaF0Wx7v0TAVduvMm0zlC5gjd+oa+wDNOWooNGeJ/8SPhhcJ8X8PM1jm3BQAAAAAAAAAAAHCRW3E/4u7EWTgv/ey5zMVSzMSL+Lw57ldirfMPmT3IuojOa+ll+O87Y62dvGv+J10b8WZmC7Nf6vnzBPJcy5Btp+uQ24svFbpqzJnXmdffhM5q76Qza2rv3c+OaurEayfxHTjXTdxP6Rw5OrFZ90ac/b90YrO14nF21Oos9T4J+2YCOXJ0EvLt3e97EjrZJdTWSRdpjdDTRryKXhyU3W8mkCNHJ6feFX3E9hKUznFNqW+M1etq70fcU+kcOTqJv7ljPaXuSG2dxL2kugmdjCn9/CXRAwAAAAAAAAAAAPA337S14r0=
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt0kFOwkAYhmGGDaKJW9bIETgJJC4aceER8CZUcE8g7MUrKHvwBEQvoI17vqZDMkyKcdMWJu+TvBk6pWT401oNAAAAAAAAAAAAAM7LWE3Us2rk3N/vXZrs85Up62TlGqlYPdnruV0X6tb7btNkey2tFyquazaBzmVq15lde87ac679vbS+yboOcDb+XN7Uu1o53xmoe++5oWbxaBsUfMYquO9H+t/XauP08Y/fiOrFnK1K7vuSzuTXu/9Z7nFOxotaqle19e51zeFc4iOFLp1LW7O4sXW8uUxznpnl7IXGf1++VKIe7PXySKH7Vj9Oid2P1N0fz0UFnwsAAAAAAAAAAAAAAOCU7QBlhzJZ
+   eJzt0kFOwkAYhuEOG0ESt66RI3iSmrBoxAVHgJtQwT3BuAeuoO7VExi4ABD2fE2HZJgU48IWM3mf5M3QKSXDn0YRAAAAAAAAAAAAAPyNkRqrJ3VRcP+wd2nyz01T1cmqM1SperTXz3Z9UR3vuw2T711rrau0prkEOJOJXad2jZ01dq79vaw7k3cV2Fz8mbyqN/XufKerHrzn+prDwNYt+YxVc9+L7H9/qE+nr1/8RlIr52zn4r4n2Tx23v1ltcf5F2Zqrhbq27t3a45nkp4oZNlMWprDja3tzWRS8My0YC8k/nuyUlvVs9fzE4VsrTZOW7ufqPsfnktKPhcAAAAAAAAAAAAAADi2B5SJMlk=
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt0s0NAUEYBuDZLUMielCCRLiui9CFCpQgogJRgRDd+CnFd5AIwc3+8DzJm9n95vLOZFICAAAAAAAAaK7+h1krS2lQZpkGGVddoET723qIDPKUhvl9r4jvUWQRKeK9tCOdrIqW9TKJ+5jmj7Pej97L+rZuIvOnMx/j//Rmdo5cnvb+QfdH38E3LF/MVqW3oCm2L2a70lvUx6zqAgAAAAAAAAAANXYFgjYQNQ==
+   eJzt0ssJwkAUBdAxZQhiD5YgSNzGjWgXVmAJIlYgViCK3fgpxbcQRFFXmsRwDlwmebO5M0lKAAAAAAAAAN83+DBrt1LKyyzzJ8ZVFyjJ/rYeInmW0jC77xXxPIosIkX8J51It1VFy/qYxF1Ms8dZv4F3sr6tm8j86bzHeD+9mZ0jl6e9pus18Pv/wvLFbFV6C+pu+2K2K71FPcyqLgAAAAAAAAAAPLgC3VEQNQ==
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1U0KwjAQhuFJ3eoJrG5d+gsuFfUE6g3UvRfWszilEUoZRWogsb4PfARmShhm0YgAAAAAAAAAAAAAAH7RSXPWXGIPkpBe7AESxV5sn+5lrJkY9Vsmcs/Kfh5urOisvTgnkvl0XFlbadZv7in63eDTxWPtZeqa3TX8apK0hPy/sBcbe7G1aS99sd+ZulfvUbXfpveoUOxmoBn5s5pnLfffzTRzzcLot9FVs/RnNfXaRrPV7Gr9f7fXHDTH2IMAAAAAAAAAAAAAQAMPqQ4Png==
+   eJzt1U0KwjAQhuFJ3eoJrG5d+gsuFfUE6g3UvRe2Z3FKI5Q0imggNb4PfARmShhm0YgAAAAAAAAAAAAAAEI5ac6aS+xBWqIXe4AWYidN7+5krJl46rdMpMiqfh5urKh8OzFGJLPpmKq20qxf3FP2u8Gni8O3k6n57K7hV5O0R8j/CTtpYidNqeykL/73xPXs3an3U3l3SuVeBpqRPet51HL73Uwz1yw8/dRcNUt71uPWNpqtZuf0/9lec9AcYw8CAAAAAAAAAAAA/Kg7PnoPng==
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt00EKgCAURdGg/W9ScB+NhBAlk+KDng9n1KR3o3QeRwIAAAAAAAAAtlUu+j0it5f9Mxe94Q/5ZrbLim16XfLLRtE7vlZfbjxvNax7rubpu+vSv5F/KnqHLrpEG928U5OZhtHvAAAAAAAAADDjAq7BuaY=
+   eJzt00EKgCAQQFGh+19S8B6thBDDEmFE3sBb6cL5Ub5SygAAAAAAAADAFupEvyNq77r7zETvsFp5mG1yWpe3JuVnn+g9VmqndM57/dqWJxl9b0368+U/it5DE0127DK6F/3+aBoAAAAAAADAvBvZjUDj
   </data>
  </layer>
  <objectgroup name="Object">
@@ -84,9 +84,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1VsKgDAMBMBC739O7S1ERArio/YzmYE9QLcJKQUAAAAAAAAAyGypRzJqtWd3dvEnEV17WetcopntIVsv7eXNmXbp698jzsKIkR2JOA9f9HJPL8+y3RoAAAAAAAAAug1722a/
+   eJzt1VEKgCAQBUDB+5+zvEVERFCR5pe4M/AO4HOXTQkAAAAAAAAAGMWSj0RT8pXd2cOfzObeyZr7MpPeDiJ1Uj7eG2V/av892wy0aNmL2eagRidPOnkX6aYAAAAAAAAAY9kAFOJmvw==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 4a9e3d0d..b2bfb92a 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="69" height="64" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -43,29 +43,29 @@
  <tileset firstgid="999" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="70" height="66">
+ <layer name="Ground" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt1rsNwjAUhWFHlDxaOlYhA8AumYmCkmkCA1B4DmxhS5crOwjkYGT9xScn4aY4R07CYIwZAAAAAAAAAAAAgB9bOpuM1RdzLfBZe6dzLovn2onzfcgc586JGb/Gudp5Slk7x5Bxa14z+/ODsxNzqZlOzNXOU7qXW2CDeKx7sZnZ1noZREa9Rv4Z6VUPmm20F5lPH/u9IPeK7EzeWzvHHL2cROYxkM+S7EX+LvurnaM0q3q5KvdAX9e9mD/IMkcv8dkYldiLvq7fR7VzlKbzfbJfWu9FZ3y3X/Q7uMX3S+p7lPre5L5H8bh2jtJS/12m8uf6q51jrj2Tyz3VUat7BQAAAAAAAAAAAACAB448HaI=
+   eJzt1rsNwjAUhWFHlDxaOlYhA8AumYmCkmkCA1B4DmxhS5crOwhkMFh/8clJuCnOkZMwGGMGAAAAAAAAAAAAQJk7q4zFG3P/zufsnc45ze5rJ863IW+cOyZm/BrnaucpYensQ761eczrz3fORsylZjoxVztPyU4ugQ3ise7EZmZb6mQQ+fQa+eeiVx1otsFOZDZ97PeA3COyL3lv7RylOzmIvGMgnx/Zifxddlc7R0lWdXJWroG+rjsxP5CldCfxeRiV2Im+rt8/tXOUpLO9sk9a7kTne7ZP9Pu2tfdJ6ruT+q7kvjvxuHaOklL/Taay57qrneMTeyWXeaqfFvcIAAAAAAAAAAAAgO+6ARQKxFM=
   </data>
  </layer>
- <layer name="Ground 2" width="70" height="66">
+ <layer name="Ground 2" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0z0KwkAQhuE1EH8KS63UVjyDp0ghWmjtedQTiCdSTyDRA/jXO8EsLstGNBASlveBD53JCJuRVQoAAAAAAAAAAABA1TSsuumYsXv2b3w0+2FmYtXTIg5SIVFG8s75YGHVrUCpjqQrmVtzofTqknHwmW1bc75YSdaSjWQvOaQ5OmaznodBwYcswTb93ElORv+h3u+vJd+fRh0XfK6yZe1Fi7/0h7WiTlW+ZC9LlW8vPbk/fcnAw3tk+ncvPouM//oquVjPXXs5S+5GPfL4PmnJbm5G9Pu7egAAAAAAAAAAAAAAAFDqBQhlMmA=
+   eJzt008OwUAUx/HRpP4sLFlhK87gFF0IC9bOgxOIE+EEUg7g395rdGIyaUWbtJh8P8kvvNcnmT4ZpQAAAAAAAAAAAABkUbPqesKM3bN/45rJBzMjqx4XcZAfEaQk79y/m1l1w1OqJWlLptacL72qZOi9ZpvWnAsWkqVkJdlKdnH2CbNpz32v4EOWbB1/biQHo39Tz3fXou93ow4LPtc3pe1EC9/0+5WiTvVd0U7mKt9OOnJnupKeY3fHlHUnrgqM//gsOVnPk3ZylFyNeuDoHdKivVyM6HdP6gEAAAAAAAAAAAAAUIYHDNUyYA==
   </data>
  </layer>
- <layer name="Fringe" width="70" height="66">
+ <layer name="Fringe" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt00EOgjAQBVCC5+EYRBdeAMGt8VacTPAodiGJVhYmYlrxvWTSTtPF9CctCgAAAAAAACA3u6ivZ+7EZ9svzcJvqMrUE+Rj/2YWmz/OrH94+yXshyiL6WwMdS2f+zVrVv6+JXWhjqmHSOB0X89Jp8hPG/5O5//MOsjlhUwAAAAAAAAAAD5zA6RiDXM=
+   eJzt000OgjAQBlCC5/EYRBdeQIEt8VaczJ+j2IUmUFloIrTB95JJO00X0y9pUQAAAAAAAADf2Ed9NXEnPtvNNAt525apJ8jD4cMcNn+aVz949yXsr1EOr7NbqHs57tfquOK3/VITqk09xMK653pOOkVe6vBfGn/mzUkmI/IAAAAAAAAAIHcP81cNcw==
   </data>
  </layer>
- <layer name="Over" width="70" height="66">
+ <layer name="Over" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKwjAQBdB4AE9Qk63LutNjef+VDbRYJEoLhdT0PRhCyqRkPgkBAAAAAAAA+HfpVPsGsA/n2hfYqS1zSRv+qza5lMmlTC5lS3Lph7ot6DtaLmlFXyu68Pst5LdyWdHXkjxzHOo6rnG2z7M+x+q+9MTQXiaTPPc9vDPI9fjYl75NZwAAAAAAAACgNS8UegvV
+   eJzt0kEKwjAQBdB4AE9Qk63LutNjef+VDbRYjEorlUh8D4aQMimZT0IAAAAAAAAAvintat8A6tnXvsAP2jKTtOG/apJJSSYlmZSWZNIPdVrQ90+ZpBV9LejC+zeQ38hhRV8r8rxxqOO4xtk+z3kdq3vRE0NbeUzyzOdwnz/X5WH/7Nt0BgAAAAAAAOBTN/fOC9U=
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0lEKgCAQQEGh+19S6B79RmCrQS3aLMyfgvuwbqVUAAAAAAAAAFjIdUbuZb/9yy6tRr3nVrCf3P2daLL3ePOv6BI3Gp3st+syTxNd/tWlZ19ddIl2fnoOAAAAAAAAgHkcghGfeQ==
+   eJzt0kEKgCAQQFGh+19S6B5tI8jGxTSFb+DtFJyPfWutAwAAAAAAAECi68zcq377W03u+kTP/d1+MvozT1O9R9Yf0WTcZ3aq367J93toskaTyK6aaBLdc5UeAAAAAAAAkOUAqILo7g==
   </data>
  </layer>
  <objectgroup name="Object">
@@ -77,9 +77,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="70" height="66">
+ <layer name="Heights" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0jEOgCAQRUES7n9O9RZWFK5CMHTLTLIdFv/FUgAAAAAAAAAgl6M+7893mZ31++Lu2XcZxP8kbm56Ta7wLitd3nrbR6fL+LJaaaLLXl1m9uqiSzO7dacmAAAAAAAAALu4ARjgiaw=
+   eJzt0jEKgDAQRcFA7n9O9RZWFlmMRCSFmxnYLhb/YSkAAAAAAAAAMNdW23vzXVZ7vb+4efTd38X/I+699Hoc4V1GmrR6u59Ok/5l9KWHJms0GdmqiSajO1fpAQAAAAAAALOc3AyJrA==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 311fb487..5d1334ff 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="87" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="84" height="67" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -35,29 +35,29 @@
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="987" source="../graphics/tilesets/candle.tsx"/>
- <layer name="Ground" width="87" height="66">
+ <layer name="Ground" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt191NwzAUQOEb4I0fqYgO0BHYoDyihiWYIHMwRmdqF8hD58BRbXHl2E5SVGzk8/CpjY2periKQiciHQAAAAAAAAAAAAAAQIXujadfOnkeCvheJbTaGo31dXt+XRmv6lob9m6M3rhT63urKaDBtbpubRfXahVop/c/7Ps3Y23fb+zrWsZth71n2/aloraP8tPKtdl41413Pfz8wbbq7bp7f/D2UlzbvoAO12w7p4VztNz1ZxPfq7ltt7Crnk1/PmPrc+RuUErbo4TnM7ZO28tn13fJ78vd4C/bthK/D7cynlM9r6lzsb3cDXK03Qe0al/Pq1tLnaOtyLuxk/H/Tye7F2rv1lLndrQNtgl1mloLqant8Hyqn1H9tvp+OtVtzjn9Oe6zczfIMbeh54A5XVPnaprbVNvQs8DSmfXP0TY8g0vuCbFzNbX1++r1JS2nxP6Wub/7fxNqCgAAAAAAAAAAAAAAUJNvCWhdvQ==
+   eJzt11tSwjAUgOFUffMygyMLYAnuAB8Z6iZcQdfhMlgTbKAPrMN0OBmOaZK2iqS2/8M30MTI8HvkUhljKgAAAAAAAAAAAAAAMEn31tMvHT0PI3heufqsrUJ83p5uF9arutaavRurtu7U+k4UI2hwyZZraeH6LAK99P673H+zlnJ/JbdL0+7Z7D1Lz5eJ93w05z6ux8q7Lrzr5uf30qeWdXd/7+2luJ71CDpcumef5+8chLv+KOJ7c+tZDWypZ9Cfw9h6H7kb5Ox5MOE5jK3Tc9iM+n7y+3I3+OuepYm/rpamPY96LlPnYnu5G1yr5y6gVPt6Lt1a6txce26srWl/jznKXqi3W0ud2860Z6hHqE3XWsjUezafH/VnSL+nfn3satXnnH4c99i5G1xrPkPv331aps5NfT5TPUPv4UNn0z83557+rA35f4+dm3pPv6leH9KvS+zvl/u5/wehjgAAAAAAAAAAAAAAAPjuC+lRK90=
   </data>
  </layer>
- <layer name="Ground 2" width="87" height="66">
+ <layer name="Ground 2" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1+tNwzAUhmEHKAtwGQAQi3QCkCqEKn6UDShigJYN2KBiAsokwASoMAAU/nOs2uqJiXMRVIL4faSj2ElOUz4MSYwBAAAAAAAAAAAAAAAAVqdTMdfW1Xiixre/93X+tKqswvnVWn7eK/nsLTVOMdswm5PI8WepI1fH2XI8C4752pPalzpQ+zw9bqMwi7Ly+fUk00G26O+6rT9WJZV1e9bwfJvfm9Sr1IVkOpS6lHqR+dzUy/ZOaurqvuH1/xP7N32d1T9/5rZhhrH9KfPrri6foV2776rmbj/Z1nNTUKvsS8kkmIf3nUdVTfpS0Sv4fzBw22lBaT7DMLtY33mNa7eJvZeNg/vZqVRf6sHk1+aTO+YVZV7W11fnjbLltduuq37GkVnk8xmc82GKczIm//uI9Y3dXD8bt9kw+/6sYLON3e/9c8KGnN9Rten6y/rGau6fjYcJZKzVyXZbMtlRtdsw21TZbP27l+bfvazDYL35eVkf2S7F3g+sWLZVfQAAAAAAAAAAAAAAAMBPfAESFncK
+   eJzt1/1NAjEYx/Geigv4MoAaF2ECTYgxxD9wAzEOAG7gBsQJxEnUCQw6gKL/+zS04bl6vZdEEux9P8mTa+9aDn6U9DAGAAAAAAAAAAAAAAAATXUq+tqmak9U+/7v3s7aqcon7N9s5Pu9ktfeUe225BnmcRa5/ip14uo0W7ZnwTVfB1KHUkfqnKfbqQg/f1n5zHqS4yBbzO+6o79WJeX1edFwvM3sQ+pd6kpyHEpdS71Jf27q5fkgNXX12PD+687+Xm+z+uNn7hjmFjvfNn591eVzs2v0U9XcnW97nmXuCmqV81I3Cfrh3vGsqsm8lPUKfusDd5wWlOZzC/OKzbusce//zu5H42BPOpfqSz2Z/Bp8cde8opzL5vXVuFG2vHeKuupzjcwik+9gzJcpzsaY/HcQmzd2ff3smpph9nuPt3nG9mm/v2/J+I6qbTe/bN5Y9f2z6zDRXLU6ee5KDnuq9hvm2SY2T/8fSPP/gazjYF35ftm8tubpxZ7ZrVieVfMAAAAAAAAAAAAAAACAVfgBp1h3Cg==
   </data>
  </layer>
- <layer name="Fringe" width="87" height="66">
+ <layer name="Fringe" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1sFtwjAUxnHbOaflVsqJG+UIOyDOqMqxQ5SyAN2gMAFiAsQEULZgGZ6VRA5GIkRtWuH8f9JT/BxZCR9xQCkAAAAAAAAAAAAAAACgPqOSHo6fzbjkfFLjvTTVJDvOtVJ9qVepRLv5MqvCeP3L93avPo1Sb3IcGDfX1W6sZT6WepBqZeNHqcicn4+Maow8h06WRZxlk/ctL6PcTvq91LfUwVz2TXeM0n1tlWVFdrgHX16/rHldaAbe3h5W2Os2w4Wqlt1PrheSjddva14Xmp6+nHu/cW2eYTG76ZXncFoYv2j3Gxqq7j9+Rvu92v8pODcz6bNn2Yw+GvreBELUNmk9/9G+fjLumgAAAAAAAAAAAAAAAEAVJ9DUJas=
+   eJzt1s1twkAQhuHZ9ZmEW35O3EiO0EOUcxRxTBEQGggdABVEVICogJ8u0kxmZVtrFinGCgZsv4808s5aK9sfXkAEAAAAAAAAAAAAAAAARb3k9E0X5vGac35Q4r00yVty/DIiz1rvWgPj5/N8Z8aLE99blUysyIcee9bPdYwfG51vad1otZPxrVZk989HVmotffbH5PlbSR5p3w5ySa2132httXb2sG+inyjes05ePuSFazIN+nnJ6+qgF+zbfoF97HKbSbG8/nO9qlsG/arkdXXQNYdzwyPXprll8xr98b6NMuMn438H66Rzwedyn6X7fwGRsY3fMcfl8tmg70Ggyu5tXA9n2rN31l8TAAAAAAAAAAAAAAAAOIVfT2glqw==
   </data>
  </layer>
- <layer name="Over" width="87" height="66">
+ <layer name="Over" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1kFKw0AYBtB4AE/Q1F2hO0XtuqKewHoDdau9/8oJTGHANCG148jkPfgImZ/JDN8qTQMAAAAAAAAAwKneQt5jPgrfpXZXpS9QMd32W1/8/hu6zafGbi9LXyCaU7fXITd/OJtTt9uQh4HZZ/Ozp667r5F9x2Zz6nZMX09D3Y3RbT66zUe3+eg2H93mU2O3i6b/n3PoX/RUx77ZrbdnPuu/6Ppdxqzis43rq2S2nPB+G3IXcp+st8lZ6b5aez3Yx2zi82CTzPYT3h9DnkKek/X0rHQf07yE7EJeS18EAAAAAAAAAKCQb//rGQ8=
+   eJzt1kFKw0AUBuB4AE9g6q7gTlG7rlRPoN5A3Wrvv/IFpjjQJqE6ODJ+H/yEzGMyw79K1wEAAAAAAAAAjHuJvKa8Vb5Li85rX6Ax+vxycfLzb+izrFb6PK19gaT1Pi8jV784a73PdeRuYvbe7Xcz9PUxs29s1nqfcw51M9XXnP/eZ2n6LEufZemzLH2W1UqfZ93hf8Kpf8XvGvvmsN4XPqumodNFyjI9+7S+zGaLI96vIzeR22y9z87K97XU5c42ZZWeO6tstj3ifRO5jzxk6/lZ+T7mPUaeIs+1LwIAAAAAAAAA8Id9AsmlGQ8=
   </data>
  </layer>
- <layer name="Collision" width="87" height="66">
+ <layer name="Collision" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1lsKgzAUQEGh+9+W4K5KPwJB8lCpXknmwkDRJm0OLbh+lmUFAAAAAAAAAADgkt/kr/OJ/m5vs2+yFa6VWqb35qLPEtGr1CrvU+vXm1naRswsbSMbp4k++4hN00Q3eLJturf/7243rxtR7ZytRvv7Z9bN0jU9O+VTutb7fdbatfZtPbeN5mjbq5PvG33WN7dtre+1neG5q9bj7rZH9hqBts+2PdLqbNsjnzeyf5611z/6rAAAAAAAAAAAd/oC+26+8g==
+   eJzt1lsKwjAUQMGC+99WobsSPwKh5FUx3hrnwoC0JpqDQvfHtu0AAAAAAAAAAMBfek3+Op/o73YH5w5H4VqpX3pvLvos32pU6pM3qTXrzco9I2blnpFd00SffZWOaaIbzO6Z7p3/l8fkdauona3V5Xz/yrqVW6bnnHxK13q/w1qv1r6tZ6wVjPZ8d/J9o896t56t9b2eqz4j1RrM7jmy16/Sc37PkT5Xe4583mo+eb5e8+izAgAAAAAAAABEewIO/2Vw
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.9">
@@ -83,9 +83,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="87" height="66">
+ <layer name="Heights" width="84" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1lsKgzAQBVAh+1+ZtmsqfkijTYRGEzA5BwZ8InPRidMEAAAAAAAAAABAqSV8t99hX+zN4Xf/eGyz5rrV6hX2NYJUXrlrlsO5OL9/q1dXMpmjkm3elWyuVq/ueO9km3bWa/zNH9eqGvf1qLTPVHY1n/c0uTWqhtzsGUHLbEcj23ul/lFbZFs6q5/EvK2nda8jZRtrmS0AAAAAAAAAQM8+vIe3cg==
+   eJzt1lsKgzAQBdBA9r8ybddU/BATawo1JrTxHBjwicxFJ4YAAAAAAAAAAADc1Ry37WfMixCm+L6/P7Zaslxr8Yh5jeooo9I18+5cmtm3NZKaHKak5JmryaO2RnLF+yXPzaf+0u95v960uG8UZ3s7yqvl8/5BaZ1poTRXRtUzzzuQZ72jf8geeZ6dvb/O/LxW7/5GzzPVM08AAAAAAAAAgLt7AScHt3I=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index 4abc2ee5..f8ec5ff7 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="67" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="60" height="63" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -28,33 +28,33 @@
  <tileset firstgid="949" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <layer name="Ground" width="67" height="66">
+ <layer name="Ground" width="60" height="63">
   <data encoding="base64" compression="zlib">
-   eJzt1LsNwjAQBmAjSh4SBS0SIzABDAC7pGbQDJCCEahxJEeyIh4VTiR/xSc7ru5+3aUJITQAAAAAAAD81Sra/rCeQZ0lcrhEi+i+DGGX7r1Teuvv5wry2ES31Ps+OmZZDG/9eY0OM6i3RBZd9Ei6zPBdQxbjvnvt6Hymc+paS2fRjt5yU9daMothDmRhLt79L2RhR+zI5yxqnos8j9p3JM/j21xMXd9U81Fj7wAAAAAAAMD8vQD327a9
+   eJzt1LENwjAQQFEjygASRVokRmACGIDskppBM0AKRqDmLJ2lk4WgceRw/sWTE1f3dVHGEMIIAAAAAAAAAMAf6sThh90K5izVehMb8diGcNTn6KJ38fnqpHkvBu3rxdn0prt43sVpBfOW6p3FU81GevfSm7dFU3a+9Kw96xK9U3Zn1Z61dG/aZyu9re330//Kcy/fs/9e7/u1zS18z7b5235rz7fknr32AQAAAAAAAADa9Qa4Hp3O
   </data>
  </layer>
- <layer name="Ground 2" width="67" height="66">
+ <layer name="Ground 2" width="60" height="63">
   <data encoding="base64" compression="zlib">
-   eJzt1kEOgjAQBdB24QHVsNNDqCfQmxo9gV7AGmwQxMAKDX0vmcWfsCiTdNIQAAAAAAAAYHqLkb0SVCN7c7ccqFJsU50HvtlMcZA/sIr1LKpY52uqW0+VYJ9mcIhN3sV2L2fK874vLqG5L1k3z9Upfs7iuUPWr/8/xjqXwL7gm+4dKZlZtOU31f3XBwEAAAAAAADo8QAj2h7b
+   eJzt1sEJwkAQBdDswQJVctMi1Aq0U4kVaAMmxCUaheQgkYzvwRxm2MN+2IEtCgAAAAAAYE4WI2dRlCNnESwHKpJtXeeBM5spLjKRVWrzlqntL3VdP1QU+zrnIXX9Lr3Ocs98Pe9vVXRvO+v3c3ZK73mbnV4/Mh5T20dhf+Prv+fo/i1vI/8rbr++CAAAAAAAfNkdmR8e2w==
   </data>
  </layer>
- <layer name="Fringe" width="67" height="66">
+ <layer name="Fringe" width="60" height="63">
   <data encoding="base64" compression="zlib">
-   eJzt1ksKwjAUBdA2jq3O1LoAxX24gCJuyG7cJ7b0gwNHFck5cCEvoySDS4oCAAAAAAAAlnf9cg+a9OsTLOteFsUm7lxHtpF1pErTvVyc4i1u5TA3sX5E2nI6k5d9eucQ2aVhfuU4Wueg74dVpOz6ou+NejTnop31xWXWD2d9kR19MfjUF1XXEXX3z6gyeQsAAAAAAAAA/ssTEVMI3A==
+   eJzt0z0OgkAYBNAFa4VOxQNovIcHIMYLycX9DBB+KgsThbyXTLKz1W4xKQEAAAAAAEty+/CO9ajzX7/g+x5ZSkX8q4qUkW1kl0/v1uQc/71nQ6/j/Iw02bSzTIe8zTGyz4f+zml0Xot+r5tI1u2333E16mvSzPZ7ne31Yr+LZb9tL7v9Fl0HAAAAAAD4Ry91Wgjc
   </data>
  </layer>
- <layer name="Over" width="67" height="66">
+ <layer name="Over" width="60" height="63">
   <data encoding="base64" compression="zlib">
-   eJzt0MsJAjEYhdEweyvw0YKiVqBWMFqIrfko0F8YyYCCuhgM5hz4FglZhJsSAAAAAAAAACUYffF2NtgvytDf4tSkdI4u0bV5vqtpi3dskdkis0Vmi+zftxhHiw/ezaPJwH8pwX2PabSMVtG6O/erYYeHY7SJttGuO/erTRvto8OvPwIAAAAAAADwwg0WpQwF
+   eJztz8sJAjEYhdEweyvw0YKiVqBWMFqIrfko0F8YISCighOZcA58i4QsclMCAAAAAACAckZfvJ319oty8r2nJqVzdImuzfNdbXvfsXd47H3N3uEZR4sP3s2jSc9/KeW+eRoto1W07s55tWx9OEabaBvtunNejdpoHx3+/REAAAAAAPixG55yDAU=
   </data>
  </layer>
- <layer name="Collision" width="67" height="66">
+ <layer name="Collision" width="60" height="63">
   <data encoding="base64" compression="zlib">
-   eJzt1MEGACEYBODo/V8neru17CnR0mGi7+e7dBpj1GopDQAAAAAAAOAA76UzpPWvh9WlcyY6uXkrfy+dM9HJzbuY/RfjWz8gp11kOvBf2IVd7PWRzpjoJJ0BAAAAAAAAYOYBT5hLNg==
+   eJzt08EJgDAQBMCA/bcTSHci+BARFDReuMzBfPLaZUldSqkAAAAAAAAMYbvoDH9oe9e7i87Zq3f2zZ9edM5evbPve/V/z29tgJz2fdfT/83dc6Z9Z+t77B2dAQAAAAAAvrYCfzx7Jg==
   </data>
  </layer>
  <objectgroup name="Object">
-  <object name="To Library First Floor" type="warp" x="1024" y="1216" width="32" height="32">
+  <object name="To Library First Floor" type="warp" x="896" y="1216" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="1664"/>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 3053801a..841ae8cc 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="87" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="84" height="77" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -41,33 +41,33 @@
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1003" source="../graphics/tilesets/candle.tsx"/>
- <layer name="Ground" width="87" height="66">
+ <layer name="Ground" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt181RwzAQQGFnOAK5cU0rTgFKExTApB6O1BQogIPrwBqkmR1FxpKItZbzDt/E+bExj42Mz13XnQEAAAAAAACs3uNoP+NpBefZGtv1ONqN3h9+HyX/Wk/fbM+jk+v40l239a+Z0WEF59sS2fZLGMQjbcvZtq+7eNfBvWdWcJ4t8i1jcyu3tc+zRXJOZc8heE/7PFsUWwtkX9qWC9eE2MyyJpS3ja2vYXPt82xROK/h9tbbltyXpuzz1sXX2di6q91gqa7HLu++NHWfQ6Rh7/a1r304W22bc19qu+xdm5R9evczTqKvEc/vqe33BN/WuO2TM/V5z4jP+rk14vnW2/q5sveeU438falsO9dVtrXbsfsH33bL17KUTv819z+udoNabS9OjeaedoMabT8DtL1d20ugtFXucbQb1Jpbe+2ywrlNvZaFs5/yHdBu0MrchsdIOZZ2g1pze4v1Nvc42g1qtJVzV+s6dk9tNWg3WIq/dk393v79Jf8e2g2W7vtX25J5z/0cAAAAAAAAAAAAAAAAkOIHWf52Eg==
+   eJzt109SgzAUgHE6LtXu3PYq9ADhEh7A6XlceqbqAVxwDsmYzLxJgyRA+iB+i9+U/oHi5wPKpWmaCwAAAAAAAAAAAAAA+PceB8cJTxvYzz2wLc+Dw+D94fdR8q+1NE3yPOhcu5fmtqd/zQxOG9jfrZM9v4RePNIzj+35eoi37N17ZgP7uRe+X2w+5bL2fu6FnEfZsA/e097PvYgd57IpPfOEx3tsNjne83rGzpdhZ+393ItwLsPlGnvOuSdMWeetiZ83Y+dR7QZrtjw3efeEqeucIt1at6597cOpqWfOPaFtcXQ9UtZp3Xd0oqkRz2vv+T3C9zRuuXPGPu8Z8Vk/n0Y8r7Gnnx973zfWxd8Typ5TLWVPuxz7Te971nY9Smmz1NRvUO0GJXtenXt09rQblOr5GaDnsp7XwNw+udvRblByPu31xwrnM/V6FM54yqxrN9jyfIbbSNmWdoOS87nG+TN3O9oNSvWU83Wva1HtPTVoN1iTv/6M/a3+/ZL/A+0GJZr+1XPOXOd+DgAAAAAAAAAAAAAAAFjiBxjVs8E=
   </data>
  </layer>
- <layer name="Ground 2" width="87" height="66">
+ <layer name="Ground 2" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2E9OAjEUx/EOiQv1IMZjEE4Ahp0ujAvXyAnQE6gnMJ5IlAMQ9QD+29sXXjNNLdKpKHH6/SQvGTpDM/lRGF6NAQAAAAAAAACIrcQxNDdMHEMzg8qYvomXnEMel10vkmHXju1V5JvrrFrU2NadfT3Vurc1qurzyCe5ftiaab2bRb74ubmth6AeN3pH7SHZzoIi2/V4sfVs6jX7ZOtto3fULpLvqxa5/p5LW1da1xu+l7+Q05fm9rI33vFtwvX/XU5fmtvLlpRtal+64x0vu97Vd0rJdqC958mSvnQ/0pceNZh/7h0f6nsl21OtNmfr951hX+qfl1xkPabkOu3UOc5XXVwA15eOtP9fV1/q//daVm3nr6+hruOc3slf++F3oFSSbd9meq6/rwdV82zd2g+Vvjcj2Xa9Z1YvI1uZY2Lfd6HzyPrv6+uS9w8kF39PdRzkkfIsc3OMvc9oFJmrNLHnedM83J6MW6/yuyLHpe/NuFzcdzg3j9j/glJzHeizS/IM96omVX0e+WJ92TGZrkVOtrudr2PbkbHU6wAAAAAAAAAAAAAAAIBVPgH57H/W
+   eJzt2E9OAjEUx/EOiQv1IMZjEE4Ahp0ujAvX45wAPYF6AuOJRDkAUQ/gv7194TXT1CKdBkKY+X6SlwydoZn8KJQ3xgAAAAAAAAAAAAAAAGBT9hLHkGacOIbVRoUxQxMvOYd0Lq9BJLe+HTsqyLSJq2JRla0n+3qq9WyrLOrzaEay/LE10/o2i0yRZ27rJajXrd7RbpM8Z0GRZ74PW++mXptvtr62eke7TzL91CLL9bq1dad1v+V72ZScnjC3j3zwjh8Trt9FOT1hbh/Z9jxTe8ID73jZ9a7+0+Y8R9r3XSzpCY8jPeFZg/nn3vGpvlfyvNRqW55+zxf2hP55yULWXUqW016d3XzVxS3lesJS++119YT+/6Rl1Ub+Ohrres3pYfw1Hq71LpE8hzbHa/29PCma5+nWeKiLzz8kz7637wwy8pQ5JvZ9NzqPrPOhvu5avy5Z+M8kqyCDlP3IzVF5n0sZmasLYvtw0wzccw+3LuU3Q467+PzDZeG+n7kZxPbzLmU50v1HMgyfAU2K+jyaifVH5+SYLSfPw97fsf3IWOp1AAAAAAAAAAAAAAAAQK5fhKd/1g==
   </data>
  </layer>
- <layer name="Fringe" width="87" height="66">
+ <layer name="Fringe" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2EtOwzAQgGHHiEpR1zTZEVZNjgBLEAeoEEu2iC3qCdqegKPxuAWXwFZt4Vh14qQVLcn/SVYVx5Gi0XTsiRAAAAAAAAAAAO0+cg44FUUixCapzz2q64Ua32fHeaehSaUQF2rkakzl73yVhJ9Bu3cVyw81PtX4kvW5W2KLE3Mt29fcRKwB/lIht+OK3Dy4zJwNpg2xpSZgH336UnrZ44k5Jwyd7ksfkm0vau3qS+lR+7kzcT1XuTYx+Va29Ey6j9X71UyG960n75m1uv/sXL/s89L/xNLEceXk8KsT27UTs6az1aW5Z02oC1FSJz/9by7+mtzkc+j8lZr7ObHvbLWjho+N3cttDCrnNyYutgb4NULXk2XSvm4svUNpzgVdzgP2u2zm/P/nTkztfmhrQFOdGJou36reZPwzscaSt32E/us6X6uImjBkbg7a+jrvsP+kgTOBX29tTci8dUPP29Ls6Zobk8WI9/hDadq7dt2L6R2KlhrgrkOdPhuE4uj2A1nDuhlxBQAAAAAAAAAAAAAAQEc/rlspTA==
+   eJzt2EtOwzAQgGHHiEpR1zTZEVZNjgBLEAeoEEu2iC3qCdqegKPxuAWXwFZs4Vp5OKUP5PyfZFVNHKkdzXjsCAEAAAAAAAAAAAAAAIBDuQ+8BhxbkQixSbavParvCzW+z07zm2KQSiEu1MjVmMrf61XS/gyavav4fajxqcaX3L52SzxxIteyf85NwBzgEApZjytycC8y09OnHfGk3hFilzMh58jjCunvMdJnwoekPgdaTWdCzofh7kwsz1VOTUxelT1nF32G1D1nJtt7z5P3zFrdf3a+v/zlR/9jSxO7lZOrr048106cuvZBl+aeNRlpzYdInTz032v4c3KTt217pdTcz4l3kFXDmjwGtgfb/105nyGxsPXt179eK5ZJ/7yY9/Ol6edD+rh9r5k5tT134mh7mq3vrjUgBkPeAb3J8GdCxZyfu2irY52XVUC9x8bNNbtezgf0kLSll/vrp633zJsXY36WphdrbhwWI+vN+9LVf5ruhezni576dueh7ultsXP36FnHvBmxBAAAAAAAAAAAAAAAwJ78ACnCKUw=
   </data>
  </layer>
- <layer name="Over" width="87" height="66">
+ <layer name="Over" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2E1qwkAYgOGpuyK9QH/cddFu6qZ7D2Dv0qvW9kCdAQWNUWbED2HyPPARGDIxvgSUpAQAAAAAAEDx0HDuIuwu+qRtHG3jaBtH2zhjbT/yLEfWtW0z1nZxZp02L+nwOdX2euZ5VhXnadtuVXle723f7m732T22bfmfFKn3tj+zlDZ5fvP8zY7Xxpzb06L3trc09baPed7z3Afcx9TbrvOUn7uvgPuYettI2sbRNs7U25Z3WMP3A9fSY9unVNeqdH3O8924p+XaPSqtyvP4uj3uz25t+N1r91xy7d6U5/Fze9yf3dqle4ZrtdcGAAAAAAAAAIBT/gF1fyAg
+   eJzt2E1KAzEYgOHYnRQvoLY7F7rRjfseQO/iVVs9kAm00I5Dm4wJhczzwMdAmEynLwP9CQEAAAAAAAAAAIAp7grOXTe7i37oWZeedelZl551jfV8jfM2sq7nZWM912fWuWwVTp9HPf9nGWeTcZ6eeTaZ5/XY8/nmeq/dS8+S7zQt9dhzuwhhF+c7zs/i79qYc3tK9NjzmubY8z7OS5zbBvcxx54fcdJH1meD+5hjz5b0rEvPuubYM/03NPw9XksvPR9CXp/U8jHOV+Gekmv3IvVJz93T/ng8h7Xh+83dM+XaPUjP3fv+eDyHtal7hmu51wYAAAAAAAAAgFK/s/UgIA==
   </data>
  </layer>
- <layer name="Collision" width="87" height="66">
+ <layer name="Collision" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt1lsKgzAQBVCh+99eIbspfghiVSZiM405AwfEF5nrKL5f0/QGAAAAAADgy1zLdvmD9TzJtrLX07toZa+zR7LNzTd7fb0yt/kZZ6+vR2a2XbbL/rKRvc5eybZNvnt5j/Jd2PZfk9fZftnGe47Ulfs+zVHf5SDDSMbR55Dde+tsMyo7g5bZHs3slbwi98rO4Nf57v0LrXM5ex7Rd2DvvOzeW81t9Fg0v1J5zRPVzFv0mmhl956Za00+S63nde+7MmK+0Xf4zsruPWuG757vkfOt7Tma1ciZXsl2rrP/ttrzAAAAAAAAAACe5AO/CNa8
+   eJzt1lEKg0AMBUCh97+e4G2KH4KISta6putOYKBYleQ1FsfPMIwAAAAAAAAAAAD8bK7l8/QH/bRuW9n9tCha2X22Qp7PZ5rdX0vsZ06u2f21wm7WzXM5Pm1k99kSedbLdC/jNz/z25lLMjo73nOekTkjdeW+b3A063SQWyTXaPbZsz+RZ0ZlZ1A7z6PdvJJR5F7ZGdTIdO+9ZZ3F2W8Q3fW987Jnr7mf0e+imU2F17xFyV5Fr4lW9uxPZ1mSyVLrvdz7z+gl0+jzeWdlz/7krt69x71lWjpnNJ/ecryS51xn71il5wEAAAAAAAAA9OYLT3I+Tw==
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.9">
-  <object name="To Library First Floor" type="warp" x="1760" y="896" width="128" height="32">
+  <object name="To Library First Floor" type="warp" x="1760" y="1216" width="128" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
     <property name="dest_x" value="1792"/>
@@ -75,9 +75,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="87" height="66">
+ <layer name="Heights" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt11sKwyAUBcBC9r/CdjElH4H04rPGH50BoaRpwMOp0dcLAAAAAACAlPeR/sy4z/E7GHP28xox2/t39It55gb/kescejufbJ+ns/PkcpTvuFyG9/2XPdgY/ew7l+Y6l7ou2/Z1sPcdFc9iu4jn0ks8l5b62JLrjnuE3Dm/dd//xFjV7Lx2zvaUm2Pr/zx1PdX/2nNXU5rnyBra09+Vxa7Fzt3vi7+prde19Xtls9bW1msr5zvyDiqNnv3GDkpzfqLfsm2fc2tWO2d66Zl7Lcfe+wAAAAAAAAAAVvIFGK1E0Q==
+   eJzt11kKgzAUBVDB/a+wXUzxQ7Ah09P4k5wDAUljIZdnhm0DAAAAAAAAAABghM+ef+ae7/7fiDvq8Gxpntff6JNmWGr0k+U46vMd8hxDbY5Vyk6m95Ryu56VnJfiVq3DyJ2wVFu5/lXz7F3XovtMeieaWXonPKV3wlrd9WS5yt5eulf3nsVHtJm8ndFqeR5K8+r9hnP9uTpv/e8ManN7siZG6nQ2aU2ltXUdl77TWn9b6/Fs3lore/tmy/TJPlJrkXPCrGrzHFHH8oyNL723Wo6nyHxb2UXHAQAAAAAAAACs5gdBdETR
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index 9aa724f9..5e889b16 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="87" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -41,29 +41,29 @@
  <tileset firstgid="999" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <layer name="Ground" width="87" height="66">
+ <layer name="Ground" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt18FxwjAQhWExOYbkliutQAHQRCqgHurCFJADdSAP7LBeS2Yghl3gP3wj2/JB+1jLZp1SWgMAAAAAAAAAAAAAAAAXfGbfI5gGqCWSNtdFNjnZfJyPrz2fk2/HV7ZSWf2kbnbXnC+zWYCaopBs/0ZAtv1sx8hVkO2ZzaYxSvltDTvvXVMUQ5mVsrPZl34D75qioG8fm+9/eNcSDdnej3zfDmVW2x+EfN961xJNm+0u259Gq72+VfP7yjHZ9ul8Srm2YzMwp8+9a4mmlqsmfXvpXu9aorF9+Ds50tebgXt03t61RGP3zVLPCvr2tnyt2n+wJnXfZeR6W762b2vvO++1PwvdjzLad5kce6/1WennXfYBuea9tlfBs38/eh/wXgsAAAAAAAAAAADewwFJaDYa
+   eJzt1ssNwjAQRVFHLPns2NIKFABNUAH1UFdCASyoA0dgMYwcA8LJRM5dHOW78HsaRzk5504AAAAAAAAAAAAAJmXurTJYjCBL7l52XvV0nr3Of73eFtbP0juIrGv3nv2X6723GUGm3N1cMyixmxy9BCV1o7M1Six/rejn1pn66EZnjmXX3cU6tM7E3Nj08w/rLHQznPB/k8rctb+C8H9jnaWPbi7e7XnU2vu1eH7rOC+xG5kv1kt7bBLP5LV1lj66ifUihbn59K51ltz0HByrB3m/Sbwj+7LO0kc3qZmQ/zJTmxs5O1LXP3Dj3r/FJfeS6kfPTdf32nrtQ3ak50J/i8O59VqtyP0S9lG4Z722sZji3vmW3EfWawEAAAAAAAAAAACGdgdt3QNb
   </data>
  </layer>
- <layer name="Ground 2" width="87" height="66">
+ <layer name="Ground 2" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt18FOAjEQgOFpA141Joo3vOnNZzCePKJBL3ogPoH6BD6i8gQGfAAF77bZ1sXa7RZYIpj/SyabpUPSTHa7MyIAAAAAAAAAAAAAAAAA1kV7yXtU6wf3VzXr1yvcy3/RayDw262Jcy3ybK4vQQxN7OsiOi6nrYvY0mWOdfMXm19jOy2RE1ezz8j6VMra5eRst5rf46Y6cLV4TeSMJD+nQ22/HbpavJt4i6yPTUwkP6dLbaNs7T6CmCyQg3z+GzesS8Tc/Dk7Smahiu1Pw3fdhz9jx4kc+ts429/u6er1nOd2V9Pf1ukpkQsXl6r4LaztUyQHaX1Tp4GJY1evM/VzXvAzwqlbPzLXO1X8D/XuTZ0eVNkbhHPYVMqeweY9Ute5pWYwi55hcX5GCOcw3yswLyxvds6dnW3RDGaH1fHnA88sAAAAAAAAAAAAsPm+ANDxY1w=
+   eJzt10FKAzEUgOGX0LpVBK073enOM4grl1WqG12IJ1BP4BG1J5DWA2jr3oQkTAxjOmhLJfk/eAzTvEJemEneiAAAAAAAAAAAAAAA2vT/eF+yUXJ/uWD8aoVz+S+GS4gS3Zg40yLP5vqSxNjErnYx8Dl97WJDNznW9Tomv0JbPZFjX/Nny/hcmtq75Gz2lj/HddnztbxmcibSPWdQ0Noc+FreTby1jE9NzKR7zn5BaxOztX8kMftFTk3CHj1elFihsM9Mslnlsv1J+q6ECHvMNJNTcn+zo38e7/LcbOvy+pvUUImc+7hQ7rd0bZ5acko3MnXemjjy9Z6q7/1e6PFO/Pihud4p978a3Js6H1RzNqV98FyaM8vmPVayLrFcD2zVemZZocdL++BwVtXc7wXxd0L8bQCn9t4vJ7xfPDMAAAAAAAAAAAAAYl/mmWNc
   </data>
  </layer>
- <layer name="Fringe" width="87" height="66">
+ <layer name="Fringe" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt1ktKA0EUBdBKiIIEB3GmOFVIdBWCOnA16hIU5+LQz578jPzOJeAWfA0tCW13NGJso+fAJVWvAikuDZ2UAAAAAAAAAACA3+CgmdJmYbZV2BfPtyd4HxhX9gyXORyazzdSOq74Hu/NRFezQ33NFbprx/4qDZLZ0W+lhdZgfZl1F7mO3DTH23da1b/xXy19UyeLuqUmp5/MWeQ8clHPNafSbeQuch95iDzm66rZUz3XnErP+Wd/aNYfMXuZ+I3+hm6861ciq5H1wrpXMntbr0WO/A8rdZL30v5iPx29jmW5Mfq898E55bp6m5iN6HYvsl/R8W5+DgAAAAAAAAAAP+0V6NMx3w==
+   eJzt1U9Kw0AUx/FJSAUJLuKu4lYhsacQ1IWnqR7B4r64rPZO1a780+5LwCv4AlMShkwapWHa8fuBH5l5U+i8RyBKAQAAAAAAAAAAAABMD6FSV0bt2tib5zcd3gf7p3iH6owq9aNAqbHldz7qSa8HlX4Pjd5j2b+qMoVbj+dzHJXrWdG75E0yD3+3TyL7f+yrky311PdwNmhn0jLPkhfJ1M01nXiXfEg+JV+ShV7baks313RipZ95pZY31L47v9FuSOVbcyY5lwyMdVZTW68vJI+efsefdF/xH/tLPJ2LzWnQfJ5tOPdV+k/7buNSZnMnubfMaKjPAQAAAAAAAAAAAAAA4NYPXSIx3w==
   </data>
  </layer>
- <layer name="Over" width="87" height="66">
+ <layer name="Over" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt1jtOw1AQBdBHDYgFEFAaCmiM+NREgRUAC8kKWAJbCEtlIoySJkRRxnH8OEe6nd9odDWFSwEAAAAAAAAAAIbu+qjvDQAO20fyvM/keUOm2+7MI7dJs5rIV9KsWowjNwk52/Peh+44Mons+nu6eP8UOdl1oYqcJs+7TJ43ZLrtjm67o9vunJfcf7BR0qxaZPSr1/UW/V6V7Ttu2nd6/dtj+en4omzuuGm/G7Xv2GzWZt0dr97pbL+rVeX3ju8i95GHsrxTveaYRp4jL30vUqHXyFvkve9FAAAAAAAA+De+AbCrEQA=
+   eJzt1j0KwkAQhuGxVvEARrGx0CbiT62oJ1APkhN4BK8Qj+oEN5hmEcmYXZL3ga9zh+FjIIoAAAAAAAAAAAAAACwteqE3ABC7u/G8h/G8kOjGL9esjGalmqfRrFjMNEuDjBre+9/6moOm7t+T4v1eM6i7UESGxvOmxvNCohs/uvGjG7+x2H7DE6NZsbDop429lIp+5vJ7R6l719ZeSjt5dzSR7x2l7neJe9cFmYvvjqp3kjW7WlTKO1prNpqtfO6ky71UHTUnzTn0IhG6aK6aW+hFAAAAAAAAAAAAgABeaTQRAA==
   </data>
  </layer>
- <layer name="Collision" width="87" height="66">
+ <layer name="Collision" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt0ksKgDAMQMGC979ewdu4cucP25oUJzAguGkeqUspFQAAAAAAAAAAADrYJ/ods+s10XtkpG3epvqO7xu9Szba5u8bvUNmun7T9+j76j/3TVsneo9srto86aetttFtWyd6l4x0HWt92XhN8PZZuNXxzu7YnfbjTsf3jX4DAAAAAAAA/7EB480y+g==
+   eJzt0lsKhEAMRUHB/W9PcDd++Sfio/VGuxoKBmQgOWQah2ECAAAAAAAAAJpbX3qOtFYvvYc232qiT19dtHmnT3qHqn3Ss7/ZZ+v33vc/a/XSezzZ5UizM///Om2Otbn70rtU7ZPe4UnzxUZzgdkr3lB61mp31NOdnLmj9CwV6QIAAAAAAECvFomN4Jg=
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 777f3452..519c02ad 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="87" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="70" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -44,33 +44,33 @@
  <tileset firstgid="1063" name="Height Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <layer name="Ground" width="87" height="66">
+ <layer name="Ground" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt2EFuwjAQheGhdFfaBWq3vQocAO7CebqMxI0oB2CRc9RWx8p05CaFVLIt/sUnJ8iLydPImXAQkQMAAAAAAACAop6CF3U2VhXU1rrnYGF0ur5XUFvryPb/2DMg2ga9DGdBpyvZXi/26UOwDB6DvWab8u30unSdLYrZrjXHV8029WxvlK6zVfYMsJna30rX2Kpzxsmgb+dl+zmCvp2X7WkEfTsv2996N52/pWuskZ9fvZXk31+9MCdM5bqV7++qj+XP7610v9E9/l1ms94I/yd4cXbda5Zvuh7d/U6GmbZ3axL38F2Wz/YyYvfHPaWfpUZjmV2j9HPUyObjZwCfX25OIN/pbNOsul4M1z7b3GxLttPZTvUkfXt7tpy3deZbun4AAAAAAAAAAAAAAAAAAADcry9PbxJi
+   eJzt1z2OwjAQhuFhoeOnQNByFTgA3IXzUEbaGwEHoMg5sNmxMmtlA1uEQfFbPHKCUow/TZzhKCJHAAAAAAAAAAAAAA/TYKGuxuwDavM2D0ZGpevmA2rzRjYN+w5Fu6CW5l2qdC0xm9gnX8E4mAQHzSblU+m1d51e2Sw1h5Vmk3qmNrzr9GLfIZuJ/c27Ri/XFmej5L6JWVw6lN435w6l981fvZPOH+8a+5DPL7mZtJ+/tQz7OxVz2cnPXHsa/5530/1Wn8nPYpvVVob3fyrOLgfNYq3rd3a/l2amqbM1ic8MbS5O2dw67F98xnsvfeja839476PvbPJvUL7/tu/UkPNJ+0qzynLUXOfZtM02JWTzrCdK7hvOm37y8a4fAAAAAAAAAAAAwHvdAZm2wIQ=
   </data>
  </layer>
- <layer name="Ground 2" width="87" height="66">
+ <layer name="Ground 2" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1z9OAkEcxfFZIhQ2RikoiWBpYzwJicQGDgX+6YnGXr2BN1BPQJADqKH3bXYmbjaDgKyMjt9P8jKwu8UvL5vNjDEAAAAAAAAAfpOBMlTOQg8Ske0kW0fKg3IVcphIjexKt+Xp5GJyK9ZXrRhTq/DelqXuuXar3Cn3G54lJi2lrRwofeVRecrlOdxof57rclffgT1lVrg/CTBTLMYL7tPt99Htz3lVpnPuvSjvG5wlRmm/b57Q62JV5Vy5UC7tf5TjVLm2v2+UbsBZYtL5Io7ve+ACv75di+cBdyboGf95ofgM/NLe3HngJPm8nt9bzduHuWd2tkofKwqutyP1eqgc235X6bZBt16ut3112lLaSfb+rtJtk269ltm7sr8FAAAAAAAAAAAAAAAAAAAA/pcPJL5TgQ==
+   eJzt1k9OwkAcxfEpERdsiLBwaQSWbgwnIcG4kUP5B/dE4169ATcATmDEA6hx7yOdCU0zFUgMM2m/n+RloO3i15c2HWMAAAAAAAAAAAAA+FwrN8pt6EEi0kjSdaJMlYeQw0RqYle6WRtkYjIrjKnXjDms8dw4bc+xZ+VFed3zLDHpKF2lp4yUmTLPZBFutOBcF0d6j1rKT+78e4CZYvG24TzdFKtyN5/KR8G5pfK9x1litOrny5Mq9FJX7pSxcm//I3WpPNrfT8pFwFliMvgjju99cimrkV3z+zm3p7sy/v1e/pqyWt23288Nk/Xx7Le56Dvurmke/PtYUXD3fa5ezpS+7WeXbo5L3s2pOuko3SR9fnbp5qSk3Wyzd6ny/gYAAAAAAAAAAAAAtvULJuFTgQ==
   </data>
  </layer>
- <layer name="Fringe" width="87" height="66">
+ <layer name="Fringe" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1MFKAlEUBuBxdNOiRUtxnRAmuPUBwgfSJ2jRS2SB9ArVE2j7rJ0v44G54BBiuqjLyPfBzz13YIbD4d4pCgAAAACA87ZpV+s07WfZOoHTDMuiWKT6JWsnQE4PZe4OztM65aeRedNAzi1N5NweNolctKq6G+td1m7gd+10p18jb5H3yH0869Tu+k3U15F+5LZWD/wPjrKMrCIfJ743Nd+DPmM+68hX5Lvc7Y9x1fnb3ppqnOb3GOm1qvUyrfsyjzxFnmvf6Jot/2zsXwkAAAAAAAAAAAAA7LEFxI8Zuw==
+   eJzt1D0KwjAYxvG0dnFwcCzOCqKCaw8gHkhP4OAl/ADxCuoJ1N3q5mV8oBGLKKigseH/g4e8KbS8CUmNAQAAAAAAAAAAAIDXnEvZOLDzobNOUDSd0JiFrZdOOwGKbRy67uA/pTb3uuwXPsC5wSd8Pzd9pRxkdayx57QbFEHJ3omVslY2ykjPotxdaaquKw2lnatbnt+nq62yU/ZvvjfwfH8OWl+qHJVTeJu/ohp9tzdXErv+iVILsrFix0eZKjNlnvtG7One4LnE838FAAAAAAAAAAAAAPzSBSJEGbs=
   </data>
  </layer>
- <layer name="Over" width="87" height="66">
+ <layer name="Over" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1k0KglAUBlCtcbSAfmgSRJOatKJq7kpaQ0vtBk6UsmdYhp0DHyJc5PLxwJdlAAAAAMAvOUZOkXPfiwD8kWXfCwyYbtubJM7ptj3dfk5Kt5tct+9wbj9nFtm/mNlF5l/YZYhWkW1Dpr1tBvwq/7Kq1DtACt1W1bvN4546iozz9t+6dLLRcHR5bnVblXp3TZm5drHQwNz7XUTW5XNRe58nzvBYETmUz+LJe9MMAAAAAAAAAAAAAPTlBiSiD2I=
+   eJzt1kEKglAUBVCtcbSAMpoE0aQmraiat5LW0FJ7QaNI+4Gk/H8OXOTDQx4XUasKAAAAAAAA+OQUOUcuQy8CFGU19AIjVmI3s8Q53bTTzWfbWjddSuxmETl8mdlHln/YZYzWkV1H5oNtBvnK7V2c+g1KkXs3dfynTCLT+vd73XrZaDz6fG5y6yb13yVl5t7HQiPz7KeJbF7X5u28TJzJ1TVyfF2vLeeuGQAAAAAAAKAsDxT8D2I=
   </data>
  </layer>
- <layer name="Collision" width="87" height="66">
+ <layer name="Collision" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt0k0KhDAMgFFh7n9JofcYXAhBcGjxJ+nwAm9hcZF+dP0sywoAAAAAAJTUguxd/sU+2j7XNk72TjOL/XS9t+uvyd5vZtpqOyNttZ2VttpW1NMottS1v9ex08hk36GyOG2wq759Xc/O9b3eN56Nvt/sO1R012Tfo6ptju90/x75BwAAAAAAAAAAAADe9gUI5YRS
+   eJzt0jEKgDAQRUHB+19S8B5WQhAiBo1fzCxMoVhsnlnmaVoAAAAAAAAAoLO1kN7lK/bRpt6mnPRO6R61Nund0l3OJr2fNt+kjTbavNsnvVvayG2unLFsMUKX2v9vmfQZ3uqzNnb5c58n7s0Ifcp3rfcnfYbe9+bOpM/Rs8/xnuzPLd8AAAAAAAAAY9gA9i3RkQ==
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object name="To Main Hall" type="warp" x="1472" y="992" width="32" height="32">
+  <object name="To Main Hall" type="warp" x="1472" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="1"/>
@@ -78,9 +78,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="87" height="66">
+ <layer name="Heights" width="71" height="70">
   <data encoding="base64" compression="zlib">
-   eJztw6ENADAIADAEv8D/F6IID0xMtEkjAAAAAACAX3Ve3qq8AAAAAAAAAAAAAAAAAAAAAGsA474BBg==
+   eJztw7EJADAIADAHf9H/L3QUDyh0SCARAAAAAAAAAPBe5+aq3AAAAAAAAAAAAAAA/GEAsEkBBg==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index 9f7aa665..69acaa43 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="87" height="66" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="68" height="70" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -44,33 +44,33 @@
  <tileset firstgid="1015" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <layer name="Ground" width="87" height="66">
+ <layer name="Ground" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt100OgjAQhuESl/4sTNx6FT0A3MXzuPRM0AO44ByWAMlQy4+BZNr4Lp4UQhfTL03pPIwxDwAAAAAAAACb2TtWOAUcIqgzRUcnc17dKD137Xgj382zvXRj7lwjqDVFdZet7Z7laMl2FetlWweetWtMlfyX1SPv2jWmKnQO+O/aNaaqXkC7xlTJs7VXOuesHdm367L17wiVwL5dl+3Y/YDzdpts/f+XPCOa3jjUD9MXz2fr3w/k3m163rsZ9sH0xfOanrcw43u378sKM+yD6YuXaXJ7T8gXziHbb1OZ/UJ7HbGR2ZQBfn5T37XXEhuZTRXgZzs1R3stsVm7b+Uc7bXEiPM27ny16wcAAAAAAAAAAAAAAAAAAMD/+gD61hkx
+   eJzt1k0OgjAQhuESl/4sTNx6FT0A3IXzuPRM2gO44By2AZJSS9UEO0jfxZOW2MXMl4JTK6VqAAAAAAAAAAAA/I21oR27gM0M6kxlaxTGtVtdl1W7njLKJJbHoVtL4ziDWlNpujx0t3dXnWEe2sujCeyla0ydR68ZeZauMaXQO+I/S9eYOo93pGtMyf1W9G7GvmjX3O6H/37Y9e7I+X74+xy/H2Nzh/v+2Lk+NMsvcabX6vV/xb0jdl4/q+EMv9SZ3s7rlRq/I/18WqnhDL/kmd72+ogoPzyzlDxifX5Duo+ps7gF+D3HfpfuZeo87gF+HrEz0r3M4X64Z6R7+UUmuX8/pspEun4AAAAAAAAAAABgCk8WSmtz
   </data>
  </layer>
- <layer name="Ground 2" width="87" height="66">
+ <layer name="Ground 2" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt181NwzAYxnEHyAAceufjwo1KTFJVSBzKEKgTcOm9dIKqEwAbdIOWCSImoDAAD2oijF23NIpi1fr/pEeWEx9evfLBrzEAAAAAAAAAmjZWnpRJ7EISNFXmysz5nkeoJTXTcnV7e9t2IQnqWeumoL7Qva0M2iokQc/Ki/Ja7vPMD5rRyfygnuujv/uFsrTy1n5JySqUU93V4tiYG63vsQs6YO69/entuXp6oVzS20Z9KCsrn3HLOWjuvUUc7hzMXNycO2c/4s7vtNqSSmgmZi4Ouzf+m9Z+2w62nKnevszFvrOT9VoE/tvvL/vMo95mfeXLMFuEXNXs7YP6Osz8M/jVVW+7Zv/ehs7A584Lm+aG/5wBAAAAAAAAAAAAAAAAAAAAkI5vQ2lLWQ==
+   eJzt1sFNAkEUxvFZgQI8cEe4cIPESowx4QBFGCrg4h2pgFiB2oEdoBVsrECwAD4Dm4yzLEEPs8PM/5d8mQzM4eXlJfuMAQAAAAAAAAAAwLmZK4/Kou5CArFU3pQn5/dWDbWEYLk/3X7c+S4kEDfWeSipqZqPwthXIYF4Vl6U1/29lZWTsnZWTkoGF7/vK+Xdyof/koKSK5eaibxhzLXOz7oL8sydj59+XKkPXaWXYD9cX8rayqbecrxz5wOnc3f4VHf6wsi5P0Q6W+sjKVTt87Ht9BNT3jns3WN85E2xm8Sy03eauzOv+N/+1tpvZvoO3yrfJq59rf/PftyrF9Os/ObcDdWPofl7P6rexMLdwQ7tYqe8AQAAAAAAAAAAABCPLfdNS1k=
   </data>
  </layer>
- <layer name="Fringe" width="87" height="66">
+ <layer name="Fringe" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt10FqwkAUBmBT3EjXLa7FBtS6c9WVC4V2316k9jZ1Iz1Re6JOYIohEIx2NES+Dx6TDG9g+JnN6/UAAAAAALpjE9ePyv760heBI+zi+hVqnO33Nzdt3OZ65SHbl5jpIKx38k1mUXq33yHXH9kms8oO9/B/r3JOrsh0KleA5JZH9D5X/s3F5/PW9gU6YBJmhIdQeajH0vesZnaYmykaeW+Y033ou630FnPxUM61Rv3Tzk0yc/Eh05jtZ8Pals7+zW5P8qWDvFsAAAAAAAAAAAAAuD6/S2QTZA==
+   eJzt1jFqAkEUBmA32ATrBGuJgpp0qawsImgfL6LeRhvxROZEGWXFzYK4ikad/T54zO7yBmZ/pniVCgAAAAAAADy2abrOct8H/30Q7tIyXVeh3pL99+nTLU5zX1ohj1Gaw3NYX0qeyWfmfqxDFj8lz+MrOd5TVt+y2drk0JEFUED/hN5h7t1M/9f41ge4knaYu5qhWqHeM8/dA/PYR8Rz2qTgv72GvlqudzPT1yPLplE9b187iXOm76R5zAvWIrN3N8P2IsuEy3I/AAAAAAAAID6/AD0TZA==
   </data>
  </layer>
- <layer name="Over" width="87" height="66">
+ <layer name="Over" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1z0KwjAYBuBURxEPYBUXFxddPJG6ewKv4lWN2MWf1loaA+V54KUE0vLx0iEJAQAAAADo2yHmGHPKPQiQ3TT3AAPWtttl0imGSbfp6Dadum6LIoRRzLh4rHX7O/9tOrpNZx6z+7JnG1P+YZYhWsVsGjJrePdYhXeT3ANAB+686fTZrbPEs0uP39LtM92mcw3tzrfOwN3c7w+LmHX1XLysy5Z7+Owcs6+e55p10x4AAAAAAAAAAAAAyOUGaYsQJA==
+   eJzt1jsKwkAUBdCJliIuwA82NjbauCJj7wrcilt1xDQjGFOoGSfnwCUMTMLjNnkhAAAAAAAA8G+OMXXMqe9BIHPTvgfITNc+Vl+dIh/6SOkj9aqPqgphFDOuHueh9/FMH6mh9DGP2b+5s4tZ/GCWXKxjti2ZtbxbNynFpO8ByJp9PfXJPkr4B10++C19pEro4xq67R9D2lHuO9kyZtM8l0/nRcc7JTnHHJrn+cW57Q4AAAAAAACU4AbhsRAk
   </data>
  </layer>
- <layer name="Collision" width="87" height="66">
+ <layer name="Collision" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt10sKgDAMQEGh97+e4G3cBvGDmlpbJjALwUV80IJzmaYZAAAAAACoZgla7zIabeuJ03qXEV1N6/16tjdL0Ta77fbe1Tav7baltrlt3bfa9kBXbXsVWx511f551zfT+hv+6E1HXXO7xpb+3er03WtNflt9z/vG8x2f77wDAAAAAAAAAAAAAF9bAZUafa0=
+   eJzt1kEKg0AQRUHB+19P8DZZCR0xhKjwO2MN1EJ00fNoQpZ5mhYAAAAAAACAQa1FepYO9HhXT3qWLr6d9HwdeqyzHluH/bv0fOn90MPvhx7neqRn06OHev9PLZ7S646TvkOyxdFOjeDqLoz4H/aOk75Dtx4jNqm7X59/+QYAAAAAAAD+2Qvw7z0a
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.88">
-  <object name="To Main Hall" type="warp" x="864" y="992" width="32" height="32">
+  <object name="To Main Hall" type="warp" x="768" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="1"/>
@@ -78,9 +78,9 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="87" height="66">
+ <layer name="Heights" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJztwzEJAAAIADDB/jk1hqcF9NtgEQAAAAAAwKfOza3KDQAAAAAAAAAAAAAAAAAAAHBhAE5OBYA=
+   eJztw0EJAAAIBLAD++fUGD7tIBssAQAAAAAAAPhr6pJ0XQAAAAAAAAAAAADgrwVNkAWA
   </data>
  </layer>
 </map>