From 10ac448955447d019dd48f59b5e16a845c465473 Mon Sep 17 00:00:00 2001
From: Alige <gauvain.dauchy@free.fr>
Date: Thu, 30 Jun 2016 22:29:57 +0200
Subject: Organised the names of the tilesets inside the .tmx files.

---
 maps/000-1.tmx    |  2 +-
 maps/001-1.tmx    | 26 +++++++++++++-------------
 maps/001-2-0.tmx  | 10 +++++-----
 maps/001-2-1.tmx  | 14 +++++++-------
 maps/001-2-10.tmx | 14 +++++++-------
 maps/001-2-11.tmx | 14 +++++++-------
 maps/001-2-12.tmx |  8 ++++----
 maps/001-2-13.tmx | 10 +++++-----
 maps/001-2-14.tmx |  8 ++++----
 maps/001-2-15.tmx | 10 +++++-----
 maps/001-2-16.tmx | 10 +++++-----
 maps/001-2-17.tmx | 12 ++++++------
 maps/001-2-18.tmx | 14 +++++++-------
 maps/001-2-19.tmx | 14 +++++++-------
 maps/001-2-2.tmx  | 12 ++++++------
 maps/001-2-20.tmx | 14 +++++++-------
 maps/001-2-25.tmx | 10 +++++-----
 maps/001-2-26.tmx | 10 +++++-----
 maps/001-2-27.tmx | 14 +++++++-------
 maps/001-2-28.tmx | 14 +++++++-------
 maps/001-2-29.tmx | 12 ++++++------
 maps/001-2-3.tmx  | 12 ++++++------
 maps/001-2-30.tmx | 16 ++++++++--------
 maps/001-2-31.tmx | 14 +++++++-------
 maps/001-2-32.tmx | 14 +++++++-------
 maps/001-2-33.tmx | 14 +++++++-------
 maps/001-2-34.tmx | 14 +++++++-------
 maps/001-2-35.tmx | 10 +++++-----
 maps/001-2-36.tmx | 16 ++++++++--------
 maps/001-2-37.tmx | 12 ++++++------
 maps/001-2-38.tmx | 14 +++++++-------
 maps/001-2-39.tmx | 10 +++++-----
 maps/001-2-4.tmx  | 10 +++++-----
 maps/001-2-40.tmx |  6 +++---
 maps/001-2-5.tmx  |  6 +++---
 maps/001-2-6.tmx  | 12 ++++++------
 maps/001-2-7.tmx  | 10 +++++-----
 maps/001-2-8.tmx  | 12 ++++++------
 maps/001-2-9.tmx  | 12 ++++++------
 39 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index ce9a4b63..d009f1d5 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -40,7 +40,7 @@
  <tileset firstgid="1066" name="Tree x4x5" tilewidth="128" tileheight="160" tilecount="1" columns="1">
   <image source="../graphics/tilesets/tree-x4x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1067" name="Heights Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1067" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="120" height="160">
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index ad0242cf..0f611e9f 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1425" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="1433" name="Pillar 2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
+ <tileset firstgid="1433" name="Pillar x1x2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
   <image source="../graphics/tilesets/artis-pillar-x1x2.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="1465" name="Windows" tilewidth="64" tileheight="32" tilecount="10" columns="5">
@@ -45,28 +45,28 @@
  <tileset firstgid="1475" name="Artis 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="Accessory 2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="1603" name="Artis 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_4" tilewidth="32" tileheight="128" tilecount="6" columns="6">
+ <tileset firstgid="1651" name="Archway x1x4" tilewidth="32" tileheight="128" tilecount="6" columns="6">
   <image source="../graphics/tilesets/artis-archway-x1x4.png" width="192" height="128"/>
  </tileset>
- <tileset firstgid="1657" name="Archway_5" tilewidth="32" tileheight="160" tilecount="7" columns="7">
+ <tileset firstgid="1657" name="Archway x1x5" tilewidth="32" tileheight="160" tilecount="7" columns="7">
   <image source="../graphics/tilesets/artis-archway-x1x5.png" width="224" height="160"/>
  </tileset>
- <tileset firstgid="1664" name="Tree_3" tilewidth="96" tileheight="96" tilecount="1" columns="1">
+ <tileset firstgid="1664" name="Tree x3x3" tilewidth="96" tileheight="96" tilecount="1" columns="1">
   <image source="../graphics/tilesets/tree-x3x3.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1665" name="Tree_4" tilewidth="96" tileheight="128" tilecount="10" columns="5">
+ <tileset firstgid="1665" name="Tree x3x4" tilewidth="96" tileheight="128" tilecount="10" columns="5">
   <image source="../graphics/tilesets/tree-x3x4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="1675" name="Tree_5" tilewidth="128" tileheight="160" tilecount="1" columns="1">
+ <tileset firstgid="1675" name="Tree x4x5" tilewidth="128" tileheight="160" tilecount="1" columns="1">
   <image source="../graphics/tilesets/tree-x4x5.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="1676" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="1712" name="Box_2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="1712" 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="1720" name="Ship Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
@@ -78,17 +78,17 @@
  <tileset firstgid="2196" name="Fountain" tilewidth="32" tileheight="32" tilecount="55" columns="11">
   <image source="../graphics/tilesets/artis-fountain.png" width="352" height="160"/>
  </tileset>
- <tileset firstgid="2251" name="Foutain_4" tilewidth="32" tileheight="128" tilecount="11" columns="11">
+ <tileset firstgid="2251" name="Foutain x1x4" tilewidth="32" tileheight="128" tilecount="11" columns="11">
   <image source="../graphics/tilesets/artis-fountain-x1x4.png" width="352" height="128"/>
  </tileset>
  <tileset firstgid="2262" source="../graphics/tilesets/accessory.tsx"/>
- <tileset firstgid="2294" name="Harbour_2_4" tilewidth="128" tileheight="64" tilecount="2" columns="2">
+ <tileset firstgid="2294" name="Harbour x4x2" tilewidth="128" tileheight="64" tilecount="2" columns="2">
   <image source="../graphics/tilesets/artis-harbour-x2-x4.png" width="256" height="64"/>
  </tileset>
- <tileset firstgid="2296" name="Harbour_4_6" tilewidth="192" tileheight="128" tilecount="1" columns="1">
+ <tileset firstgid="2296" name="Harbour x6x4" tilewidth="192" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/artis-harbour-x4-x6.png" width="192" height="128"/>
  </tileset>
- <tileset firstgid="2297" name="Harbour_6_4" tilewidth="128" tileheight="192" tilecount="2" columns="2">
+ <tileset firstgid="2297" name="Harbour x4x6" tilewidth="128" tileheight="192" tilecount="2" columns="2">
   <image source="../graphics/tilesets/artis-harbour-x6-x4.png" width="256" height="192"/>
  </tileset>
  <tileset firstgid="2299" source="../graphics/tilesets/artis-chimney.tsx"/>
@@ -98,7 +98,7 @@
  <tileset firstgid="2565" name="Shadows" tilewidth="32" tileheight="32" tilecount="48" columns="8">
   <image source="../graphics/tilesets/artis-shadows.png" width="256" height="192"/>
  </tileset>
- <tileset firstgid="2613" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="2613" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="2629" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 004fafa0..75370bf8 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="713" name="Artis 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">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="889" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="889" 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="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 97838308..5778f24f 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -13,29 +13,29 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="637" 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="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="785" 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="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1051" name="Height Numbers" 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 a5a18ef5..456b5173 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -13,29 +13,29 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="637" 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="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="785" 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="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1051" name="Height Numbers" 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 87b21fd7..fef4d824 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -13,29 +13,29 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="637" 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="645" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="657" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="785" 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="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1051" name="Height Numbers" 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 a9cc60a0..adde23c8 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -13,13 +13,13 @@
  <tileset firstgid="257" 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="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="569" name="Artis 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,10 +34,10 @@
  <tileset firstgid="995" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1059" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1059" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1075" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1075" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="67" height="61">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 5a6e703d..ceeeb94d 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -13,10 +13,10 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
@@ -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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="621" name="Artis 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,10 +35,10 @@
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1011" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1023" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1023" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1039" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1039" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="66" height="62">
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index a3d69dff..6a463363 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -13,10 +13,10 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -25,7 +25,7 @@
  <tileset firstgid="613" 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="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="621" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -47,7 +47,7 @@
  <tileset firstgid="843" 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="907" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="907" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="65" height="61">
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index c8e09e64..a25f2a6d 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -13,13 +13,13 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -35,10 +35,10 @@
  <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="911" 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="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="915" name="Height Numbers" 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-16.tmx b/maps/001-2-16.tmx
index d93b2c31..4a478034 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -13,10 +13,10 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -25,7 +25,7 @@
  <tileset firstgid="613" 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="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="621" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -38,10 +38,10 @@
  <tileset firstgid="645" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="901" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <tileset firstgid="901" 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="917" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="917" 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="921" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index 31fab67e..af2244dd 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -13,16 +13,16 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="593" name="Artis 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">
@@ -31,7 +31,7 @@
  <tileset firstgid="757" 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="765" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="765" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -47,7 +47,7 @@
  <tileset firstgid="853" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1109" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1109" 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="1113" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index cb89e2e7..d87dc1b3 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -13,19 +13,19 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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">
@@ -37,7 +37,7 @@
  <tileset firstgid="773" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1029" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="1029" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -47,7 +47,7 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1053" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1053" 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="1057" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
@@ -56,7 +56,7 @@
  <tileset firstgid="1121" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1127" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1127" name="Height Numbers" 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 01262714..daac59de 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -13,19 +13,19 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="593" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="721" name="Artis 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">
@@ -34,7 +34,7 @@
  <tileset firstgid="777" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="841" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="841" 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="845" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -46,7 +46,7 @@
  <tileset firstgid="1229" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1235" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1235" name="Height Numbers" 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 404649b3..0fa93ec9 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -13,10 +13,10 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
@@ -25,13 +25,13 @@
  <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="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="629" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="757" 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="761" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -40,7 +40,7 @@
  <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1023" name="Height Numbers" 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 f78ba616..f76e3f8b 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="729" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -38,7 +38,7 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="753" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="753" 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="757" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index b286f521..6993e76a 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -13,19 +13,19 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="713" name="Artis 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">
@@ -37,7 +37,7 @@
  <tileset firstgid="805" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="869" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
+ <tileset firstgid="869" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="3">
    <animation>
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 05df7122..de525d61 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -13,13 +13,13 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
@@ -35,10 +35,10 @@
  <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="911" 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="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="915" name="Height Numbers" 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 6f39dd9b..9509e859 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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">
@@ -38,10 +38,10 @@
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="941" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="953" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <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 Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="957" name="Height Numbers" 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="6" columns="3">
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index c8dab074..adf736e9 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -14,22 +14,22 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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">
@@ -39,13 +39,13 @@
  <tileset firstgid="825" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1081" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1081" 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="1085" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1149" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1149" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1165" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index f7ca8f5c..a0c84f6b 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -13,32 +13,32 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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"/>
  <tileset firstgid="741" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="997" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="997" 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="1001" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1065" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1065" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1081" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 7683944c..f8605398 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -13,10 +13,10 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
@@ -25,13 +25,13 @@
  <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="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="629" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="757" 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="761" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -40,7 +40,7 @@
  <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1023" name="Height Numbers" 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 83edf50e..bf287a2f 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -13,41 +13,41 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="813" name="Box x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="813" 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="821" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <tileset firstgid="833" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1089" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1089" 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="1093" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1157" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1157" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1173" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index c65acf72..61c47b4a 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -13,35 +13,35 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="813" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="825" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="825" 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="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="893" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="893" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="909" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 967d66c3..c9cd674c 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="777" 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="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1119" name="Height Numbers" 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 f0c9b352..d1f1995c 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="777" 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="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1119" name="Height Numbers" 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 4dfcfadd..44195432 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="777" 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="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1119" name="Height Numbers" 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 ea52d8c7..816e488c 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -14,19 +14,19 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="529" name="Artis 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">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="693" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
+ <tileset firstgid="693" 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="701" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="701" 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="705" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -39,7 +39,7 @@
  <tileset firstgid="979" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1043" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1043" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="60" height="71">
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index 58a5e2f8..997723df 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -14,28 +14,28 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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">
   <image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="785" name="Pillar 2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
+ <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>
@@ -43,7 +43,7 @@
    </properties>
   </tile>
  </tileset>
- <tileset firstgid="817" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <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"/>
  </tileset>
  <tileset firstgid="821" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -56,7 +56,7 @@
  <tileset firstgid="1095" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1159" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1159" name="Height Numbers" 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 0d7b9cdd..10b71502 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="777" 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="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 585bd247..117452ae 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -13,25 +13,25 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="777" 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="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -44,7 +44,7 @@
  <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1119" name="Height Numbers" 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 ae15ffbf..ca503bba 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -13,26 +13,26 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="585" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="713" 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="717" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="781" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="793" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="793" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="809" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 1b801276..5a8bd982 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -13,16 +13,16 @@
  <tileset firstgid="257" 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="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <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="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="577" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="705" 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="709" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -31,7 +31,7 @@
  <tileset firstgid="965" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="971" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="971" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="987" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index af426b8f..e73405e6 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -23,17 +23,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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="961" name="Artis 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="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="1089" name="Artis 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="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1143" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1155" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1155" name="Height Numbers" 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-5.tmx b/maps/001-2-5.tmx
index 2d69fb4d..69559141 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -13,13 +13,13 @@
  <tileset firstgid="257" 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="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="561" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="689" 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="693" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index d29cbbaf..2d8866d0 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="729" 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="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -37,7 +37,7 @@
  <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="995" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="995" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1011" source="../graphics/tilesets/candle-x1x2.tsx"/>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index fd78a136..08e51ca1 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="729" 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="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 1e0651b3..c21ca536 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="729" 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="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -41,7 +41,7 @@
  <tileset firstgid="1007" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1071" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1071" name="Height Numbers" 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 a7130b92..e0a670b4 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -13,22 +13,22 @@
  <tileset firstgid="257" 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="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <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="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" 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="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <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="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="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis 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" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="729" 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="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -38,7 +38,7 @@
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="995" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1007" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1007" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1023" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
-- 
cgit v1.2.3-60-g2f50