44 files changed, 362 insertions, 175 deletions
diff --git a/data/maps/the_great/connections.txtpb b/data/maps/the_great/connections.txtpb
index f1a7e25..171e809 100644
--- a/data/maps/the_great/connections.txtpb
+++ b/data/maps/the_great/connections.txtpb

@@ -256,3 +256,7 @@ connections {
  to_room: "Zero Room"
  door { name: "Lavender Cube" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "The Landscapes"
+}
diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb
index be7cd00..98d9859 100644
--- a/data/maps/the_great/doors.txtpb
+++ b/data/maps/the_great/doors.txtpb

@@ -29,6 +29,15 @@ doors {
  location_room: "Main Area"
 }
 doors {
+  name: "Near Linear Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DEW" }
+  panels { room: "Main Area" name: "EWE" }
+  panels { room: "Main Area" name: "NO" }
+  location_room: "Main Area"
+  location_name: "DEW, EWE, NO"
+}
+doors {
  name: "Courtyard Entrance"
  type: STANDARD
  receivers: "Components/Doors/entry_1"
@@ -49,23 +58,27 @@ doors {
  type: LOCATION_ONLY
  panels { room: "West Side" name: "ERASE" }
  location_room: "West Side"
+  location_name: "ERASE"
 }
 doors {
  name: "Control Center Purple Door"
  type: CONTROL_CENTER_COLOR
+  latch: true
  receivers: "Components/Doors/entry_23"
  control_center_color: "purple"
 }
 doors {
  name: "Control Center Gray Door"
  type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  latch: true
+  receivers: "Components/Doors/Gates/Gate/animationListener"
  control_center_color: "gray"
 }
 doors {
  name: "Control Center Red Door"
  type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  latch: true
+  receivers: "Components/Doors/entry_18"
  control_center_color: "red"
 }
 doors {
@@ -123,6 +136,7 @@ doors {
  panels { room: "Magnet Room" name: "SAW" }
  panels { room: "Magnet Room" name: "BLENDER" }
  location_room: "Magnet Room"
+  location_name: "Gravestone"
 }
 doors {
  name: "Hive Entrance"
@@ -142,6 +156,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"
@@ -203,29 +218,31 @@ doors {
  panels { room: "Jail Part 2" name: "GRIMACE" }
  panels { room: "Jail Part 2" name: "COMMENCE" }
  location_room: "Jail Part 2"
+  location_name: "Gravestone"
 }
 doors {
  name: "The Landscapes Gravestone"
  type: GRAVESTONE
-  panels { room: "Back Area" name: "Top Landscape Top" }
+  panels { room: "The Landscapes" name: "Top Landscape Top" }
-  panels { room: "Back Area" name: "Top Landscape Right" }
+  panels { room: "The Landscapes" name: "Top Landscape Right" }
-  panels { room: "Back Area" name: "Top Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Top Landscape Bottom" }
-  panels { room: "Back Area" name: "Top Landscape Left" }
+  panels { room: "The Landscapes" name: "Top Landscape Left" }
-  panels { room: "Back Area" name: "Left Landscape Top" }
+  panels { room: "The Landscapes" name: "Left Landscape Top" }
-  panels { room: "Back Area" name: "Left Landscape Right" }
+  panels { room: "The Landscapes" name: "Left Landscape Right" }
-  panels { room: "Back Area" name: "Left Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Left Landscape Bottom" }
-  panels { room: "Back Area" name: "Left Landscape Left" }
+  panels { room: "The Landscapes" name: "Left Landscape Left" }
-  panels { room: "Back Area" name: "Right Landscape Top" }
+  panels { room: "The Landscapes" name: "Right Landscape Top" }
-  panels { room: "Back Area" name: "Right Landscape Right" }
+  panels { room: "The Landscapes" name: "Right Landscape Right" }
-  panels { room: "Back Area" name: "Right Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Right Landscape Bottom" }
-  panels { room: "Back Area" name: "Right Landscape Left" }
+  panels { room: "The Landscapes" name: "Right Landscape Left" }
-  location_room: "Back Area"
+  location_room: "The Landscapes"
+  location_name: "Gravestone"
 }
 doors {
  name: "Tower Entrance"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_25"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
  name: "Maze Out/South Door"
@@ -316,6 +333,7 @@ doors {
  panels { room: "Maze Up Area" name: "UP" }
  panels { room: "Maze Wreck Area" name: "WRECK" }
  location_room: "Maze Slice Area"
+  location_name: "Gravestone"
 }
 doors {
  name: "Courtyard Side Door"
@@ -391,11 +409,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"
@@ -406,7 +426,8 @@ doors {
 }
 doors {
  name: "Question Room Back Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/question_11"
  panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
  location_room: "Behind Question Area"
@@ -415,9 +436,10 @@ doors {
  name: "Invisible Entrance"
  type: STANDARD
  receivers: "Components/Doors/entry_36"
-  panels { room: "Back Area" name: "Right Landscape Top" answer: "tell" }
+  panels { room: "The Landscapes" name: "Right Landscape Top" answer: "tell" }
-  panels { room: "Back Area" name: "Right Landscape Left" answer: "eyes" }
+  panels { room: "The Landscapes" name: "Right Landscape Left" answer: "eyes" }
-  location_room: "Back Area"
+  location_room: "The Landscapes"
+  location_name: "Alternate Answers"
 }
 doors {
  name: "Nature Room Door"
@@ -463,12 +485,17 @@ doors {
  panels { room: "Whole Room" name: "CHIPS" }
  panels { room: "Whole Room" name: "TOWER" }
  location_room: "Whole Room"
+  location_name: "Gravestone"
 }
 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"
@@ -485,6 +512,7 @@ doors {
  panels { room: "Zero Room" name: "MANY" }
  panels { room: "Zero Room" name: "REMAINING" }
  location_room: "Zero Room"
+  location_name: "Panels"
 }
 doors {
  name: "Spiral Painting"
@@ -493,3 +521,110 @@ 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" }
+}
+doors {
+  name: "Why Is It Not Red"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHY" }
+  panels { room: "Main Area" name: "IS" }
+  panels { room: "Main Area" name: "IT" }
+  panels { room: "Main Area" name: "NOT" }
+  panels { room: "Main Area" name: "RED" }
+  location_room: "Main Area"
+  location_name: "WHY, IS, IT, NOT, RED"
+}
+doors {
+  name: "Control Center Gray Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COLOR" }
+  location_room: "Main Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Purple Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "COLOR" }
+  location_room: "East Landscape"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Red Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Side" name: "COLOR" }
+  location_room: "West Side"
+  location_name: "COLOR"
+}
+doors {
+  name: "Mistreat Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "MISTREAT" }
+  location_room: "East Landscape"
+  location_name: "MISTREAT"
+}
+doors {
+  name: "Tower Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "TOWEL" }
+  panels { room: "Maze Tower" name: "SPIRE" }
+  location_room: "Maze Tower"
+  location_name: "SPIRE, TOWEL"
+}
+doors {
+  name: "Tree Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "PLANT" }
+  panels { room: "Back Area" name: "TREE" }
+  location_room: "Back Area"
+  location_name: "PLANT, TREE"
+}
+doors {
+  name: "Behind Question Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Behind Question Area" name: "DEW" }
+  panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
+  panels { room: "Behind Question Area" name: "NO" }
+  location_room: "Behind Question Area"
+  location_name: "DEW, YEW/EWE, NO"
+}
+doors {
+  name: "Broken Shed Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "LAUGH" }
+  panels { room: "North Landscape" name: "FINISHED" }
+  panels { room: "North Landscape" name: "LAUGH FINISHED" }
+  location_room: "North Landscape"
+  location_name: "LAUGH, FINISHED, LAUGH FINISHED"
+}
+doors {
+  name: "Nature Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "WEATHER" }
+  panels { room: "North Landscape" name: "ANIMALS" }
+  panels { room: "North Landscape" name: "PLANTS" }
+  location_room: "North Landscape"
+  location_name: "ANIMALS, PLANTS, WEATHER"
+}
+doors {
+  name: "Teal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Maze Wreck Area" name: "MAROON" }
+  location_room: "Maze Wreck Area"
+  location_name: "MAROON"
+}
+doors {
+  name: "Behind Orb Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "BROWN RED ORANGE" }
+  location_room: "Main Area"
+  location_name: "Brown Red Orange"
+}
diff --git a/data/maps/the_great/rooms/Back Area.txtpb b/data/maps/the_great/rooms/Back Area.txtpb
index 3701249..33da394 100644
--- a/data/maps/the_great/rooms/Back Area.txtpb
+++ b/data/maps/the_great/rooms/Back Area.txtpb

@@ -1,5 +1,5 @@
 name: "Back Area"
-display_name: "Back Area"
+panel_display_name: "Back Area"
 panels {
  name: "PLANT"
  path: "Panels/General/entry_14"
@@ -28,92 +28,6 @@ panels {
  answer: "tower"
  symbols: SPARKLES
 }
-panels {
-  name: "Top Landscape Top"
-  path: "Panels/Kiwi Room/kiwi_1"
-  clue: ""
-  answer: "one"
-  symbols: QUESTION
-}
-panels {
-  name: "Top Landscape Right"
-  path: "Panels/Kiwi Room/kiwi_2"
-  clue: ""
-  answer: "road"
-  symbols: QUESTION
-}
-panels {
-  name: "Top Landscape Bottom"
-  path: "Panels/Kiwi Room/kiwi_3"
-  clue: ""
-  answer: "many"
-  symbols: QUESTION
-}
-panels {
-  name: "Top Landscape Left"
-  path: "Panels/Kiwi Room/kiwi_4"
-  clue: ""
-  answer: "turns"
-  symbols: QUESTION
-}
-panels {
-  name: "Left Landscape Top"
-  path: "Panels/Kiwi Room/kiwi_5"
-  clue: ""
-  answer: "find"
-  symbols: QUESTION
-}
-panels {
-  name: "Left Landscape Right"
-  path: "Panels/Kiwi Room/kiwi_6"
-  clue: ""
-  answer: "keys"
-  symbols: QUESTION
-}
-panels {
-  name: "Left Landscape Bottom"
-  path: "Panels/Kiwi Room/kiwi_7"
-  clue: ""
-  answer: "write"
-  symbols: QUESTION
-}
-panels {
-  name: "Left Landscape Left"
-  path: "Panels/Kiwi Room/kiwi_8"
-  clue: ""
-  answer: "words"
-  symbols: QUESTION
-}
-panels {
-  name: "Right Landscape Top"
-  path: "Panels/Kiwi Room/kiwi_9"
-  clue: ""
-  answer: "hear"
-  symbols: QUESTION
-  proxies { answer: "tell" path: "Panels/Kiwi Proxies/kiwi_9_proxy_1" }
-}
-panels {
-  name: "Right Landscape Right"
-  path: "Panels/Kiwi Room/kiwi_10"
-  clue: ""
-  answer: "lies"
-  symbols: QUESTION
-}
-panels {
-  name: "Right Landscape Bottom"
-  path: "Panels/Kiwi Room/kiwi_11"
-  clue: ""
-  answer: "the"
-  symbols: QUESTION
-}
-panels {
-  name: "Right Landscape Left"
-  path: "Panels/Kiwi Room/kiwi_12"
-  clue: ""
-  answer: "ears"
-  symbols: QUESTION
-  proxies { answer: "eyes" path: "Panels/Kiwi Proxies/kiwi_12_proxy_1" }
-}
 paintings {
  name: "SPIRAL"
  path: "Components/Paintings/spiral"
@@ -124,23 +38,31 @@ paintings {
 }
 ports {
  name: "UNKEMPT"
+  display_name: "Unkempt Entrance"
  path: "Meshes/Blocks/Warps/worldport5"
-  orientation: "north"
+  destination { x: 72 y: 0 z: 10.5 }
+  rotation: 180
 }
 ports {
  name: "THREEDOORS"
+  display_name: "Three Doors Entrance"
  path: "Meshes/Blocks/Warps/worldport16"
-  orientation: "south"
+  destination { x: 77 y: 0 z: 33.5 }
+  rotation: 0
 }
 ports {
  name: "TOWER"
+  display_name: "Tower Entrance"
  path: "Meshes/Blocks/Warps/worldport10"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 52 }
+  rotation: 0
  required_door { name: "Tower Entrance" }
  # The reverse warp bypasses the door, so there needs to be two oneway connections.
 }
 ports {
  name: "TREE"
+  display_name: "Tree Entrance"
  path: "Meshes/Blocks/Warps/worldport17"
-  orientation: "north"
+  destination { x: 26 y: 0 z: 58 }
+  rotation: 180
 }
diff --git a/data/maps/the_great/rooms/Behind Question Area.txtpb b/data/maps/the_great/rooms/Behind Question Area.txtpb
index 88f800f..744d4c4 100644
--- a/data/maps/the_great/rooms/Behind Question Area.txtpb
+++ b/data/maps/the_great/rooms/Behind Question Area.txtpb

@@ -1,5 +1,5 @@
 name: "Behind Question Area"
-display_name: "Main Area"
+panel_display_name: "Question Room"
 panels {
  name: "DEW"
  path: "Panels/General/uc_4"
diff --git a/data/maps/the_great/rooms/Colorful Entrance.txtpb b/data/maps/the_great/rooms/Colorful Entrance.txtpb
index 5d7c9b2..5464698 100644
--- a/data/maps/the_great/rooms/Colorful Entrance.txtpb
+++ b/data/maps/the_great/rooms/Colorful Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Colorful Entrance"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 ports {
  name: "COLORFUL"
+  display_name: "Pillar Room Worldport"
  path: "Meshes/Blocks/Warps/worldport13"
-  orientation: "west"
+  destination { x: -37.5 y: 0 z: 74 }
+  rotation: 270
 }
diff --git a/data/maps/the_great/rooms/Daedalus Entrance.txtpb b/data/maps/the_great/rooms/Daedalus Entrance.txtpb
index 7e1d477..abfab99 100644
--- a/data/maps/the_great/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_great/rooms/Daedalus Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Daedalus Entrance"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
  name: "MISSING"
  path: "Panels/General/entry_2"
@@ -9,8 +9,10 @@ panels {
 }
 ports {
  name: "DAEDALUS"
+  display_name: "Daedalus Entrance"
  path: "Meshes/Blocks/Warps/worldport8"
-  orientation: "south"
+  destination { x: 98 y: 2 z: 27.5 }
+  rotation: 0
  required_door { name: "Daedalus Entrance" }
  # The reverse warp bypasses the door, so there needs to be two oneway connections.
 }
diff --git a/data/maps/the_great/rooms/East Landscape.txtpb b/data/maps/the_great/rooms/East Landscape.txtpb
index 84fc182..44ed2c5 100644
--- a/data/maps/the_great/rooms/East Landscape.txtpb
+++ b/data/maps/the_great/rooms/East Landscape.txtpb

@@ -1,5 +1,5 @@
 name: "East Landscape"
-display_name: "East Landscape"
+panel_display_name: "East Landscape"
 panels {
  name: "COLOR"
  path: "Panels/General/entry_10"
diff --git a/data/maps/the_great/rooms/G Room.txtpb b/data/maps/the_great/rooms/G Room.txtpb
index 218a9c1..f93c899 100644
--- a/data/maps/the_great/rooms/G Room.txtpb
+++ b/data/maps/the_great/rooms/G Room.txtpb

@@ -1,5 +1,5 @@
 name: "G Room"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 letters {
  key: "g"
  path: "Components/Collectables/g"
diff --git a/data/maps/the_great/rooms/Hive Entrance.txtpb b/data/maps/the_great/rooms/Hive Entrance.txtpb
index ba886b1..56acc22 100644
--- a/data/maps/the_great/rooms/Hive Entrance.txtpb
+++ b/data/maps/the_great/rooms/Hive Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Hive Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
  name: "LOST"
  path: "Panels/Hive Room/hive_1"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "HIVE"
+  display_name: "Hive Entrance"
  path: "Meshes/Blocks/Warps/worldport19"
-  orientation: "east"
+  destination { x: -91.5 y: 0 z: 37 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Jail Part 1.txtpb b/data/maps/the_great/rooms/Jail Part 1.txtpb
index bd468bd..452841b 100644
--- a/data/maps/the_great/rooms/Jail Part 1.txtpb
+++ b/data/maps/the_great/rooms/Jail Part 1.txtpb

@@ -1,5 +1,5 @@
 name: "Jail Part 1"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "FLAP"
  path: "Panels/Throat/throat_1"
diff --git a/data/maps/the_great/rooms/Jail Part 2.txtpb b/data/maps/the_great/rooms/Jail Part 2.txtpb
index 1f54dd5..1a0c975 100644
--- a/data/maps/the_great/rooms/Jail Part 2.txtpb
+++ b/data/maps/the_great/rooms/Jail Part 2.txtpb

@@ -1,5 +1,5 @@
 name: "Jail Part 2"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "DIGEST"
  path: "Panels/Bowels3/bowels_1"
diff --git a/data/maps/the_great/rooms/Jubilant Entrance.txtpb b/data/maps/the_great/rooms/Jubilant Entrance.txtpb
index eaf9811..b254cc0 100644
--- a/data/maps/the_great/rooms/Jubilant Entrance.txtpb
+++ b/data/maps/the_great/rooms/Jubilant Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Jubilant Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 ports {
  name: "JUBILANT"
+  display_name: "Jubilant Entrance"
  path: "Meshes/Blocks/Warps/worldport12"
-  orientation: "east"
+  destination { x: -62 y: 0 z: -19 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Magnet Room.txtpb b/data/maps/the_great/rooms/Magnet Room.txtpb
index 4cf6433..2d122a4 100644
--- a/data/maps/the_great/rooms/Magnet Room.txtpb
+++ b/data/maps/the_great/rooms/Magnet Room.txtpb

@@ -1,5 +1,5 @@
 name: "Magnet Room"
-display_name: "Magnet Room"
+panel_display_name: "Magnet Room"
 panels {
  name: "AIRPLANE"
  path: "Panels/Magnet Room/magnet_2"
diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb
index 40c7fbb..a5ed9f3 100644
--- a/data/maps/the_great/rooms/Main Area.txtpb
+++ b/data/maps/the_great/rooms/Main Area.txtpb

@@ -1,5 +1,5 @@
 name: "Main Area"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
  name: "INTRO"
  path: "Panels/General/entry_8"
@@ -111,6 +111,7 @@ panels {
  answer: "high"
  symbols: SUN
  symbols: ZERO
+  required_door { name: "Cyan Doors" }
 }
 panels {
  name: "CURT"
@@ -121,27 +122,37 @@ panels {
 }
 ports {
  name: "ENTRY"
+  display_name: "Entry Building"
  path: "Meshes/Blocks/Warps/worldport"
-  orientation: "south"
+  destination { x: 33 y: 0 z: 15 }
+  rotation: 0
 }
 ports {
  name: "KEEN"
+  display_name: "Keen Building Front"
  path: "Meshes/Blocks/Warps/worldport6"
-  orientation: "north"
+  destination { x: 33 y: 0 z: -21 }
+  rotation: 180
 }
 ports {
  name: "ORB"
+  display_name: "Orb Building"
  path: "Meshes/Blocks/Warps/worldport3"
-  orientation: "north"
+  destination { x: 62 y: 0 z: -13 }
+  rotation: 180
 }
 ports {
  name: "LINEAR"
+  display_name: "Keen Building Back"
  path: "Meshes/Blocks/Warps/worldport15"
-  orientation: "south"
+  destination { x: 33 y: 0 z: -42.5 }
+  rotation: 0
 }
 ports {
  name: "DIGITAL"
+  display_name: "Digital Hole"
  path: "Meshes/Blocks/Warps/worldport4"
-  orientation: "down"
+  destination { x: -6.5 y: 0 z: 7.5 }
+  rotation: 0
  required_door { name: "Digital Entrance" }
 }
diff --git a/data/maps/the_great/rooms/Maze Center.txtpb b/data/maps/the_great/rooms/Maze Center.txtpb
index f557eaa..97ff146 100644
--- a/data/maps/the_great/rooms/Maze Center.txtpb
+++ b/data/maps/the_great/rooms/Maze Center.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Center"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "POOR"
  path: "Panels/Maze/maze_7"
diff --git a/data/maps/the_great/rooms/Maze Cold Area.txtpb b/data/maps/the_great/rooms/Maze Cold Area.txtpb
index 5886ca8..70b311e 100644
--- a/data/maps/the_great/rooms/Maze Cold Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Cold Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Cold Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "COLD"
  path: "Panels/Maze/maze_11"
diff --git a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb
index d6f265f..1540ee2 100644
--- a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb
+++ b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb

@@ -1,2 +1,2 @@
 name: "Maze Empty Vestibule"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
diff --git a/data/maps/the_great/rooms/Maze In Area.txtpb b/data/maps/the_great/rooms/Maze In Area.txtpb
index 13597a0..8c556aa 100644
--- a/data/maps/the_great/rooms/Maze In Area.txtpb
+++ b/data/maps/the_great/rooms/Maze In Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze In Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "IN"
  path: "Panels/Maze/maze_3"
diff --git a/data/maps/the_great/rooms/Maze Moon Area.txtpb b/data/maps/the_great/rooms/Maze Moon Area.txtpb
index b515224..10af4a1 100644
--- a/data/maps/the_great/rooms/Maze Moon Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Moon Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Moon Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "MOON"
  path: "Panels/Maze/maze_9"
diff --git a/data/maps/the_great/rooms/Maze Off Area.txtpb b/data/maps/the_great/rooms/Maze Off Area.txtpb
index 2fe7bed..c577129 100644
--- a/data/maps/the_great/rooms/Maze Off Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Off Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Off Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "OFF"
  path: "Panels/Maze/maze_14"
diff --git a/data/maps/the_great/rooms/Maze Slice Area.txtpb b/data/maps/the_great/rooms/Maze Slice Area.txtpb
index d720501..f59d6e5 100644
--- a/data/maps/the_great/rooms/Maze Slice Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Slice Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Slice Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SLICE"
  path: "Panels/Maze/maze_4"
diff --git a/data/maps/the_great/rooms/Maze Smooth Area.txtpb b/data/maps/the_great/rooms/Maze Smooth Area.txtpb
index 8145357..156e885 100644
--- a/data/maps/the_great/rooms/Maze Smooth Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Smooth Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Smooth Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SMOOTH"
  path: "Panels/Maze/maze_5"
diff --git a/data/maps/the_great/rooms/Maze South Area.txtpb b/data/maps/the_great/rooms/Maze South Area.txtpb
index b3708db..e65778d 100644
--- a/data/maps/the_great/rooms/Maze South Area.txtpb
+++ b/data/maps/the_great/rooms/Maze South Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze South Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SOUTH"
  path: "Panels/Maze/maze_2"
diff --git a/data/maps/the_great/rooms/Maze Start.txtpb b/data/maps/the_great/rooms/Maze Start.txtpb
index 1e89cbe..16a57f5 100644
--- a/data/maps/the_great/rooms/Maze Start.txtpb
+++ b/data/maps/the_great/rooms/Maze Start.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Start"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "OUT"
  path: "Panels/Maze/maze_1"
diff --git a/data/maps/the_great/rooms/Maze Tower.txtpb b/data/maps/the_great/rooms/Maze Tower.txtpb
index 6a815aa..3b1e5fc 100644
--- a/data/maps/the_great/rooms/Maze Tower.txtpb
+++ b/data/maps/the_great/rooms/Maze Tower.txtpb

@@ -1,5 +1,4 @@
 name: "Maze Tower"
-display_name: "Courtyard"
 panels {
  name: "FEEL"
  path: "Panels/Maze/maze_12"
diff --git a/data/maps/the_great/rooms/Maze Up Area.txtpb b/data/maps/the_great/rooms/Maze Up Area.txtpb
index 29f175b..0046cef 100644
--- a/data/maps/the_great/rooms/Maze Up Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Up Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Up Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "UP"
  path: "Panels/Maze/maze_15"
diff --git a/data/maps/the_great/rooms/Maze Wreck Area.txtpb b/data/maps/the_great/rooms/Maze Wreck Area.txtpb
index 6808fc2..5710df5 100644
--- a/data/maps/the_great/rooms/Maze Wreck Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Wreck Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Wreck Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "WRECK"
  path: "Panels/Maze/maze_8"
diff --git a/data/maps/the_great/rooms/Nature Room.txtpb b/data/maps/the_great/rooms/Nature Room.txtpb
index 9f798f3..464d3a2 100644
--- a/data/maps/the_great/rooms/Nature Room.txtpb
+++ b/data/maps/the_great/rooms/Nature Room.txtpb

@@ -1,5 +1,5 @@
 name: "Nature Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
  name: "SEVERE"
  path: "Panels/General/nature_2"
diff --git a/data/maps/the_great/rooms/North Landscape.txtpb b/data/maps/the_great/rooms/North Landscape.txtpb
index 959f351..f738ed3 100644
--- a/data/maps/the_great/rooms/North Landscape.txtpb
+++ b/data/maps/the_great/rooms/North Landscape.txtpb

@@ -1,5 +1,5 @@
 name: "North Landscape"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
  name: "WEATHER"
  path: "Panels/General/platforms_1"
@@ -52,11 +52,13 @@ panels {
 keyholders {
  name: "X"
  path: "Components/KeyHolders/keyHolderX"
+  key: "x"
 }
 ports {
  name: "INVISIBLE"
+  display_name: "Eye Worldport"
  path: "Meshes/Blocks/Warps/worldport20"
-  orientation: "north"
+  destination { x: 33 y: 0 z: -66.5 }
-  # Note that this can be easily entered from the other side.
+  rotation: 0
  required_door { name: "Invisible Entrance" }
 }
diff --git a/data/maps/the_great/rooms/Outside Jail.txtpb b/data/maps/the_great/rooms/Outside Jail.txtpb
index ab30761..d6dfa71 100644
--- a/data/maps/the_great/rooms/Outside Jail.txtpb
+++ b/data/maps/the_great/rooms/Outside Jail.txtpb

@@ -1,5 +1,5 @@
 name: "Outside Jail"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "GUT"
  path: "Panels/Head/head_1"
diff --git a/data/maps/the_great/rooms/Pillar Room.txtpb b/data/maps/the_great/rooms/Pillar Room.txtpb
index 01ff309..648b7b4 100644
--- a/data/maps/the_great/rooms/Pillar Room.txtpb
+++ b/data/maps/the_great/rooms/Pillar Room.txtpb

@@ -1,5 +1,5 @@
 name: "Pillar Room"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 panels {
  name: "EYE"
  path: "Panels/Impressive/entry_2"
diff --git a/data/maps/the_great/rooms/Purple Room.txtpb b/data/maps/the_great/rooms/Purple Room.txtpb
index ff9bd9a..12e79e7 100644
--- a/data/maps/the_great/rooms/Purple Room.txtpb
+++ b/data/maps/the_great/rooms/Purple Room.txtpb

@@ -1,7 +1,9 @@
 name: "Purple Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
  name: "DAEDALUS"
+  display_name: "Purple Hallway"
  path: "Meshes/Blocks/Warps/worldport18"
-  orientation: "north"
+  destination { x: 158 y: 0 z: 14 }
+  rotation: 180
 }
diff --git a/data/maps/the_great/rooms/Question Room How.txtpb b/data/maps/the_great/rooms/Question Room How.txtpb
index 2c4395b..8f087d0 100644
--- a/data/maps/the_great/rooms/Question Room How.txtpb
+++ b/data/maps/the_great/rooms/Question Room How.txtpb

@@ -1,5 +1,5 @@
 name: "Question Room How"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_3"
@@ -12,6 +12,7 @@ panels {
  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"
diff --git a/data/maps/the_great/rooms/Question Room What.txtpb b/data/maps/the_great/rooms/Question Room What.txtpb
index c7be6a9..a61ccef 100644
--- a/data/maps/the_great/rooms/Question Room What.txtpb
+++ b/data/maps/the_great/rooms/Question Room What.txtpb

@@ -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: "what" path: "Panels/Question Proxies/question_4_proxied" }
-  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied2" }
+  proxies { answer: "why" path: "Panels/Question Proxies/question_4_proxied2" }
-  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied3" }
+  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied3" }
  proxies { answer: "how" path: "Panels/Question Proxies/question_4_proxied4" }
-  proxies { answer: "what" path: "Panels/Question Proxies/question_4_proxied5" }
+  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied5" }
-  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied6" }
+  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied6" }
+  display_name: "QUESTION (What)"
 }
diff --git a/data/maps/the_great/rooms/Question Room When.txtpb b/data/maps/the_great/rooms/Question Room When.txtpb
index 4de0d0f..b3ee2db 100644
--- a/data/maps/the_great/rooms/Question Room When.txtpb
+++ b/data/maps/the_great/rooms/Question Room When.txtpb

@@ -1,5 +1,5 @@
 name: "Question Room When"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_1"
@@ -12,6 +12,7 @@ panels {
  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"
diff --git a/data/maps/the_great/rooms/Question Room Who.txtpb b/data/maps/the_great/rooms/Question Room Who.txtpb
index f1d6eb7..eb80882 100644
--- a/data/maps/the_great/rooms/Question Room Who.txtpb
+++ b/data/maps/the_great/rooms/Question Room Who.txtpb

@@ -1,5 +1,5 @@
 name: "Question Room Who"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_2"
@@ -12,4 +12,5 @@ panels {
  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)"
 }
diff --git a/data/maps/the_great/rooms/Salmon Room.txtpb b/data/maps/the_great/rooms/Salmon Room.txtpb
index 96efd1a..8458829 100644
--- a/data/maps/the_great/rooms/Salmon Room.txtpb
+++ b/data/maps/the_great/rooms/Salmon Room.txtpb

@@ -1,7 +1,9 @@
 name: "Salmon Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
  name: "BETWEEN"
+  display_name: "Salmon Hallway"
  path: "Meshes/Blocks/Warps/worldport11"
-  orientation: "east"
+  destination { x: 83 y: 0 z: -21 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Talented Entrance.txtpb b/data/maps/the_great/rooms/Talented Entrance.txtpb
index 038c7e7..53c27dc 100644
--- a/data/maps/the_great/rooms/Talented Entrance.txtpb
+++ b/data/maps/the_great/rooms/Talented Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Talented Entrance"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 ports {
  name: "TALENTED"
+  display_name: "Under Question Room Worldport"
  path: "Meshes/Blocks/Warps/worldport14"
-  orientation: "south"
+  destination { x: 109 y: -6 z: -26.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_great/rooms/The Landscapes.txtpb b/data/maps/the_great/rooms/The Landscapes.txtpb
new file mode 100644
index 0000000..2912843
--- /dev/null
+++ b/data/maps/the_great/rooms/The Landscapes.txtpb

@@ -0,0 +1,88 @@
+name: "The Landscapes"
+panel_display_name: "The Landscapes"
+panels {
+  name: "Top Landscape Top"
+  path: "Panels/Kiwi Room/kiwi_1"
+  clue: ""
+  answer: "one"
+  symbols: QUESTION
+}
+panels {
+  name: "Top Landscape Right"
+  path: "Panels/Kiwi Room/kiwi_2"
+  clue: ""
+  answer: "road"
+  symbols: QUESTION
+}
+panels {
+  name: "Top Landscape Bottom"
+  path: "Panels/Kiwi Room/kiwi_3"
+  clue: ""
+  answer: "many"
+  symbols: QUESTION
+}
+panels {
+  name: "Top Landscape Left"
+  path: "Panels/Kiwi Room/kiwi_4"
+  clue: ""
+  answer: "turns"
+  symbols: QUESTION
+}
+panels {
+  name: "Left Landscape Top"
+  path: "Panels/Kiwi Room/kiwi_5"
+  clue: ""
+  answer: "find"
+  symbols: QUESTION
+}
+panels {
+  name: "Left Landscape Right"
+  path: "Panels/Kiwi Room/kiwi_6"
+  clue: ""
+  answer: "keys"
+  symbols: QUESTION
+}
+panels {
+  name: "Left Landscape Bottom"
+  path: "Panels/Kiwi Room/kiwi_7"
+  clue: ""
+  answer: "write"
+  symbols: QUESTION
+}
+panels {
+  name: "Left Landscape Left"
+  path: "Panels/Kiwi Room/kiwi_8"
+  clue: ""
+  answer: "words"
+  symbols: QUESTION
+}
+panels {
+  name: "Right Landscape Top"
+  path: "Panels/Kiwi Room/kiwi_9"
+  clue: ""
+  answer: "hear"
+  symbols: QUESTION
+  proxies { answer: "tell" path: "Panels/Kiwi Proxies/kiwi_9_proxy_1" }
+}
+panels {
+  name: "Right Landscape Right"
+  path: "Panels/Kiwi Room/kiwi_10"
+  clue: ""
+  answer: "lies"
+  symbols: QUESTION
+}
+panels {
+  name: "Right Landscape Bottom"
+  path: "Panels/Kiwi Room/kiwi_11"
+  clue: ""
+  answer: "the"
+  symbols: QUESTION
+}
+panels {
+  name: "Right Landscape Left"
+  path: "Panels/Kiwi Room/kiwi_12"
+  clue: ""
+  answer: "ears"
+  symbols: QUESTION
+  proxies { answer: "eyes" path: "Panels/Kiwi Proxies/kiwi_12_proxy_1" }
+}
diff --git a/data/maps/the_great/rooms/Under Question Room.txtpb b/data/maps/the_great/rooms/Under Question Room.txtpb
index 4992632..db751bb 100644
--- a/data/maps/the_great/rooms/Under Question Room.txtpb
+++ b/data/maps/the_great/rooms/Under Question Room.txtpb

@@ -1,5 +1,5 @@
 name: "Under Question Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/General/question_1"
@@ -8,4 +8,5 @@ panels {
  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)"
 }
diff --git a/data/maps/the_great/rooms/West Side.txtpb b/data/maps/the_great/rooms/West Side.txtpb
index 4723213..9f098ee 100644
--- a/data/maps/the_great/rooms/West Side.txtpb
+++ b/data/maps/the_great/rooms/West Side.txtpb

@@ -1,5 +1,5 @@
 name: "West Side"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
  name: "ERASE"
  path: "Panels/General/entry_9"
@@ -63,17 +63,24 @@ paintings {
 }
 ports {
  name: "IMPRESSIVE"
+  display_name: "Impressive Entrance"
  path: "Meshes/Blocks/Warps/worldport2"
-  orientation: "south"
+  destination { x: -34 y: 0 z: 22.5 }
+  rotation: 0
 }
 ports {
  name: "CC"
+  display_name: "Control Center"
  path: "Meshes/Blocks/Warps/worldport9"
-  orientation: "north"
+  destination { x: -59 y: 0 z: -50.5 }
+  rotation: 180
 }
 ports {
  name: "PARTIAL"
+  display_name: "Red Hallway"
  path: "Meshes/Blocks/Warps/worldport7"
-  orientation: "east"
+  destination { x: -62 y: 0 z: 11 }
+  rotation: 90
  # ER with this is weird; make sure to place on the surface
+  required_door { name: "Partial Entrance" }
 }
diff --git a/data/maps/the_great/rooms/Whole Room.txtpb b/data/maps/the_great/rooms/Whole Room.txtpb
index 2f5c855..989241a 100644
--- a/data/maps/the_great/rooms/Whole Room.txtpb
+++ b/data/maps/the_great/rooms/Whole Room.txtpb

@@ -1,5 +1,5 @@
 name: "Whole Room"
-display_name: "North Landscape"
+panel_display_name: "Building Building"
 panels {
  name: "VAULT"
  path: "Panels/Whole Room/whole_1"
diff --git a/data/maps/the_great/rooms/Y Room.txtpb b/data/maps/the_great/rooms/Y Room.txtpb
index b20420c..46c83ea 100644
--- a/data/maps/the_great/rooms/Y Room.txtpb
+++ b/data/maps/the_great/rooms/Y Room.txtpb

@@ -1,5 +1,5 @@
 name: "Y Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 letters {
  key: "y"
  path: "Components/Collectables/y"
diff --git a/data/maps/the_great/rooms/Zero Room.txtpb b/data/maps/the_great/rooms/Zero Room.txtpb
index dcbe067..54675bf 100644
--- a/data/maps/the_great/rooms/Zero Room.txtpb
+++ b/data/maps/the_great/rooms/Zero Room.txtpb

@@ -1,5 +1,5 @@
 name: "Zero Room"
-display_name: "Zero Room"
+panel_display_name: "Zero Room"
 panels {
  name: "HERO"
  path: "Panels/General/zero_1"