40 files changed, 234 insertions, 120 deletions
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 68aa344..6260665 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -64,6 +64,16 @@ connections {
  door { name: "Flipped Pyramid Area Entrance" }
 }
 connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
+connections {
  from_room: "Right Eye"
  to_room: "Least Blue Last"
  door { name: "Red Blue Area Left Door" }
@@ -90,8 +100,19 @@ connections {
 }
 connections {
  from_room: "Red Blue Halls"
+  to_room: "Least Blue Last"
+  oneway: true
+}
+connections {
+  from_room: "Red Blue Halls"
  to_room: "Wrath Room"
  door { name: "Noon Door" }
+  oneway: true
+}
+connections {
+  from_room: "Wrath Room"
+  to_room: "Least Blue Last"
+  oneway: true
 }
 connections {
  from_room: "Red Blue Halls"
@@ -100,6 +121,11 @@ connections {
 }
 connections {
  from_room: "Wrath Room"
+  to_room: "Rabbit Hole Lock"
+  door { name: "Noon Door" }
+}
+connections {
+  from_room: "Wrath Room"
  to_room: "Rabbit Hole"
  door { name: "Rabbithole Door" }
 }
@@ -116,7 +142,7 @@ connections {
 connections {
  from_room: "Blue Alcove"
  to_room: "Least Blue Last"
-  door { name: "Red Alcove Exit" }
+  door { name: "Blue Alcove Exit" }
 }
 connections {
  from_room: "Parthenon Return"
@@ -144,6 +170,11 @@ connections {
  door { name: "Lime Room Entrance" }
 }
 connections {
+  from_room: "Lime Room"
+  to_room: "Revitalized Entrance"
+  door { name: "Revitalized Entrance" }
+}
+connections {
  from { painting { room: "Link Area" name: "NEAR" } }
  to { painting { room: "Flipped Link Area" name: "NEAR" } }
  oneway: true
@@ -162,12 +193,12 @@ connections {
  from_room: "Starting Room"
  to_room: "Digital Entrance"
  door { name: "Second Room Left Door" }
-  oneway: true
 }
 connections {
  from_room: "Digital Entrance"
  to_room: "Starting Room"
  oneway: true
+  vanilla_only: true
 }
 connections {
  from_room: "Starting Room"
@@ -182,10 +213,35 @@ connections {
 connections {
  from_room: "Starting Room"
  to_room: "Repetitive Entrance"
-  door { name: "Repetitive Entrance" }
+  door { name: "Starting Room West Wall North Door" }
 }
 connections {
  from_room: "Lime Room"
  to_room: "White Hallway To Daedalus"
  door { name: "Control Center White Door" }
 }
+connections {
+  from_room: "Flipped Second Room"
+  to_room: "Four Rooms Entrance"
+  door { name: "Flipped Second Room Right Door" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Liberated Entrance"
+  door { name: "Liberated Entrance" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Literate Entrance"
+  door { name: "Literate Entrance" }
+}
+connections {
+  from_room: "Liberated Entrance"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Literate Entrance"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 917edc7..40e486a 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -62,9 +62,9 @@ doors {
  name: "Rabbithole Door"
  type: STANDARD
  receivers: "Components/Doors/second_right8"
-  panels { room: "Wrath Room" name: "RABBIT" }
+  panels { room: "Rabbit Hole Lock" name: "RABBIT" }
-  panels { room: "Wrath Room" name: "HOLE" }
+  panels { room: "Rabbit Hole Lock" name: "HOLE" }
-  location_room: "Wrath Room"
+  location_room: "Rabbit Hole Lock"
 }
 # second_right is vanilla because it's like LOST door.
 doors {
@@ -113,10 +113,9 @@ doors {
 }
 doors {
  name: "Right Eye Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
  receivers: "Components/Doors/third_right"
  panels { room: "Trick Room" name: "INK" }
-  location_room: "Trick Room"
 }
 doors {
  name: "Red Blue Area Left Door"
@@ -138,8 +137,10 @@ doors {
  type: STANDARD
  receivers: "Components/Doors/back_left_2"
  panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" }
-  # "wall" is supposed to also work. idk man
+  panels { room: "Colored Doors Area" name: "OPEN" answer: "wall" }
+  complete_at: 1
  location_room: "Colored Doors Area"
+  location_name: "OPEN"
 }
 doors {
  name: "Lime Room Entrance"
@@ -194,10 +195,10 @@ doors {
  location_room: "Starting Room"
 }
 doors {
-  name: "Repetitive Entrance"
+  name: "Starting Room West Wall North Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/Entry/entry_proxied_9"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
  name: "Shop Entrance"
@@ -210,20 +211,20 @@ doors {
  name: "Liberated Entrance"
  type: STANDARD
  receivers: "Components/Doors/Entry/entry_proxied_10"
-  panels { room: "Flipped Pyramid Area" name: "TURN (1)" }
+  panels { room: "Liberated Entrance Panel" name: "TURN (1)" }
  location_room: "Flipped Pyramid Area"
 }
 doors {
  name: "Flipped Pyramid Area Entrance"
-  type: ITEM_ONLY
+  type: EVENT
  receivers: "Components/Doors/Entry/entry_proxied_12"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
  name: "Literate Entrance"
  type: STANDARD
  receivers: "Components/Doors/Entry/entry_proxied_11"
-  panels { room: "Flipped Pyramid Area" name: "TURN (2)" }
+  panels { room: "Literate Entrance Panel" name: "TURN (2)" }
  location_room: "Flipped Pyramid Area"
 }
 doors {
@@ -252,7 +253,7 @@ doors {
  type: ITEM_ONLY
  receivers: "Components/Doors/Entry/d_3"
  receivers: "Components/Doors/Entry/d_4"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
  name: "D Room Panels"
@@ -287,7 +288,8 @@ doors {
 doors {
  name: "Least Blue Last Panels"
  type: EVENT
-  move_paintings { room: "Starting Room" name: "OWL" }
+  #move_paintings { room: "Starting Room" name: "OWL" }
+  #receivers: "Components/Paintings/owl/visibilityListener"
  panels { room: "Least Blue Last" name: "CAPABLE (1)" }
  panels { room: "Least Blue Last" name: "CAPABLE (2)" }
  panels { room: "Least Blue Last" name: "LUSTRE" }
@@ -301,7 +303,8 @@ doors {
 doors {
  name: "Red Room Painting"
  type: STANDARD
-  move_paintings { room: "Right Eye" name: "PSYCHIC" }
+  #move_paintings { room: "Right Eye" name: "PSYCHIC" }
+  receivers: "Components/Paintings/psychic/teleportListener"
  panels { room: "Right Eye" name: "FAINT" }
  location_room: "Right Eye"
 }
diff --git a/data/maps/the_entry/metadata.txtpb b/data/maps/the_entry/metadata.txtpb
index 679454a..0eeb29a 100644
--- a/data/maps/the_entry/metadata.txtpb
+++ b/data/maps/the_entry/metadata.txtpb

@@ -9,3 +9,5 @@ excluded_nodes: "Panels/Back Left/backleft_3_proxied_1"
 excluded_nodes: "Panels/Back Left/backleft_3_proxied_2"
 excluded_nodes: "Panels/Back Left/backleft_4_proxied_1"
 excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
+# This is a proxy related to the first panel and it doesn't seem useful.
+excluded_nodes: "Panels/Entry/entry_proxied_fake"
diff --git a/data/maps/the_entry/rooms/Blue Alcove.txtpb b/data/maps/the_entry/rooms/Blue Alcove.txtpb
index 4c2c48c..3df58b9 100644
--- a/data/maps/the_entry/rooms/Blue Alcove.txtpb
+++ b/data/maps/the_entry/rooms/Blue Alcove.txtpb

@@ -1,5 +1,5 @@
 name: "Blue Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "BLUE"
  path: "Panels/Back Right/br_11"
diff --git a/data/maps/the_entry/rooms/Colored Doors Area.txtpb b/data/maps/the_entry/rooms/Colored Doors Area.txtpb
index 29e89b5..4767387 100644
--- a/data/maps/the_entry/rooms/Colored Doors Area.txtpb
+++ b/data/maps/the_entry/rooms/Colored Doors Area.txtpb

@@ -1,5 +1,5 @@
 name: "Colored Doors Area"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "OPEN"
  path: "Panels/Back Left/backleft_proxying_1"
diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
index 4c18625..ca9e7f4 100644
--- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Composite Room Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "COMPOSITE"
+  display_name: "Starting Room NE Worldport"
  path: "Components/Warps/worldport12"
-  orientation: "east"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb
index 0819953..fabcd60 100644
--- a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb
+++ b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb

@@ -1,5 +1,5 @@
 name: "Ctrl Tutorial"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "RIGHT"
  path: "Panels/Back Left/backleft_proxying_2"
diff --git a/data/maps/the_entry/rooms/D Room Final.txtpb b/data/maps/the_entry/rooms/D Room Final.txtpb
index 960cb1c..bb8ee87 100644
--- a/data/maps/the_entry/rooms/D Room Final.txtpb
+++ b/data/maps/the_entry/rooms/D Room Final.txtpb

@@ -1,5 +1,5 @@
 name: "D Room Final"
-display_name: "D Room"
+panel_display_name: "D Room"
 letters {
  key: "d"
  path: "Components/Collectables/d"
diff --git a/data/maps/the_entry/rooms/D Room.txtpb b/data/maps/the_entry/rooms/D Room.txtpb
index 27a975b..fdf6846 100644
--- a/data/maps/the_entry/rooms/D Room.txtpb
+++ b/data/maps/the_entry/rooms/D Room.txtpb

@@ -1,5 +1,5 @@
 name: "D Room"
-display_name: "D Room"
+panel_display_name: "D Room"
 panels {
  name: "BASEBALL"
  path: "Panels/D/d_2"
diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
index 60b41cb..76dc278 100644
--- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Daedalus Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "DAEDALUS"
+  display_name: "Starting Room North Wall West Worldport"
  path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb
index 5713a8d..b7689bd 100644
--- a/data/maps/the_entry/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Digital Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "DIGITAL"
+  display_name: "Second Room Left Worldport"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb
index 6b4fadd..e270bf8 100644
--- a/data/maps/the_entry/rooms/Entry Exit.txtpb
+++ b/data/maps/the_entry/rooms/Entry Exit.txtpb

@@ -1,7 +1,9 @@
 name: "Entry Exit"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "GREAT"
+  display_name: "Second Room Right Worldport"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb
index 8c6290b..00f2534 100644
--- a/data/maps/the_entry/rooms/Eye Room.txtpb
+++ b/data/maps/the_entry/rooms/Eye Room.txtpb

@@ -1,5 +1,5 @@
 name: "Eye Room"
-display_name: "Eye Room"
+panel_display_name: "Eye Room"
 panels {
  name: "I"
  path: "Panels/Entry/eyes_1"
@@ -31,6 +31,8 @@ paintings {
 }
 ports {
  name: "LIONIZED"
+  display_name: "Eye Room Worldport"
  path: "Components/Warps/worldport10"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Flipped Link Area.txtpb b/data/maps/the_entry/rooms/Flipped Link Area.txtpb
index 5251023..950e9b1 100644
--- a/data/maps/the_entry/rooms/Flipped Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Link Area.txtpb

@@ -1,18 +1,19 @@
 name: "Flipped Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
  name: "WANDER"
  path: "Panels/Pilgrimage/cream_4"
  clue: "wander"
  answer: "roam"
  symbols: SUN
+  display_name: "WANDER (Flipped)"
 }
 paintings {
  name: "NEAR"
  path: "Components/Paintings/aches2"
  orientation: "north"
  gravity: Y_PLUS
-  display_name: "Flipper Near Painting"
+  display_name: "Flipped Near Painting"
 }
 paintings {
  name: "FAR"
diff --git a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
index e2dd992..30e737f 100644
--- a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb

@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
-panels {
+# The fact that the doors here cover up the panels once they open is a problem
-  name: "TURN (1)"
+# since you're not guaranteed to have access to the lower area if painting
-  path: "Panels/Entry/l_opener_3"
+# shuffle is a thing. So we need to edit these doors so that they don't cover up
-  clue: "turn"
+# the panels.
-  answer: "flip"
-  symbols: SUN
-}
-panels {
-  name: "TURN (2)"
-  path: "Panels/Entry/l_opener_4"
-  clue: "turn"
-  answer: "spin"
-  symbols: SUN
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb
index 429d63e..14f3f5a 100644
--- a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb

@@ -1,5 +1,5 @@
 name: "Flipped Right Eye"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
  name: "WHERE"
  path: "Panels/Pilgrimage/cream_5"
diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
index d4ee780..0d518bb 100644
--- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb

@@ -1,5 +1,5 @@
 name: "Flipped Second Room"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
  name: "CLUE"
  path: "Panels/Entry/second_right_top"
@@ -21,10 +21,3 @@ paintings {
  gravity: Y_PLUS
  display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  gravity: Y_PLUS
-  required_door { name: "Flipped Second Room Right Door" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
new file mode 100644
index 0000000..4d94d5a
--- /dev/null
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -0,0 +1,9 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  display_name: "Flipped Second Room Right Worldport"
+  path: "Components/Warps/worldport9"
+  destination { x: -41 y: 6 z: -17.5 }
+  rotation: 0
+  gravity: Y_PLUS
+}
diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb
index 1273928..7235d80 100644
--- a/data/maps/the_entry/rooms/Gallery Return.txtpb
+++ b/data/maps/the_entry/rooms/Gallery Return.txtpb

@@ -1,5 +1,5 @@
 name: "Gallery Return"
-display_name: "Starting Room"
+panel_display_name: "Gallery Return"
 panels {
  name: "RETURN"
  path: "Panels/Entry/gallery_return"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "GALLERY"
+  display_name: "Gallery Return"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb
index 0f198b7..dde203a 100644
--- a/data/maps/the_entry/rooms/Least Blue Last.txtpb
+++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb

@@ -1,5 +1,5 @@
 name: "Least Blue Last"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "CAPABLE (1)"
  path: "Panels/LBL/lbl_1"
@@ -72,8 +72,10 @@ panels {
 }
 ports {
  name: "DARKROOM"
+  display_name: "Near L1 Worldport"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
  name: "PAINS"
diff --git a/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb
new file mode 100644
index 0000000..7c5ef71
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb

@@ -0,0 +1,9 @@
+name: "Liberated Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (1)"
+  path: "Panels/Entry/l_opener_3"
+  clue: "turn"
+  answer: "flip"
+  symbols: SUN
+}
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
new file mode 100644
index 0000000..56cc597
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -0,0 +1,8 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  display_name: "Pyramid Area Blue Worldport"
+  path: "worldport8"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
+}
diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb
index 6054dd7..603fbdc 100644
--- a/data/maps/the_entry/rooms/Lime Room.txtpb
+++ b/data/maps/the_entry/rooms/Lime Room.txtpb

@@ -1,5 +1,5 @@
 name: "Lime Room"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "HIDE"
  path: "Panels/Back Left/backleft_proxying_3"
@@ -19,9 +19,3 @@ panels {
  answer: "white"
  symbols: EXAMPLE
 }
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb
index 2866abd..5b68279 100644
--- a/data/maps/the_entry/rooms/Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Link Area.txtpb

@@ -1,11 +1,12 @@
 name: "Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
  name: "WANDER"
  path: "Panels/Pilgrimage/cream_3"
  clue: "wander"
  answer: "amble"
  symbols: SUN
+  display_name: "WANDER (Obverse)"
 }
 paintings {
  name: "NEAR"
@@ -25,15 +26,3 @@ paintings {
  orientation: "south"
  display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb
new file mode 100644
index 0000000..676598b
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb

@@ -0,0 +1,9 @@
+name: "Literate Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (2)"
+  path: "Panels/Entry/l_opener_4"
+  clue: "turn"
+  answer: "spin"
+  symbols: SUN
+}
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
new file mode 100644
index 0000000..b86ac80
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -0,0 +1,8 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  display_name: "Pyramid Area Brown Worldport"
+  path: "worldport9"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
+}
diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb
index 5a7f6b8..bb12964 100644
--- a/data/maps/the_entry/rooms/Parthenon Return.txtpb
+++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb

@@ -1,5 +1,5 @@
 name: "Parthenon Return"
-display_name: "Starting Room"
+panel_display_name: "Parthenon Return"
 panels {
  name: "RETURN"
  path: "Panels/Back Left/backleft_return"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "PARTHENON"
+  display_name: "Parthenon Return"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: -5.5 y: 0 z: 18 }
-}
-\ No newline at end of file
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb b/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb
new file mode 100644
index 0000000..78b4f3b
--- /dev/null
+++ b/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb

@@ -0,0 +1,18 @@
+name: "Rabbit Hole Lock"
+panel_display_name: "Red Blue Area"
+panels {
+  name: "RABBIT"
+  path: "Panels/Back Right/br_4"
+  clue: "rabbit"
+  answer: "hair"
+  symbols: SUN
+  symbols: ZERO
+}
+panels {
+  name: "HOLE"
+  path: "Panels/Back Right/br_5"
+  clue: "hole"
+  answer: "part"
+  symbols: ZERO
+  symbols: BOXES
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 9b18bc8..4ffeb84 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -1,5 +1,5 @@
 name: "Rabbit Hole"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "PUZZLE"
  path: "Panels/Back Right/br_6"
@@ -8,6 +8,8 @@ panels {
 }
 ports {
  name: "HOLE"
+  display_name: "Rabbit Hole"
  path: "worldport4"
-  orientation: "down"
+  destination { x: 74 y: 0 z: -43 }
-}
-\ No newline at end of file
+  rotation: 0
+}
diff --git a/data/maps/the_entry/rooms/Red Alcove.txtpb b/data/maps/the_entry/rooms/Red Alcove.txtpb
index 5c4085e..503b4a9 100644
--- a/data/maps/the_entry/rooms/Red Alcove.txtpb
+++ b/data/maps/the_entry/rooms/Red Alcove.txtpb

@@ -1,5 +1,5 @@
 name: "Red Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "BROW"
  path: "Panels/Back Right/br_10"
diff --git a/data/maps/the_entry/rooms/Red Blue Halls.txtpb b/data/maps/the_entry/rooms/Red Blue Halls.txtpb
index 7d07f9e..789ca42 100644
--- a/data/maps/the_entry/rooms/Red Blue Halls.txtpb
+++ b/data/maps/the_entry/rooms/Red Blue Halls.txtpb

@@ -1,5 +1,5 @@
 name: "Red Blue Halls"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "CENTER"
  path: "Panels/Back Right/br_1"
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 982e3f3..25c3307 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

@@ -1,7 +1,12 @@
 name: "Repetitive Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "REPETITIVE"
+  display_name: "Starting Room West Wall North Worldport"
  path: "Components/Warps/worldport7"
-  orientation: "north"
+  destination { x: -20 y: 0 z: -16 }
+  rotation: 180
+  # TODO: this is part of what makes the keyholder dependent connection from CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
diff --git a/data/maps/the_entry/rooms/Revitalized Entrance.txtpb b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb
new file mode 100644
index 0000000..fb5e7e0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb

@@ -0,0 +1,9 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  display_name: "Plum Hallway"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Right Eye.txtpb b/data/maps/the_entry/rooms/Right Eye.txtpb
index 1c7bf68..8f6c431 100644
--- a/data/maps/the_entry/rooms/Right Eye.txtpb
+++ b/data/maps/the_entry/rooms/Right Eye.txtpb

@@ -1,5 +1,5 @@
 name: "Right Eye"
-display_name: "Right Eye Area"
+panel_display_name: "Right Eye Area"
 panels {
  name: "EYE"
  path: "Panels/Entry/front_2"
diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index b52cde7..4a99efa 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Shop Entrance"
-display_name: "Starting Room"
+panel_display_name: "Shop Entrance"
 panels {
  name: "TURN"
  path: "Panels/Entry/l_opener_2"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "SHOP"
+  display_name: "Shop Entrance"
  path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb
index aeb66ab..8e8373b 100644
--- a/data/maps/the_entry/rooms/Starting Room.txtpb
+++ b/data/maps/the_entry/rooms/Starting Room.txtpb

@@ -1,10 +1,11 @@
 name: "Starting Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
  name: "HI"
  path: "Panels/Entry/entry_proxying_1"
  clue: "hi"
  answer: "hi"
+  proxies { answer: "hi" path: "Panels/Entry/entry_proxied_1" }
  proxies { answer: "bye" path: "Panels/Entry/entry_proxied_2" }
  proxies { answer: "hidden" path: "Panels/Entry/entry_proxied_5" }
  proxies { answer: "high" path: "Panels/Entry/entry_proxied_3" }
@@ -23,7 +24,9 @@ panels {
  path: "Panels/Entry/front_1"
  clue: "eye"
  answer: "i"
-  symbols: ZERO
+  #symbols: ZERO
+  # This panel blocks getting N1 and T1. We will mod it to be I/I with no symbol
+  # when symbol shuffle is on.
 }
 panels {
  name: "HINT"
diff --git a/data/maps/the_entry/rooms/Trick Room.txtpb b/data/maps/the_entry/rooms/Trick Room.txtpb
index ff9be38..d20502e 100644
--- a/data/maps/the_entry/rooms/Trick Room.txtpb
+++ b/data/maps/the_entry/rooms/Trick Room.txtpb

@@ -1,5 +1,5 @@
 name: "Trick Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
  name: "INK"
  path: "Panels/Entry/l_opener_1"
diff --git a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
index bf1398d..de0cec2 100644
--- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
+++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb

@@ -1,7 +1,9 @@
 name: "White Hallway To Daedalus"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 ports {
  name: "DAEDALUS"
+  display_name: "White Control Center Hallway"
  path: "Components/Warps/worldport11"
-  orientation: "west"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Wrath Room.txtpb b/data/maps/the_entry/rooms/Wrath Room.txtpb
index 29bd1cb..903a0b7 100644
--- a/data/maps/the_entry/rooms/Wrath Room.txtpb
+++ b/data/maps/the_entry/rooms/Wrath Room.txtpb

@@ -1,21 +1,5 @@
 name: "Wrath Room"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
-panels {
-  name: "RABBIT"
-  path: "Panels/Back Right/br_4"
-  clue: "rabbit"
-  answer: "hair"
-  symbols: SUN
-  symbols: ZERO
-}
-panels {
-  name: "HOLE"
-  path: "Panels/Back Right/br_5"
-  clue: "hole"
-  answer: "part"
-  symbols: ZERO
-  symbols: BOXES
-}
 panels {
  name: "WREATH"
  path: "Panels/Back Right/br_17"
diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb
index ada16f8..8388b4e 100644
--- a/data/maps/the_entry/rooms/X Area.txtpb
+++ b/data/maps/the_entry/rooms/X Area.txtpb

@@ -1,11 +1,13 @@
 name: "X Area"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 letters {
  key: "x"
  path: "Components/Collectables/x"
 }
 ports {
  name: "CC"
+  display_name: "Near X1 Worldport"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }