diff --git a/src/autosave_warning.lua b/src/autosave_warning.lua
index d0601d373..31b065f0d 100644
--- a/src/autosave_warning.lua
+++ b/src/autosave_warning.lua
@@ -26,6 +26,9 @@ function state:enter()
   Timer.add(8, function()
     Gamestate.switch('scanning')
   end)
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function state:leave()
@@ -40,8 +43,8 @@ function state:draw()
   local width = self.background:getWidth()
   local height = self.background:getHeight()
   
-  local x = (window.width - width)/2
-  local y = (window.height - height)/2
+  local x = (self.width - width)/2
+  local y = (self.height - height)/2
 
   love.graphics.draw(self.background, x, y)
   self.savingAnimation:draw(self.savingImage, x + 10, y + 10)
diff --git a/src/credits.lua b/src/credits.lua
index 902277c7e..0584b9b53 100644
--- a/src/credits.lua
+++ b/src/credits.lua
@@ -17,6 +17,9 @@ function state:enter(previous)
   self.ty = 0
   camera:setPosition(0, self.ty)
   self.previous = previous
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function state:leave()
@@ -378,7 +381,7 @@ function state:draw()
   for i = shift - 14, shift + 1 do
     local name = self.credits[i]
     if name then
-      love.graphics.printf(name, 0, window.height + 25 * i, window.width, 'center')
+      love.graphics.printf(name, 0, self.height + 25 * i, self.width, 'center')
     end
   end
 end
diff --git a/src/images/tilesets/baseball.png b/src/images/tilesets/baseball.png
index 6d378f307..42f7b6e3d 100644
Binary files a/src/images/tilesets/baseball.png and b/src/images/tilesets/baseball.png differ
diff --git a/src/images/tilesets/deans-closet.png b/src/images/tilesets/deans-closet.png
index f1432c9ac..09d22e5c2 100644
Binary files a/src/images/tilesets/deans-closet.png and b/src/images/tilesets/deans-closet.png differ
diff --git a/src/instructions.lua b/src/instructions.lua
index e89a22fb3..b0ee7bbfe 100644
--- a/src/instructions.lua
+++ b/src/instructions.lua
@@ -37,7 +37,6 @@ menu:onSelect(function()
   state.statusText = "PRESS NEW KEY" end)
 
 function state:init()
-  VerticalParticles.init()
 
   self.arrow = love.graphics.newImage("images/menu/arrow.png")
   self.background = love.graphics.newImage("images/menu/pause.png")
@@ -56,12 +55,16 @@ end
 function state:enter(previous)
   fonts.set( 'big' )
   sound.playMusic( "daybreak" )
-
+  VerticalParticles.init()
+  
   camera:setPosition(0, 0)
   self.instructions = controls:getActionmap()
   self.previous = previous
   self.option = 0
   self.statusText = ''
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function state:leave()
@@ -82,29 +85,31 @@ function state:draw()
   VerticalParticles.draw()
 
   love.graphics.draw(self.background, 
-    camera:getWidth() / 2 - self.background:getWidth() / 2,
-    camera:getHeight() / 2 - self.background:getHeight() / 2)
+    (self.width - self.background:getWidth()) / 2,
+    (self.height - self.background:getHeight()) / 2)
 
   local n = 1
-
+  local x = (self.width - window.width)/2
+  local y = (self.height - window.height)/2
+  
   love.graphics.setColor(255, 255, 255)
   local back = controls:getKey("START") .. ": BACK TO MENU"
   local howto = controls:getKey("ATTACK") .. " OR " .. controls:getKey("JUMP") .. ": REASSIGN CONTROL"
 
   love.graphics.print(back, 25, 25)
   love.graphics.print(howto, 25, 55)
-  love.graphics.print(self.statusText, self.left_column, 280)
+  love.graphics.print(self.statusText, x + self.left_column, y + 280)
   love.graphics.setColor( 0, 0, 0, 255 )
 
   for i, button in ipairs(menu.options) do
-    local y = self.top + self.spacing * (i - 1)
+    local z = y + self.top + self.spacing * (i - 1)
     local key = controls:getKey(button)
-    love.graphics.print(descriptions[button], self.left_column, y, 0, 0.5)
-    love.graphics.print(key, self.right_column, y, 0, 0.5)
+    love.graphics.print(descriptions[button], x + self.left_column, z, 0, 0.5)
+    love.graphics.print(key, x + self.right_column, z, 0, 0.5)
   end
   
   love.graphics.setColor( 255, 255, 255, 255 )
-  love.graphics.draw(self.arrow, 135, 87 + self.spacing * menu:selected())
+  love.graphics.draw(self.arrow, x + 135, y + 87 + self.spacing * menu:selected())
 end
 
 function state:remapKey(key)
diff --git a/src/level.lua b/src/level.lua
index 9840a1129..3d6939563 100644
--- a/src/level.lua
+++ b/src/level.lua
@@ -94,23 +94,22 @@ local function collision_stop(dt, shape_a, shape_b)
   end
 end
 
-local function setBackgroundColor(map)
-  local prop = map.properties
-  if not prop.red then
-    love.graphics.setBackgroundColor(0, 0, 0)
-    return
-  end
-  love.graphics.setBackgroundColor(tonumber(prop.red),
-                   tonumber(prop.green),
-                   tonumber(prop.blue))
-end
-
 local function getCameraOffset(map)
   local prop = map.properties
-  if not prop.offset then
-    return 0
+
+  local width, height, flags = love.window.getMode( )
+  if not flags.fullscreen then 
+    if not prop.offset then		
+      return 0
+    end
+    return tonumber(prop.offset) * map.tilewidth
+  else
+    if not prop.offset or tonumber(prop.offset) < 2 then
+      return (map.height*map.tileheight - height*window.scale)/2
+    end
+    return math.min(tonumber(prop.offset)*map.tileheight + (window.height - height*window.scale)/2,
+                      map.height*map.tileheight - height*window.scale)
   end
-  return tonumber(prop.offset) * map.tilewidth
 end
 
 local function getTitle(map)
@@ -149,7 +148,6 @@ function Level.new(name)
   level.map.moving_platforms = {} -- Need to give map access to moving platforms
   level.tileset = tmx.load(level.map)
   level.collider = HC(100, on_collision, collision_stop)
-  level.offset = getCameraOffset(level.map)
   level.music = getSoundtrack(level.map)
   level.spawn = (level.map.properties and level.map.properties.respawn) or 'studyroom'
   level.overworldName = (level.map.properties and level.map.properties.overworldName) or 'greendale'
@@ -371,9 +369,14 @@ function Level:enter(previous, door, position)
     self:restartLevel(true)
   end
 
-  camera.max.x = self.map.width * self.map.tilewidth - window.width
-
-  setBackgroundColor(self.map)
+  local width, height, flags = love.window.getMode( ) 
+  if not flags.fullscreen then
+    camera.max.x = self.map.width * self.map.tilewidth - window.width
+  else
+    local widthDif = self.map.width * self.map.tilewidth - width*window.scale
+    camera.max.x = widthDif > 0 and widthDif or widthDif/2
+  end
+  self.offset = getCameraOffset(self.map)
  
   sound.playMusic( self.music )
 
diff --git a/src/maps/admin-hallway.tmx b/src/maps/admin-hallway.tmx
index ee7b10e00..260d08ece 100644
--- a/src/maps/admin-hallway.tmx
+++ b/src/maps/admin-hallway.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="48" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="48" height="14" tilewidth="24" tileheight="24" nextobjectid="16">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="159"/>
-  <property name="green" value="123"/>
-  <property name="red" value="104"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Admin Hallway"/>
  </properties>
@@ -14,6 +11,11 @@
  <tileset firstgid="481" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="Tile Layer 0" width="48" height="14">
+  <data encoding="base64" compression="zlib">
+   eJztwzENAAAMBKGb3r/kuugECaumqqpPD97OD8E=
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="48" height="14">
   <data encoding="base64" compression="zlib">
    eJxjZGBwYBzCmImBgWGI4wNDGTOMQJA+SM0aBaSDjcBCZBPjwNjdC7S3j0K7TwL1nyLDDGYohgFJIJbCwsYHlgLtXTZAYYfL/dIMhN0vQ4T5QDUNxKhDB7JEqoO5nx2KDYHYCIiNkdjsOLAJHjkkNQ3EqEPHpljE7mIRYx7FgwIzDnEMAH5IPoY=
@@ -34,48 +36,48 @@
    eJxjYBja4CHj0MajYBSMglEwCoYu+M0IwQMFhJgYGASZsMsJMKGqE4BiXOoJmYcOvjEObTwKBhYAAAPfW1Q=
   </data>
  </layer>
- <objectgroup name="nodes" width="48" height="14">
-  <object name="main" type="door" x="96" y="216" width="24" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="main" type="door" x="96" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="admin1"/>
    </properties>
   </object>
-  <object name="humanbeing" type="npc" x="576" y="216" width="48" height="50"/>
-  <object type="firealarm" x="480" y="216" width="24" height="48"/>
-  <object type="firealarm" x="840" y="216" width="24" height="48"/>
-  <object type="firealarm" x="24" y="216" width="24" height="48"/>
-  <object type="info" x="360" y="216" width="48" height="48">
+  <object id="2" name="humanbeing" type="npc" x="576" y="216" width="48" height="50"/>
+  <object id="3" type="firealarm" x="480" y="216" width="24" height="48"/>
+  <object id="4" type="firealarm" x="840" y="216" width="24" height="48"/>
+  <object id="5" type="firealarm" x="24" y="216" width="24" height="48"/>
+  <object id="6" type="info" x="360" y="216" width="48" height="48">
    <properties>
     <property name="info" value="The only trophy reads: | Most Valued Customer ... | Henderson Trophy Cases"/>
    </properties>
   </object>
-  <object type="info" x="1104" y="216" width="48" height="48">
+  <object id="7" type="info" x="1104" y="216" width="48" height="48">
    <properties>
     <property name="info" value="Stairway closed due to black mold"/>
    </properties>
   </object>
-  <object type="info" x="216" y="216" width="24" height="48">
+  <object id="8" type="info" x="216" y="216" width="24" height="48">
    <properties>
     <property name="info" value="$0.25 per sip. 2 drink minimum."/>
    </properties>
   </object>
-  <object type="info" x="169" y="216" width="16" height="48">
+  <object id="9" type="info" x="169" y="216" width="16" height="48">
    <properties>
     <property name="info" value="The extinguisher reads ... | WARNING CONTENTS HIGHLY FLAMMABLE"/>
    </properties>
   </object>
-  <object type="info" x="1011" y="218" width="41" height="44">
+  <object id="10" type="info" x="1011" y="218" width="41" height="44">
    <properties>
     <property name="info" value="Wait a minute... This is just hot soda."/>
    </properties>
   </object>
-  <object type="info" x="984" y="216" width="23" height="44">
+  <object id="11" type="info" x="984" y="216" width="23" height="44">
    <properties>
     <property name="info" value="This ATM only dispenses ... | Greendale Dollars."/>
    </properties>
   </object>
-  <object name="raveSwitch" type="door" x="768" y="216" width="24" height="60">
+  <object id="12" name="raveSwitch" type="door" x="768" y="216" width="24" height="60">
    <properties>
     <property name="button" value="INTERACT"/>
     <property name="level" value="rave-hallway"/>
@@ -83,17 +85,17 @@
     <property name="to" value="raveSwitch"/>
    </properties>
   </object>
-  <object type="info" x="313" y="218" width="22" height="44">
+  <object id="13" type="info" x="313" y="218" width="22" height="44">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="529" y="215" width="44" height="47">
+  <object id="14" type="info" x="529" y="215" width="44" height="47">
    <properties>
     <property name="info" value="These doors are locked."/>
    </properties>
   </object>
-  <object type="info" x="866" y="217" width="22" height="47">
+  <object id="15" type="info" x="866" y="217" width="22" height="47">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
diff --git a/src/maps/baseball.tmx b/src/maps/baseball.tmx
index 64f9b174b..ecd5d5977 100644
--- a/src/maps/baseball.tmx
+++ b/src/maps/baseball.tmx
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="22" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="249"/>
-  <property name="green" value="154"/>
-  <property name="offset" value="0"/>
-  <property name="red" value="125"/>
   <property name="soundtrack" value="audio/music/britta-bot.ogg"/>
   <property name="title" value="Baseball with Cornelius"/>
  </properties>
@@ -15,6 +11,11 @@
  <tileset firstgid="121" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="backbackground" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjY2BgYBvFo3gUj+JhgAFy/wc5
+  </data>
+ </layer>
  <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
    eJztzEVOg2EUhtEyYAslwbVYgherkNDirgUKxd2d5XNI/sG3gTLqm5zBTW6eWKyyyv5vcWqCu5Y66mmgkSaaaaGVNtrpIEEnXaQi3fTQG3T76GeAQYYYZoQko4wxzgSTUStNkQ0yZJkKutPkyDPDLHPMs8AiSyyzwiprrAfdP5tssc0OuxTYY5+D6P+QI0occ8IpZ5xzEXQvueKaG265454HHnnimRdeeeOdDz754pufqFtVJtVl8gs3bR3E
@@ -35,14 +36,14 @@
    eJxjYBgFo2AUjALsoJJGmFYAAHZ/Cmc=
   </data>
  </layer>
- <objectgroup name="nodes" width="22" height="14">
-  <object type="cornelius_head" x="384" y="48" width="90" height="139"/>
-  <object name="baseball" type="projectile" x="360" y="120" width="9" height="9">
+ <objectgroup name="nodes">
+  <object id="1" type="cornelius_head" x="384" y="48" width="90" height="139"/>
+  <object id="2" name="baseball" type="projectile" x="360" y="120" width="9" height="9">
    <properties>
     <property name="foreground" value="true"/>
    </properties>
   </object>
-  <object name="main" type="door" x="24" y="240" width="24" height="48">
+  <object id="3" name="main" type="door" x="24" y="240" width="24" height="48">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="sound" value="false"/>
diff --git a/src/maps/borchert-hallway.tmx b/src/maps/borchert-hallway.tmx
index 85809263e..249743a0d 100644
--- a/src/maps/borchert-hallway.tmx
+++ b/src/maps/borchert-hallway.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="39" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="39" height="14" tilewidth="24" tileheight="24" nextobjectid="9">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="159"/>
-  <property name="green" value="123"/>
-  <property name="red" value="104"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
@@ -16,38 +13,38 @@
  </tileset>
  <layer name="Tile Layer 1" width="39" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjZGBwYBykmImBgWEQ4wODFTOMghEPRIBYFIjFBtohSMAcmKktGAfaFdiBP9BdAVRymyQQS2GhiQUyDAwNMmhicmh8eTR+Fg6MzW0w82E0KW4zAeoxQRMzI8An1m2GSObDaCMs6phHMVmYcRBjAFTfNdY=
+   eJxjZGBwYBykmImBgWEQ4wODFbMB3TeKR/Fgw+bATG3BOPDuwIb9ge4KoJLbJIFYCgtNrH4ZBoYGGTQxOTS+PBo/CwfG5jaY+TCaFLeZAPWYoImZEeAT6zZDJPNhtBEWdcyjmCzMOIgxANdwO+s=
   </data>
  </layer>
  <layer name="Tile Layer 2" width="39" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFww3UMDA4IONqND5U7AC6GDH6KMEg89Ddmoxd7AAhPyZTJaQIugObugYizKIqwOEObGIN5JiFDTRB1Cpgw01I9lDDbaGMDAxhjMS7DZ+6ZCLdlgHFyHoUgdiHgWFBCjAtAOkDikTaSYnbZAnoRdYDdBNDCoROINZOct0GzK8MplAahKuhNAxAxRpqkPg1SGqQ9eECNUSqg9lDSN0oGLoAAIKVRDw=
+   eJxjYBgFww3UMDA4IONqND5U7AC6GDH6KMEg89Ddmoxd7AAhPyZTJaQIugObugYizKIqwOEObGINMLYIEIsCsRgR+rCBJohaBWy4CckeUtxmzsjAYMGIKRcKFAtjJN5t+NQlE+m2DCiG6fEH2h8AxD4MDAtSgGkBSB9QJNJOdPMlgVgKC43NbbJY7JABqpNB848cA9htDCkQOkEeTV8WDozNbTDzYTQ2twHzK4MplAbhaihtAlRnghBrANFmSOrQ+dV43FaDps4QyXwYbYRkD0zdKBh+AABfhFEc
   </data>
  </layer>
- <layer name="Tile Layer 3" width="39" height="14">
+ <layer name="Tile Layer 3" width="39" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgF5AL/gXYAFADd0YBNnIOGdipQoNcbqj+dDL349HhDaVxmazIyMGgBsTYjfjsUyHAXsQCX2Y5ANzkBsTMd3BYJxFFAHA3EMUAcC8RxVDCbWP2RQD9GAXE0Fr8WAnEREBcDcQkQlwJxGdRsRaB6JTQ9nEDMRYSdFmh8JSBWxqE2E4jroeyVQLyKCLMtge6yIhB3IPAfRKCpCwDio1D2Wjx6QW5qAOJGKP8gEB8iYB/I7DQgriPsNAZxoLsk0NxmDsR3oeypSOJTUZUxTEHj3wTiWzjsCQfiCCRzpiHJTQfiGUg0MkC3cxQMHwAA2IQfgA==
   </data>
  </layer>
- <layer name="collision" width="39" height="14">
+ <layer name="collision" width="39" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJx7yMjA8HCQ4lEwCkbBKBgFhMFvRuyYXkCIiX52fWMcvHgUkAcAbV1ODA==
   </data>
  </layer>
- <objectgroup name="nodes" width="39" height="14">
-  <object name="main" type="door" x="144" y="216" width="48" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="main" type="door" x="144" y="216" width="48" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="borchert"/>
    </properties>
   </object>
-  <object name="bathroom-mens" type="door" x="264" y="216" width="24" height="60">
+  <object id="2" name="bathroom-mens" type="door" x="264" y="216" width="24" height="60">
    <properties>
     <property name="level" value="mens-bathroom"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="bathroom-womans" type="door" x="360" y="216" width="24" height="60">
+  <object id="3" name="bathroom-womans" type="door" x="360" y="216" width="24" height="60">
    <properties>
     <property name="info" value="To use this bathroom, you must have a key to the ladies room."/>
     <property name="key" value="ladiesroom"/>
@@ -55,23 +52,23 @@
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="jerry" type="npc" x="528" y="234" width="48" height="48"/>
-  <object type="info" x="24" y="216" width="24" height="48">
+  <object id="4" name="jerry" type="npc" x="528" y="234" width="48" height="48"/>
+  <object id="5" type="info" x="24" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="720" y="216" width="96" height="48">
+  <object id="6" type="info" x="720" y="216" width="96" height="48">
    <properties>
     <property name="info" value="The pool is currently closed for refurbishment."/>
    </properties>
   </object>
-  <object type="info" x="384" y="192" width="48" height="72">
+  <object id="7" type="info" x="384" y="192" width="48" height="72">
    <properties>
     <property name="info" value="That's good no-no juice."/>
    </properties>
   </object>
-  <object type="info" x="72" y="216" width="24" height="48">
+  <object id="8" type="info" x="72" y="216" width="24" height="48">
    <properties>
     <property name="info" value="Hello, rich people?"/>
    </properties>
diff --git a/src/maps/castle-hawkthorne-entrance.tmx b/src/maps/castle-hawkthorne-entrance.tmx
index e77de3e58..0b8628a32 100644
--- a/src/maps/castle-hawkthorne-entrance.tmx
+++ b/src/maps/castle-hawkthorne-entrance.tmx
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="37" height="23" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="37" height="23" tilewidth="24" tileheight="24" nextobjectid="17">
  <properties>
-  <property name="blue" value="0"/>
-  <property name="green" value="0"/>
   <property name="offset" value="9"/>
   <property name="overworldName" value="caverns"/>
-  <property name="red" value="0"/>
   <property name="soundtrack" value="castle-entrance"/>
  </properties>
  <tileset firstgid="1" name="castle-hawkthorne-entrance" tilewidth="24" tileheight="24">
@@ -56,53 +53,53 @@
    eJztzlsz1HEAxvH/cqPS7pbDvaJdEfeS7BLuK4VS7qPY7eQtkKK3EOXwFopObyGd3wIlh04zPm/BMH5jZp+Zz/XzjaLdbz0WRRtsssVv/vCXf/yP7cHJDhcviqIESY5xnDLKqaCyaP+bUj7T1HKaOuo5QwONAZpafWbI0kY7F+igk64ATT0+e+njGtfp5wY3GQjQNOIzR5673OM+D3jIaICmMZ/jPGKCxzxhkimeBmh65nOaGZ7zglnmmGchQNNLn69YZInXvOEt73gfoOmDz2U+8onPfOEr3/geoGnF5yo/+Mkav1hng80ATSXFUXSIwxyhlKPESZAs3v+mKp8nOEk1NZwiRZraAE1NPs/SzDlaOE8rGbIBmi76vMRlurnCVXropS9A0y2fgwxxmzsMM0KOfICmwgor7OBvG2e7Qs0=
   </data>
  </layer>
- <objectgroup name="floorspace" width="37" height="23">
-  <object x="0" y="336">
+ <objectgroup name="floorspace">
+  <object id="1" x="0" y="336">
    <properties>
     <property name="primary" value="true"/>
    </properties>
    <polygon points="0,0 360,0 360,24 408,24 432,24 456,24 473,-2 554,-2 540,22 584,22 600,15 707,15 696,72 648,144 600,192 552,216 328,218 292,156 -2,157 0,120 288,120 288,96 264,96 245,64 0,63"/>
   </object>
-  <object x="365" y="380">
+  <object id="2" x="365" y="380">
    <properties>
     <property name="height" value="24"/>
    </properties>
    <polygon points="1,4 47,4 63,-8 16,-8"/>
   </object>
-  <object x="96" y="377" width="72" height="6">
+  <object id="3" x="96" y="377" width="72" height="6">
    <properties>
     <property name="height" value="1000"/>
    </properties>
   </object>
-  <object x="428" y="478">
+  <object id="4" x="428" y="478">
    <properties>
     <property name="height" value="24"/>
    </properties>
    <polygon points="20,4 39,4 36,0 22,0"/>
   </object>
-  <object x="18" y="382">
+  <object id="5" x="18" y="382">
    <properties>
     <property name="height" value="24"/>
    </properties>
    <polygon points="20,4 39,4 36,0 22,0"/>
   </object>
  </objectgroup>
- <objectgroup color="#000000" name="nodes" width="37" height="23">
-  <object type="door" x="0" y="0" width="24" height="482">
+ <objectgroup color="#000000" name="nodes">
+  <object id="6" type="door" x="0" y="0" width="24" height="482">
    <properties>
     <property name="instant" value="true"/>
     <property name="level" value="seabluff"/>
     <property name="to" value="seabluff-to-castle"/>
    </properties>
   </object>
-  <object type="sprite" x="432" y="456" width="48" height="24">
+  <object id="7" type="sprite" x="432" y="456" width="48" height="24">
    <properties>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/castle/castle-rock.png"/>
     <property name="width" value="48"/>
    </properties>
   </object>
-  <object type="sprite" x="0" y="0" width="288" height="384">
+  <object id="8" type="sprite" x="0" y="0" width="288" height="384">
    <properties>
     <property name="depth" value="3"/>
     <property name="height" value="384"/>
@@ -110,21 +107,21 @@
     <property name="width" value="288"/>
    </properties>
   </object>
-  <object type="sprite" x="24" y="360" width="48" height="24">
+  <object id="9" type="sprite" x="24" y="360" width="48" height="24">
    <properties>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/castle/castle-rock.png"/>
     <property name="width" value="48"/>
    </properties>
   </object>
-  <object type="sprite" x="0" y="480" width="312" height="24">
+  <object id="10" type="sprite" x="0" y="480" width="312" height="24">
    <properties>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/castle/entrance_bridge.png"/>
     <property name="width" value="312"/>
    </properties>
   </object>
-  <object name="next" type="door" x="489" y="254" width="47" height="82">
+  <object id="11" name="next" type="door" x="489" y="254" width="47" height="82">
    <properties>
     <property name="aniframes2" value="1-7,1"/>
     <property name="anispeed2" value="0.25"/>
@@ -142,7 +139,7 @@
     <property name="trigger" value="doortriggers.pedestal"/>
    </properties>
   </object>
-  <object type="sprite" x="441" y="312" width="24" height="24">
+  <object id="12" type="sprite" x="441" y="312" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -150,7 +147,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="560" y="312" width="24" height="24">
+  <object id="13" type="sprite" x="560" y="312" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -158,9 +155,9 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object name="master" type="key" x="600" y="456" width="24" height="24"/>
-  <object name="main" type="door" x="48" y="432" width="24" height="50"/>
-  <object type="hiddendoortrigger" x="360" y="336" width="72" height="48">
+  <object id="14" name="master" type="key" x="600" y="456" width="24" height="24"/>
+  <object id="15" name="main" type="door" x="48" y="432" width="24" height="50"/>
+  <object id="16" type="hiddendoortrigger" x="360" y="336" width="72" height="48">
    <properties>
     <property name="height" value="52"/>
     <property name="needKey" value="white_crystal"/>
diff --git a/src/maps/castle-hawkthorne-room-1.tmx b/src/maps/castle-hawkthorne-room-1.tmx
index 80087203c..0cd4694cf 100644
--- a/src/maps/castle-hawkthorne-room-1.tmx
+++ b/src/maps/castle-hawkthorne-room-1.tmx
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="100" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="0"/>
-  <property name="green" value="0"/>
-  <property name="offset" value="0"/>
   <property name="overworldName" value="caverns"/>
-  <property name="red" value="0"/>
   <property name="soundtrack" value="castle"/>
  </properties>
  <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
@@ -40,8 +36,8 @@
    eJzt2EEJACAABEHBJDY3qgjaYR8zcAn2d2uOvayycUeDHi16tOjRokeLHi16tOjRokeLHi16tPwegd/G3n9FywFP75pZ
   </data>
  </layer>
- <objectgroup color="#a41f05" name="nodes" width="100" height="14" visible="0">
-  <object type="sprite" x="336" y="192" width="24" height="24">
+ <objectgroup color="#a41f05" name="nodes" visible="0">
+  <object id="1" type="sprite" x="336" y="192" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -49,17 +45,17 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object name="tower" type="key" x="168" y="264" width="24" height="24">
+  <object id="2" name="tower" type="key" x="168" y="264" width="24" height="24">
    <properties>
     <property name="info" value="You found the {{red}}Tower{{white}} key!"/>
    </properties>
   </object>
-  <object name="main" type="door" x="230" y="216" width="47" height="72">
+  <object id="3" name="main" type="door" x="230" y="216" width="47" height="72">
    <properties>
     <property name="level" value="castle-hawkthorne"/>
     <property name="to" value="room1"/>
    </properties>
   </object>
-  <object name="dinosaur" type="vehicle" x="408" y="264" width="24" height="24"/>
+  <object id="4" name="dinosaur" type="vehicle" x="408" y="264" width="24" height="24"/>
  </objectgroup>
 </map>
diff --git a/src/maps/castle-hawkthorne-room-2.tmx b/src/maps/castle-hawkthorne-room-2.tmx
index 40a30311c..6555c698f 100644
--- a/src/maps/castle-hawkthorne-room-2.tmx
+++ b/src/maps/castle-hawkthorne-room-2.tmx
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="100" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="0"/>
-  <property name="green" value="0"/>
-  <property name="offset" value="0"/>
   <property name="overworldName" value="caverns"/>
-  <property name="red" value="0"/>
   <property name="soundtrack" value="castle"/>
  </properties>
  <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
@@ -40,8 +36,8 @@
    eJzt2LENACAMxMCXMkk2ZxRGgwIKJsCFT/oJnCpdSVeGQ2zuCcIeLPZgsQeLPVjswWIPFnuw2IPFHiz2YLk9AH8bd/5Xv29CrwVZAqN5
   </data>
  </layer>
- <objectgroup color="#a41f05" name="nodes" width="100" height="14" visible="0">
-  <object type="sprite" x="336" y="192" width="24" height="24">
+ <objectgroup color="#a41f05" name="nodes" visible="0">
+  <object id="1" type="sprite" x="336" y="192" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -49,17 +45,17 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object name="bluetower" type="key" x="168" y="264" width="24" height="24">
+  <object id="2" name="bluetower" type="key" x="168" y="264" width="24" height="24">
    <properties>
     <property name="info" value="You found the {{red}}Blue Tower{{white}} key!"/>
    </properties>
   </object>
-  <object name="main" type="door" x="230" y="216" width="47" height="72">
+  <object id="3" name="main" type="door" x="230" y="216" width="47" height="72">
    <properties>
     <property name="level" value="castle-hawkthorne"/>
     <property name="to" value="room2"/>
    </properties>
   </object>
-  <object name="robot" type="vehicle" x="408" y="264" width="24" height="24"/>
+  <object id="4" name="robot" type="vehicle" x="408" y="264" width="24" height="24"/>
  </objectgroup>
 </map>
diff --git a/src/maps/castle-hawkthorne-room-3.tmx b/src/maps/castle-hawkthorne-room-3.tmx
index d31ae6d18..9bac46c24 100644
--- a/src/maps/castle-hawkthorne-room-3.tmx
+++ b/src/maps/castle-hawkthorne-room-3.tmx
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="100" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="0"/>
-  <property name="green" value="0"/>
-  <property name="offset" value="0"/>
   <property name="overworldName" value="caverns"/>
-  <property name="red" value="0"/>
   <property name="soundtrack" value="castle"/>
  </properties>
  <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
@@ -40,8 +36,8 @@
    eJzt2LEJADAMxMAHT5LNM4pHCwE3mSAqdPATyJVXpVdlO8Rui44Q7MFiDxZ7sNiDxR4s9mCxB4s9WOzBYg+W6RHA38bN/+r3Teh1AMz7rHk=
   </data>
  </layer>
- <objectgroup color="#a41f05" name="nodes" width="100" height="14" visible="0">
-  <object type="sprite" x="336" y="192" width="24" height="24">
+ <objectgroup color="#a41f05" name="nodes" visible="0">
+  <object id="1" type="sprite" x="336" y="192" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -49,17 +45,17 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object name="keyshardtop" type="material" x="168" y="264" width="24" height="24">
+  <object id="2" name="keyshardtop" type="material" x="168" y="264" width="24" height="24">
    <properties>
     <property name="info" value="You found the top half of a key!"/>
    </properties>
   </object>
-  <object name="main" type="door" x="230" y="216" width="47" height="72">
+  <object id="3" name="main" type="door" x="230" y="216" width="47" height="72">
    <properties>
     <property name="level" value="castle-hawkthorne"/>
     <property name="to" value="room3"/>
    </properties>
   </object>
-  <object name="helicopter" type="vehicle" x="408" y="264" width="24" height="24"/>
+  <object id="4" name="helicopter" type="vehicle" x="408" y="264" width="24" height="24"/>
  </objectgroup>
 </map>
diff --git a/src/maps/castle-hawkthorne-room-4.tmx b/src/maps/castle-hawkthorne-room-4.tmx
index 90482505e..39f84e2ff 100644
--- a/src/maps/castle-hawkthorne-room-4.tmx
+++ b/src/maps/castle-hawkthorne-room-4.tmx
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="100" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="14" tilewidth="24" tileheight="24" nextobjectid="6">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="0"/>
-  <property name="green" value="0"/>
-  <property name="offset" value="0"/>
   <property name="overworldName" value="caverns"/>
-  <property name="red" value="0"/>
   <property name="soundtrack" value="castle"/>
  </properties>
  <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
@@ -40,8 +36,8 @@
    eJzt2LEJADAMxMAHT5LNM4pHCwE3mSAqdPATyJVXpVdlO8Rui44Q7MFiDxZ7sNiDxR4s9mCxB4s9WOzBYg+W6RHA38bN/+r3Teh1AMz7rHk=
   </data>
  </layer>
- <objectgroup color="#a41f05" name="nodes" width="100" height="14" visible="0">
-  <object type="sprite" x="336" y="192" width="24" height="24">
+ <objectgroup color="#a41f05" name="nodes" visible="0">
+  <object id="1" type="sprite" x="336" y="192" width="24" height="24">
    <properties>
     <property name="animation" value="1-3,1"/>
     <property name="height" value="24"/>
@@ -49,18 +45,18 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object name="keyshardbottom" type="material" x="168" y="264" width="24" height="24">
+  <object id="2" name="keyshardbottom" type="material" x="168" y="264" width="24" height="24">
    <properties>
     <property name="info" value="You found the bottom half of a key!"/>
    </properties>
   </object>
-  <object name="main" type="door" x="230" y="216" width="47" height="72">
+  <object id="3" name="main" type="door" x="230" y="216" width="47" height="72">
    <properties>
     <property name="level" value="castle-hawkthorne"/>
     <property name="to" value="room4"/>
    </properties>
   </object>
-  <object name="blimp" type="vehicle" x="408" y="264" width="24" height="24"/>
-  <object name="bomb" type="vehicle" x="1392" y="264" width="24" height="24"/>
+  <object id="4" name="blimp" type="vehicle" x="408" y="264" width="24" height="24"/>
+  <object id="5" name="bomb" type="vehicle" x="1392" y="264" width="24" height="24"/>
  </objectgroup>
 </map>
diff --git a/src/maps/class-basement.tmx b/src/maps/class-basement.tmx
index 939c36e60..2fa18c16b 100644
--- a/src/maps/class-basement.tmx
+++ b/src/maps/class-basement.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="72" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="72" height="12" tilewidth="24" tileheight="24" nextobjectid="23">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="115"/>
-  <property name="green" value="109"/>
-  <property name="red" value="105"/>
   <property name="soundtrack" value="greendale-alt"/>
  </properties>
  <tileset firstgid="1" name="greendale-hallways" tilewidth="24" tileheight="24">
@@ -13,71 +10,71 @@
  <tileset firstgid="481" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="Tile Layer 1" width="72" height="14">
+ <layer name="Tile Layer 1" width="72" height="12">
   <data encoding="base64" compression="zlib">
-   eJzt1zEOgCAMBdAq8RZ6C929hBzChDu4yC28qwwdapNiiBoc/vACQ9OWv+GJyIOpIZrB1qaMAOAbC2Q5VnuPPwkC8rmKyS5Y+fTivgq53gPRNry8r9XTmlM6X9cfnEtQ+XTKKO4yH10nTekt001NKaunNad0vq6PLPDpAB5oIKv2/+/vTiCJrEk=
+   eJzt0LENgCAQBdBD4hayhfTOY8IONrIFu0pxxUlyGBSjxS9eoLjch2+IFgOqgYgA4B0jVFn29Tv+JAjo5yxmu6D1M4n7KtR2O6LNdX6vtlPLac0v5xP3Ei76mW/04/NffOd+tJ1aTmt+OR9Z4NMCPGCg6gB6gSqp
   </data>
  </layer>
- <layer name="Tile Layer 2" width="72" height="14">
+ <layer name="Tile Layer 2" width="72" height="12">
   <data encoding="base64" compression="zlib">
-   eJztUUtOw0AMnUGCO4AEClyBj4AbQIAbgISQ2lXSFUhQKqVINPw2sIMN3y1ryimAG3AUnqmHOu4kIFZdzJOe4vHY79kTYwICAgIChhEpswHWwYjzMX9bxmQtjlGTpaJHcgc87seFuobQk5Dahv2dT8SaQj8j/aTEP+XZta/Px7dHpHrqXLcKroA5e2sPSdRk1JtYnG1xV9plHrkF29uFcqeIz+x3348G7djxaCci73xIcxT9Y0KzCpF4Y2P6vk7b/b/co0W9ce/+U99ti/rF34YgH8zbAdvgEb8T7bKOeEPsco/4ge+n8Z0BLThiBzVfkOuCr+KONCdxnlLv8yz6NnG3ZQdnz5E7EVqziOfAc/DC41+29wF899V71kRcuFC4hs+NeB8H379eQt0yOA5O2GJBG3xD7h38UO9TpUnYRf2eZ99b5O5EPka8Bj6CT6q+ZspxBd9L8BCxpFGxUTnNpqhpevT+wyrNslmqZvxLfUBAQMCw4Av8Km/Q
+   eJztUcsuBFEQvVfCP5CQ5hc8gj+g8QckIplZdc+KhDFJj8S014YdG8+ttfEV+AOf4pSpa6prbjexYHNPctJ161adU3XbmICAgID/QcpsgHUw4nzM35YxWYtj1GSp6JHcAg/7caGuIfQkpLZhf+cTsabQz0g/KfFPeXbt6/Px7RGpnjrXLYNLYM7e2kMSNRn1JhZnW9yVdplFbs72dqHcMeIT+9n3pUE7djzaicg7H9IcRv+I0KxCJN7YmL6v03b/L/doUW/cu3/Xd5uifv67IcgH83bANnjA70S7rCJeE7vcIr7j+0l8p0ALDtlBzSfkuuCzuCPNcZwn1Ps8ir513G3Ywdlz5I6E1jTiGfAUPPP4l+29B99d9Z41ERcuFC7hcyXex8H3rxdQtwiOgmO2WNAGX5B7Bd/U+1RpErZRv+PZ9xq5G5GPEa+A9+CDqq+ZclzA9xzcRyxpVGxUTrMpapoevd+wSrNslqoZf1IfEBDwd/gAKbdv0A==
   </data>
  </layer>
- <layer name="Tile Layer 3" width="72" height="14">
+ <layer name="Tile Layer 3" width="72" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKBA/4D7QAcAOiuBiQ23e2kJsjDwabEPFLNBKnJBeI2IG4lwz5qqoOBA4wMCTeAmERtBIECAXlvaltIAGTQ2T4QUGZkYFBhxC5ngUXsLxD/o5LdzUB7W4BYEU18Jg71VkSaWw+l1xKpvhGI63DIWQPdZ4MlfNJwqBcFqhXDEZ7E6EcGs4HmzCHCLHQwlYD8ZCRMrHnTCJhFrDsIuY1cQCtzR8EoGAWjgBIAAI5VGf8=
+   eJxjYBgFo2AU0BL4D7QDcACguxqQ2HS3k5ogDwebEvNINROkJheI24C4lQz7qKkOBg4wMiTcAGIStREECgTkvaltIQGQQWf7QECZkYFBhRG7nAUWsb9A/I9KdjcD7W0BYkU08Zk41FsRaW49lF5LpPpGIK7DIWcNdJ8NlvBJw6FeFKhWDEd4EqMfGcwGmjOHCLPQwVQC8pORMLHmTSNgFrHuIOQ2cgGtzB0Fo2AU4AcATKIZ/w==
   </data>
  </layer>
- <layer name="collision" width="72" height="14">
+ <layer name="collision" width="72" height="12">
   <data encoding="base64" compression="zlib">
-   eJztzKENACAMBdG2EwD7L8cSGAw43FetIfeSs2cGZTqpAAD41fYXtBFm7dYj55XxqbScVADqHDaNiF0=
+   eJztzKENACAMAMG2EwD7L9clMBhwKGoohvwlb99VxOkYAAC/GrpDrJlIWVXLeWV8XupKUcCNCcPHiF0=
   </data>
  </layer>
- <objectgroup name="nodes" width="72" height="14">
-  <object name="main" type="door" x="0" y="192" width="48" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="main" type="door" x="0" y="168" width="48" height="60">
    <properties>
     <property name="level" value="class-hallway"/>
     <property name="sound" value="false"/>
     <property name="to" value="basement"/>
    </properties>
   </object>
-  <object type="firealarm" x="96" y="192" width="24" height="48"/>
-  <object type="firealarm" x="912" y="192" width="24" height="48"/>
-  <object type="firealarm" x="1224" y="192" width="24" height="48"/>
-  <object type="firealarm" x="1584" y="192" width="24" height="48"/>
-  <object name="duncan" type="door" x="1536" y="192" width="24" height="60">
+  <object id="2" type="firealarm" x="96" y="168" width="24" height="48"/>
+  <object id="3" type="firealarm" x="912" y="168" width="24" height="48"/>
+  <object id="4" type="firealarm" x="1224" y="168" width="24" height="48"/>
+  <object id="5" type="firealarm" x="1584" y="168" width="24" height="48"/>
+  <object id="6" name="duncan" type="door" x="1536" y="168" width="24" height="60">
    <properties>
     <property name="level" value="winterwonderland"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="info" x="1248" y="192" width="24" height="48">
+  <object id="7" type="info" x="1248" y="168" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="1104" y="192" width="24" height="48">
+  <object id="8" type="info" x="1104" y="168" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="960" y="192" width="48" height="48">
+  <object id="9" type="info" x="960" y="168" width="48" height="48">
    <properties>
     <property name="info" value="These doors are locked."/>
    </properties>
   </object>
-  <object type="info" x="456" y="192" width="48" height="48">
+  <object id="10" type="info" x="456" y="168" width="48" height="48">
    <properties>
     <property name="info" value="These doors are locked."/>
    </properties>
   </object>
-  <object type="info" x="144" y="192" width="24" height="48">
+  <object id="11" type="info" x="144" y="168" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object name="vent" type="door" x="1680" y="192" width="24" height="60"/>
-  <object type="sprite" x="1656" y="168" width="24" height="24">
+  <object id="12" name="vent" type="door" x="1680" y="168" width="24" height="60"/>
+  <object id="13" type="sprite" x="1656" y="144" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -85,7 +82,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1680" y="168" width="24" height="24">
+  <object id="14" type="sprite" x="1680" y="144" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -93,7 +90,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1704" y="168" width="24" height="24">
+  <object id="15" type="sprite" x="1704" y="144" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -101,7 +98,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1656" y="192" width="24" height="24">
+  <object id="16" type="sprite" x="1656" y="168" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -109,7 +106,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1704" y="192" width="24" height="24">
+  <object id="17" type="sprite" x="1704" y="168" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -117,7 +114,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1416" y="144" width="24" height="24">
+  <object id="18" type="sprite" x="1416" y="120" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -125,7 +122,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1032" y="120" width="24" height="24">
+  <object id="19" type="sprite" x="1032" y="96" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -133,7 +130,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="1296" y="120" width="24" height="24">
+  <object id="20" type="sprite" x="1296" y="96" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -141,7 +138,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="456" y="120" width="24" height="24">
+  <object id="21" type="sprite" x="456" y="96" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
@@ -149,7 +146,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="672" y="144" width="24" height="24">
+  <object id="22" type="sprite" x="672" y="120" width="24" height="24">
    <properties>
     <property name="animation" value="1-2,1"/>
     <property name="height" value="24"/>
diff --git a/src/maps/class-hallway-2.tmx b/src/maps/class-hallway-2.tmx
index c7c143fcd..aff4be484 100644
--- a/src/maps/class-hallway-2.tmx
+++ b/src/maps/class-hallway-2.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="92" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="92" height="14" tilewidth="24" tileheight="24" nextobjectid="18">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="159"/>
-  <property name="green" value="123"/>
-  <property name="red" value="104"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Class Hallway 2"/>
  </properties>
@@ -14,6 +11,11 @@
  <tileset firstgid="481" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="background" width="92" height="14">
+  <data encoding="base64" compression="zlib">
+   eJztw0ENAAAMA6F71b/kCRkkrJqqqqqq+vIBJVAeMQ==
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="92" height="14">
   <data encoding="base64" compression="zlib">
    eJztlT0KwkAQhXeNnsLYG9BC0T4p9RJa22mjpTfQW+ghFDyAv6A38PcWPsFAGLJhN4YNyDz4ip2d2Zl5KSKF8CVjjYIQgrHKhrGHYLFYrIzkfMlCDfyAmzKjx3LSHhwM8h3sW9TY2SF8VENdndQewUmzdwe13YTeK9ytc/geW7DTzL2DB4kNMfNIMXcZcTel33F6gpfGnDo6Y65LDn5fwS1FXQ+z9sEMzH+cO8nvCjm7Bu96Qky9mPggQqiqZp4q10QmO4S9xvB4AhZgqfCbeqUS9bsUoU3OLXJOIoDfQUw86mMY8zXzVLkmmOxg0ot6pYL6zTD/iGSs8gbMi39G
@@ -34,73 +36,73 @@
    eJztzjEOABAMRuHWCXD/y7mExWKR2GiiMfC+5G3NT1GRQtcCAAAA8J6mM4+7H+QgEkcp+O5a97Lh/d2eZePkj6v7qnQz4GUdOnOxPg==
   </data>
  </layer>
- <objectgroup name="nodes" width="92" height="14">
-  <object name="main" type="door" x="2160" y="216" width="48" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="main" type="door" x="2160" y="216" width="48" height="60">
    <properties>
     <property name="level" value="class-hallway"/>
     <property name="sound" value="false"/>
     <property name="to" value="classHallway2"/>
    </properties>
   </object>
-  <object type="info" x="2019" y="207" width="41" height="58">
+  <object id="2" type="info" x="2019" y="207" width="41" height="58">
    <properties>
     <property name="info" value="Vending machines - getting in is easier than getting out."/>
    </properties>
   </object>
-  <object type="info" x="1974" y="217" width="35" height="47">
+  <object id="3" type="info" x="1974" y="217" width="35" height="47">
    <properties>
     <property name="info" value="Yummy hot water, with just a touch of coffee flavour."/>
    </properties>
   </object>
-  <object type="info" x="1947" y="216" width="9" height="46">
+  <object id="4" type="info" x="1947" y="216" width="9" height="46">
    <properties>
     <property name="info" value="A note on the extinguisher reads ... | I.O.U. one recharge - the Dean"/>
    </properties>
   </object>
-  <object type="firealarm" x="1896" y="216" width="24" height="48"/>
-  <object type="firealarm" x="1416" y="216" width="24" height="48"/>
-  <object type="firealarm" x="984" y="216" width="24" height="48"/>
-  <object type="firealarm" x="720" y="216" width="24" height="48"/>
-  <object type="firealarm" x="144" y="216" width="24" height="48"/>
-  <object type="info" x="1920" y="216" width="24" height="48">
+  <object id="5" type="firealarm" x="1896" y="216" width="24" height="48"/>
+  <object id="6" type="firealarm" x="1416" y="216" width="24" height="48"/>
+  <object id="7" type="firealarm" x="984" y="216" width="24" height="48"/>
+  <object id="8" type="firealarm" x="720" y="216" width="24" height="48"/>
+  <object id="9" type="firealarm" x="144" y="216" width="24" height="48"/>
+  <object id="10" type="info" x="1920" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="1392" y="216" width="24" height="48">
+  <object id="11" type="info" x="1392" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="216" y="216" width="24" height="48">
+  <object id="12" type="info" x="216" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="0" y="144" width="48" height="120">
+  <object id="13" type="info" x="0" y="144" width="48" height="120">
    <properties>
     <property name="info" value="This stairwell is out of use due to a mild mould issue."/>
    </properties>
   </object>
-  <object name="potteryclass" type="door" x="480" y="216" width="48" height="60">
+  <object id="14" name="potteryclass" type="door" x="480" y="216" width="48" height="60">
    <properties>
     <property name="level" value="potteryclass"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="biology" type="door" x="1656" y="216" width="24" height="60">
+  <object id="15" name="biology" type="door" x="1656" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-biology"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="anthroright" type="door" x="1008" y="216" width="24" height="60">
+  <object id="16" name="anthroright" type="door" x="1008" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-anthropology"/>
     <property name="to" value="rightdoor"/>
    </properties>
   </object>
-  <object name="anthroleft" type="door" x="744" y="216" width="24" height="60">
+  <object id="17" name="anthroleft" type="door" x="744" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-anthropology"/>
     <property name="to" value="leftdoor"/>
diff --git a/src/maps/class-hallway.tmx b/src/maps/class-hallway.tmx
index a37d6ccf0..9bec93943 100644
--- a/src/maps/class-hallway.tmx
+++ b/src/maps/class-hallway.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="92" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="92" height="14" tilewidth="24" tileheight="24" nextobjectid="20">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="153"/>
-  <property name="green" value="195"/>
-  <property name="red" value="219"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Class Hallway 1"/>
  </properties>
@@ -14,6 +11,11 @@
  <tileset firstgid="481" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="background" width="92" height="14">
+  <data encoding="base64" compression="zlib">
+   eJztw0ENAAAMA6F71b/kCRkkrJqqqqqq+vIBJVAeMQ==
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="92" height="14">
   <data encoding="base64" compression="zlib">
    eJzt1EkKwjAUBuAXPYUDikdwwLXn8RS9gtMhnJa6dlzq3uku/lACEkLKa/VJy/vho6RJSfpDa4gGRokpEZEStVNySKPJWUb4MY9hAlOYmX+fqNiZo98FLGEFa+37p9mj3wMc4QRnT99lhyZ9buj3Dg94witj3xWoeq4SaQXmNnivbU6+3TR912KR2/fQw3ffps44Z2jtBV1fE/r+1l6+NAJzTWfM6bsNHejGIju24fbdS9jvM5y1WZ/n7tVnzLl9K1VERol6A0q/ftA=
@@ -34,88 +36,88 @@
    eJztzLEJACAMBdHECdT9l3MJGxvtFSEgEeUeXBM+KSpSyC0AAAAAb2k6t7rjrhxE4iiFM/ts/LXbWn5ZVCXPgJ91MtWzwA==
   </data>
  </layer>
- <objectgroup name="nodes" width="92" height="14">
-  <object name="classHallway2" type="door" x="2160" y="216" width="48" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="classHallway2" type="door" x="2160" y="216" width="48" height="60">
    <properties>
     <property name="level" value="class-hallway-2"/>
     <property name="sound" value="false"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="main" type="door" x="264" y="216" width="48" height="60">
+  <object id="2" name="main" type="door" x="264" y="216" width="48" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="classHallway"/>
    </properties>
   </object>
-  <object name="basement" type="door" x="0" y="216" width="48" height="60">
+  <object id="3" name="basement" type="door" x="0" y="216" width="48" height="60">
    <properties>
     <property name="level" value="class-basement"/>
     <property name="sound" value="false"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="firealarm" x="48" y="216" width="24" height="48"/>
-  <object type="firealarm" x="984" y="216" width="24" height="48"/>
-  <object type="firealarm" x="1368" y="216" width="24" height="48"/>
-  <object type="firealarm" x="2112" y="216" width="24" height="48"/>
-  <object type="info" x="96" y="216" width="48" height="48">
+  <object id="4" type="firealarm" x="48" y="216" width="24" height="48"/>
+  <object id="5" type="firealarm" x="984" y="216" width="24" height="48"/>
+  <object id="6" type="firealarm" x="1368" y="216" width="24" height="48"/>
+  <object id="7" type="firealarm" x="2112" y="216" width="24" height="48"/>
+  <object id="8" type="info" x="96" y="216" width="48" height="48">
    <properties>
     <property name="info" value="What is Abed's special drink?"/>
    </properties>
   </object>
-  <object type="info" x="144" y="240" width="24" height="24">
+  <object id="9" type="info" x="144" y="240" width="24" height="24">
    <properties>
     <property name="info" value="Insufficient funds!"/>
    </properties>
   </object>
-  <object type="info" x="528" y="216" width="24" height="48">
+  <object id="10" type="info" x="528" y="216" width="24" height="48">
    <properties>
     <property name="info" value="$0.25 per sip; no sharing."/>
    </properties>
   </object>
-  <object type="info" x="1992" y="216" width="24" height="48">
+  <object id="11" type="info" x="1992" y="216" width="24" height="48">
    <properties>
     <property name="info" value="$0.25 per sip; no returns."/>
    </properties>
   </object>
-  <object type="info" x="2090" y="217" width="15" height="47">
+  <object id="12" type="info" x="2090" y="217" width="15" height="47">
    <properties>
     <property name="info" value="The extinguisher reads ... | Expires in 1982."/>
    </properties>
   </object>
-  <object type="info" x="75" y="216" width="10" height="48">
+  <object id="13" type="info" x="75" y="216" width="10" height="48">
    <properties>
     <property name="info" value="The extinguisher reads ... | For entertainment purposes only"/>
    </properties>
   </object>
-  <object type="info" x="2064" y="216" width="24" height="48">
+  <object id="14" type="info" x="2064" y="216" width="24" height="48">
    <properties>
     <property name="info" value="Cleaning in progress.|Please use the restrooms at Borchert Hall."/>
    </properties>
   </object>
-  <object type="info" x="1896" y="216" width="24" height="48">
+  <object id="15" type="info" x="1896" y="216" width="24" height="48">
    <properties>
     <property name="info" value="Cleaning in progress.|Please use the restrooms at Borchert Hall."/>
    </properties>
   </object>
-  <object type="info" x="1608" y="216" width="24" height="48">
+  <object id="16" type="info" x="1608" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="1344" y="216" width="24" height="48">
+  <object id="17" type="info" x="1344" y="216" width="24" height="48">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object name="frythat" type="door" x="960" y="216" width="24" height="60">
+  <object id="18" name="frythat" type="door" x="960" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-fry"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="ladders" type="door" x="696" y="216" width="24" height="60">
+  <object id="19" name="ladders" type="door" x="696" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-ladders"/>
     <property name="to" value="main"/>
diff --git a/src/maps/deans-closet.tmx b/src/maps/deans-closet.tmx
index b71e77988..bebeada42 100644
--- a/src/maps/deans-closet.tmx
+++ b/src/maps/deans-closet.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="166" height="18" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="166" height="18" tilewidth="24" tileheight="24" nextobjectid="26">
  <properties>
-  <property name="blue" value="117"/>
-  <property name="green" value="117"/>
   <property name="offset" value="4"/>
-  <property name="red" value="117"/>
   <property name="soundtrack" value="dancingqueen"/>
   <property name="title" value="Dean's Closet"/>
  </properties>
@@ -14,6 +11,11 @@
  <tileset firstgid="122" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="background" width="166" height="18">
+  <data encoding="base64" compression="zlib">
+   eJztw0ENAAAMA6GTVf/KZmJPSFg1VVVVVVVVVVVVVVV9ftdujb8=
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="166" height="18">
   <data encoding="base64" compression="zlib">
    eJztWd1u60QQntRtkos4UgGpUXsACScOFwikcIFAIAI3IH7egUfxo5xH6aPhqeeLv0x21+vTpHB0OtLI9np3Z3bmmx8nIq/0Sq/0LlT/1wq80gdDa5Emd251QT3OTUMxtHkRLT4sOmfe2kbGrzpueGwsLot3UehMFDuXUj3w/rmksb7urll0dUFdPOXqNJbUps/JWz4/xvwzMWaqOvlNblzsxqkWJfVbIYdYOTwXkVyvZ0zhbmtcj6gVY6gizqHlJZQIUFsjmlanfc7c+vi+ic0DnsacN0Twl8rdmP8Q30welxsZtjf2RI28foaeTCXpo7wI6AfScwB3sdywJT43qcz/Iy5Nr30OLteGX2AzdQ59p/5GnkitSfVOW+nx6Flof5+PKhm2t3+fymlKub0tMDhv+d6uGPPY4/PE9LwkLnPsBLIa0Fj+b4bmumesy9VrP4RL6z0ab5/QOdb0Tllr44P0OK0Cc0P25ncx1r00Ny2Ny75Pary913KKf+8P7BOiWD9Sd9xw3p3YuZfEOxv3eTEUa0qo/7V7bzn+CR8WR4wV4bHIUQ62wJkqW2N9T5TeOBbpbcrr1nJaG+CnMjO2GZeQ4fMG4WDP9mE/Ff1+R7WhNF1CMYm5Hpc8NoRLPf+05Y/s3uMxlQ94XM/jcVkH5jKm+JwFvVc97qSr3yvb80F6XFoNOKrhPL4hXUJnrmzflhvsG2Jgz3CoNavxdRu8pHus86Rnurez3EmPgdr8izPBLxu3dmfXIeIazjmTeyHEq+45s2uo7mC+Py/sx2Nm+6cxxjmIfTSES7XnbcufyrFtY1wnav2dsxt0qN08tn/Ir8sEp87DfB2Z7+2KHmEvXXyq/jeSF6Mx/WM1/dpxzn5WS570+VJ6nMR6N/SKKVxyX6fPMzmOeeQ0lVFK7yv8ZlNYrcGz1x3jvFcoh2xtLu6Lrm41WM/fv7gOYPMQ4yFc1k6PsX7Ve/7WmZh9VpE+OcRD+XJCc/T+T+niU59bXD4O4bKQIz80IZuBkDNiNi6k7/Extujv97DJt3ZFT+h77bqff8LAtp1rP4RLYHfl/OJjKxSPEzmtbTE/le5e8/bXLX9j99or5MZyjDm3+5iIrQn9JsS/C7mxbFxeST4uTf6h3/TPHLuxOBqqNdxb+Pkcf5WTSfY55KiCciL3p/rs9UUOcvntgEveM2THIoCbj1v+hHDjc8+Y2laSXN1fY+T7ln+we32P743JqT9OcuMYXKZyT0myc/gS+VJ1Xpkd5gGeGXssjsEl5sGnKVzqFflhRqzPb5wdAvZs0J/f2xVnQN1h/3Au8naCHT1uPmv5c+lxk2v7EK8cLpfO3h4bd45zcMnfaF5PzCkia9g+O/IBP3vbpRjfCDm45G/+ufPVXPpvAz4H17dYPfM8IZ9yrCIX7AK6zZx89B2p/AP/ze36QDJKN59xTzZ6bPkf1QX9hGHoaP5Mwr2V+m0asYH3g7fpouMGV91/avuBb4y/yrA5x73H5crJDuVYxsLUbHljdp3KeFziOz6FS/599MF8Wpq8X+yKsVS+zI1dlfljyz/JMS517c+0B+OS/TEGl1jzK/lyBC7fmm5vGZcLk49+wL4DTnCpfrrN9BP7iPHI11vH2v8rf5dhc8TWIpAvuV/1Nd3nS+iB7w/8XrCwObm4HKrjse99laPy/urlBnvCRWCvHFz+1vLvzg4q8w/aU98hXtkf8FMIl5X1mwvDJdb8Tb7Ef2cxXKrsL87IKf+cU47n3HzJPoD/LqlXyj4vKfc95cdzcSpGzylnSC7HnR/39+36/Uuxs8eLyX0f+V+CgUXE
@@ -34,130 +36,130 @@
    eJzt2FEOwiAMxvGde+fYJXzxjGaJL5oCCl9L2f6/pIkvSlPKVtw2AAAAjUMUSo93XI26Toih6Hv2Hrgfj/ej9fs98SzEiiJmhoyzEmKVzo/X/q/QR1Y+33lmzn8G6oDTVe+68OMxbzDD9LPOcE/NIuvOc6etdhdS3QVG9jjbeR3JY7Re2Z9RmXMD1Fb9HwnAXK3Z1HqHMs9+1qD0eZboHHrWq31nF0aNcp1/1m3xzKuWZ+S6K4bKL33pQdGXEay+RNkLFaLUDw==
   </data>
  </layer>
- <objectgroup name="nodes" width="166" height="18" visible="0">
-  <object name="main" type="door" x="24" y="240" width="24" height="48">
+ <objectgroup name="nodes" visible="0">
+  <object id="1" name="main" type="door" x="24" y="240" width="24" height="48">
    <properties>
     <property name="level" value="deans-office-2"/>
     <property name="sound" value="false"/>
     <property name="to" value="filecabinet"/>
    </properties>
   </object>
-  <object type="enemy" x="240" y="96" width="47" height="47">
+  <object id="2" type="enemy" x="240" y="96" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="408" y="192" width="47" height="47">
+  <object id="3" type="enemy" x="408" y="192" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="744" y="336" width="47" height="47">
+  <object id="4" type="enemy" x="744" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="264" y="336" width="47" height="47">
+  <object id="5" type="enemy" x="264" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="816" y="192" width="47" height="47">
+  <object id="6" type="enemy" x="816" y="192" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1008" y="240" width="47" height="47">
+  <object id="7" type="enemy" x="1008" y="240" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1056" y="24" width="47" height="47">
+  <object id="8" type="enemy" x="1056" y="24" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1128" y="96" width="47" height="47">
+  <object id="9" type="enemy" x="1128" y="96" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1824" y="336" width="47" height="47">
+  <object id="10" type="enemy" x="1824" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1896" y="216" width="47" height="47">
+  <object id="11" type="enemy" x="1896" y="216" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="1800" y="48" width="47" height="47">
+  <object id="12" type="enemy" x="1800" y="48" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2160" y="120" width="47" height="47">
+  <object id="13" type="enemy" x="2160" y="120" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2280" y="336" width="47" height="47">
+  <object id="14" type="enemy" x="2280" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2712" y="192" width="47" height="47">
+  <object id="15" type="enemy" x="2712" y="192" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2448" y="120" width="47" height="47">
+  <object id="16" type="enemy" x="2448" y="120" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2880" y="120" width="47" height="47">
+  <object id="17" type="enemy" x="2880" y="120" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="2952" y="336" width="47" height="47">
+  <object id="18" type="enemy" x="2952" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3168" y="96" width="47" height="47">
+  <object id="19" type="enemy" x="3168" y="96" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3288" y="216" width="47" height="47">
+  <object id="20" type="enemy" x="3288" y="216" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3456" y="336" width="47" height="47">
+  <object id="21" type="enemy" x="3456" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3696" y="216" width="47" height="47">
+  <object id="22" type="enemy" x="3696" y="216" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3912" y="120" width="47" height="47">
+  <object id="23" type="enemy" x="3912" y="120" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object type="enemy" x="3936" y="336" width="47" height="47">
+  <object id="24" type="enemy" x="3936" y="336" width="47" height="47">
    <properties>
     <property name="enemytype" value="mannequin"/>
    </properties>
   </object>
-  <object name="next" type="door" x="3912" y="216" width="24" height="48">
+  <object id="25" name="next" type="door" x="3912" y="216" width="24" height="48">
    <properties>
     <property name="level" value="deans-closet2"/>
     <property name="sound" value="false"/>
diff --git a/src/maps/deans-closet2.tmx b/src/maps/deans-closet2.tmx
index 2d06fd149..2a1c6be67 100644
--- a/src/maps/deans-closet2.tmx
+++ b/src/maps/deans-closet2.tmx
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="117"/>
-  <property name="green" value="117"/>
   <property name="offset" value="1"/>
-  <property name="red" value="117"/>
   <property name="soundtrack" value="dancingqueen"/>
  </properties>
  <tileset firstgid="1" name="deans-closet" tilewidth="24" tileheight="24">
@@ -14,6 +11,11 @@
  <tileset firstgid="122" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="backbackground" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJyzYGBgsBjFo3gUj+JRPIpHKAYA8e5icQ==
+  </data>
+ </layer>
  <layer name="background" width="30" height="15">
   <data encoding="base64" compression="zlib">
    eJztkksOwCAIRLmLINfk6NVEokWj1rbpok4yC8Lg8wewtZWFwfQBl5Pf5HtTU8F1yU9LGcoPtbhFbpxHqM9hFTKi60PBaHHxvFdRhr6BN/OYMm5gmsjwZKaXsz3OjncgnZyM2CvmsWXm3Hf4V/qte9B/8ycdKecbyA==
@@ -39,22 +41,22 @@
    eJxjYBgFo4B4MIVKZlDDHELmU2IHsn5qmEcpoNRuStyPTd8UIjEx6gcKkOL+kQaqBggPFAAAqPAmAQ==
   </data>
  </layer>
- <objectgroup name="nodes" width="30" height="15" visible="0">
-  <object name="next" type="door" x="600" y="264" width="24" height="48">
+ <objectgroup name="nodes" visible="0">
+  <object id="1" name="next" type="door" x="600" y="264" width="24" height="48">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="sound" value="false"/>
     <property name="to" value="dean"/>
    </properties>
   </object>
-  <object name="main" type="door" x="48" y="168" width="24" height="48">
+  <object id="2" name="main" type="door" x="48" y="168" width="24" height="48">
    <properties>
     <property name="level" value="deans-closet"/>
     <property name="sound" value="false"/>
     <property name="to" value="next"/>
    </properties>
   </object>
-  <object type="info" x="384" y="288" width="48" height="24">
+  <object id="3" type="info" x="384" y="288" width="48" height="24">
    <properties>
     <property name="info" value="Time Desk: The Chronicles of Dean Dangerous"/>
    </properties>
diff --git a/src/maps/deans-office-2.tmx b/src/maps/deans-office-2.tmx
index daa75e4b9..1ae1bc7b9 100644
--- a/src/maps/deans-office-2.tmx
+++ b/src/maps/deans-office-2.tmx
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="22" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="16">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="83"/>
-  <property name="green" value="148"/>
   <property name="jumping" value="false"/>
-  <property name="red" value="152"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Dean Inner Office"/>
  </properties>
  <tileset firstgid="1" name="deans-office" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/deans-office.png" width="264" height="360"/>
  </tileset>
+ <layer name="background" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjZGBgYBzFo3gUj+JhgAHsdgE1
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="22" height="14">
   <data encoding="base64" compression="zlib">
    eJxTYmBgUKIBpgZgxIKHi7nZQJxDwLwYEsx1htJlQFxOhFuriDAXZKYuEWYhg1YC5oLM9ANiSQaGA6SYOwGPuchmMgNpcjC6uTC/U2ImNrOpZSa62dQ0E9lsapsJw7Qoc0AYAPkCEXI=
@@ -32,50 +34,50 @@
    eJxjYBgFowA7mEUjc5fSyNxRMAoAKpEBQA==
   </data>
  </layer>
- <objectgroup name="floorspace" width="22" height="14">
-  <object x="480" y="264">
+ <objectgroup name="floorspace">
+  <object id="1" x="480" y="264">
    <properties>
     <property name="height" value="18"/>
    </properties>
    <polygon points="0,0 -18,0 -48,-30 -30,-30"/>
   </object>
-  <object x="360" y="245">
+  <object id="2" x="360" y="245">
    <properties>
     <property name="height" value="25"/>
    </properties>
    <polygon points="0,0 29,26 57,26 29,0"/>
   </object>
-  <object name="couch2" x="252" y="183" width="48" height="14">
+  <object id="3" name="couch2" x="252" y="183" width="48" height="14">
    <properties>
     <property name="height" value="12"/>
    </properties>
   </object>
-  <object name="primary" x="0" y="314" visible="0">
+  <object id="4" name="primary" x="0" y="314" visible="0">
    <properties>
     <property name="primary" value="true"/>
    </properties>
    <polygon points="0,0 120,-120 145,-121 240,-120 277,-121 339,-121 348,-119 361,-120 408,-119 410,-117 528,0"/>
   </object>
-  <object x="318" y="181" width="12" height="13">
+  <object id="5" x="318" y="181" width="12" height="13">
    <properties>
     <property name="height" value="17"/>
    </properties>
   </object>
-  <object x="372" y="192" width="24" height="4">
+  <object id="6" x="372" y="192" width="24" height="4">
    <properties>
     <property name="height" value="60"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="nodes" width="22" height="14">
-  <object name="main" type="door" x="78" y="185" width="16" height="53">
+ <objectgroup name="nodes">
+  <object id="7" name="main" type="door" x="78" y="185" width="16" height="53">
    <properties>
     <property name="button" value="LEFT"/>
     <property name="level" value="deans-office"/>
     <property name="to" value="dean2"/>
    </properties>
   </object>
-  <object name="filecabinet" type="door" x="192" y="144" width="24" height="50">
+  <object id="8" name="filecabinet" type="door" x="192" y="144" width="24" height="50">
    <properties>
     <property name="hideable" value="true"/>
     <property name="level" value="deans-closet"/>
@@ -91,7 +93,7 @@
     <property name="trigger" value="doortriggers.dalmatian"/>
    </properties>
   </object>
-  <object type="hiddendoortrigger" x="335" y="158" width="24" height="40">
+  <object id="9" type="hiddendoortrigger" x="335" y="158" width="24" height="40">
    <properties>
     <property name="height" value="42"/>
     <property name="message" value="Move dalmatian statue?"/>
@@ -100,7 +102,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="96" y="192" width="24" height="24">
+  <object id="10" type="sprite" x="96" y="192" width="24" height="24">
    <properties>
     <property name="depth" value="4"/>
     <property name="flip" value="true"/>
@@ -109,7 +111,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="432" y="216" width="48" height="48">
+  <object id="11" type="sprite" x="432" y="216" width="48" height="48">
    <properties>
     <property name="depth" value="30"/>
     <property name="flip" value="true"/>
@@ -118,7 +120,7 @@
     <property name="width" value="48"/>
    </properties>
   </object>
-  <object type="sprite" x="360" y="216" width="58" height="55">
+  <object id="12" type="sprite" x="360" y="216" width="58" height="55">
    <properties>
     <property name="depth" value="24"/>
     <property name="direction" value="right"/>
@@ -127,7 +129,7 @@
     <property name="width" value="58"/>
    </properties>
   </object>
-  <object type="sprite" x="237" y="164" width="71" height="28">
+  <object id="13" type="sprite" x="237" y="164" width="71" height="28">
    <properties>
     <property name="depth" value="15"/>
     <property name="height" value="35"/>
@@ -135,7 +137,7 @@
     <property name="width" value="70"/>
    </properties>
   </object>
-  <object type="sprite" x="312" y="158" width="22" height="31">
+  <object id="14" type="sprite" x="312" y="158" width="22" height="31">
    <properties>
     <property name="depth" value="11"/>
     <property name="height" value="40"/>
@@ -143,6 +145,6 @@
     <property name="width" value="20"/>
    </properties>
   </object>
-  <object name="vent" type="door" x="224" y="3" width="65" height="21"/>
+  <object id="15" name="vent" type="door" x="224" y="3" width="65" height="21"/>
  </objectgroup>
 </map>
diff --git a/src/maps/deans-office.tmx b/src/maps/deans-office.tmx
index 884181b8d..6b909d403 100644
--- a/src/maps/deans-office.tmx
+++ b/src/maps/deans-office.tmx
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="22" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="13">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="83"/>
-  <property name="green" value="148"/>
   <property name="jumping" value="false"/>
-  <property name="red" value="152"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Dean Outer Office"/>
  </properties>
  <tileset firstgid="1" name="deans-office" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/deans-office.png" width="264" height="360"/>
  </tileset>
+ <layer name="background" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjZGBgYBzFo3gUj+JhgAHsdgE1
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="22" height="14">
   <data encoding="base64" compression="zlib">
    eJxTYmBgUKIBHgWDE6ggsSUZGBpoYYcf0FxizBYnEQPNdCBkNjOZGJ/Z5JqJz2xKzUQ3m5pmIptNbTNhmBZlDggDAPUbEN8=
@@ -32,22 +34,22 @@
    eJxjYBgFowA7mEGB3pl45BZTYO4SCvSOguEPAPbHAnk=
   </data>
  </layer>
- <objectgroup color="#41b4c2" name="nodes" width="22" height="14">
-  <object name="main" type="door" x="76" y="189" width="17" height="53">
+ <objectgroup color="#41b4c2" name="nodes">
+  <object id="1" name="main" type="door" x="76" y="189" width="17" height="53">
    <properties>
     <property name="button" value="LEFT"/>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="admin2"/>
    </properties>
   </object>
-  <object name="dean2" type="door" x="432" y="185" width="18" height="55">
+  <object id="2" name="dean2" type="door" x="432" y="185" width="18" height="55">
    <properties>
     <property name="button" value="RIGHT"/>
     <property name="level" value="deans-office-2"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="sprite" x="96" y="144" width="192" height="72">
+  <object id="3" type="sprite" x="96" y="144" width="192" height="72">
    <properties>
     <property name="animation" value="1-5,1"/>
     <property name="depth" value="4"/>
@@ -56,7 +58,7 @@
     <property name="width" value="192"/>
    </properties>
   </object>
-  <object type="sprite" x="408" y="192" width="24" height="24">
+  <object id="4" type="sprite" x="408" y="192" width="24" height="24">
    <properties>
     <property name="depth" value="3"/>
     <property name="height" value="24"/>
@@ -64,7 +66,7 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="337" y="173" width="47" height="22">
+  <object id="5" type="sprite" x="337" y="173" width="47" height="22">
    <properties>
     <property name="depth" value="5"/>
     <property name="height" value="21"/>
@@ -72,12 +74,12 @@
     <property name="width" value="48"/>
    </properties>
   </object>
-  <object type="info" x="170" y="146" width="22" height="28">
+  <object id="6" type="info" x="170" y="146" width="22" height="28">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="sprite" x="289" y="133" width="21" height="57">
+  <object id="7" type="sprite" x="289" y="133" width="21" height="57">
    <properties>
     <property name="depth" value="15"/>
     <property name="height" value="65"/>
@@ -86,31 +88,31 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="floorspace" width="22" height="14">
-  <object x="0" y="312" visible="0">
+ <objectgroup name="floorspace">
+  <object id="8" x="0" y="312" visible="0">
    <properties>
     <property name="primary" value="true"/>
    </properties>
    <polygon points="0,0 120,-120 408,-120 528,0"/>
   </object>
-  <object x="96" y="216" visible="0">
+  <object id="9" x="96" y="216" visible="0">
    <properties>
     <property name="height" value="37"/>
    </properties>
    <polygon points="0,0 6,-5 188,-5 192,0"/>
   </object>
-  <object x="410" y="210" visible="0">
+  <object id="10" x="410" y="210" visible="0">
    <properties>
     <property name="height" value="20"/>
    </properties>
    <polygon points="0,0 15,0 20,5 5,5"/>
   </object>
-  <object x="343" y="187" width="34" height="7">
+  <object id="11" x="343" y="187" width="34" height="7">
    <properties>
     <property name="height" value="12"/>
    </properties>
   </object>
-  <object x="298" y="191" width="5" height="4">
+  <object id="12" x="298" y="191" width="5" height="4">
    <properties>
     <property name="height" value="60"/>
    </properties>
diff --git a/src/maps/dorm-lobby.tmx b/src/maps/dorm-lobby.tmx
index 246650bd8..61d313b94 100644
--- a/src/maps/dorm-lobby.tmx
+++ b/src/maps/dorm-lobby.tmx
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="24" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="autosave" value="false"/>
-  <property name="blue" value="88"/>
-  <property name="green" value="113"/>
-  <property name="red" value="168"/>
   <property name="title" value="dorm lobby"/>
  </properties>
  <tileset firstgid="1" name="greendale-hallways" tilewidth="24" tileheight="24">
@@ -13,6 +10,11 @@
  <tileset firstgid="481" name="collisions" tilewidth="24" tileheight="24">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
+ <layer name="background" width="24" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjZ2BgYB/Fo3gUj+JRTDIGADcICTE=
+  </data>
+ </layer>
  <layer name="Tile Layer 1" width="24" height="14">
   <data encoding="base64" compression="zlib">
    eJxjZGBwYKQhZmJgYKAxPkBLzEAjUAMMGxCm1Jw0YCCnA3EGIxUchQXUAc2tB+IGAuZfAuLLZJg/DWjudCCeQcD8V0D8mgzz1wHNXQ/EG8gIn2wkjI2PCyQC7UpCs08GGIQyVDK/Emh2FZr5JkDzTQjoIwXUQDHzEMeMNMYAn2gt+Q==
@@ -33,20 +35,20 @@
    eJx7yMjA8JCGeBSMglEwdME3RtrioQ4AXc8sWQ==
   </data>
  </layer>
- <objectgroup name="nodes" width="24" height="14" visible="0">
-  <object name="main" type="door" x="48" y="216" width="48" height="60">
+ <objectgroup name="nodes" visible="0">
+  <object id="1" name="main" type="door" x="48" y="216" width="48" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="dorm"/>
    </properties>
   </object>
-  <object type="firealarm" x="96" y="216" width="24" height="48"/>
-  <object type="info" x="397" y="199" width="71" height="63">
+  <object id="2" type="firealarm" x="96" y="216" width="24" height="48"/>
+  <object id="3" type="info" x="397" y="199" width="71" height="63">
    <properties>
     <property name="info" value="Not in use."/>
    </properties>
   </object>
-  <object type="info" x="144" y="216" width="24" height="48">
+  <object id="4" type="info" x="144" y="216" width="24" height="48">
    <properties>
     <property name="info" value="Money, money, money!"/>
    </properties>
diff --git a/src/options.lua b/src/options.lua
index ce63a3b8a..820ce1789 100644
--- a/src/options.lua
+++ b/src/options.lua
@@ -215,6 +215,11 @@ function state:enter(previous, target)
   camera:setPosition(0, 0)
   self.previous = previous
   self.target = target
+  
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
+  
 end
 
 function state:leave()
@@ -227,15 +232,19 @@ end
 function state:updateFullscreen()
   if self.option_map['FULLSCREEN'].bool then
     utils.setMode(0, 0, true)
-    local width = love.graphics:getWidth()
-    local height = love.graphics:getHeight()
-    camera:setScale( window.width / width , window.height / height )
+    --TODO: large screens & changing scale
+    camera:setScale(window.scale, window.scale)
     love.mouse.setVisible(false)
   else
-    camera:setScale(window.scale,window.scale)
+    camera:setScale(window.scale, window.scale)
     utils.setMode(window.screen_width, window.screen_height, false)
     love.mouse.setVisible(true)
   end
+  --TODO: see if there's a better way to do this
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
+  VerticalParticles.init()
 end
 
 function state:updateFpsSetting()
@@ -336,15 +345,16 @@ function state:draw()
   local back = controls:getKey("START") .. ": BACK TO MENU"
   love.graphics.print(back, 25, 25)
 
-  local y = 96
+  local x = (self.width - window.width)/2
+  local y = 96 + (self.height - window.height)/2
 
   love.graphics.draw(self.background,
-  camera:getWidth() / 2 - self.background:getWidth() / 2,
-  camera:getHeight() / 2 - self.background:getHeight() / 2)
+  (self.width - self.background:getWidth()) / 2,
+  (self.height - self.background:getHeight()) / 2)
 
   love.graphics.setColor( 0, 0, 0, 255 )
 
-  local xoffset = self.page == 'optionspage' and 20 or 0
+  local xoffset = self.page == 'optionspage' and x + 20 or x
 
   for n, opt in pairs(menu.options) do
     if tonumber( n ) ~= nil  then
@@ -353,9 +363,9 @@ function state:draw()
         local option = self.option_map[opt]
         if option.bool ~= nil then
           if option.bool then
-            love.graphics.draw( self.checkbox_checked, 366, y )
+            love.graphics.draw( self.checkbox_checked, x + 366, y )
           else
-            love.graphics.draw( self.checkbox_unchecked, 366, y )
+            love.graphics.draw( self.checkbox_unchecked, x + 366, y )
           end
         elseif option.range ~= nil then
           love.graphics.draw( self.range, 336, y + 2 )
@@ -367,10 +377,11 @@ function state:draw()
   end
 
   if self.page ~= 'optionspage' then
-    love.graphics.draw( self.arrow, 138, 124 + ( 26 * ( menu.selection - 1 ) ) )
+    -- TODO: currently too low down on "GAME" menu
+    love.graphics.draw( self.arrow, x + 138, y - 52 + ( 26 * ( menu.selection - 1 ) ) )
   else
     love.graphics.setColor(255,255,255,255)
-    love.graphics.draw( self.bigarrow, 138, 116 + ( 26 * ( menu.selection - 1) ) )
+    love.graphics.draw( self.bigarrow, x + 138, y - 110 + ( 26 * ( menu.selection - 1) ) )
   end
   love.graphics.setColor( 255, 255, 255, 255 )
 end
diff --git a/src/pause.lua b/src/pause.lua
index b436fe3ed..6123c2998 100644
--- a/src/pause.lua
+++ b/src/pause.lua
@@ -20,6 +20,10 @@ function state:enter(previous, player)
 
   fonts.set( 'big' )
 
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
+  
   camera:setPosition(0, 0)
   self.option = 0
 
@@ -91,19 +95,22 @@ function state:draw()
   VerticalParticles.draw()
 
   love.graphics.draw(self.background, 
-    camera:getWidth() / 2 - self.background:getWidth() / 2,
-    camera:getHeight() / 2 - self.background:getHeight() / 2)
+    (self.width - self.background:getWidth()) / 2,
+    (self.height - self.background:getHeight()) / 2)
+  
+  local x = (self.width - window.width)/2
+  local y = (self.height - window.height)/2
 
   local controls = self.player.controls
 
   love.graphics.setColor( 0, 0, 0, 255 )
-  love.graphics.print('Controls', 198, 101)
-  love.graphics.print('Options', 198, 131)
-  love.graphics.print('Quit to Map', 198, 161)
-  love.graphics.print('Quit to Menu', 198, 191)
-  love.graphics.print('Quit to Desktop', 198, 221)
+  love.graphics.print('Controls', x + 198, y + 101)
+  love.graphics.print('Options', x + 198, y + 131)
+  love.graphics.print('Quit to Map', x + 198, y + 161)
+  love.graphics.print('Quit to Menu', x + 198, y + 191)
+  love.graphics.print('Quit to Desktop', x + 198, y + 221)
   love.graphics.setColor( 255, 255, 255, 255 )
-  love.graphics.draw(self.arrow, 156, 96 + 30 * self.option)
+  love.graphics.draw(self.arrow, x + 156, y + 96 + 30 * self.option)
   local back = controls:getKey("START") .. ": BACK TO GAME"
   local howto = controls:getKey("ATTACK") .. " OR " .. controls:getKey("JUMP") .. ": SELECT ITEM"
   love.graphics.print(back, 25, 25)
diff --git a/src/scanning.lua b/src/scanning.lua
index 7df829d22..5fe2318d4 100644
--- a/src/scanning.lua
+++ b/src/scanning.lua
@@ -16,6 +16,9 @@ function state:enter(previous)
   self:refresh()
   self.previous = previous
   self.music = sound.playMusic("opening")
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function state:keypressed( button )
@@ -57,8 +60,8 @@ function state:draw()
   love.graphics.setColor( 255, 255, 255, 255 )
 
   -- coloured backgrounds
-  local width = window.width
-  local height = window.height
+  local width = self.width
+  local height = self.height
   local xcorner = width/2 - 200
   local ycorner = height/2 - 125
   
diff --git a/src/start.lua b/src/start.lua
index 19d5ed3b2..a921abaa1 100644
--- a/src/start.lua
+++ b/src/start.lua
@@ -41,6 +41,9 @@ function state:enter( previous )
   camera:setPosition( 0, 0 )
   self.previous = previous
   self.window = 'main'
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function state:leave()
@@ -161,8 +164,11 @@ function state:draw()
 
   love.graphics.setColor(255, 255, 255)
   love.graphics.draw(self.background,
-    camera:getWidth() / 2 - self.background:getWidth() / 2,
-    camera:getHeight() / 2 - self.background:getHeight() / 2)
+    (self.width - self.background:getWidth()) / 2,
+    (self.height - self.background:getHeight()) / 2)
+
+  local x = (self.width - window.width)/2
+  local y = 90 + (self.height - window.height)/2
 
   if self.window == 'main' then
     love.graphics.setColor(255, 255, 255)
@@ -172,20 +178,18 @@ function state:draw()
     love.graphics.print(delete, 25, 55)
     local yFactor = 20
 
-    local y = 90
-
     love.graphics.setColor( 0, 0, 0, 255 )
 
     for n, opt in pairs(self.options) do
       if tonumber( n ) ~= nil  then
         if opt.name and opt.slot then
-          love.graphics.print( opt.name , 175, y, 0 )
+          love.graphics.print( opt.name , x + 175, y, 0 )
           y = y + yFactor
-          love.graphics.print( self.get_slot_level( opt.slot ), 190, y, 0 )
+          love.graphics.print( self.get_slot_level( opt.slot ), x + 190, y, 0 )
           y = y + yFactor
         elseif opt.name then
           y = y + yFactor
-          love.graphics.print( opt.name, 175, y, 0 )
+          love.graphics.print( opt.name, x + 175, y, 0 )
         end
       end
     end
@@ -195,7 +199,7 @@ function state:draw()
     if self.selection > 2 then
       arrowYFactor = 2.5
     end
-    love.graphics.draw( self.arrow, 135, 127 + ( (yFactor * arrowYFactor) * ( self.selection - 1 ) ) )
+    love.graphics.draw( self.arrow, x + 135, y - 80 + ( (yFactor * arrowYFactor) * ( self.selection - 1 ) ) )
   elseif self.window == 'deleteSlot' then
     love.graphics.setColor(255, 255, 255)
     local howto = controls:getKey("UP") .. " OR " .. controls:getKey("DOWN") .. ": CHANGE OPTION"
@@ -203,11 +207,11 @@ function state:draw()
     love.graphics.print(howto, 25, 25)
     love.graphics.print(delete, 25, 55)
     love.graphics.setColor( 0, 0, 0, 255 )
-    love.graphics.printf('Are you sure you want to delete this slot?', 155, 110, self.background:getWidth() - 30, 'left')
-    love.graphics.print('Yes', 175, 175, 0)
-    love.graphics.print('No', 175, 205, 0)
+    love.graphics.printf('Are you sure you want to delete this slot?', x + 155, y + 20, self.background:getWidth() - 30, 'left')
+    love.graphics.print('Yes', x + 175, y + 85, 0)
+    love.graphics.print('No', x + 175, y + 115, 0)
     love.graphics.setColor( 255, 255, 255, 255 )
-    love.graphics.draw( self.arrow, 140, 170 + 30 * self.selectionDelete ) 
+    love.graphics.draw( self.arrow, x + 140, y + 80 + 30 * self.selectionDelete ) 
   end
 end
 
diff --git a/src/update.lua b/src/update.lua
index b389c519a..db732a2ce 100644
--- a/src/update.lua
+++ b/src/update.lua
@@ -21,6 +21,9 @@ function screen:enter()
   self.logo = love.graphics.newImage('images/menu/splash.png')
   self.bg = sound.playMusic("ending")
   self.updater:start()
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 end
 
 function screen:update(dt)
@@ -54,16 +57,16 @@ end
 
 function screen:draw()
   love.graphics.setColor(255, 255, 255, math.min(255, self.time * 100))
-  love.graphics.draw(self.logo, window.width / 2 - self.logo:getWidth() / 2,
-                     window.height / 2 - self.logo:getHeight() / 2)
+  love.graphics.draw(self.logo, (self.width - self.logo:getWidth()) / 2,
+                     (self.height - self.logo:getHeight()) / 2)
 
   if self.progress > 0 then
     love.graphics.setColor(255, 255, 255)
-    love.graphics.rectangle("line", 40, window.height - 75, window.width - 80, 10)
-    love.graphics.rectangle("fill", 40, window.height - 75, 
-                            (window.width - 80) * self.progress / 100, 10)
-    love.graphics.printf(self.message, 40, window.height - 55,
-                         window.width - 80, 'center')
+    love.graphics.rectangle("line", 40, self.width - 75, self.height - 80, 10)
+    love.graphics.rectangle("fill", 40, self.height - 75, 
+                            (self.width - 80) * self.progress / 100, 10)
+    love.graphics.printf(self.message, 40, self.height - 55,
+                         self.width - 80, 'center')
   end
 end
 
diff --git a/src/verticalparticles.lua b/src/verticalparticles.lua
index 21f4f0447..de5a38134 100644
--- a/src/verticalparticles.lua
+++ b/src/verticalparticles.lua
@@ -7,12 +7,14 @@ function Particle:new()
   new = {}
   setmetatable(new, Particle)
 
-  local winWidth = window.width
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 
   new.size = math.random(3)
-  new.pos = { x = math.random(winWidth), y = math.random(window.height) }
+  new.pos = { x = math.random(self.width), y = math.random(self.height) }
 
-  local ratio = 1.0 - math.cos(math.abs(new.pos.x - winWidth/2) * 2 / winWidth) * 0.6
+  local ratio = 1.0 - math.cos(math.abs(new.pos.x - self.width/2) * 2 / self.width) * 0.6
 
   new.speed = 300 * (ratio + math.random()/4)
 
@@ -23,7 +25,7 @@ end
 function Particle:update(dt)
   self.pos.y = self.pos.y - (dt * self.speed)
 
-  if self.pos.y < 0 then self.pos.y = window.height end
+  if self.pos.y < 0 then self.pos.y = self.height end
 end
 
 function Particle:draw()
diff --git a/src/welcome.lua b/src/welcome.lua
index 4f453623b..93c35ef3b 100644
--- a/src/welcome.lua
+++ b/src/welcome.lua
@@ -22,7 +22,6 @@ function state:init()
       Gamestate.switch(option)
     end
   end)
-
 end
 
 function state:enter(previous)
@@ -30,6 +29,10 @@ function state:enter(previous)
   self.arrow = love.graphics.newImage("images/menu/small_arrow.png")
   self.text = string.format(app.i18n('s_or_s_select_item'), controls:getKey('JUMP'), controls:getKey('ATTACK') )
   self.bg = sound.playMusic("ending")
+  
+  local width, height, flags = love.window.getMode()
+  self.width = width*window.scale
+  self.height = height*window.scale
 
   self.line = " terminal:// \n\n operations://loadprogram:(true) \n\n"..
     " program:-journey-to-the-center-of-hawkthorne \n\n loading simulation ..."
@@ -87,23 +90,21 @@ end
 
 function state:draw()
 
-  --background colour
-  love.graphics.setColor( 0, 0, 0, 255 )
-  love.graphics.rectangle( 'fill', 0, 0, love.graphics:getWidth(), love.graphics:getHeight() )
-  love.graphics.setColor( 255, 255, 255, 255 )
+  local a = (self.width - window.width)/2
+  local b = (self.height - window.height)/2
 
   -- green terminal
   fonts.set('courier')
   love.graphics.setColor( 48, 254, 31, 225 )
   if self.code_loaded == false then
-    love.graphics.print(self.line_short, 50, 50, 0, 0.5, 0.5 )
+    love.graphics.print(self.line_short, a + 50, b + 50, 0, 0.5, 0.5 )
     for i = 1, 7 do
-      love.graphics.print(self.code_short[i], 60*i - 10, 130, 0, 0.4, 0.4)
+      love.graphics.print(self.code_short[i], a + 60*i - 10, b + 130, 0, 0.4, 0.4)
     end
   else
-    love.graphics.print(self.line, 50, 50, 0, 0.5, 0.5 )
+    love.graphics.print(self.line, a + 50, b + 50, 0, 0.5, 0.5 )
     for i = 1, 7 do
-      love.graphics.print(self.code, 60*i - 10, 130, 0, 0.4, 0.4)
+      love.graphics.print(self.code, a + 60*i - 10, b + 130, 0, 0.4, 0.4)
     end
   end
 
@@ -111,8 +112,8 @@ function state:draw()
   fonts.set( 'big' )
 
   -- menu
-  local x = window.width / 2 - self.splash:getWidth()/2
-  local y = 2*window.height / 2.5 - self.splash:getHeight()/2
+  local x = (self.width - self.splash:getWidth())/2
+  local y = 0.8* self.height - self.splash:getHeight()/2
   if self.code_loaded then
     love.graphics.draw(self.splash, x, y)
     love.graphics.draw(self.arrow, x + 12, y + 23 + 12 * (self.menu:selected() - 1))
@@ -121,7 +122,7 @@ function state:draw()
     end
     self.menu_shown = true
     -- control instructions
-    love.graphics.print(self.text, window.width/2-65, window.height - 24, 0, 0.5, 0.5)
+    love.graphics.print(self.text, self.width/2-65, self.height - 24, 0, 0.5, 0.5)
   end
 
 end