7 files changed, 78 insertions, 62 deletions
diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index c04e03ed..c32368dc 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -13,12 +13,12 @@
  <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Shadow.png" width="160" height="160"/>
  </tileset>
- <tileset firstgid="410" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
- </tileset>
- <tileset firstgid="414" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="410" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Box.png" width="128" height="128"/>
  </tileset>
+ <tileset firstgid="426" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+ </tileset>
  <layer name="Ground" width="44" height="44">
   <data encoding="base64" compression="zlib">
    eJzt1bEKwjAQh/FbHDuIk/RRrC7avkPHglCHvP/sCQnUo+LQIf/CN/wI3PQREm40sxEAAAAQMQW1e+it5+Juf3QCncXVHfO9ntzsXmE2CHT+6j1kyr3l3bauyc6LuWJvsu8/lxanYu9a68dzB72RUu/d9bmrD8rsIdAZre0J9d0BAAAAYLs3DkycNQ==
@@ -31,7 +31,7 @@
  </layer>
  <layer name="Fringe" width="44" height="44">
   <data encoding="base64" compression="zlib">
-   eJzt0r0JgDAUReGX1UX8ARVECBlCx3AER3APb5FS0EZj5HxwIKS6xTMDAAAAvqN2ZoUqVetSr7nWaWMfGzLYO2qjV0FNGezFs1ZVnfw3bw+5aVM+vmfd7xJvOKg90SYAAAAAAP7mADHhDL8=
+   eJzt0r0JgDAUReGX1UX8ARVECBlBB3EER3APb5FS0EZj5HxwIKS6xTMDAAAAvqN2ZoUqVetSr7nWaWMfGzLYO2qjV0FNGezFs1ZVnfw3bw+5aVM+vmfd7xJvOKg90SYAAAAAAP7mALZCDLc=
   </data>
  </layer>
  <layer name="Shadow" width="44" height="44">
@@ -41,10 +41,10 @@
  </layer>
  <layer name="Collision" width="44" height="44" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztzjENAAAIwDDwLwGzBAc8hKdL+q8yogAAAIAT0/cDAAAAbDUaGZth
+   eJztzjENAAAIwDDwLwWTBAc8hKdL+q8yogAAAIAT0/cDAAAAbDWq0xRg
   </data>
  </layer>
- <objectgroup name="Object" width="44" height="44" visible="0">
+ <objectgroup name="Object" width="44" height="44">
   <object name="ToLevel2" type="warp" x="1954" y="1090" width="26" height="28">
    <properties>
     <property name="dest_map" value="001-2-2"/>
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index d9e24757..83b196f3 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="41" height="41" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="47" height="47" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-NC-ND"/>
   <property name="manaplus version" value="1"/>
@@ -17,44 +17,43 @@
  <tileset firstgid="733" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
  </tileset>
- <layer name="Ground" width="41" height="41">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3TSQrCMBgF4KQHUhFUcFh24QB6AhVFj+BGj6CCrp2WTjtFN+JwBj2QrxCwtqmgtpvyFh8JSfvn8YcYQgiDiIiIQicihYhCTIlL9zdJ6ZZSrP00xgxkIaf5/1+mfFeHPFSVBHSgAEUoOZShIt11TB+zWrXumDyMV8aa5rw+DKABTZsWtD0y+pVV18dPGYeO9S70Asz3a0Z730cwDviuJ6g1hRnMYfFlHy1LWMEaNrAN4N3sUHOvHOAIJw+6fp3hAle4BZCPiIiIiIiIwuMJgfZ2LEQaAAA=
+ <layer name="Ground" width="47" height="47">
+  <data encoding="base64" compression="zlib">
+   eJzt08sOwUAYBeCZPhAiQeKy7MIl4QkQwiPY8AhIWLst3XaEjbg8Aw/kNJlEtVNBol04iy/TdKb9z/zTGkIIg4iIiIiI3haSQoQhokSle01cuiUUaz6JMQVpyGie/xVTPqtCFspKDFqQgzwUHIpQku73mD7swapxxcXNeGSvaHJ0oQc1qNs0oOmR/dd70PX9Vfa+434bOgHk/ja7/ZwGMAzomxmhxhgmMIXZh323zGEBS1jB2sf/dYNaW2UHezh40PX3CCc4w8XH3ERERERERERE9L/uNB9MAw==
   </data>
  </layer>
- <layer name="Ground 2" width="41" height="41">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2UvU4CQRhFZ6m0UbQSjT+JCkIrDQ1qbHwC1JfQl9CaQgoNpVJiwSMIBYLSIOrjcEyWZArZbJjdheKe5CSb3cy9X2YzY4wQybCUMmY5Ne8pgtlY8PmEEOFZ8YxZxTSu4boXfUeGzE3c8rO3rY4dnnct93z3LQ/wELOYwyPMYyGGWScck33hW5zS88BdWMPSP9/LvDvBUzxznPPcYf0z871gI+DerpB/iVcOPdcx/gubG4ee2wRmvHPsuI95xkfynxw76gHrq9a5qc7Q02TNa0R70IphL9/IbEeY2yXrHXvYxw/8xEFIh/iFI/zGH/xN6Cz+0UmuSgghhBBCCCEWnjFXhCUZRBoAAA==
+ <layer name="Ground 2" width="47" height="47">
+  <data encoding="base64" compression="zlib">
+   eJztlT1OAlEYRR9U2gBaKQQ1URFsobFBiI0rQN2EbkJrCiwklGCJBUsACgGlwb/lcIohmRAlBPLeQLwnOclkJvPdO39vjBFCiP/DRtiYzXDQLRZjZ017CyFWn0jImCjGcAu3Q+6yd8mKY8LLTPqy99je93ngeejzCI8xhSeYxgyeOryGCVkyLz1zf+RXWMsf8eyX43n2nWMBi5b6Xywxt07vBj7P+B+VmH+F1xb63zh6prcWcu4cdL+3lPFgufsT86uWMmoz5pZ932t5gfwm57xYvjctC/PbzOw4eB9fyehhHwf4hu84nNMRfuAnfuE3/gSwrk/TDbqAEEIIIYQQQgghxBowBi8JJds=
   </data>
  </layer>
- <layer name="Fringe" width="41" height="41">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3VOQrCQBiG4X9GcSldk8JeG0/vcgOXG2itJ3A5gG8QRcSIWGT+4nvgI5AmLyOMZvJwCGbHkLqi3Im2M7uwq9POEM0iq7F6vL9r8GzGtF2vOrR0WY/12YANWZagsTiXFmt/+PaGd1sH51acS17S4aVxTMPEeeM3O/r2zhsX9C3V+JRxB+dv9/Doh3t5Rd+6osbpn/8TM/rmzn9rERERERERERGpxg0LLsi1RBoAAA==
+ <layer name="Fringe" width="47" height="47">
+  <data encoding="base64" compression="zlib">
+   eJzt1UkKwjAYhuE/URyWju3CvW48vcMNHG6g63oChwP4FXdFJRYkDbwPfBSyegmFmAH4p8KZXVzsit9d1XzT7tojsX7nzbzW0tr+ddbRt+vjdoUYqHGojbSxNtGmWtag9vIee1r/TdNBZ8cGtVaV95h/6Gt6+1xti0Tbvzmp+5xo+0bdW9pry/S25JX3ZRbw3uzUvY/cvqz5Lq7UvU70nwEAAAAAAAAAIMQTXXITtw==
   </data>
  </layer>
- <layer name="Over" width="41" height="41">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3Sx0oDYRSG4Zksol6AbjX2jV2Xdm/AcgOWpUKKWzVFrAtjB92Y2EBd2BDUiHVjAQso6NX4BgwZY4iDZMYszgcP+ZOc+c/hJIoikUjMyJJFUZYt0fdWy8+abD7LgQ25yEM+ClCIIhTHeS5Z2eLubewgE1maXiWcS1GGclSgElWoRo2Bc0X2cowTnCKk2UsktZzrUI8GNKIJzWgxaL7YvdziDvd40LGXVr5vQzs6DJoxdi/v+MCRzn6d1HWhGz0G/s7aWFVFSUM6MtTEtXZmcsAJF/pNmjGcA3od6ujnpsYDL3wYNnHGa3rd6Ojnp2YaMybOFskrPd909F2hJoCgzr3/R3aZaw/7Ovfey/+775f/uJ7YucMBJ1wJ7jtnpgtc4irO3gd4dhBDcMMDL3xJmHGEO0YxhnFMYFJzr43zFB6Z6QnPeIFfjQpnltc5zGMBi0mYLVECmvuDnFc11r6sYwObBs/yl4TU785ScEaJRCKRSCQSiUQikaRuPgGWW2jHRBoAAA==
+ <layer name="Over" width="47" height="47">
+  <data encoding="base64" compression="zlib">
+   eJzt08kuAwEcx/GZHooH4ErtFztHuxewvIDlSNLFFV3EelB7wkVrS3CwRYKK9WJJLAkJT+PbRNNRTU1IOyX/b/KJKdPOLzOqKJIkSZIUvQWToiyawq/Npq/nZPK7LFiQjRzkIg/5KEBhlPfFuw2uuYktpCNDs6GI42KUoBRlKEcFKlFlwN7QfTzEEY4R0NzHUNUc16AWdahHAxrRlODdkffxGje4xZ2O+9jM31vQirYEb4+8j694w4HOHe2c14FOdBnw/6LNrCpKClKRpsY+18pWG+xwoNfg7cH22LCvY4eTc1xww4PBJNh+yYYrHTu8nDOJqSTYHOqZLS869ixxjg9+nc8pmdpm7w52dT6nbr4/Pd98h36Tlc+2wQ5HjOucsvUM57iI8pz6eG8/BuCEC2544rh9iM8exghGMYZxzfUsHE/gnq0PeMQTvGpYsGl+zmAWc5iP4+ZY+TTX9XO8rLHyYRVrWDdo408KqJ+d/KHtkiRJkiRJkiRJkiRJ0v/pHWykR64=
   </data>
  </layer>
- <layer name="Collision" width="41" height="41">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OsQkAAAgEMXH/GX8WwSW0yEH6S1cFAACA7foBAADgiwHoSnhLRBoAAA==
+ <layer name="Collision" width="47" height="47">
+  <data encoding="base64" compression="zlib">
+   eJztzjENAAAIwDCCf41oIQjghqNL+q8yogAAAABYTdcPAAAAAN815DCMag==
   </data>
  </layer>
- <objectgroup name="Object" width="41" height="41" visible="0">
-  <object name="ToInterior" type="warp" x="4544" y="2208" width="26" height="60">
+ <objectgroup name="Object" width="47" height="47">
+  <object name="ToInterior" type="warp" x="4640" y="2304" width="26" height="60">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="640"/>
     <property name="dest_y" value="864"/>
    </properties>
   </object>
-  <object name="ezili-ocean-sounds.ogg" type="music" x="25" y="2530" width="5057" height="937"/>
-  <object x="3928" y="3420"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="2948" y="2268" width="2124" height="252"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="3812" y="1152" width="1256" height="1104"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="536" y="372" width="584" height="2156"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="1124" y="528" width="3928" height="612"/>
+  <object name="ezili-ocean-sounds.ogg" type="music" x="121" y="2626" width="5057" height="937"/>
+  <object x="4024" y="3516"/>
+  <object name="Ezili - Ocean sounds.ogg" type="music" x="3044" y="2364" width="2124" height="252"/>
+  <object name="Ezili - Ocean sounds.ogg" type="music" x="3908" y="1248" width="1256" height="1104"/>
+  <object name="Ezili - Ocean sounds.ogg" type="music" x="96" y="96" width="1312" height="1312"/>
  </objectgroup>
 </map>
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 5aead0bb..2e39887d 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -18,31 +18,31 @@
   <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
  </tileset>
  <layer name="Ground" width="120" height="130">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3WSW4TURCAYdsHAoQUkBiWWTBIcAJAIDgCGzgCIJE105JpB4INYjgDHIiyZES73cObq97rf/EpITHtdv2vWtmsVqsNAAAAAAAAAAAAAAAAAACRvqz3ad8P9rukbEtnO8aaTDUbek3qM4M0Tef+7drX5Xran7tVKfay/3vXc0BbW32Hmobs99T/055HLVxnFdumJO2ZWjE3j5qa0ta9rcsz1iqf87tUNe7t1D1rz9MS7T4l9npp+jPQbkFfWvo0XUpf7Xmzt/SlLX1jW7faX3u22u/fvQ/tFrW3tXAf/ZYt7m3p/bF0zsbeV7tJi3urcU9D76ndo+a+1u6Lvvn7jr2m9L202rdkY9f3Lnlv/ffSblFz36m9CX1djjPXGot9XWZPY3t9uzNNMXv62mubqwVt624714S+9F1S61xz12hL37x9Na6f8v20W1hvbWH29E3fNWQ+FnZXe+41tdXuwM6Wazw3N43rLLVtrr5D89O+zhLb9ueVs3eKHrnO3hJY7pvzzCyV9vxpXKZxa627n0d7vlZoN2Fnaeu7v9pztUC7Bftbrm3Nvbv3rj1XK/qz0G7EzubrXJOhe9aeoWXavUL3lLZtdtaeU83Gnn+W+J5X7Zla1J3L1IyHfm6hMfse3nuq7dSZKLW7tE3bfWyOGs/kuXOH9O3p2y7txtqfv3W+7VL0pW3elr59fV5P3/A2MR3HrhP63E3xjEb680DfNvg+K+nbnpi/iVP9HQ36gr4tip0lfW2LmadLW/rWy7XvUK+YcwHbfWP3Hvb6htD+fEuWuy2N2+5K4/a70nlZfencVlvtz90ydrQtLvMu2faUfD0tzuycHWh+bn3o/M729xfk60VxSVzmzMzuUsm+x+t9d8QVcWvnSDwUV8U1cb3nhri5PrzOMZ292ud6Lm87/JZv/mz+97090OqJeCruinsd98WDkb50ttG3v79TfZ/1fv5IPKZtcNtczWP6dvf9uTihbXDbXH3/Xf+FfH0pXonX4o3n/m69Fe/Ee/FBfKTtbDuX16Ta4U/y/eed7c+/im8jhvb0u/ghfopftJ3s5nMGUjZGe23pnL9tyDlwbUVr22L7sN92zc3apQfPcJtK7mbIfWjPp2YuMw3dZ5rpc5m7z+9dX0Nn/bYhz1XtzwS3tiHX0f5MOOyS6oxofx4ctrFwDQAAAAAAAAAAAAAAAGDMX1CtfFfA8wAA
+  <data encoding="base64" compression="zlib">
+   eJzt1kluE1EQgGHbBwKEFJAYllkwSHACQCA4Ahs4AiCRNdOSaQeCDWI4AxyIsmREu93Dm6ve63/xKSEx7Xb9r1rZrFarDQAAAAAAAAAAAAAAAAAAkb6s92nfD/a7pGxLZzvGmkw1G3pN6jODNE3n/u3a1+V62p+7VSn2sv9713NAW1t9h5qG7PfU/9OeRy1cZxXbpiTtmVoxN4+amtLWva3LM9Yqn/O7VDXu7dQ9a8/TEu0+JfZ6afoz0G5BX1r6NF1KX+15s7f0pS19Y1u32l97ttrv370P7Ra1t7VwH/2WLe5t6f2xdM7G3le7SYt7q3FPQ++p3aPmvtbui775+469pvS9tNq3ZGPX9y55b/330m5Rc9+pvQl9XY4z1xqLfV1mT2N7fbszTTF7+tprm6sFbetuO9eEvvRdUutcc9doS9+8fTWun/L9tFtYb21h9vRN3zVkPhZ2V3vuNbXV7sDOlms8NzeN6yy1ba6+Q/PTvs4S2/bnlbN3ih65zt4SWO6b88wslfb8aVymcWutu59He75WaDdhZ2nru7/ac7VAuwX7W65tzb279649Vyv6s9BuxM7m61yToXvWnqFl2r1C95S2bXbWnlPNxp5/lvieV+2ZWtSdy9SMh35uoTH7Ht57qu3UmSi1u7RN231sjhrP5Llzh/Tt6dsu7cban791vu1S9KVt3pa+fX1eT9/wNjEdx64T+txN8YxG+vNA3zb4Pivp256Yv4lT/R0N+oK+LYqdJX1ti5mnS1v61su171CvmHMB231j9x72+obQ/nxLlrstjdvuSuP2u9J5WX3p3FZb7c/dMna0LS7zLtn2lHw9Lc7snB1ofm596PzO9vcX5OtFcUlc5szM7lLJvsfrfXfEFXFr50g8FFfFNXG954a4uT68zjGdvdrnei5vO/yWb/5s/ve9PdDqiXgq7op7HffFg5G+dLbRt7+/U32f9X7+SDymbXDbXM1j+nb3/bk4oW1w21x9/13/hXx9KV6J1+KN5/5uvRXvxHvxQXyk7Ww7l9ek2uFP8v3nne3Pv4pvI4b29Lv4IX6KX7Sd7OZzBlI2Rntt6Zy/bcg5cG1Fa9ti+7Dfds3N2qUHz3CbSu5myH1oz6dmLjMN3Wea6XOZu8/vXV9DZ/22Ic9V7c8Et7Yh19H+TDjskuqMaH8eHLaxcA0AAAAAAAAAAAAAAABgzF99kyUk
   </data>
  </layer>
  <layer name="Ground 2" width="120" height="130">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3Yuy5kcQDH8UNF41Yt4pK4a2m2cYnGE+zyErwE9RQUNkqUFPsINLtujbU8jl8xxSkswo6/yOeTfJPJmczJyf/XzExVAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8Bl0tFdVZ3vpp6BVvtgWAACe1dVWVd2pJ/WmvrbST0Rdf/YYSIPNXYZq+wzn9Uit0WZjtcbTRJpMU2k6zaRZO39Ic9lltdn8PzbayW/d3fT1kfcXcm0xLaVlGxez8oazP8i2h+noif80vuX+39OajYtYf6dz37BvEZvvcO5bti1mu8Vnv5f7/7BvMftPnH2j9h2r8YqNjvOZE9sW97MFG5zmnme2/RB+ZYff6TxdpMt0la5f2E36k27T33SX7m0LAAAAAAAAAAAAAAAAwH/0ACmiA2fA8wAA
+  <data encoding="base64" compression="zlib">
+   eJzt2LsuZHEAx/FDReNWLeKSuGtptnGJxhPs8hK8BPUUFDZKlBT7CDS7bo21PI5fMcUpLMKOv8jnk3yTyZnMycn/18xMVQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAZdLRXVWd76aegVb7YFgAAntXVVlXdqSf1pr620k9EXX/2GEiDzV2GavsM5/VIrdFmY7XG00SaTFNpOs2kWTt/SHPZZbXZ/D822slv3d309ZH3F3JtMS2lZRsXs/KGsz/Itofp6In/NL7l/t/Tmo2LWH+nc9+wbxGb73DuW7YtZrvFZ7+X+/+wbzH7T5x9o/Ydq/GKjY7zmRPbFvezBRuc5p5ntv0QfmWH3+k8XaTLdJWuX9hN+pNu0990l+5tCwAAAAAAAAAAAAAAAMB/9AAiASUX
   </data>
  </layer>
  <layer name="Fringe" width="120" height="130">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3YzUoCUQCG4TNjlC1NSxftc+PVm95BP3dQ67qCfi6gT9yJgoipMz4PfAyc1cDLwHBKAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgHH1UpXxWx34L/sNXun5nP9mvxq1T1aXUWSe7qJdnl3le1cd9L/ajl443WT8bZLfZXTbUt1EW32M3u17T7SVnr3o22uJ7HG1oqG/zPaTfWN+z9Ja27/q21ixt5/q2lr7NMKzyD7VyR3G/xZ3FU9o+63vyJjveP03T9lFfAAAAAAAAAAAAAAAAAAAAADioPwzTdUDA8wAA
+  <data encoding="base64" compression="zlib">
+   eJzt2M1KAlEAhuEzY5QtTUsX7XPj1ZveQT93UOu6gn4uoE/ciYKIqTM+D3wMnNXAy8BwSgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4Bx9VKV8Vsd+C/7DV7p+Zz/Zr8atU9Wl1Fknu6iXZ5d5XtXHfS/2o5eON1k/G2S32V021LdRFt9jN7te0+0lZ696NtriexxtaKhv8z2k31jfs/SWtu/6ttYsbef6tpa+zTCs8g+1ckdxv8WdxVPaPut78iY73j9N0/ZRXwAAAAAAAAAAAAAAAAAAAAA4qD/6tRO3
   </data>
  </layer>
  <layer name="Over" width="120" height="130">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3VSW+McQDH8WfmULwArhTFxc7R7g1Y3oDlSNLFFV3EUgetNeGitSU42CJBxXqxJJaEhFfjJ9F0VFNPiPQZ+XySb+Zp5z+X+eWfKQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/sT5elFcqI/93VL/9czs/G9Oak1z07w0P7WlBWlhWjTB55h617PLjXQzzUyzGnZanOclaWlalpanFWllWpVW27SSRu/jg/QwPUojDfdx1Jo8r03r0vq0IW1Mm9Jm21bO+Pv4Kr1Ob9LbEvdxS97fmral7fatnPH38Uv6mu6X3GpHzu1Mu9Ju+1ZeS60opqXpaUZt8rPt2bMjdaautM++TeFudrpXYqvunOlJvakvHbJvU3iRnV6W2GogZwbTSbs2lU/Z63OJzS7mzFAaLnnfaS63suntdKfkfd+T3/O9v/lN599qz/ffkTpT1yRbPMmeT9Oz9HyC+74/nz2QDqbu1JN6U599p9ThfP9H0tF0LPWn4w2btOb5RHqXPd+nD+ljGqiN9d2pvJ5OZ9LZdM6ulTXUsM1wni81dPlHV9LVdM2O/5WR2s89ti8AAAAAAAAAAAAAAAAA8Be+AcB1A7HA8wAA
+  <data encoding="base64" compression="zlib">
+   eJzt1UlvjHEAx/Fn5lC8AK4UxcXO0e4NWN6A5UjSxRVdxFIHrTXhorUlONgiQcV6sSSWhIRX4yfRdFRTT4j0Gfl8km/maec/l/nlnykKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7E+XpRXKiP/d1S//XM7PxvTmpNc9O8ND+1pQVpYVo0weeYetezy410M81Msxp2WpznJWlpWpaWpxVpZVqVVtu0kkbv44P0MD1KIw33cdSaPK9N69L6tCFtTJvSZttWzvj7+Cq9Tm/S2xL3cUve35q2pe32rZzx9/FL+prul9xqR87tTLvSbvtWXkutKKal6WlGbfKz7dmzI3WmrrTPvk3hbna6V2Kr7pzpSb2pLx2yb1N4kZ1elthqIGcG00m7NpVP2etzic0u5sxQGi5532kut7Lp7XSn5H3fk9/zvb/5Teffas/335E6U9ckWzzJnk/Ts/R8gvu+P589kA6m7tSTelOffafU4Xz/R9LRdCz1p+MNm7Tm+UR6lz3fpw/pYxqojfXdqbyeTmfS2XTOrpU11LDNcJ4vNXT5R1fS1XTNjv+VkdrPPbYvAAAAAAAAAAAAAAAAAPAXvgEeXkeu
   </data>
  </layer>
- <layer name="Collision" width="120" height="130" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2cAW7jIBBFq97/jEmOsrIqqywFDHiY4VvvSaNtbGKGeYbYTrSv76+vF9EVikTXTCkUia6ZUigSXTOlUCS6ZkqhSHTNlEKR6JophSLRNVMKRaJrphSKRNdMKRSJrplSKBJdM6VQJLpmSqFIdM2UQpHomimFItE1UwpFomumFIpE10wpFImumVIoEl2znXzh9znRU5MnYF23j0C8H+KuB0W/NfD7l9393qF13NJaXVqT1dfp3fyuYtR1Wh9ldvHrxei6/W64VyDar2XOI4z49T4HLYny65FnD/i19RuR00g/Ofi18Wudh5Xfg/dF7jvj6dej/x5nM+eC6j1zpF8Pt6N+8/bna/y2/a7ud2Q+jr6H9fm5frm+Gvfr6W1mzCn4vfY70mcrz/Tf3rHMjD1vg9///Z5Y+S3VvHcso2Mv9ZOPSwlLtyVG1+Zajq3XrWOPjr3WDr82/ZXa147Tc+zRXFptFYn0q4RavifefhVRHh9+n42l35pj1WuTJ7Da71Pc8vz5r9+nuD3GpToWa78Rv6laDX77/M5+fkdfy+HXzm/ubuQ8WIXyerSb394cvXg1xqOAqt/RuFOfT8CaYcVKvz3fLZS2r8hvtjbnOPA779cjx9m64Ndm/q7OcaYmqVv8lv2mjnefv7Vx4Nff78rx5/njN2b+pvvz9q19vbmvOqc8ifbbU8Oedpb5ltzi18Zv73ybHUPN5ydrg9995u+Vt97A77jf0b56c0z3WbhlfV7jt7S99p70dbr/6OedhPWY8HvP77lvhrMf/JZZ6benr3N7T56ltrnf2tqKX1u/vX3dBb9tdvJbq2FrvuO3jbLftD/8lvH025NLK8e8Xdrf1b1N+p7e7fgt+y2RXt/e/S3xWevWvWvvmC3a7YyH39I9S28+tTYHV88m8vb53619yk5TPP3eyQPm8PA7M2/xa4Pn5y9+/fHyy/yNwcvvQev/Uj63lbzid54Iv1bk91zp9wvwwwq/Pc+vLPhkfb6+2883RuMJePpN+7Ni5PkVfu38tq6jrcFvHW+/FnU7j1HrE7+/rPR7dS98t561zwT8/hLh92hn8R3DeRz81lnt9+paOr2fKdW2Vu/8Xhq/ZTz8Wl1P1+rf088o+L03f2fyKHH1O+Y7dXkCq/2u5srvbC5PWa+t/XpSc2bhOnpsVqj6vXJ0d17jd+8ajPj1/DzxZme/dz3MOn6S8138rqi7ld8neAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADw4B+EJ7WXwPMAAA==
+ <layer name="Collision" width="120" height="130">
+  <data encoding="base64" compression="zlib">
+   eJztwQENAAAAwqD3T20PBxQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADPBvPAAAE=
   </data>
  </layer>
- <objectgroup name="Object" width="120" height="130" visible="0">
+ <objectgroup name="Object" width="120" height="130">
   <object name="ToInterior" type="warp" x="4544" y="2208" width="26" height="60">
    <properties>
     <property name="dest_map" value="001-2-0"/>
@@ -50,11 +50,7 @@
     <property name="dest_y" value="864"/>
    </properties>
   </object>
-  <object name="ezili-ocean-sounds.ogg" type="music" x="25" y="2530" width="5057" height="937"/>
   <object x="3928" y="3420"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="2948" y="2268" width="2124" height="252"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="3812" y="1152" width="1256" height="1104"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="536" y="372" width="584" height="2156"/>
-  <object name="Ezili - Ocean sounds.ogg" type="music" x="1124" y="528" width="3928" height="612"/>
+  <object name="Ezili - Ocean sounds.ogg" type="music" x="0" y="0" width="3840" height="4160"/>
  </objectgroup>
 </map>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 53858da4..ea7e05f4 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -40,17 +40,17 @@
    eJztz0EOABAQBEH+f/Ni8QCyThY1Sd2nWy2lAQAAAMCjxk5/0LPuiTTd0h3ZTnf2lllfVi+16Dn/97ceAAAAgOw6l0QCHQ==
   </data>
  </layer>
- <objectgroup name="Object" width="52" height="53" visible="0">
+ <objectgroup name="Object" width="52" height="53">
   <object name="ToLevel1" type="warp" x="961" y="801" width="28" height="30">
    <properties>
-    <property name="dest_map" value="001-2-1"/>
+    <property name="dest_map" value="000-2-1"/>
     <property name="dest_x" value="1952"/>
     <property name="dest_y" value="928"/>
    </properties>
   </object>
   <object name="ToLevel1" type="warp" x="608" y="864" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
+    <property name="dest_map" value="000-1"/>
     <property name="dest_x" value="4512"/>
     <property name="dest_y" value="2208"/>
    </properties>
@@ -62,5 +62,12 @@
     <property name="dest_y" value="864"/>
    </properties>
   </object>
+  <object name="ToLevel1" type="warp" x="1024" y="864" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="000-2-3"/>
+    <property name="dest_x" value="640"/>
+    <property name="dest_y" value="864"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 82c39502..ba81dfce 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -17,7 +17,7 @@
   <image source="../graphics/tiles/Box.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="449" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../../privclientdata/graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
  </tileset>
  <layer name="Ground" width="83" height="59">
   <data encoding="base64" compression="zlib">
@@ -39,22 +39,29 @@
    eJztmMtKAzEUhhOLW0W0a/FScKHgooLgZWMrWBUXVsW9VTe6sXWjL+UT6MJH8FGEbj2HTHAMaZLBVOfyf/DTSXLmJPOTmSQVAgAAAAAAAAAAAAAAAAAAAFxmVJWJ6U+ZvY45l9oyX+P5a3hcWwFxT572A9IZeSlJE4bSMS6eA8axLfLt5U5AnM8Hbu9JNTfnSJ9CqSm/52tIDh/7ohpeDuTP97xF1w3Dy77jOwAvw9p1zOYvcrxIeBkzRxW8PCd1PDp23H8V0AdTBC95vX13xJ168nRJ/ClcINVI9URct5jUuXJ0khw2TkgNUpvUEvn30rUmhDBrlHuk6wz31x1tPBfXRDH2lyHveFbuSPeRcrGXGyLfPjLj8nJAeoyUS38ji+Tlx38OxMEFaTe5LsO551C41+ijMebQ6xdThHXcB+9XJoVaj6dIy6RpoZ6T60L3RDoH37tEmk/lKMueyIf5nKuW9hmhPOY1/YZ0a9RxTHfEfmFo6cNGGb1sWtrZD9NjkarDuUeR1YdXmn9v0h2TtQ+mKl7WPPv9Kni5J9T5bCX5TUvXPXjyxPhvo2/p1yzn/QyptW6U03Wj/A71mtFe+XyyjcUsFxXXM/m8tnlVVp9iEDq34RUAAAAAAAAAAAAAAACE8wX5K3I1
   </data>
  </layer>
- <layer name="Collision" width="83" height="59" visible="0">
+ <layer name="Collision" width="83" height="59">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKgzAQQFF7/1t5stKFG9GY0aQT9QUeiLTR+Wb+TNMMAAAAAAAAAAG/lf0OT1Fq+abOyypd/7tl5NkjOVoj7JHd6MwZ2LvObnnHnpkdntJyPUv0XJb2bPE979zyygxn/7/37Kd0rJmv58ru0rtl7fwt97qbEVd2kxYtR2m7vEd2m1bncev3V/eIvkd2o2jLyPX6Xqlxr286opoZambcmjnasvSs7E6tz2Wk9V5f5/J4xqsdtNSyZe83dchurSUAAAAAQMwXQIFGCA==
+   eJzt0kEKgzAQQFF7/1t5stKFG9E0o4kT9QUeiLTR+Wb+TNMMAAAAAAAAAAG/lf0OT1Fq+abOyypdX9VyvbLbHG25t0bYI7tRtGXpOrvlHXtmdnhKy/Us0XNZ2rPF97xzyzMzHP3/3rOf0rFmvp4ru0vvlrXzt9zrbkZc2U1atByl7fIe2W1ancet35/dI/oe2Y2iLSPX63ulxr2+6YhqZqiZcWvmaMvSs7I7tT6XkdZ7fZ3L/zOe7aClli17v6lDdmstAQAAAABivmhhRII=
   </data>
  </layer>
- <objectgroup name="Object" width="83" height="59" visible="0">
+ <objectgroup name="Object" width="83" height="59">
   <object name="ToLevel2" type="warp" x="1954" y="1090" width="26" height="28">
    <properties>
-    <property name="dest_map" value="001-2-2"/>
-    <property name="dest_x" value="864"/>
-    <property name="dest_y" value="992"/>
+    <property name="dest_map" value="000-2-2"/>
+    <property name="dest_x" value="992"/>
+    <property name="dest_y" value="864"/>
    </properties>
   </object>
   <object name="ToLevel0" type="warp" x="1954" y="962" width="26" height="28">
    <properties>
-    <property name="dest_map" value="001-2-0"/>
+    <property name="dest_map" value="000-2-0"/>
+    <property name="dest_x" value="960"/>
+    <property name="dest_y" value="832"/>
+   </properties>
+  </object>
+  <object name="ToLevel0" type="warp" x="1954" y="962" width="26" height="28">
+   <properties>
+    <property name="dest_map" value="000-2-0"/>
     <property name="dest_x" value="960"/>
     <property name="dest_y" value="832"/>
    </properties>
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 87c33717..ef2daf09 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -30,7 +30,7 @@
  </layer>
  <layer name="Fringe" width="53" height="51">
   <data encoding="base64" compression="zlib">
-   eJzt0bENACAMA8FkdBoalmYFRIMS7iaw9REAAAAAwK2RrxdwSqt6NKtnZs9uq+EnAAAA4G8bGgoDHA==
+   eJzt0SESACAMA8H26RgMn0ZjUbTsmujMRQAAAAAAt0aey7s0qkezemb27LYafgIAAAD+tgGyVgOe
   </data>
  </layer>
  <layer name="Over" width="53" height="51">
@@ -48,7 +48,7 @@
    eJzt0UEKwCAMBED7/6f4Sa9FotAixMAE5pTLLtuf1joAAAAAQGB17192xhN9on5V7Lap2GnOW32nKO9qs+ysfzpV3ORLp+xcpztlZwIAAADuMQBmHe7H
   </data>
  </layer>
- <objectgroup name="Object" width="53" height="51" visible="0">
+ <objectgroup name="Object" width="53" height="51">
   <object name="ToLevel1" type="warp" x="994" y="898" width="26" height="29">
    <properties>
     <property name="dest_map" value="001-2-1"/>
@@ -56,5 +56,12 @@
     <property name="dest_y" value="1088"/>
    </properties>
   </object>
+  <object name="ToLevel1" type="warp" x="994" y="898" width="26" height="29">
+   <properties>
+    <property name="dest_map" value="000-2-1"/>
+    <property name="dest_x" value="1952"/>
+    <property name="dest_y" value="1088"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 9e6ae313..60588ac9 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -46,7 +46,7 @@
  <objectgroup name="Object" width="52" height="53">
   <object name="ToLevel1" type="warp" x="608" y="864" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-2-0"/>
+    <property name="dest_map" value="000-2-0"/>
     <property name="dest_x" value="992"/>
     <property name="dest_y" value="864"/>
    </properties>