43 files changed, 253 insertions, 215 deletions

@@ -49,6 +49,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "West Side" name: "ERASE" }
   location_room: "West Side"
+  location_name: "ERASE"
 }
 doors {
   name: "Control Center Purple Door"
@@ -98,7 +99,8 @@ doors {
 doors {
   name: "Savory Painting"
   type: STANDARD
-  move_paintings { room: "West Side" name: "EXTRAVAGANT" }
+  #move_paintings { room: "West Side" name: "EXTRAVAGANT" }
+  receivers: "Components/Paintings/unless/teleportListener"
   panels { room: "West Side" name: "SAVORY" }
   panels { room: "West Side" name: "FLAVORS" }
   location_room: "West Side"
@@ -141,6 +143,7 @@ doors {
   panels { room: "Pillar Room" name: "CAUGHT" }
   panels { room: "Pillar Room" name: "TEN" }
   location_room: "Pillar Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "North Landscape Entrance"
@@ -224,7 +227,7 @@ doors {
   name: "Tower Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_25"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Maze Out/South Door"
@@ -306,7 +309,7 @@ doors {
   panels { room: "Maze Cold Area" name: "COLD" }
   panels { room: "Maze In Area" name: "IN" }
   panels { room: "Maze Moon Area" name: "MOON" }
-  panels { room: "Maze Of Area" name: "OFF" }
+  panels { room: "Maze Off Area" name: "OFF" }
   panels { room: "Maze Slice Area" name: "SLICE" }
   panels { room: "Maze Smooth Area" name: "SMOOTH" }
   panels { room: "Maze South Area" name: "SOUTH" }
@@ -327,7 +330,7 @@ doors {
   panels { room: "Maze Cold Area" name: "COLD" }
   panels { room: "Maze In Area" name: "IN" }
   panels { room: "Maze Moon Area" name: "MOON" }
-  panels { room: "Maze Of Area" name: "OFF" }
+  panels { room: "Maze Off Area" name: "OFF" }
   panels { room: "Maze Slice Area" name: "SLICE" }
   panels { room: "Maze Smooth Area" name: "SMOOTH" }
   panels { room: "Maze South Area" name: "SOUTH" }
@@ -390,11 +393,13 @@ doors {
   name: "Big Y"
   type: STANDARD
   receivers: "Components/Doors/question_3"
+  receivers: "Components/Doors/question_12"
   panels { room: "Question Room What" name: "QUESTION" answer: "why" }
   panels { room: "Question Room How" name: "QUESTION" answer: "why" }
   panels { room: "Question Room When" name: "QUESTION" answer: "why" }
   panels { room: "Question Room Who" name: "QUESTION" answer: "why" }
   location_room: "Question Room Who"
+  location_name: "Whys"
 }
 doors {
   name: "Talented Entrance"
@@ -417,6 +422,7 @@ doors {
   panels { room: "Back Area" name: "Right Landscape Top" answer: "tell" }
   panels { room: "Back Area" name: "Right Landscape Left" answer: "eyes" }
   location_room: "Back Area"
+  location_name: "Landscapes Room Alternate Answers"
 }
 doors {
   name: "Nature Room Door"
@@ -465,9 +471,13 @@ doors {
 }
 doors {
   name: "Lavender Cube"
-  type: ITEM_ONLY
+  type: EVENT
   receivers: "Components/Doors/entry_28"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
   name: "Zero Entrance"
@@ -492,3 +502,14 @@ doors {
   panels { room: "Back Area" name: "PAINTING" }
   location_room: "Back Area"
 }
+doors {
+  name: "Cyan Doors"
+  type: EVENT
+  receivers: "Panels/General/entry_7/teleportListener"
+  double_letters: true
+}
+doors {
+  name: "Partial Entrance"
+  type: EVENT
+  panels { room: "West Side" name: "CLUE" }
+}
@@ -0,0 +1,8 @@
+display_name: "The Great"
+# This can't be shuffled because it is tilted.
+excluded_nodes: "Components/Paintings/u"
+# This can't be shuffled because it is on the ground.
+excluded_nodes: "Components/blare"
+# This is the fake HI panel that used to be in the Control Center entrance. It
+# is neither visible nor accessible.
+excluded_nodes: "Panels/General/entry_4"
@@ -1,95 +1,95 @@
 name: "Back Area"
-display_name: "Back Area"
+panel_display_name: "Back Area"
 panels {
   name: "PLANT"
   path: "Panels/General/entry_14"
   clue: "plant"
   answer: "growth"
-  symbols: "null"
+  symbols: NULL
 }
 panels {
   name: "TREE"
   path: "Panels/General/entry_15"
   clue: "tree"
   answer: "growth"
-  symbols: "null"
+  symbols: NULL
 }
 panels {
   name: "PAINTING"
   path: "Panels/General/entry_11"
   clue: "painting"
   answer: "art"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "TOWEL"
   path: "Panels/Towers/tower_2"
   clue: "towel"
   answer: "tower"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "Top Landscape Top"
   path: "Panels/Kiwi Room/kiwi_1"
   clue: ""
   answer: "one"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Top Landscape Right"
   path: "Panels/Kiwi Room/kiwi_2"
   clue: ""
   answer: "road"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Top Landscape Bottom"
   path: "Panels/Kiwi Room/kiwi_3"
   clue: ""
   answer: "many"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Top Landscape Left"
   path: "Panels/Kiwi Room/kiwi_4"
   clue: ""
   answer: "turns"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Left Landscape Top"
   path: "Panels/Kiwi Room/kiwi_5"
   clue: ""
   answer: "find"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Left Landscape Right"
   path: "Panels/Kiwi Room/kiwi_6"
   clue: ""
   answer: "keys"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Left Landscape Bottom"
   path: "Panels/Kiwi Room/kiwi_7"
   clue: ""
   answer: "write"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Left Landscape Left"
   path: "Panels/Kiwi Room/kiwi_8"
   clue: ""
   answer: "words"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Right Landscape Top"
   path: "Panels/Kiwi Room/kiwi_9"
   clue: ""
   answer: "hear"
-  symbols: "question"
+  symbols: QUESTION
   proxies { answer: "tell" path: "Panels/Kiwi Proxies/kiwi_9_proxy_1" }
 }
 panels {
@@ -97,21 +97,21 @@ panels {
   path: "Panels/Kiwi Room/kiwi_10"
   clue: ""
   answer: "lies"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Right Landscape Bottom"
   path: "Panels/Kiwi Room/kiwi_11"
   clue: ""
   answer: "the"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
   name: "Right Landscape Left"
   path: "Panels/Kiwi Room/kiwi_12"
   clue: ""
   answer: "ears"
-  symbols: "question"
+  symbols: QUESTION
   proxies { answer: "eyes" path: "Panels/Kiwi Proxies/kiwi_12_proxy_1" }
 }
 paintings {
@@ -134,7 +134,7 @@ ports {
 }
 ports {
   name: "TOWER"
-  path: "Components/Warps/worldport10"
+  path: "Meshes/Blocks/Warps/worldport10"
   orientation: "south"
   required_door { name: "Tower Entrance" }
   # The reverse warp bypasses the door, so there needs to be two oneway connections.
@@ -1,18 +1,18 @@
 name: "Behind Question Area"
-display_name: "Main Area"
+panel_display_name: "Question Room"
 panels {
   name: "DEW"
   path: "Panels/General/uc_4"
   clue: "dew"
   answer: "do"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "YEW"
   path: "Panels/General/uc_5"
   clue: "yew"
   answer: "you"
-  symbols: "zero"
+  symbols: ZERO
   proxies { answer: "ewe" path: "Panels/General/uc_5_proxy_1" }
 }
 panels {
@@ -20,5 +20,5 @@ panels {
   path: "Panels/General/uc_6"
   clue: "no"
   answer: "know"
-  symbols: "zero"
+  symbols: ZERO
 }
@@ -1,5 +1,5 @@
 name: "Colorful Entrance"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 ports {
   name: "COLORFUL"
   path: "Meshes/Blocks/Warps/worldport13"
@@ -1,15 +1,15 @@
 name: "Daedalus Entrance"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
   name: "MISSING"
   path: "Panels/General/entry_2"
   clue: "missing"
   answer: "lost"
-  symbols: "sun"
+  symbols: SUN
 }
 ports {
   name: "DAEDALUS"
-  path: "Components/Warps/worldport8"
+  path: "Meshes/Blocks/Warps/worldport8"
   orientation: "south"
   required_door { name: "Daedalus Entrance" }
   # The reverse warp bypasses the door, so there needs to be two oneway connections.
@@ -1,16 +1,16 @@
 name: "East Landscape"
-display_name: "East Landscape"
+panel_display_name: "East Landscape"
 panels {
   name: "COLOR"
   path: "Panels/General/entry_10"
   clue: "color"
   answer: "purple"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "MISTREAT"
   path: "Panels/General/entry_13"
   clue: "mistreat"
   answer: "ream"
-  symbols: "lingo"
+  symbols: EVAL
 }
@@ -1,5 +1,5 @@
 name: "G Room"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 letters {
   key: "g"
   path: "Components/Collectables/g"
@@ -1,11 +1,11 @@
 name: "Hive Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
   name: "LOST"
   path: "Panels/Hive Room/hive_1"
   clue: "lost"
   answer: "found"
-  symbols: "sun"
+  symbols: SUN
 }
 ports {
   name: "HIVE"
@@ -1,87 +1,87 @@
 name: "Jail Part 1"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "FLAP"
   path: "Panels/Throat/throat_1"
   clue: "flap"
   answer: "trap"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "LUCK"
   path: "Panels/Throat/throat_2"
   clue: "luck"
   answer: "stuck"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "STICK"
   path: "Panels/Throat/throat_3"
   clue: "stick"
   answer: "stuck"
-  symbols: "age"
+  symbols: AGE
 }
 panels {
   name: "SNARE"
   path: "Panels/Throat/throat_4"
   clue: "snare"
   answer: "trap"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "DOPAMINE"
   path: "Panels/Bowels/bowels_1"
   clue: "dopamine"
   answer: "pain"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "PALINDROME"
   path: "Panels/Bowels/bowels_2"
   clue: "palindrome"
   answer: "pain"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "SUPERVILLAIN"
   path: "Panels/Bowels/bowels_3"
   clue: "supervillain"
   answer: "evil"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "PREVAILS"
   path: "Panels/Bowels/bowels_4"
   clue: "prevails"
   answer: "evil"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "ENGRAVED"
   path: "Panels/Bowels2/bowels_1"
   clue: "engraved"
   answer: "grave"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "GLIDEPATH"
   path: "Panels/Bowels2/bowels_2"
   clue: "glidepath"
   answer: "death"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "DECATHLON"
   path: "Panels/Bowels2/bowels_3"
   clue: "decathlon"
   answer: "death"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "GRIEVES"
   path: "Panels/Bowels2/bowels_4"
   clue: "grieves"
   answer: "grave"
-  symbols: "sparkles"
-  symbols: "zero"
+  symbols: SPARKLES
+  symbols: ZERO
 }
@@ -1,58 +1,58 @@
 name: "Jail Part 2"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "DIGEST"
   path: "Panels/Bowels3/bowels_1"
   clue: "digest"
   answer: "die"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "JAUNDICE"
   path: "Panels/Bowels3/bowels_2"
   clue: "jaundice"
   answer: "die"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "NECROTIZE (1)"
   path: "Panels/Bowels3/bowels_3"
   clue: "necrotize"
   answer: "rot"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "NECROTIZE (2)"
   path: "Panels/Bowels3/bowels_4"
   clue: "necrotize"
   answer: "rot"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "TORMENTS"
   path: "Panels/Bowels4/bowels_1"
   clue: "torments"
   answer: "omen"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "PILGRIM"
   path: "Panels/Bowels4/bowels_2"
   clue: "pilgrim"
   answer: "grim"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "GRIMACE"
   path: "Panels/Bowels4/bowels_3"
   clue: "grimace"
   answer: "grim"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "COMMENCE"
   path: "Panels/Bowels4/bowels_4"
   clue: "commence"
   answer: "omen"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
@@ -1,5 +1,5 @@
 name: "Jubilant Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 ports {
   name: "JUBILANT"
   path: "Meshes/Blocks/Warps/worldport12"
@@ -1,100 +1,100 @@
 name: "Magnet Room"
-display_name: "Magnet Room"
+panel_display_name: "Magnet Room"
 panels {
   name: "AIRPLANE"
   path: "Panels/Magnet Room/magnet_2"
   clue: "airplane"
   answer: "fly"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "PILOT"
   path: "Panels/Magnet Room/magnet_3"
   clue: "pilot"
   answer: "fly"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "AUTHOR"
   path: "Panels/Magnet Room/magnet_4"
   clue: "author"
   answer: "write"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "PEN"
   path: "Panels/Magnet Room/magnet_5"
   clue: "pen"
   answer: "write"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "HEAL"
   path: "Panels/Magnet Room/magnet_6"
   clue: "heal"
   answer: "nurse"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "CLEAN"
   path: "Panels/Magnet Room/magnet_7"
   clue: "clean"
   answer: "janitor"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "TRUCKER"
   path: "Panels/Magnet Room/magnet_8"
   clue: "trucker"
   answer: "drive"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "DOCTOR"
   path: "Panels/Magnet Room/magnet_9"
   clue: "doctor"
   answer: "heal"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "BARTENDER"
   path: "Panels/Magnet Room/magnet_10"
   clue: "bartender"
   answer: "mix"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "DIG"
   path: "Panels/Magnet Room/magnet_11"
   clue: "dig"
   answer: "shovel"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "TILL"
   path: "Panels/Magnet Room/magnet_12"
   clue: "till"
   answer: "hoe"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "WRENCH"
   path: "Panels/Magnet Room/magnet_13"
   clue: "wrench"
   answer: "turn"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "SAW"
   path: "Panels/Magnet Room/magnet_14"
   clue: "saw"
   answer: "cut"
-  symbols: "job"
+  symbols: JOB
 }
 panels {
   name: "BLENDER"
   path: "Panels/Magnet Room/magnet_15"
   clue: "blender"
   answer: "mix"
-  symbols: "job"
+  symbols: JOB
 }
@@ -1,12 +1,5 @@
 name: "Main Area"
-display_name: "Main Area"
-panels {
-  name: "OUT"
-  path: "Panels/Maze/maze_1"
-  clue: "out"
-  answer: "in"
-  symbols: "sun"
-}
+panel_display_name: "Main Area"
 panels {
   name: "INTRO"
   path: "Panels/General/entry_8"
@@ -18,35 +11,35 @@ panels {
   path: "Panels/General/entry_12"
   clue: "borne"
   answer: "born"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "DEW"
   path: "Panels/General/dyk_1"
   clue: "dew"
   answer: "do"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "EWE"
   path: "Panels/General/dyk_2"
   clue: "ewe"
   answer: "you"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "NO"
   path: "Panels/General/dyk_3"
   clue: "no"
   answer: "know"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "BROWN RED ORANGE"
   path: "Panels/General/seeking_1"
   clue: ""
   answer: "bro"
-  symbols: "lingo"
+  symbols: LINGO
 }
 panels {
   name: "DO"
@@ -65,14 +58,14 @@ panels {
   path: "Panels/General/uc_3"
   clue: "see"
   answer: "sea"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "SMILE"
   path: "Panels/General/entry_1"
   clue: "smile"
   answer: "grin"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "WHY"
@@ -109,39 +102,47 @@ panels {
   path: "Panels/General/entry_6"
   clue: "color"
   answer: "gray"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "BYE"
   path: "Panels/General/entry_7"
   clue: "bye"
   answer: "high"
-  symbols: "sun"
-  symbols: "zero"
+  symbols: SUN
+  symbols: ZERO
+  required_door { name: "Cyan Doors" }
+}
+panels {
+  name: "CURT"
+  path: "Panels/Maze/entry_1"
+  clue: "curt"
+  answer: "court"
+  symbols: SPARKLES
 }
 ports {
   name: "ENTRY"
-  path: "Components/Warps/worldport"
+  path: "Meshes/Blocks/Warps/worldport"
   orientation: "south"
 }
 ports {
   name: "KEEN"
-  path: "Components/Warps/worldport6"
+  path: "Meshes/Blocks/Warps/worldport6"
   orientation: "north"
 }
 ports {
   name: "ORB"
-  path: "Components/Warps/worldport3"
+  path: "Meshes/Blocks/Warps/worldport3"
   orientation: "north"
 }
 ports {
   name: "LINEAR"
-  path: "Components/Warps/worldport15"
+  path: "Meshes/Blocks/Warps/worldport15"
   orientation: "south"
 }
 ports {
   name: "DIGITAL"
-  path: "Components/Warps/worldport4"
+  path: "Meshes/Blocks/Warps/worldport4"
   orientation: "down"
   required_door { name: "Digital Entrance" }
 }
@@ -1,16 +1,16 @@
 name: "Maze Center"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "POOR"
   path: "Panels/Maze/maze_7"
   clue: "poor"
   answer: "rich"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "CHASE"
   path: "Panels/Maze/maze_10"
   clue: "chase"
   answer: "hunt"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Cold Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "COLD"
   path: "Panels/Maze/maze_11"
   clue: "cold"
   answer: "hot"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,2 +1,2 @@
 name: "Maze Empty Vestibule"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
@@ -1,9 +1,9 @@
 name: "Maze In Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "IN"
   path: "Panels/Maze/maze_3"
   clue: "in"
   answer: "out"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Moon Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "MOON"
   path: "Panels/Maze/maze_9"
   clue: "moon"
   answer: "sun"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Off Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OFF"
   path: "Panels/Maze/maze_14"
   clue: "off"
   answer: "on"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Slice Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SLICE"
   path: "Panels/Maze/maze_4"
   clue: "slice"
   answer: "cut"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Smooth Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SMOOTH"
   path: "Panels/Maze/maze_5"
   clue: "smooth"
   answer: "rough"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze South Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SOUTH"
   path: "Panels/Maze/maze_2"
   clue: "south"
   answer: "north"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Start"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OUT"
   path: "Panels/Maze/maze_1"
   clue: "out"
   answer: "in"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,23 +1,23 @@
 name: "Maze Tower"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "FEEL"
   path: "Panels/Maze/maze_12"
   clue: "feel"
   answer: "touch"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "DECOMPOSE"
   path: "Panels/Maze/maze_13"
   clue: "decompose"
   answer: "rot"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "SPIRE"
   path: "Panels/Towers/tower_1"
   clue: "spire"
   answer: "tower"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,9 +1,9 @@
 name: "Maze Up Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "UP"
   path: "Panels/Maze/maze_15"
   clue: "up"
   answer: "down"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,11 +1,11 @@
 name: "Maze Wreck Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "WRECK"
   path: "Panels/Maze/maze_8"
   clue: "wreck"
   answer: "ruin"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   # This is behind a teal wall.
@@ -13,5 +13,5 @@ panels {
   path: "Panels/General/teal_1"
   clue: "maroon"
   answer: "teal"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,30 +1,30 @@
 name: "Nature Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "SEVERE"
   path: "Panels/General/nature_2"
   clue: "severe"
   answer: "grave"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "FOOT"
   path: "Panels/General/nature_3"
   clue: "foot"
   answer: "yard"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "PAUSES"
   path: "Panels/General/nature_4"
   clue: "pauses"
   answer: "waits"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "ABOVE"
   path: "Panels/General/nature_5"
   clue: "above"
   answer: "below"
-  symbols: "sun"
+  symbols: SUN
 }
@@ -1,57 +1,58 @@
 name: "North Landscape"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "WEATHER"
   path: "Panels/General/platforms_1"
   clue: "weather"
   answer: "nature"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "ANIMALS"
   path: "Panels/General/platforms_2"
   clue: "animals"
   answer: "nature"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "PLANTS"
   path: "Panels/General/platforms_3"
   clue: "plants"
   answer: "nature"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "LAUGH"
   path: "Panels/General/dyk_4"
   clue: "laugh"
   answer: "half"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "FINISHED"
   path: "Panels/General/dyk_5"
   clue: "finished"
   answer: "done"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "LAUGH FINISHED"
   path: "Panels/General/dyk_6"
   clue: ""
   answer: "shed"
-  symbols: "lingo"
+  symbols: LINGO
 }
 panels {
   name: "INSIDE"
   path: "Panels/General/nature_1"
   clue: "inside"
   answer: "outside"
-  symbols: "sun"
+  symbols: SUN
 }
 keyholders {
   name: "X"
   path: "Components/KeyHolders/keyHolderX"
+  key: "x"
 }
 ports {
   name: "INVISIBLE"
@@ -1,30 +1,30 @@
 name: "Outside Jail"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "GUT"
   path: "Panels/Head/head_1"
   clue: "gut"
   answer: "guilt"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "HAM"
   path: "Panels/Head/head_2"
   clue: "ham"
   answer: "shame"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "MAIM"
   path: "Panels/Head/head_3"
   clue: "maim"
   answer: "shame"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "WILT"
   path: "Panels/Head/head_4"
   clue: "wilt"
   answer: "guilt"
-  symbols: "zero"
+  symbols: ZERO
 }
@@ -1,12 +1,12 @@
 name: "Pillar Room"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 panels {
   name: "EYE"
   path: "Panels/Impressive/entry_2"
   clue: "eye"
   answer: "you"
-  symbols: "sun"
-  symbols: "zero"
+  symbols: SUN
+  symbols: ZERO
 }
 panels {
   name: "HAVE"
@@ -19,14 +19,14 @@ panels {
   path: "Panels/Impressive/entry_4"
   clue: "four"
   answer: "for"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "CAUGHT"
   path: "Panels/Impressive/entry_5"
   clue: "caught"
   answer: "got"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "TEN"
@@ -1,7 +1,7 @@
 name: "Purple Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
   name: "DAEDALUS"
-  path: "Components/Warps/worldport18"
+  path: "Meshes/Blocks/Warps/worldport18"
   orientation: "north"
 }
@@ -1,17 +1,18 @@
 name: "Question Room How"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_3"
   clue: "question"
   answer: "how"
-  symbols: "example"
-  # "Panels/Question Proxies/question_3_proxied" <- this is just how again
+  symbols: EXAMPLE
+  proxies { answer: "how" path: "Panels/Question Proxies/question_3_proxied" }
   proxies { answer: "who" path: "Panels/Question Proxies/question_3_proxied2" }
   proxies { answer: "why" path: "Panels/Question Proxies/question_3_proxied3" }
   proxies { answer: "what" path: "Panels/Question Proxies/question_3_proxied4" }
   proxies { answer: "when" path: "Panels/Question Proxies/question_3_proxied5" }
   proxies { answer: "where" path: "Panels/Question Proxies/question_3_proxied6" }
+  display_name: "QUESTION (How)"
 }
 paintings {
   name: "WHY"
@@ -1,15 +1,16 @@
 name: "Question Room What"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_4"
   clue: "question"
   answer: "what"
-  symbols: "example"
-  proxies { answer: "why" path: "Panels/Question Proxies/question_4_proxied" }
-  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied2" }
-  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied3" }
+  symbols: EXAMPLE
+  proxies { answer: "what" path: "Panels/Question Proxies/question_4_proxied" }
+  proxies { answer: "why" path: "Panels/Question Proxies/question_4_proxied2" }
+  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied3" }
   proxies { answer: "how" path: "Panels/Question Proxies/question_4_proxied4" }
-  # "Panels/Question Proxies/question_4_proxied5" <- this is just what again
-  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied6" }
+  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied5" }
+  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied6" }
+  display_name: "QUESTION (What)"
 }
@@ -1,17 +1,18 @@
 name: "Question Room When"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_1"
   clue: "question"
   answer: "what"
-  symbols: "example"
+  symbols: EXAMPLE
   proxies { answer: "when" path: "Panels/Question Proxies/question_1_proxied" }
   proxies { answer: "why" path: "Panels/Question Proxies/question_1_proxied2" }
-  # "Panels/Question Proxies/question_1_proxied3" <- this is just what again
+  proxies { answer: "what" path: "Panels/Question Proxies/question_1_proxied3" }
   proxies { answer: "who" path: "Panels/Question Proxies/question_1_proxied4" }
   proxies { answer: "how" path: "Panels/Question Proxies/question_1_proxied5" }
   proxies { answer: "where" path: "Panels/Question Proxies/question_1_proxied6" }
+  display_name: "QUESTION (When)"
 }
 paintings {
   name: "WHY"
@@ -1,15 +1,16 @@
 name: "Question Room Who"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_2"
   clue: "question"
   answer: "who"
-  symbols: "example"
+  symbols: EXAMPLE
   proxies { answer: "why" path: "Panels/Question Proxies/question_2_proxied" }
-  # "Panels/Question Proxies/question_2_proxied2" <- this is just who again
+  proxies { answer: "who" path: "Panels/Question Proxies/question_2_proxied2" }
   proxies { answer: "where" path: "Panels/Question Proxies/question_2_proxied3" }
   proxies { answer: "how" path: "Panels/Question Proxies/question_2_proxied4" }
   proxies { answer: "what" path: "Panels/Question Proxies/question_2_proxied5" }
   proxies { answer: "when" path: "Panels/Question Proxies/question_2_proxied6" }
+  display_name: "QUESTION (Who)"
 }
@@ -1,7 +1,7 @@
 name: "Salmon Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
   name: "BETWEEN"
-  path: "Components/Warps/worldport11"
+  path: "Meshes/Blocks/Warps/worldport11"
   orientation: "east"
 }
@@ -1,5 +1,5 @@
 name: "Talented Entrance"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 ports {
   name: "TALENTED"
   path: "Meshes/Blocks/Warps/worldport14"
@@ -1,10 +1,12 @@
 name: "Under Question Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/General/question_1"
   clue: "question"
   answer: "which"
-  symbols: "example"
+  symbols: EXAMPLE
+  proxies { answer: "which" path: "Panels/General/question_1_proxy_1" }
   proxies { answer: "where" path: "Panels/General/question_1_proxy_2" }
+  display_name: "QUESTION (Where)"
 }
@@ -1,53 +1,53 @@
 name: "West Side"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
   name: "ERASE"
   path: "Panels/General/entry_9"
   clue: "erase"
   answer: "write"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "TEACH"
   path: "Panels/Magnet Room/magnet_1"
   clue: "teach"
   answer: "learn"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "RIGHT"
   path: "Panels/Impressive/entry_1"
   clue: "right"
   answer: "wrong"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "SAVORY"
   path: "Panels/Favors/favors_1"
   clue: "savory"
   answer: "unsavory"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "FLAVORS"
   path: "Panels/Favors/favors_2"
   clue: "flavors"
   answer: "favors"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "COLOR"
   path: "Panels/General/entry_5"
   clue: "color"
   answer: "red"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "CLUE"
   path: "Panels/General/entry_3"
   clue: "clue"
   answer: "hint"
-  symbols: "sun"
+  symbols: SUN
 }
 letters {
   key: "a"
@@ -76,4 +76,5 @@ ports {
   path: "Meshes/Blocks/Warps/worldport7"
   orientation: "east"
   # ER with this is weird; make sure to place on the surface
+  required_door { name: "Partial Entrance" }
 }
@@ -1,170 +1,170 @@
 name: "Whole Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "VAULT"
   path: "Panels/Whole Room/whole_1"
   clue: "vault"
   answer: "bank"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "STALL"
   path: "Panels/Whole Room/whole_2"
   clue: "stall"
   answer: "barn"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "OFFICE"
   path: "Panels/Whole Room/whole_3"
   clue: "office"
   answer: "bank"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "RAFTER"
   path: "Panels/Whole Room/whole_4"
   clue: "rafter"
   answer: "barn"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "REGISTER"
   path: "Panels/Whole Room/whole_5"
   clue: "register"
   answer: "store"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "SHELF"
   path: "Panels/Whole Room/whole_6"
   clue: "shelf"
   answer: "store"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "BEDROOM"
   path: "Panels/Whole Room/whole_7"
   clue: "bedroom"
   answer: "house"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "BATHROOM"
   path: "Panels/Whole Room/whole_8"
   clue: "bathroom"
   answer: "house"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "PHARMACY"
   path: "Panels/Whole Room/whole_9"
   clue: "pharmacy"
   answer: "hospital"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "LOBBY"
   path: "Panels/Whole Room/whole_10"
   clue: "lobby"
   answer: "hotel"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "CAFETERIA"
   path: "Panels/Whole Room/whole_11"
   clue: "cafeteria"
   answer: "hospital"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "ROOM"
   path: "Panels/Whole Room/whole_12"
   clue: "room"
   answer: "hotel"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "BLEACHER"
   path: "Panels/Whole Room/whole_13"
   clue: "bleacher"
   answer: "stadium"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "MACHINE"
   path: "Panels/Whole Room/whole_14"
   clue: "machine"
   answer: "factory"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "LINE"
   path: "Panels/Whole Room/whole_15"
   clue: "line"
   answer: "factory"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "CONCESSIONS"
   path: "Panels/Whole Room/whole_16"
   clue: "concessions"
   answer: "stadium"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "WALL"
   path: "Panels/Whole Room/whole_17"
   clue: "wall"
   answer: "fort"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "GATE"
   path: "Panels/Whole Room/whole_18"
   clue: "gate"
   answer: "fort"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "HOME (1)"
   path: "Panels/Whole Room/whole_19"
   clue: "home"
   answer: "duplex"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "HOME (2)"
   path: "Panels/Whole Room/whole_20"
   clue: "home"
   answer: "duplex"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "DICE"
   path: "Panels/Whole Room/whole_21"
   clue: "dice"
   answer: "casino"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "MOAT"
   path: "Panels/Whole Room/whole_22"
   clue: "moat"
   answer: "castle"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "CHIPS"
   path: "Panels/Whole Room/whole_23"
   clue: "chips"
   answer: "casino"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
   name: "TOWER"
   path: "Panels/Whole Room/whole_24"
   clue: "tower"
   answer: "castle"
-  symbols: "boxes"
+  symbols: BOXES
 }
@@ -1,5 +1,5 @@
 name: "Y Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 letters {
   key: "y"
   path: "Components/Collectables/y"
@@ -1,11 +1,11 @@
 name: "Zero Room"
-display_name: "Zero Room"
+panel_display_name: "Zero Room"
 panels {
   name: "HERO"
   path: "Panels/General/zero_1"
   clue: "hero"
   answer: "zero"
-  symbols: "zero"
+  symbols: ZERO
   required_door { name: "Zero Entrance" }
 }
 panels {
@@ -13,7 +13,7 @@ panels {
   path: "Panels/General/zero_2"
   clue: "many"
   answer: "zero"
-  symbols: "sun"
+  symbols: SUN
   required_door { name: "Zero Entrance" }
 }
 panels {
@@ -21,14 +21,14 @@ panels {
   path: "Panels/General/zero_3"
   clue: "shift"
   answer: "control"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "REMAINING"
   path: "Panels/General/zero_5"
   clue: "remaining"
   answer: "zero"
-  symbols: "question"
+  symbols: QUESTION
   required_door { name: "Zero Entrance" }
 }
 panels {
@@ -36,5 +36,5 @@ panels {
   path: "Panels/General/zero_4"
   clue: "middle"
   answer: "center"
-  symbols: "sun"
+  symbols: SUN
 }