Consistency of tileset names in maps.

56 files changed, 143 insertions, 160 deletions

diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index d1f9715e..6535f1db 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Sailor's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx
index 4ff44b38..863ec47f 100644
--- a/maps/000-0-1.tmx
+++ b/maps/000-0-1.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Sailor's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 64a768c0..9f862676 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -16,10 +16,10 @@
   <property name="overlay1scrollY" value="0.35"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/>
- <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
+ <tileset firstgid="241" name="Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
   <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
  </tileset>
- <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="461" name="Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 9288fbe4..7155ec9e 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -12,10 +12,10 @@
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-calm.tsx"/>
- <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
+ <tileset firstgid="241" name="Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
   <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
  </tileset>
- <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="461" name="Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
@@ -40,7 +40,7 @@
  <tileset firstgid="1101" name="Tree x4x5" tilewidth="128" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/tree-x4x5.png" width="512" height="160"/>
  </tileset>
- <tileset firstgid="1105" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1105" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1121" source="../graphics/tilesets/ship-flag-x3x2.tsx"/>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index bb81b9de..0846f37d 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -7,10 +7,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="First Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index af4ffd06..1a6d83ee 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Second Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle-x1x2.tsx"/>
@@ -21,7 +21,7 @@
  <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="442" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="442" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="443" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 616c85f3..2ed3c632 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -24,7 +24,7 @@
  <tileset firstgid="561" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="570" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="570" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="571" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 75d13bc6..e9fb1564 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -7,10 +7,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Nard's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
diff --git a/maps/000-2-4.tmx b/maps/000-2-4.tmx
index 67e8f47e..3b0713ad 100644
--- a/maps/000-2-4.tmx
+++ b/maps/000-2-4.tmx
@@ -12,10 +12,10 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -27,7 +27,7 @@
  <tileset firstgid="549" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="558" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="558" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="559" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 49d38893..2e90df69 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -42,10 +42,10 @@
  <tileset firstgid="1465" name="Windows" tilewidth="64" tileheight="32" tilecount="10" columns="5">
   <image source="../graphics/tilesets/artis-windows.png" width="320" height="64"/>
  </tileset>
- <tileset firstgid="1475" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1475" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1603" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="1603" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="1651" name="Archway x1x4" tilewidth="32" tileheight="128" tilecount="6" columns="6">
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 504d9703..706d4253 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -22,10 +22,10 @@
  <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="713" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="761" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 938bda24..322a9531 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -32,7 +32,7 @@
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="785" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1054" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1054" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="67">
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index c555d5b8..26f9ca7c 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -32,7 +32,7 @@
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="785" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1054" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1054" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="79" height="67">
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index c47fc099..17843b24 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -32,7 +32,7 @@
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="785" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1054" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1054" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="72">
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 7b1930c1..c496afb8 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -19,7 +19,7 @@
  <tileset firstgid="561" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="569" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="569" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="697" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -34,7 +34,7 @@
  <tileset firstgid="998" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1126" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1126" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1142" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index b4c5ba83..54ab676f 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="621" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="621" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="749" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -35,7 +35,7 @@
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="1014" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1026" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1026" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1042" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index bfacde0b..eeccf352 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -37,7 +37,7 @@
  <tileset firstgid="886" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="950" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="950" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="966" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index ac0bf35c..95a65af0 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -38,7 +38,7 @@
  <tileset firstgid="914" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="918" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="918" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="62" height="72">
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index ed5472f3..584a240b 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -22,7 +22,7 @@
  <tileset firstgid="577" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="721" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index 01a405f3..14dd07ac 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -46,7 +46,7 @@
  <tileset firstgid="1161" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1170" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1170" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="101" height="63">
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 5e5f8cb1..9ed19ce5 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -22,10 +22,10 @@
  <tileset firstgid="577" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="721" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="769" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
@@ -46,7 +46,7 @@
  <tileset firstgid="1293" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1302" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1302" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="70" height="81">
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index ae906bb4..d39471ac 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -28,7 +28,7 @@
  <tileset firstgid="621" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="629" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="757" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -40,7 +40,7 @@
  <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1026" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1026" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="69" height="65">
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index 800d8abc..c146b87e 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index cd1b7cd5..acb40edc 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -7,10 +7,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="First Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle-x1x2.tsx"/>
@@ -29,17 +29,14 @@
  <tileset firstgid="578" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="582" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
- </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="csv">
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,693,693,693,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,693,693,693,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,693,693,693,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 6a65683a..54f0e9c0 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Second Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle-x1x2.tsx"/>
@@ -21,7 +21,7 @@
  <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="442" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="442" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="443" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
@@ -30,18 +30,15 @@
  <tileset firstgid="451" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="455" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
- </tileset>
  <layer name="Ground" width="93" height="59" opacity="0.99">
   <data encoding="csv">
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,566,566,566,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,566,566,566,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,566,566,566,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index 73352e24..8102669e 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -8,10 +8,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -24,7 +24,7 @@
  <tileset firstgid="561" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="570" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="570" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="571" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
@@ -33,18 +33,15 @@
  <tileset firstgid="579" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="583" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
- </tileset>
  <layer name="Ground" width="70" height="62">
   <data encoding="csv">
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,89,694,694,694,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,89,694,694,694,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,89,89,89,89,89,89,89,694,694,694,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,89,89,89,89,89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index ab83d69e..62eecfce 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -7,10 +7,10 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Nard's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="129" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -31,9 +31,6 @@
  <tileset firstgid="575" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="579" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
- </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="csv">
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
@@ -43,9 +40,9 @@
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,690,690,690,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,690,690,690,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
-89,89,89,690,690,690,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
+89,89,89,0,0,0,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 274e797f..4a8fb7ed 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -22,10 +22,10 @@
  <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="713" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="761" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 21da501a..6d67636c 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -38,7 +38,7 @@
  <tileset firstgid="914" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="918" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="918" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="62" height="72">
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index d73d2126..210becd7 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
@@ -41,7 +41,7 @@
  <tileset firstgid="953" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="957" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="957" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="973" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index d8b46551..5a093a59 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -26,10 +26,10 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -45,7 +45,7 @@
  <tileset firstgid="1085" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1213" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1213" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1229" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index 5f6015e4..715e97f6 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" source="../graphics/tilesets/candle-x1x2.tsx"/>
@@ -38,7 +38,7 @@
  <tileset firstgid="1001" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1129" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1129" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1145" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 417b7e11..92e086dc 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -28,7 +28,7 @@
  <tileset firstgid="621" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="629" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="757" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -40,7 +40,7 @@
  <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1026" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1026" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="69" height="64">
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index 82925fd6..9f18646f 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -47,7 +47,7 @@
  <tileset firstgid="1093" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1221" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1221" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1237" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 267a86c6..ec9a1091 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -41,7 +41,7 @@
  <tileset firstgid="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="957" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="957" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="973" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index e3932db8..b2c40156 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1058" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1186" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1186" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="57" height="58">
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index da51df88..b20b6271 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1058" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1186" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1186" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index b2c85b2c..e557383d 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1058" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1186" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1186" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="57" height="58">
diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index d90bbc26..0938ae3f 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -17,7 +17,7 @@
  <tileset firstgid="513" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="529" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="657" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index f3a12fbe..38cbda9d 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -26,10 +26,10 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
@@ -37,11 +37,6 @@
  </tileset>
  <tileset firstgid="785" name="Pillar x1x2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
   <image source="../graphics/tilesets/artis-pillar-x1x2.png" width="256" height="256"/>
-  <tile id="11">
-   <properties>
-    <property name="TileCondition" value="8"/>
-   </properties>
-  </tile>
  </tileset>
  <tileset firstgid="817" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
@@ -56,7 +51,7 @@
  <tileset firstgid="1098" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1226" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1226" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="61" height="71">
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index d8836df5..f1818c59 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 24b11a7d..90ba7ddc 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -44,7 +44,7 @@
  <tileset firstgid="1058" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1186" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1186" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="61" height="71">
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index adcc2e7a..a10741dc 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -22,7 +22,7 @@
  <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="713" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -32,7 +32,7 @@
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="845" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="857" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="857" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="873" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index f3ea2227..e2bc46fe 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -19,7 +19,7 @@
  <tileset firstgid="561" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="577" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="705" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -31,7 +31,7 @@
  <tileset firstgid="965" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="974" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="974" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="990" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index 25e9f123..eaf62a84 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -10,7 +10,7 @@
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="321" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
@@ -22,17 +22,17 @@
  <tileset firstgid="705" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="961" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="961" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1089" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="1089" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="1137" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="1146" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1158" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1158" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx
index 1a4f641e..b2738fd7 100644
--- a/maps/001-2-41.tmx
+++ b/maps/001-2-41.tmx
@@ -25,10 +25,10 @@
  <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -44,7 +44,7 @@
  <tileset firstgid="1085" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1213" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1213" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1229" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-42.tmx b/maps/001-2-42.tmx
index 50a1d553..85eb9021 100644
--- a/maps/001-2-42.tmx
+++ b/maps/001-2-42.tmx
@@ -28,7 +28,7 @@
  <tileset firstgid="942" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="950" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="950" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="966" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index 654dd2fe..15149cbd 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -16,7 +16,7 @@
  <tileset firstgid="513" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="561" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="561" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="689" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 107515c8..9e5dc734 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -37,7 +37,7 @@
  <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="998" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="998" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1014" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index fd6da429..5c29519d 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index fc10a80a..7a4797e6 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -41,7 +41,7 @@
  <tileset firstgid="1010" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1138" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1138" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="70">
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index 95694e89..f18abfd6 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -25,7 +25,7 @@
  <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
@@ -38,7 +38,7 @@
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="998" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1010" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1010" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1026" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 9fe3c443..86bb227d 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -7,31 +7,31 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
  </properties>
- <tileset firstgid="1" name="artis-sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="artis-indoor-cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="artis-sewer-x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/artis-sewer-x2x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="329" name="artis-sewer-x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/artis-sewer-x3x3.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="365" name="artis-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="493" name="box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="529" name="box-x1x2" tilewidth="32" tileheight="32" tilecount="16" columns="4">
+ <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32" tilecount="16" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="545" name="shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="673" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 968215dd..5ff93363 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -7,19 +7,19 @@
   <property name="music" value=""/>
   <property name="name" value="Rivercave"/>
  </properties>
- <tileset firstgid="1" name="artis-sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="artis-indoor-cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="321" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="449" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="449" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="465" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <tileset firstgid="465" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
  <layer name="Ground" width="60" height="80">
diff --git a/maps/test.tmx b/maps/test.tmx
index fc9f7bcd..e11b792b 100644
--- a/maps/test.tmx
+++ b/maps/test.tmx
@@ -9,13 +9,13 @@
   <property name="overlay0scrollX" value="0.3"/>
   <property name="overlay0scrollY" value="0.2"/>
  </properties>
- <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="257" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="513" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="529" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/testbg.tmx b/maps/testbg.tmx
index d955c7ed..e91a8588 100644
--- a/maps/testbg.tmx
+++ b/maps/testbg.tmx
@@ -3,7 +3,7 @@
  <properties>
   <property name="name" value="testbg"/>
  </properties>
- <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="30" height="30">