--- a/data/game.json	Fri Apr 08 17:32:50 2011 +0200
+++ b/data/game.json	Fri Apr 08 19:12:44 2011 +0200
@@ -12,25 +12,30 @@
         "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
         "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
         "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] },
-        "vase": { "type": "Vase", "level": "level2", "pos": [1, 3], "broken": false }
+        "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false }
     },
     "npcs": {
         "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
-        "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" },
-        "hattori": { "type": "Hattori", "level": "level3", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" },
-        "ichiro": { "type": "Ichiro", "level": "level3", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" },
-        "kaneda": { "type": "Kaneda", "level": "level4", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
-        "kumiko": { "type": "Kumiko", "level": "level4", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" },
-        "actor": { "type": "Actor", "level": "level5", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" },
-        "sasuke": { "type": "Sasuke", "level": "level5", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" },
-        "kitsune": { "type": "Kitsune", "level": "level5", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" }
+        "guard": { "type": "Guard", "level": "temple_grounds", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" },
+        "hattori": { "type": "Hattori", "level": "road", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" },
+        "ichiro": { "type": "Ichiro", "level": "road", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" },
+        "kaneda": { "type": "Kaneda", "level": "tea_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
+        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" },
+        "actor": { "type": "Actor", "level": "theatre", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" },
+        "sasuke": { "type": "Sasuke", "level": "road", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" },
+        "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" }
     },
     "levels": {
+        "celestial_plane" : "celestial_plane",
+        "fishmonger_house" : "fishmonger_house",
+        "geisha_room" : "geisha_room",
+        "market" : "market",
+        "road" : "road",
+        "tea_house" : "tea_house",
+        "temple_grounds" : "temple_grounds",
         "temple" : "temple",
-        "level2" : "level2",
-        "level3" : "level3",
-        "level4" : "level4",
-        "level5" : "level5"
+        "theatre" : "theatre",
+        "town" : "town"
     },
     "player": {"level": "temple", "doorway": "starting"}
 }