574 files changed, 2566 insertions, 1181 deletions

@@ -0,0 +1,13 @@
+# Lingo 2 Randomizer Data
+
+This folder contains the logic for the Lingo 2 randomizer in a human-readable
+format. This data is compiled into a single file and used in the various parts
+of the randomizer project (client, apworld, etc).
+
+The data is structured using [Protocol Buffers](https://protobuf.dev/). The
+schema for the human-readable format is
+[located in the repository](https://code.fourisland.com/lingo2-archipelago/tree/proto/human.proto).
+
+## Compiling
+
+Hi.
@@ -20,7 +20,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Flipped Second Room"
+      room: "Four Rooms Entrance"
       name: "FOUR"
     }
   }
@@ -141,7 +141,7 @@ connections {
   to {
     port {
       map: "the_darkroom"
-      room: "First Room"
+      room: "Cyan Hallway"
       name: "COLORFUL"
     }
   }
@@ -157,7 +157,7 @@ connections {
   to {
     port {
       map: "the_darkroom"
-      room: "Second Room"
+      room: "Congruent Entrance"
       name: "CONGRUENT"
     }
   }
@@ -233,7 +233,7 @@ connections {
   from {
     port {
       map: "the_darkroom"
-      room: "First Room"
+      room: "Double Sided Entrance"
       name: "DOUBLESIDED"
     }
   }
@@ -308,6 +308,23 @@ connections {
       name: "GALLERY"
     }
   }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_butterfly"
+      room: "Main Area"
+      name: "GALLERY"
+    }
+  }
+  to {
+    room {
+      map: "the_gallery"
+      name: "Main Area"
+    }
+  }
+  oneway: true
 }
 connections {
   from {
@@ -618,7 +635,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Link Area"
+      room: "Liberated Entrance"
       name: "BLUE"
     }
   }
@@ -666,7 +683,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Link Area"
+      room: "Literate Entrance"
       name: "BROWN"
     }
   }
@@ -714,7 +731,7 @@ connections {
   from {
     port {
       map: "the_orb"
-      room: "B Room"
+      room: "Middle Room"
       name: "MID"
     }
   }
@@ -841,6 +858,8 @@ connections {
   }
   oneway: true
 }
+# Two one-way connections because the CLUE panel only needs to be solved to
+# go from The Great to The Partial.
 connections {
   from {
     port {
@@ -856,6 +875,25 @@ connections {
       name: "GREAT"
     }
   }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_partial"
+      room: "Obverse Side"
+      name: "GREAT"
+    }
+  }
+  to {
+    port {
+      map: "the_great"
+      room: "West Side"
+      name: "PARTIAL"
+    }
+  }
+  oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
@@ -925,7 +963,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Lime Room"
+      room: "Revitalized Entrance"
       name: "REVITALIZED"
     }
   }
@@ -1193,6 +1231,7 @@ connections {
     }
   }
   oneway: true
+  roof_access: true
 }
 connections {
   from {
@@ -1398,7 +1437,7 @@ connections {
   to {
     room {
       map: "daedalus"
-      name: "Roof"
+      name: "Castle"
     }
   }
   oneway: true
@@ -1434,7 +1473,6 @@ connections {
       name: "GREAT"
     }
   }
-  door { map: "the_great" name: "Daedalus Entrance" }
   oneway: true
 }
 connections {
@@ -1453,6 +1491,7 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
@@ -1748,12 +1787,13 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
     port {
       map: "the_bearer"
-      room: "Back Area"
+      room: "Tree Entrance"
       name: "TREE"
     }
   }
@@ -1830,7 +1870,6 @@ connections {
   }
 }
 connections {
-  # Two one-way connections because the door only blocks one direction.
   from {
     port {
       map: "the_great"
@@ -1847,6 +1886,7 @@ connections {
   }
 }
 connections {
+  # Two one-way connections because the door only blocks one direction.
   from {
     port {
       map: "the_unkempt"
@@ -1879,6 +1919,7 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
@@ -2022,7 +2063,7 @@ connections {
   to {
     room {
       map: "the_wondrous"
-      name: "Regular"
+      name: "Huge"
     }
   }
   oneway: true
@@ -2404,3 +2445,34 @@ connections {
     }
   }
 }
+connections {
+  from {
+    painting {
+      map: "the_entry"
+      room: "Eye Room"
+      name: "GALLERY"
+    }
+  }
+  to {
+    room {
+      map: "the_gallery"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    room {
+      map: "the_sun_temple"
+      name: "Temple"
+    }
+  }
+  to {
+    room {
+      map: "the_graveyard"
+      name: "Outside"
+    }
+  }
+  oneway: true
+}
@@ -0,0 +1,163 @@
+door_groups {
+  name: "The Entry - Repetitive Entrance"
+  # This *should* be a CONNECTOR, but currently we're not shuffling these
+  # entrances because we want to guarantee that there's a way to The Repetitive
+  # without missing keys in vanilla doors. Hopefully can be changed eventually.
+  type: SHUFFLE_GROUP
+  doors {
+    map: "the_entry"
+    name: "Starting Room West Wall North Door"
+  }
+  doors {
+    map: "the_repetitive"
+    name: "Entry Entrance"
+  }
+}
+door_groups {
+  name: "The Repetitive - Plaza Entrance"
+  type: CONNECTOR
+  doors {
+    map: "the_repetitive"
+    name: "Black Hallway"
+  }
+  doors {
+    map: "the_plaza"
+    name: "Repetitive Entrance"
+  }
+}
+door_groups {
+  name: "Control Center White Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "White Hallway From Entry"
+  }
+  doors {
+    map: "the_entry"
+    name: "Control Center White Door"
+  }
+}
+door_groups {
+  name: "Control Center Purple Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "Purple Hallway From Great"
+  }
+  doors {
+    map: "the_great"
+    name: "Control Center Purple Door"
+  }
+}
+door_groups {
+  name: "Control Center Orange Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "daedalus"
+    name: "Control Center Orange Door"
+  }
+  doors {
+    map: "the_unkempt"
+    name: "Control Center Orange Door"
+  }
+}
+door_groups {
+  name: "Control Center Brown Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "the_bearer"
+    name: "Control Center Brown Door"
+  }
+  doors {
+    map: "the_tree"
+    name: "Control Center Brown Door"
+  }
+}
+door_groups {
+  name: "Control Center Blue Doors"
+  type: COLOR_CONNECTOR
+  doors {
+    map: "the_digital"
+    name: "Control Center Blue Door"
+  }
+  doors {
+    map: "the_unyielding"
+    name: "Digital Entrance"
+  }
+}
+door_groups {
+  name: "Cyan Doors"
+  type: CYAN_DOORS
+  doors {
+    map: "daedalus"
+    name: "Eye Painting"
+  }
+  doors {
+    map: "the_bearer"
+    name: "Butterfly Entrance"
+  }
+  doors {
+    map: "the_darkroom"
+    name: "Double Letter Panel Blockers"
+  }
+  doors {
+    map: "the_entry"
+    name: "Starting Room West Wall North Door"
+  }
+  doors {
+    map: "the_entry"
+    name: "Flipped Pyramid Area Entrance"
+  }
+  doors {
+    map: "the_entry"
+    name: "Near D Room Painting"
+  }
+  doors {
+    map: "the_graveyard"
+    name: "Double Letters"
+  }
+  doors {
+    map: "the_great"
+    name: "Tower Entrance"
+  }
+  doors {
+    map: "the_great"
+    name: "Cyan Doors"
+  }
+  doors {
+    map: "the_parthenon"
+    name: "Double Letters"
+  }
+  doors {
+    map: "the_unkempt"
+    name: "Cyan Doors"
+  }
+  doors {
+    map: "the_unkempt"
+    name: "Control Center Orange Door"
+  }
+  doors {
+    map: "the_unyielding"
+    name: "Cyan Doors"
+  }
+}
+door_groups {
+  name: "Lavender Cubes"
+  type: SHUFFLE_GROUP
+  doors {
+    map: "daedalus"
+    name: "C Keyholder Blocker"
+  }
+  doors {
+    map: "the_congruent"
+    name: "T Keyholder Blocker"
+  }
+  doors {
+    map: "the_great"
+    name: "Lavender Cube"
+  }
+  doors {
+    map: "the_parthenon"
+    name: "Lavender Cubes"
+  }
+}
@@ -20,6 +20,11 @@ maps:
         panels:
           COLOR: 2726
           Letters: 2727
+        keyholders:
+          1: 2760
+          2: 2761
+          3: 2762
+          4: 2763
       Partial Entrance:
         panels:
           PARTIAL: 2729
@@ -155,6 +160,9 @@ maps:
       Brown Smiley:
         panels:
           OTHERS: 1667
+      C Keyholder:
+        keyholders:
+          C: 2755
       Castle:
         panels:
           FIVE (Blue): 1673
@@ -265,6 +273,9 @@ maps:
           SUMMER: 1754
           WORD: 1753
           WORDWORD: 1761
+      D Keyholder:
+        keyholders:
+          D: 2759
       Dark Light Exit:
         panels:
           GASKET: 1763
@@ -287,6 +298,9 @@ maps:
       Eye Painting:
         panels:
           REVILED: 1777
+      F Keyholder:
+        keyholders:
+          F: 2756
       F2 Room:
         panels:
           CAST: 1782
@@ -480,6 +494,8 @@ maps:
         panels:
           GOING: 1934
           TURN: 1935
+        keyholders:
+          G: 2757
       Nursery:
         panels:
           "?": 1937
@@ -547,6 +563,8 @@ maps:
           WALLS: 1986
           WHISPER: 1978
           WING: 1979
+        keyholders:
+          H: 2758
       Outside Magic Room:
         panels:
           WIZARD: 1988
@@ -730,7 +748,7 @@ maps:
           Back (2): 2090
           Colors: 2097
           FIR: 2095
-          Left: 2088
+          Near Obscured Puzzles: 2088
           OAK: 2093
           PINE: 2094
           WALK BACK: 2091
@@ -879,7 +897,6 @@ maps:
           REDACTED: 2274
           STRINGS: 2205
           WINDS: 2204
-          "[REDACTED]": 2207
       Yellow Color Door:
         panels:
           Paintings: 2210
@@ -970,7 +987,6 @@ maps:
       Blue Rainbow Room: 1538
       Blue Room: 1477
       Blue Room Entrance: 1476
-      Blue Smiley Entrance: 1478
       Blue Smiley Exit To Red: 1547
       Book Room Entrance: 1588
       Book Room Exit: 1592
@@ -998,12 +1014,13 @@ maps:
       Dark Light Room Exit: 1570
       Dark Light Room Exit Panel: 1571
       Entry Shortcut Secret Exit: 1437
+      Eye Painting: 2751
       Eye Painting Exit: 1446
       F Keyholder Door: 1551
-      F2 Room Back Left Door: 1491
-      F2 Room Back Middle Door: 1492
-      F2 Room Back Right Door: 1490
-      F2 Room Entrance: 1487
+      F2 Room Northwest Door: 1491
+      F2 Room Southeast Door: 1487
+      F2 Room Southwest Door: 1490
+      F2 Room West Door: 1492
       Flip Painting Blocker: 1552
       Globe Room East Door: 1589
       Globe Room South Door: 1591
@@ -1026,6 +1043,7 @@ maps:
       House Entrance: 1495
       House Side Door: 1566
       Intense Room Entrance: 1522
+      Lime Hexes: 2810
       Magenta Hexes: 2272
       Magic Room Entrance: 1500
       Magic Room Panels: 1499
@@ -1037,7 +1055,9 @@ maps:
       Near Sweet Blue Door: 1573
       Near Sweet Brown Door: 1561
       Near Yellow Room Door: 1565
-      O2 Room Back Door: 1485
+      North Castle Panel: 2742
+      O2 Room Northeast Door: 1485
+      O2 Room Southeast Door: 1478
       Orange Rainbow Panel: 2267
       Orange Rainbow Room: 1535
       Orange Room: 1507
@@ -1064,6 +1084,7 @@ maps:
       Purple NW Vestibule: 1459
       Purple Rainbow Panel: 2271
       Purple Rainbow Room: 1539
+      Purple Room: 2741
       Purple Room East Entrance: 1472
       Purple Room North Entrance: 1469
       Purple Room South Entrance: 1470
@@ -1088,9 +1109,10 @@ maps:
       Snake Room Entrance: 1514
       South Castle Area Back Door: 1574
       South Castle Area Entrance: 1575
+      South Castle Panel: 2744
       Southwest Area Intersection: 1475
-      Splintering Exit Left Door: 1449
-      Splintering Exit Right Door: 1450
+      Splintering Exit North Door: 1449
+      Splintering Exit South Door: 1450
       Starting Room East Wall Center Door: 1439
       Starting Room East Wall North Door: 1440
       Starting Room North Wall Center Door: 1432
@@ -1103,15 +1125,17 @@ maps:
       Starting Room West Wall South Door: 1433
       Sticks And Stones Door: 1593
       Temple of the Eyes Entrance: 1444
-      U2 Room Back Door: 1497
-      U2 Room Back Right Door: 1496
-      U2 Room Entrance: 1498
-      U2 Room Shortcut: 1493
+      Theo Panels: 2811
+      U2 Room East Door: 1498
+      U2 Room Southeast Door: 1493
+      U2 Room Southwest Door: 1496
+      U2 Room West Door: 1497
       Welcome Back Door: 1435
       Welcome Back Secret Door: 1434
+      West Castle Panel: 2743
       White Hallway From Entry: 1488
-      Wonderland Left Door: 1520
-      Wonderland Right Door: 1504
+      Wonderland North Door: 1520
+      Wonderland South Door: 1504
       Yellow Rainbow Panel: 2268
       Yellow Rainbow Room: 1536
       Yellow Room: 1568
@@ -1155,6 +1179,9 @@ maps:
           SWAY: 24
           TERROR: 20
           TURN: 22
+      Keyholder Room:
+        keyholders:
+          A: 2773
       Synonyms Room:
         panels:
           ADORE: 26
@@ -1191,7 +1218,6 @@ maps:
         panels:
           THIS: 45
     doors:
-      End Door: 42
       Front Door: 41
       Lavender Cubes: 43
   the_bearer:
@@ -1272,7 +1298,6 @@ maps:
       Control Center Brown Door: 49
       Exit Door: 47
       Overlook Door: 46
-      Q2 Door: 48
   the_between:
     rooms:
       Control Center Side:
@@ -1447,6 +1472,9 @@ maps:
         panels:
           CIVIL: 216
           CRABS: 217
+      T Keyholder:
+        keyholders:
+          T: 2754
     doors:
       C Keyholder Blocker: 176
       C2 Door: 177
@@ -1458,7 +1486,6 @@ maps:
       Obverse Magenta Door: 173
       Obverse Yellow Door: 178
       Obverse Yellow Puzzles: 179
-      T Keyholder Blocker: 183
   the_darkroom:
     rooms:
       First Room:
@@ -1489,9 +1516,7 @@ maps:
     doors:
       Colorful Entrance: 222
       Congruent Entrance: 223
-      Double Letter Panel Blockers: 218
       Double Sided Entrance: 224
-      S1 Door: 221
       Second Room Entrance: 219
       Third Room Entrance: 220
   the_digital:
@@ -1610,10 +1635,6 @@ maps:
       Flipped Link Area:
         panels:
           WANDER: 340
-      Flipped Pyramid Area:
-        panels:
-          TURN (1): 341
-          TURN (2): 342
       Flipped Right Eye:
         panels:
           HERE: 344
@@ -1637,6 +1658,9 @@ maps:
           STEALER: 352
           TRUST: 354
           WANT: 351
+      Liberated Entrance Panel:
+        panels:
+          TURN (1): 341
       Lime Room:
         panels:
           COLOR: 361
@@ -1645,12 +1669,19 @@ maps:
       Link Area:
         panels:
           WANDER: 362
+      Literate Entrance Panel:
+        panels:
+          TURN (2): 342
       Parthenon Return:
         panels:
           RETURN: 363
       Rabbit Hole:
         panels:
           PUZZLE: 364
+      Rabbit Hole Lock:
+        panels:
+          HOLE: 2749
+          RABBIT: 2748
       Red Alcove:
         panels:
           BROW: 365
@@ -1687,8 +1718,6 @@ maps:
         panels:
           CORN: 393
           DICE: 392
-          HOLE: 390
-          RABBIT: 389
           WREATH: 391
     doors:
       Blue Alcove Entrance: 297
@@ -1700,7 +1729,6 @@ maps:
       D Room Entrance: 319
       Daedalus Entrance: 311
       Flip Area Entrance: 310
-      Flipped Pyramid Area Entrance: 315
       Flipped Second Room Left Door: 300
       Flipped Second Room Right Door: 299
       Gallery Entrance: 321
@@ -1718,13 +1746,13 @@ maps:
       Red Blue Area Left Door: 302
       Red Blue Area Right Door: 303
       Red Room Painting: 323
-      Repetitive Entrance: 312
       Revitalized Entrance: 306
       Right Eye Entrance: 301
       Scarf Door: 296
       Second Room Left Door: 298
       Second Room Right Door: 290
       Shop Entrance: 313
+      Starting Room West Wall North Door: 2781
       Third Eye Painting: 324
       Trick Door: 287
       Trick To Shop Door: 289
@@ -1751,6 +1779,8 @@ maps:
       X Plus:
         panels:
           ROSE: 405
+        keyholders:
+          M: 2766
       X Plus Middle Leg:
         panels:
           COLONY: 403
@@ -1780,6 +1810,9 @@ maps:
       Daedalus Extension:
         panels:
           WHERE: 433
+      Main Area:
+        keyholders:
+          P: 2765
     doors:
       Ancient Painting: 428
       Between Painting: 414
@@ -1818,22 +1851,10 @@ maps:
     rooms:
       Back Area:
         panels:
-          Left Landscape Bottom: 482
-          Left Landscape Left: 483
-          Left Landscape Right: 481
-          Left Landscape Top: 480
           PAINTING: 474
           PLANT: 472
-          Right Landscape Bottom: 486
-          Right Landscape Left: 487
-          Right Landscape Right: 485
-          Right Landscape Top: 484
           TOWEL: 475
           TREE: 473
-          Top Landscape Bottom: 478
-          Top Landscape Left: 479
-          Top Landscape Right: 477
-          Top Landscape Top: 476
       Behind Question Area:
         panels:
           DEW: 488
@@ -1964,6 +1985,8 @@ maps:
           LAUGH FINISHED: 573
           PLANTS: 570
           WEATHER: 568
+        keyholders:
+          X: 2770
       Outside Jail:
         panels:
           GUT: 575
@@ -1989,6 +2012,20 @@ maps:
       Question Room Who:
         panels:
           QUESTION: 587
+      The Landscapes:
+        panels:
+          Left Landscape Bottom: 482
+          Left Landscape Left: 483
+          Left Landscape Right: 481
+          Left Landscape Top: 480
+          Right Landscape Bottom: 486
+          Right Landscape Left: 487
+          Right Landscape Right: 485
+          Right Landscape Top: 484
+          Top Landscape Bottom: 478
+          Top Landscape Left: 479
+          Top Landscape Right: 477
+          Top Landscape Top: 476
       Under Question Room:
         panels:
           QUESTION: 588
@@ -2052,7 +2089,6 @@ maps:
       Into The Mouth Gravestone: 457
       Invisible Entrance: 465
       Jail Entrance: 451
-      Lavender Cube: 469
       Magnet Room Entrance: 449
       Nature Room Door: 466
       Nature Room Panels: 467
@@ -2111,6 +2147,8 @@ maps:
           WAS: 631
           WINGS: 662
           YELL: 636
+        keyholders:
+          B: 2769
       Mastery Room:
         masteries:
           MASTERY: 666
@@ -2177,6 +2215,8 @@ maps:
           FLASHBACK: 705
           PUSH: 703
           PUSHBACK: 702
+        keyholders:
+          J: 2772
     doors:
       Side Door: 687
   the_keen:
@@ -2288,10 +2328,12 @@ maps:
           NAY: 774
           NIGH: 781
           TORE: 787
+        keyholders:
+          S: 2767
     doors:
-      Left Room Puzzles: 763
-      Main Room Puzzles: 765
-      Right Room Puzzles: 764
+      Blue Side Puzzles: 763
+      Green Side Puzzles: 764
+      Main Room Door: 2750
   the_orb:
     rooms:
       Main Area:
@@ -2318,6 +2360,7 @@ maps:
           COLOR: 823
           ETCH: 837
           FAINT: 821
+          FIZZLE: 2745
           HAD: 830
           HEAVY: 829
           LAY: 834
@@ -2350,11 +2393,10 @@ maps:
         panels:
           CRUSH: 845
           RAY: 846
-      R2C2.5 Bottom:
+      R2C3 Bottom:
         panels:
-          BLACK: 849
-          FIGMENT: 848
-          FIZZLE: 847
+          BLACK: 2747
+          FIGMENT: 2746
       Z Room:
         panels:
           MAZE: 850
@@ -2389,6 +2431,9 @@ maps:
           CLEOPATRA: 859
           NAPOLEON: 860
           XERXES: 857
+      U Keyholder:
+        keyholders:
+          U: 2777
     doors:
       K2 Door: 852
   the_partial:
@@ -2412,6 +2457,8 @@ maps:
           TON: 878
           TURN: 875
           UP: 870
+        keyholders:
+          L: 2771
       Reverse Side:
         panels:
           BRO: 884
@@ -2516,20 +2563,23 @@ maps:
           TYPIST BEAR RIGHT WING: 968
           WING: 950
     doors:
-      Bottom Left Door: 894
-      Bottom Left Puzzles: 898
-      Bottom Right Door: 895
-      Bottom Right Puzzles: 899
+      Northeast Door: 893
+      Northeast Puzzles: 897
+      Northwest Door: 892
+      Northwest Puzzles: 896
       Repetitive Entrance: 888
       Sirenic Entrance: 890
+      Southeast Door: 895
+      Southeast Puzzles: 899
+      Southwest Door: 894
+      Southwest Puzzles: 898
       Symbolic Entrance: 889
-      Top Left Door: 892
-      Top Left Puzzles: 896
-      Top Right Door: 893
-      Top Right Puzzles: 897
       Turtle Entrance: 891
   the_quiet:
     rooms:
+      Keyholder Room:
+        keyholders:
+          Q: 2778
       Main Area:
         panels:
           BEE: 979
@@ -2606,7 +2656,8 @@ maps:
     rooms:
       Anti Room:
         panels:
-          EYE: 1041
+          EYE (1): 1041
+          EYE (2): 2813
           HA (1): 1035
           HA (2): 1036
           HA (3): 1037
@@ -2713,7 +2764,9 @@ maps:
           W: 1117
           ZEROING: 1118
     doors:
+      Anti-Collectable: 2812
       Anti-Collectable Room: 1025
+      Black Hallway: 2780
       Cyan Door: 1028
       Cyan Puzzles: 1032
       Dot Area Entrance: 1026
@@ -2722,7 +2775,6 @@ maps:
       Lime Puzzles: 1031
       Magenta Door: 1029
       Magenta Puzzles: 1033
-      Plaza Entrance: 1024
       Yellow Door: 1030
       Yellow Puzzles: 1034
   the_revitalized:
@@ -2776,6 +2828,8 @@ maps:
           STIM: 1148
           STONE: 1142
           TADPOLES: 1159
+        keyholders:
+          N: 2779
     doors:
       Books Puzzles: 1136
       Games Puzzles: 1137
@@ -3086,22 +3140,15 @@ maps:
         panels:
           WHOLE: 2426
     doors:
-      Black Door: 2276
-      Blue Door: 2278
-      Green Door: 2279
       Main Area Fifth Row: 2290
       Main Area First Row: 2286
       Main Area Fourth Row: 2289
       Main Area Second Row: 2287
       Main Area Third Row: 2288
-      Orange Door: 2282
       Poetry Room Panels: 2285
-      Purple Door: 2281
-      Red Door: 2277
+      Tutorial Door: 2754
       Tutorial Panels: 2283
       Whirred Room Panels: 2284
-      White Door: 2275
-      Yellow Door: 2280
   the_talented:
     rooms:
       Back Room:
@@ -3130,6 +3177,8 @@ maps:
           SWINE (Brown): 2446
           WIFE (Black): 2440
           WIFE (Brown): 2447
+        keyholders:
+          Y: 2764
     doors:
       Black Side Panels: 2427
       Brown Side Panels: 2428
@@ -3142,6 +3191,9 @@ maps:
       Control Center Entrance:
         panels:
           ZERO: 2455
+      Main Area:
+        keyholders:
+          K: 2768
       Mastery:
         masteries:
           MASTERY: 2456
@@ -3346,6 +3398,8 @@ maps:
           WAYS: 2621
           WHILE: 2613
           ZOO: 2615
+        keyholders:
+          I: 2775
       Middle Room:
         panels:
           FELLOW: 2624
@@ -3393,12 +3447,18 @@ maps:
           UNINTERESTED: 2650
           UNIRONIC: 2656
           UNLUCKY: 2654
+      V Keyholder:
+        keyholders:
+          V: 2776
+      W Keyholder:
+        keyholders:
+          W: 2774
     doors:
       Cog Rhino Hug Rug: 2586
       Control Center Orange Door: 2582
+      East Door: 2580
       Honor Our Hint: 2585
       Let Untrue Tie: 2583
-      Right Door: 2580
       Routine Out Chute: 2584
       W2 Room Door: 2581
   the_unyielding:
@@ -3638,9 +3698,9 @@ maps:
           HEALTH: 1428
     doors:
       Bearer Entrance: 1259
-      Black Alcove: 2265
       Brown Alcove: 1255
       Digital Entrance: 1257
+      East Room 1: 2740
       East Room 1 Entrance: 1251
       Hero Room Entrance: 1252
       Jay Painting: 1253
@@ -3783,4 +3843,61 @@ endings:
   WHITE: 2738
   YELLOW: 1206
 special:
-  Nothing: 1160
+  A Job Well Done: 1160
+  Age Symbol: 2791
+  Anagram Symbol: 2792
+  Anti A: 2814
+  Anti B: 2815
+  Anti C: 2816
+  Anti D: 2817
+  Anti E: 2818
+  Anti F: 2819
+  Anti G: 2820
+  Anti H: 2821
+  Anti I: 2822
+  Anti J: 2823
+  Anti K: 2824
+  Anti L: 2825
+  Anti M: 2826
+  Anti N: 2827
+  Anti O: 2828
+  Anti P: 2829
+  Anti Q: 2830
+  Anti R: 2831
+  Anti S: 2832
+  Anti T: 2833
+  Anti U: 2834
+  Anti V: 2835
+  Anti W: 2836
+  Anti X: 2837
+  Anti Y: 2838
+  Anti Z: 2839
+  Boxes Symbol: 2793
+  Cross Symbol: 2794
+  Eval Symbol: 2795
+  Example Symbol: 2796
+  Gender Symbol: 2797
+  Job Symbol: 2798
+  Lingo Symbol: 2799
+  Null Symbol: 2800
+  Planet Symbol: 2801
+  Pyramid Symbol: 2802
+  Question Symbol: 2803
+  Sound Symbol: 2804
+  Sparkles Symbol: 2805
+  Stars Symbol: 2806
+  Sun Symbol: 2807
+  Sweet Symbol: 2808
+  Zero Symbol: 2809
+progressives:
+  Progressive Gold Ending: 2753
+door_groups:
+  Control Center Blue Doors: 2788
+  Control Center Brown Doors: 2787
+  Control Center Orange Doors: 2786
+  Control Center Purple Doors: 2785
+  Control Center White Doors: 2784
+  Cyan Doors: 2789
+  Lavender Cubes: 2790
+  The Entry - Repetitive Entrance: 2782
+  The Repetitive - Plaza Entrance: 2783
@@ -109,6 +109,7 @@ doors {
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "e" }
   location_room: "Main Area"
+  location_name: "Keyword MORE"
 }
 doors {
   name: "Perceptive From Outside"
@@ -132,6 +133,7 @@ doors {
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "o" }
   location_room: "Main Area"
+  location_name: "Keyword ZERO"
 }
 doors {
   name: "Between Door"
@@ -1,5 +1,10 @@
 name: "Ancient Entrance"
 ports {
   name: "ANCIENT"
+  display_name: "Ancient Entrance"
   path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "BETWEEN"
+  display_name: "Between Connector"
   path: "Components/Warps/worldport5"
+  destination { x: 39 y: 0 z: -17 }
+  rotation: 270
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entry Connector"
   path: "Components/Warps/worldport2"
+  destination { x: 26 y: 0 z: -16.5 }
+  rotation: 0
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -1.5 }
+  rotation: 0
 }
@@ -4,7 +4,7 @@ panels {
   path: "Panels/Doors/entry_2"
   clue: "color"
   answer: "red"
-  #proxies { answer: "red" path: "Panels/Colors/color_1" }
+  proxies { answer: "red" path: "Panels/Colors/color_1" }
   proxies { answer: "blue" path: "Panels/Colors/color_2" }
   proxies { answer: "green" path: "Panels/Colors/color_3" }
   proxies { answer: "yellow" path: "Panels/Colors/color_4" }
@@ -30,37 +30,52 @@ panels {
 keyholders {
   name: "1"
   path: "Components/KeyHolders/keyHolder"
+  key: "z"
 }
 keyholders {
   name: "2"
   path: "Components/KeyHolders/keyHolder2"
+  key: "e"
 }
 keyholders {
   name: "3"
   path: "Components/KeyHolders/keyHolder3"
+  key: "r"
 }
 keyholders {
   name: "4"
   path: "Components/KeyHolders/keyHolder4"
+  key: "o"
 }
 ports {
   name: "RIGHT"
+  display_name: "Hinterlands South Entrance"
   path: "Components/Warps/worldport6"
+  destination { x: 82 y: 0 z: -10 }
+  rotation: 90
 }
 ports {
   name: "LEFT"
+  display_name: "Hinterlands North Entrance"
   path: "Components/Warps/worldport7"
-  # Check that this is correct.
+  destination { x: 82 y: 0 z: -48 }
+  rotation: 90
 }
 ports {
   name: "RELENTLESS_LEFT"
+  display_name: "Relentless LEFT Entrance"
   path: "Components/Warps/worldport9"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_SHOP"
+  display_name: "Relentless SHOP Entrance"
   path: "Components/Warps/worldport11"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_TURN"
+  display_name: "Relentless TURN Entrance"
   path: "Components/Warps/worldport10"
+  no_shuffle: true
 }
@@ -8,5 +8,10 @@ panels {
 }
 ports {
   name: "PARTIAL"
+  display_name: "Partial Connector"
   path: "Components/Warps/worldport4"
+  destination { x: 21 y: 0 z: -41 }
+  rotation: 270
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -16,5 +16,10 @@ panels {
 }
 ports {
   name: "PERCEPTIVE"
+  display_name: "Perceptive Entrance"
   path: "Components/Warps/worldport12"
+  destination { x: -23 y: 0 z: -11 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -1,5 +1,10 @@
 name: "Repetitive Entrance"
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport14"
+  destination { x: -16 y: 0 z: -17.5 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -8,5 +8,10 @@ panels {
 }
 ports {
   name: "TENACIOUS"
+  display_name: "Tenacious Connector"
   path: "Components/Warps/worldport13"
+  destination { x: 56 y: 0 z: -38 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -8,5 +8,10 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Unkempt Connector"
   path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -100,6 +100,11 @@ connections {
   oneway: true
 }
 connections {
+  from_room: "Outside House"
+  to_room: "Blue Hallway Tall Side"
+  door { name: "House Side Door" }
+}
+connections {
   from_room: "Purple SE Vestibule"
   to_room: "Welcome Back Area"
   oneway: true
@@ -200,11 +205,16 @@ connections {
   door { name: "Temple of the Eyes Entrance" }
 }
 connections {
-  from_room: "Outside Eye Temple"
+  from_room: "Eye Painting"
   to_room: "Starting Room"
   door { name: "Starting Room South Wall West Door" }
 }
 connections {
+  from_room: "Eye Painting"
+  to_room: "Outside Eye Temple"
+  door { name: "Eye Painting Exit" }
+}
+connections {
   from_room: "Outside Pyramid"
   to_room: "Number Paintings Area"
   door { name: "Near Pyramid Gate" }
@@ -217,12 +227,12 @@ connections {
 connections {
   from_room: "West Castle Area"
   to_room: "Post Orange Smiley Three Way"
-  door { name: "Splintering Exit Left Door" }
+  door { name: "Splintering Exit North Door" }
 }
 connections {
   from_room: "West Castle Area"
   to_room: "Amber North 2"
-  door { name: "Splintering Exit Right Door" }
+  door { name: "Splintering Exit South Door" }
 }
 connections {
   from_room: "Z2 Room"
@@ -373,7 +383,7 @@ connections {
 connections {
   from_room: "O2 Room"
   to_room: "Blue Smiley"
-  door { name: "Blue Smiley Entrance" }
+  door { name: "O2 Room Southeast Door" }
 }
 connections {
   from_room: "O2 Room"
@@ -403,7 +413,7 @@ connections {
 connections {
   from_room: "O2 Room"
   to_room: "Blue Hallway"
-  door { name: "O2 Room Back Door" }
+  door { name: "O2 Room Northeast Door" }
 }
 connections {
   from_room: "O2 Room"
@@ -418,7 +428,7 @@ connections {
 connections {
   from_room: "Sweet Foyer"
   to_room: "F2 Room"
-  door { name: "F2 Room Entrance" }
+  door { name: "F2 Room Southeast Door" }
 }
 connections {
   from_room: "Globe Room"
@@ -433,17 +443,17 @@ connections {
 connections {
   from_room: "F2 Room"
   to_room: "Blue Hallway"
-  door { name: "F2 Room Back Right Door" }
+  door { name: "F2 Room Southwest Door" }
 }
 connections {
   from_room: "F2 Room"
   to_room: "Outside Salt Room"
-  door { name: "F2 Room Back Left Door" }
+  door { name: "F2 Room Northwest Door" }
 }
 connections {
   from_room: "F2 Room"
   to_room: "Red Color Door"
-  door { name: "F2 Room Back Middle Door" }
+  door { name: "F2 Room West Door" }
   oneway: true
   # This is the red backside, which has nothing in it. Maybe could be its own
   # region at some point.
@@ -456,7 +466,7 @@ connections {
 connections {
   from_room: "U2 Room"
   to_room: "Maze Paintings Area"
-  door { name: "U2 Room Shortcut" }
+  door { name: "U2 Room Southeast Door" }
 }
 connections {
   from_room: "Maze Paintings Area"
@@ -471,17 +481,17 @@ connections {
 connections {
   from_room: "U2 Room"
   to_room: "Purple SE Vestibule"
-  door { name: "U2 Room Back Right Door" }
+  door { name: "U2 Room Southwest Door" }
 }
 connections {
   from_room: "U2 Room"
   to_room: "Purple Room East"
-  door { name: "U2 Room Back Door" }
+  door { name: "U2 Room West Door" }
 }
 connections {
   from_room: "Maze"
   to_room: "U2 Room"
-  door { name: "U2 Room Entrance" }
+  door { name: "U2 Room East Door" }
 }
 connections {
   from_room: "Outside Magic Room"
@@ -506,7 +516,7 @@ connections {
 connections {
   from_room: "Wonderland"
   to_room: "Black Hex"
-  door { name: "Wonderland Right Door" }
+  door { name: "Wonderland South Door" }
 }
 connections {
   from_room: "Outside Pyramid"
@@ -530,6 +540,11 @@ connections {
 }
 connections {
   from_room: "Z2 Room"
+  to_room: "Orange Room Hallway"
+  door { name: "Z2 Room Southeast Door" }
+}
+connections {
+  from_room: "Orange Room Hallway"
   to_room: "Orange Room"
   door { name: "Z2 Room Southeast Door" }
 }
@@ -591,7 +606,7 @@ connections {
 connections {
   from_room: "Wonderland"
   to_room: "Number Paintings Area"
-  door { name: "Wonderland Left Door" }
+  door { name: "Wonderland North Door" }
 }
 connections {
   from_room: "Outside House"
@@ -1540,3 +1555,322 @@ connections {
   to_room: "Pyramid Top"
   door { name: "Pyramid Third Floor Door" }
 }
+connections {
+  from_room: "Roof"
+  to_room: "After Bee Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Amber North 2"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Black Hex"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Blue Hallway Tall Side"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Blue Hallway"
+  oneway: true
+  roof_access: true
+}
+# Blue Hallway Cut Side is inside.
+connections {
+  from_room: "Roof"
+  to_room: "Eye Painting"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Globe Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Gray Color Door"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Green Color Door"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Green Smiley"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Hedges"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Maze Paintings Area"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Maze"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "North Castle Area"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Number Paintings Area"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Orange Room Hallway"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Book Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Eye Temple"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Hedges"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Hotel"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside House"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Magic Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Orange Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Pyramid"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Red Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Salt Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Outside Snake Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Post Orange Smiley Three Way"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Purple NW Vestibule"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Purple Room East"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Purple Room South"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Purple Room West"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Purple SE Vestibule"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Pyramid Second Floor"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Pyramid Top"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Quiet Entrance"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Red Color Door"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "South Castle Area"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Starting Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Sweet Foyer"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Tree Entrance"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "West Castle Area"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "West Spire"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Yellow Color Door"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Z2 Room"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo Center"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo E"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo N"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo NE"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo S"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Zoo SE"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "F Keyholder"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Yellow Color Backside"
+  oneway: true
+  roof_access: true
+}
@@ -188,18 +188,18 @@ doors {
 }
 doors {
   name: "Welcome Back Secret Door"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_13"
   panels { room: "Welcome Back Area" name: "FAREWELL LITTLE LAMB" }
   panels { room: "West Spire" name: "BYE" }
-  location_room: "West Spire"
 }
 doors {
   name: "Welcome Back Door"
-  type: STANDARD
-  receivers: "Components/Doors/Entry/entry_14"
+  type: LOCATION_ONLY
+  #receivers: "Components/Doors/Entry/entry_14"
   panels { room: "Welcome Back Area" name: "GREETINGS OLD FRIEND" }
   location_room: "Welcome Back Area"
+  location_name: "GREETINGS OLD FRIEND"
 }
 # entry_3 is the door to SEAL, which we will ignore.
 doors {
@@ -296,9 +296,10 @@ doors {
   panels { room: "Black Hex" name: "CLUES" }
   panels { room: "Black Hex" name: "SECRET" }
   location_room: "Black Hex"
+  location_name: "Black Hex"
 }
 doors {
-  name: "Splintering Exit Left Door"
+  name: "Splintering Exit North Door"
   type: STANDARD
   receivers: "Components/Doors/Entry/gate_4"
   panels { room: "West Castle Area" name: "EVER" }
@@ -308,7 +309,7 @@ doors {
   location_room: "West Castle Area"
 }
 doors {
-  name: "Splintering Exit Right Door"
+  name: "Splintering Exit South Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/gate_5"
   panels { room: "West Castle Area" name: "EVER" }
@@ -382,6 +383,7 @@ doors {
   panels { room: "Z2 Room" name: "CAPE" }
   panels { room: "Z2 Room" name: "GLANCE" }
   location_room: "Z2 Room"
+  location_name: "West Puzzles"
 }
 doors {
   name: "Z2 Room Northwest Door"
@@ -413,6 +415,7 @@ doors {
   panels { room: "Z2 Room" name: "DISCORD" }
   panels { room: "Z2 Room" name: "CAT" }
   location_room: "Z2 Room"
+  location_name: "East Puzzles"
 }
 doors {
   name: "Z2 Room Southeast Door"
@@ -517,6 +520,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "West Purple Vestibules"
 }
 doors {
   name: "Purple West Area South Door"
@@ -545,6 +549,7 @@ doors {
   panels { room: "Godot Room" name: "TRAIN" }
   panels { room: "Godot Room" name: "RECORDING" }
   location_room: "Godot Room"
+  location_name: "Godot Room"
 }
 doors {
   name: "Beehalls Intersection"
@@ -576,6 +581,7 @@ doors {
   panels { room: "Purple Room South" name: "ANY" }
   panels { room: "Outside House" name: "A" }
   location_room: "Outside House"
+  location_name: "East Purple Vestibules"
 }
 doors {
   name: "Purple East Area North Door"
@@ -593,6 +599,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "Purple Vestibules"
 }
 doors {
   name: "Purple Room South Entrance"
@@ -622,6 +629,20 @@ doors {
   panels { room: "Purple Room South" name: "THESE" }
 }
 doors {
+  name: "Purple Room"
+  type: LOCATION_ONLY
+  panels { room: "Purple Room" name: "HOIST" }
+  panels { room: "Purple Room" name: "CORE" }
+  panels { room: "Purple Room" name: "FISH" }
+  panels { room: "Purple Room" name: "ALLOW" }
+  panels { room: "Purple Room" name: "BIRD" }
+  panels { room: "Purple Room" name: "HONK" }
+  panels { room: "Purple Room" name: "APE" }
+  panels { room: "Purple Room" name: "APATHY" }
+  location_room: "Purple Room"
+  location_name: "Puzzles"
+}
+doors {
   name: "Hedges Tower"
   type: LOCATION_ONLY
   # TODO: Not making this an item right now in order to force the player to
@@ -676,6 +697,7 @@ doors {
   panels { room: "Blue Room" name: "CELEBRATORY" }
   panels { room: "Blue Room" name: "DETECTIVE" }
   location_room: "Blue Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "O2 Prize"
@@ -694,7 +716,7 @@ doors {
   panels { room: "O2 Room" name: "UNBLOCKED" }
 }
 doors {
-  name: "Blue Smiley Entrance"
+  name: "O2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/oroom_2"
   panels { room: "O2 Room" name: "HONEST" }
@@ -734,6 +756,7 @@ doors {
   panels { room: "Composite Room S" name: "BLEAKCARD" }
   panels { room: "Composite Room S" name: "MISSIONMISSION" }
   location_room: "Composite Room S"
+  location_name: "East Rooms"
 }
 doors {
   name: "Composite Room North Door"
@@ -762,6 +785,7 @@ doors {
   panels { room: "Composite Room NW" name: "OUTGARDEN" }
   panels { room: "Composite Room NW" name: "HELLOTALE" }
   location_room: "Composite Room NE"
+  location_name: "North Rooms"
 }
 doors {
   name: "Composite Room West Door"
@@ -792,12 +816,13 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room NW"
+  location_name: "West Rooms"
 }
 doors {
   name: "Composite Room NW Entrance"
   type: STANDARD
   receivers: "Components/Doors/Halls/oroom_10"
-  panels { room: "Red Color Door" name: "Left" }
+  panels { room: "Red Color Door" name: "Near Obscured Puzzles" }
   location_room: "Red Color Door"
 }
 doors {
@@ -829,9 +854,10 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room S"
+  location_name: "South Rooms"
 }
 doors {
-  name: "O2 Room Back Door"
+  name: "O2 Room Northeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/oroom_4"
   panels { room: "O2 Room" name: "UNBLOCKED" }
@@ -858,7 +884,7 @@ doors {
   panels { room: "F2 Room" name: "SHAPE" }
 }
 doors {
-  name: "F2 Room Entrance"
+  name: "F2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_2"
   panels { room: "Sweet Foyer" name: "RENT (1)" }
@@ -866,36 +892,32 @@ doors {
 }
 doors {
   name: "White Hallway From Entry"
-  # TODO: This should be combined with the corresponding door in the_entry, at
-  # least when connections are not shuffled.
   type: CONTROL_CENTER_COLOR
   receivers: "Components/Doors/Halls/froom_6"
   control_center_color: "white"
 }
 doors {
   name: "Purple Hallway From Great"
-  # TODO: This should be combined with the corresponding door in the_great, at
-  # least when connections are not shuffled.
   type: CONTROL_CENTER_COLOR
   receivers: "Components/Doors/Halls/froom_7"
   control_center_color: "purple"
 }
 doors {
-  name: "F2 Room Back Right Door"
+  name: "F2 Room Southwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_3"
   panels { room: "F2 Room" name: "RISKY" }
   location_room: "F2 Room"
 }
 doors {
-  name: "F2 Room Back Left Door"
+  name: "F2 Room Northwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_4"
   panels { room: "F2 Room" name: "SHAPE" }
   location_room: "F2 Room"
 }
 doors {
-  name: "F2 Room Back Middle Door"
+  name: "F2 Room West Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_5"
   panels { room: "F2 Room" name: "DIRT" }
@@ -916,7 +938,7 @@ doors {
   panels { room: "U2 Room" name: "HEAVEN" }
 }
 doors {
-  name: "U2 Room Shortcut"
+  name: "U2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/uroom_2"
   panels { room: "U2 Room" name: "WICKED" }
@@ -937,21 +959,21 @@ doors {
   location_room: "House Entrance"
 }
 doors {
-  name: "U2 Room Back Right Door"
+  name: "U2 Room Southwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/uroom_3"
   panels { room: "U2 Room" name: "HEAVEN" }
   location_room: "U2 Room"
 }
 doors {
-  name: "U2 Room Back Door"
+  name: "U2 Room West Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/uroom_5"
   panels { room: "Purple Room South" name: "ANY" }
   panels { room: "Outside House" name: "A" }
 }
 doors {
-  name: "U2 Room Entrance"
+  name: "U2 Room East Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/uroom_4"
   panels { room: "Outside Magic Room" name: "WIZARD" }
@@ -995,7 +1017,7 @@ doors {
   panels { room: "Outside Magic Room" name: "WIZARD" }
 }
 doors {
-  name: "Wonderland Right Door"
+  name: "Wonderland South Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/wonderland_1"
   panels { room: "Wonderland" name: "APRIL" }
@@ -1004,6 +1026,7 @@ doors {
   panels { room: "Wonderland" name: "ARTS" }
   panels { room: "Wonderland" name: "SONG" }
   location_room: "Wonderland"
+  location_name: "Wonderland"
 }
 doors {
   name: "Pyramid Entrance"
@@ -1034,6 +1057,7 @@ doors {
   panels { room: "Orange Room" name: "COAL" }
   panels { room: "Orange Room" name: "OWED" }
   location_room: "Orange Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Hedges Entrance"
@@ -1052,6 +1076,7 @@ doors {
   panels { room: "Outside Snake Room" name: "SONG (South)" }
   panels { room: "West Castle Area" name: "SONG (2)" }
   location_room: "West Castle Area"
+  location_name: "South SONGs"
 }
 doors {
   name: "Amber North Door"
@@ -1060,6 +1085,7 @@ doors {
   panels { room: "Outside Snake Room" name: "SONG (North)" }
   panels { room: "Amber North 2" name: "SONG" }
   location_room: "Amber North 2"
+  location_name: "North SONGs"
 }
 doors {
   name: "Amber East Doors"
@@ -1182,70 +1208,37 @@ doors {
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/connections_1"
   receivers: "Components/Doors/Halls/connections_3"
+  # These have the same effect as the above, but including them here prevents
+  # them from opening in door shuffle when the J2 door opens.
+  receivers: "Components/Triggers/teleportListenerConnections3"
+  receivers: "Components/Triggers/teleportListenerConnections4"
+  # This door can open from either solving all panels, or just the smiley ones,
+  # and the latter is obviously a subset of the former so let's just check for
+  # that.
   panels { room: "Hotel" name: "PARKA" }
-  panels { room: "Hotel" name: "MARLIN" }
-  panels { room: "Hotel" name: "WHO" }
   panels { room: "Hotel" name: "CLOAK" }
-  panels { room: "Hotel" name: "MANE" }
-  panels { room: "Hotel" name: "WHAT" }
-  panels { room: "Hotel" name: "BLAZER" }
-  panels { room: "Hotel" name: "WHERE" }
   panels { room: "Hotel" name: "DOROTHY" }
-  panels { room: "Hotel" name: "JACKET" }
-  panels { room: "Hotel" name: "TAIL" }
   panels { room: "Hotel" name: "JAWS" }
-  panels { room: "Hotel" name: "FLOUNDER" }
   panels { room: "Hotel" name: "WHEN" }
   panels { room: "Hotel" name: "CLAWS" }
-  panels { room: "Hotel" name: "BRUCE" }
   panels { room: "Hotel" name: "POTATO" }
-  panels { room: "Hotel" name: "SALAD" }
-  panels { room: "Hotel" name: "BATHING" }
   panels { room: "Hotel" name: "MICRO" }
-  panels { room: "Hotel" name: "BUSINESS" }
-  panels { room: "Hotel" name: "WEDDING" }
-  panels { room: "Hotel" name: "TREE" }
-  panels { room: "Hotel" name: "RIVER" }
   panels { room: "Hotel" name: "TUNING" }
-  panels { room: "Hotel" name: "BOXING" }
-  panels { room: "Hotel" name: "TELEPHONE" }
   panels { room: "Hotel" name: "LAW" }
-  panels { room: "Hotel" name: "POKER" }
   panels { room: "Hotel" name: "CARD" }
   panels { room: "Hotel" name: "ROAD" }
-  panels { room: "Hotel" name: "CHOCOLATE" }
   panels { room: "Hotel" name: "DEPART" }
-  panels { room: "Hotel" name: "WITHDRAW" }
-  panels { room: "Hotel" name: "QUIT" }
   panels { room: "Hotel" name: "LEAVE" }
-  panels { room: "Hotel" name: "PALE" }
-  panels { room: "Hotel" name: "JUST" }
-  panels { room: "Hotel" name: "NEW" }
-  panels { room: "Hotel" name: "UNTALENTED" }
   panels { room: "Hotel" name: "SERVICE" }
-  panels { room: "Hotel" name: "FULL" }
-  panels { room: "Hotel" name: "EVIL" }
   panels { room: "Hotel" name: "HONEY" }
-  panels { room: "Hotel" name: "CRESCENT" }
   panels { room: "Hotel" name: "INVALID" }
   panels { room: "Hotel" name: "FESTIVAL" }
-  panels { room: "Hotel" name: "BEAUTIFUL" }
   panels { room: "Hotel" name: "WILTED" }
-  panels { room: "Hotel" name: "DROOPED" }
-  panels { room: "Hotel" name: "FADED" }
   panels { room: "Hotel" name: "WANED" }
-  panels { room: "Hotel" name: "TALL" }
-  panels { room: "Hotel" name: "CANVAS" }
-  panels { room: "Hotel" name: "LEVER" }
-  panels { room: "Hotel" name: "SCULPTURE" }
   panels { room: "Hotel" name: "RAGE" }
-  panels { room: "Hotel" name: "BALL" }
-  panels { room: "Hotel" name: "FOOL" }
   panels { room: "Hotel" name: "VERGE" }
-  panels { room: "Hotel" name: "ART" }
   panels { room: "Hotel" name: "EVER" }
   panels { room: "Hotel" name: "PAIN" }
-  panels { room: "Hotel" name: "FOOT" }
 }
 doors {
   name: "J2 Door 1"
@@ -1281,7 +1274,7 @@ doors {
   panels { room: "J2 Vestibule" name: "COLORFUL" }
 }
 doors {
-  name: "Wonderland Left Door"
+  name: "Wonderland North Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/wonderland_2"
   panels { room: "Wonderland" name: "APRIL" }
@@ -1389,12 +1382,32 @@ doors {
 }
 doors {
   name: "Roof Access"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Castle/entry_stairs_big"
   receivers: "Components/Doors/Castle/entry_stairs_big2"
+  receivers: "Meshes/Stairs/staircase31/teleportListener"
+  receivers: "Meshes/Stairs/staircase32/teleportListener2"
+  receivers: "Meshes/Stairs/staircase33/teleportListener3"
   panels { room: "North Castle Area" name: "A SUMMER PLACE" }
   panels { room: "West Castle Area" name: "SONG FACE" }
   panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
+}
+doors {
+  name: "North Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "North Castle Area" name: "A SUMMER PLACE" }
+  location_room: "North Castle Area"
+}
+doors {
+  name: "West Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "SONG FACE" }
+  location_room: "West Castle Area"
+}
+doors {
+  name: "South Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
   location_room: "South Castle Area"
 }
 doors {
@@ -1411,6 +1424,7 @@ doors {
   panels { room: "West Spire" name: "CUT" }
   panels { room: "West Spire" name: "STONES" }
   location_room: "West Spire"
+  location_name: "Pairs Room Puzzles"
 }
 doors {
   name: "Pairs Room West Door"
@@ -1453,87 +1467,87 @@ doors {
 }
 doors {
   name: "Red Rainbow Room"
-  type: ITEM_ONLY
+  type: STANDARD
   receivers: "Components/Doors/Color Reading/door_3"
   panels { room: "Rainbow Start" name: "PAINTING" }
-  panels { room: "Red Smiley" name: "SMILE" }
+  location_room: "Rainbow Start"
 }
 doors {
   name: "Orange Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_4"
   panels { room: "Rainbow Red" name: "THEME" }
-  panels { room: "Outside Orange Room" name: "SMILE" }
+  panels { room: "Red Smiley" name: "SMILE" }
 }
 doors {
   name: "Yellow Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_17"
   panels { room: "Rainbow Orange" name: "THEME" }
-  panels { room: "Hedges" name: "SMILE" }
+  panels { room: "Outside Orange Room" name: "SMILE" }
 }
 doors {
   name: "Green Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_5"
   panels { room: "Rainbow Yellow" name: "THEME" }
-  panels { room: "Green Smiley" name: "SMILE" }
+  panels { room: "Hedges" name: "SMILE" }
 }
 doors {
   name: "Blue Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_6"
   panels { room: "Rainbow Green" name: "THEME" }
-  panels { room: "Blue Smiley" name: "SMILE" }
+  panels { room: "Green Smiley" name: "SMILE" }
 }
 doors {
   name: "Purple Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_7"
   panels { room: "Rainbow Blue" name: "THEME" }
-  panels { room: "Purple Smiley" name: "SMILE" }
+  panels { room: "Blue Smiley" name: "SMILE" }
 }
 doors {
   name: "Red Rainbow Panel"
   type: LOCATION_ONLY
-  panels { room: "Rainbow Start" name: "PAINTING" }
-  location_room: "Rainbow Start"
-}
-doors {
-  name: "Orange Rainbow Panel"
-  type: LOCATION_ONLY
   panels { room: "Rainbow Red" name: "THEME" }
   location_room: "Rainbow Red"
 }
 doors {
-  name: "Yellow Rainbow Panel"
+  name: "Orange Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Orange" name: "THEME" }
   location_room: "Rainbow Orange"
 }
 doors {
-  name: "Green Rainbow Panel"
+  name: "Yellow Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Yellow" name: "THEME" }
   location_room: "Rainbow Yellow"
 }
 doors {
-  name: "Blue Rainbow Panel"
+  name: "Green Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Green" name: "THEME" }
   location_room: "Rainbow Green"
 }
 doors {
-  name: "Purple Rainbow Panel"
+  name: "Blue Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Blue" name: "THEME" }
   location_room: "Rainbow Blue"
 }
 doors {
   name: "Cyan Rainbow Room"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_18"
   panels { room: "Rainbow Purple" name: "THEME" }
+  panels { room: "Purple Smiley" name: "SMILE" }
+}
+doors {
+  name: "Purple Rainbow Panel"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Purple" name: "THEME" }
   location_room: "Rainbow Purple"
 }
 doors {
@@ -1542,6 +1556,7 @@ doors {
   receivers: "Components/Doors/Color Reading/door_8"
   panels { room: "Rainbow Cyan" name: "THEME" }
   location_room: "Rainbow Cyan"
+  location_name: "Cyan Rainbow Panel"
 }
 doors {
   name: "Pepper Room Entrance"
@@ -1565,6 +1580,7 @@ doors {
   panels { room: "Salt Room" name: "SEASONING" }
   panels { room: "Pepper Room" name: "SEASONING" }
   location_room: "Pepper Room"
+  location_name: "Seasonings"
 }
 doors {
   name: "Bow Side"
@@ -1600,6 +1616,7 @@ doors {
   # Components/Doors/Smileys/blue_1
   panels { room: "Blue Smiley" name: "SMILE" }
   location_room: "Blue Smiley"
+  location_name: "Blue SMILE"
 }
 doors {
   name: "Blue Smiley Annex"
@@ -1631,6 +1648,7 @@ doors {
   receivers: "Components/Doors/Smileys/yellow_2"
   panels { room: "Hedges" name: "SMILE" }
   location_room: "Hedges"
+  location_name: "Yellow SMILE"
 }
 doors {
   name: "Green Smiley"
@@ -1639,6 +1657,7 @@ doors {
   receivers: "Components/Doors/Smileys/green_2"
   panels { room: "Green Smiley" name: "SMILE" }
   location_room: "Green Smiley"
+  location_name: "Green SMILE"
 }
 doors {
   name: "Orange Smiley Exit"
@@ -1646,6 +1665,7 @@ doors {
   receivers: "Components/Doors/Smileys/orange_1"
   panels { room: "Outside Orange Room" name: "SMILE" }
   location_room: "Outside Orange Room"
+  location_name: "Orange SMILE"
 }
 doors {
   name: "F Keyholder Door"
@@ -1670,6 +1690,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Red Smiley" name: "SMILE" }
   location_room: "Red Smiley"
+  location_name: "Red SMILE"
 }
 doors {
   name: "Pink Hallway"
@@ -1708,6 +1729,7 @@ doors {
   panels { room: "Cyan Room" name: "COLD" }
   panels { room: "Cyan Room" name: "WORDWORD" }
   location_room: "Cyan Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Green Room Entrance"
@@ -1731,6 +1753,7 @@ doors {
   panels { room: "Green Room" name: "DOUBLE" }
   panels { room: "Green Room" name: "BADMINTON" }
   location_room: "Green Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway South Divider"
@@ -1769,6 +1792,7 @@ doors {
   panels { room: "Red Room" name: "TESTAMENT" }
   panels { room: "Red Room" name: "TAKEOUT" }
   location_room: "Red Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway To Red Room"
@@ -1782,6 +1806,7 @@ doors {
   panels { room: "Blue Hallway" name: "CHOP" }
   panels { room: "Blue Hallway Tall Side" name: "TALL" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "CHOP, TALL"
 }
 doors {
   name: "Near Yellow Room Door"
@@ -1794,6 +1819,7 @@ doors {
   panels { room: "Blue Hallway Tall Side" name: "CHILD" }
   panels { room: "Blue Hallway Tall Side" name: "NEW" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "Pink Hex"
 }
 doors {
   name: "House Side Door"
@@ -1830,6 +1856,7 @@ doors {
   panels { room: "Yellow Room" name: "PROTON" }
   panels { room: "Yellow Room" name: "SPIRIT" }
   location_room: "Yellow Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Dark Light Room Entrance"
@@ -1865,6 +1892,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Dark Light Exit" name: "GASKET" }
   location_room: "Dark Light Exit"
+  location_name: "GASKET"
 }
 doors {
   name: "Dark Light Room Divider"
@@ -1884,6 +1912,7 @@ doors {
   # Not technically true; it's complete_at=11 with both rooms, but you couldn't
   # get to the other side in vanilla doors anyway.
   location_room: "Dark Light Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Near Sweet Blue Door"
@@ -1896,6 +1925,7 @@ doors {
   panels { room: "Gray Color Backside" name: "LAST" }
   panels { room: "Gray Color Backside" name: "RISE" }
   location_room: "Gray Color Backside"
+  location_name: "Light Green Hex"
 }
 doors {
   name: "South Castle Area Back Door"
@@ -1935,6 +1965,7 @@ doors {
   panels { room: "Plum Room" name: "SNAKE" }
   panels { room: "Plum Room" name: "CENTER" }
   location_room: "Plum Room"
+  location_name: "Plum Room"
 }
 doors {
   name: "D Keyholder Blocker"
@@ -2036,6 +2067,7 @@ doors {
   panels { room: "Computer Room" name: "MOUSE (2)" }
   panels { room: "Computer Room" name: "KEYBOARD (2)" }
   location_room: "Computer Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Computer Room Entrance"
@@ -2048,12 +2080,17 @@ doors {
   panels { room: "Rainbow Color Doors" name: "MISCHIEF" }
   panels { room: "Rainbow Color Doors" name: "CASUAL" }
   location_room: "Rainbow Color Doors"
+  location_name: "Red Tower"
 }
 doors {
   name: "C Keyholder Blocker"
   type: EVENT
-  # Components/Doors/Unincorporated/temple_foyer_7
-  switches: "lavender_cubes"
+  receivers: "Components/Doors/Unincorporated/temple_foyer_7"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
   name: "Computer Room Back Door"
@@ -2115,6 +2152,7 @@ doors {
   panels { room: "Book Room" name: "BOOK (11)" }
   panels { room: "Book Room" name: "BOOK (12)" }
   location_room: "Book Room"
+  location_name: "Book Room"
 }
 doors {
   name: "Sticks And Stones Door"
@@ -2122,6 +2160,7 @@ doors {
   receivers: "Components/Doors/Unincorporated/temple_foyer_6"
   panels { room: "Globe Room" name: "WORD" }
   location_room: "Globe Room"
+  location_name: "Sticks and Stones"
 }
 doors {
   name: "Castle Numbers Puzzle"
@@ -2141,6 +2180,7 @@ doors {
   panels { room: "Black Hex" name: "BARK" }
   panels { room: "Zoo N" name: "LEAF" }
   location_room: "Zoo N"
+  location_name: "BARK, LEAF"
 }
 doors {
   name: "Zoo East Entrance"
@@ -2226,3 +2266,38 @@ doors {
   panels { room: "Yellow Color Backside" name: "REDACTED" }
   location_room: "Yellow Color Backside"
 }
+doors {
+  name: "Tenacious Color Painting"
+  type: EVENT
+  panels { room: "South Castle Area" name: "COLOR (1)" answer: "red" }
+  panels { room: "South Castle Area" name: "COLOR (2)" answer: "yellow" }
+  panels { room: "South Castle Area" name: "COLOR (3)" answer: "purple" }
+  panels { room: "South Castle Area" name: "COLOR (4)" answer: "green" }
+}
+doors {
+  name: "Eye Painting"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/Temple of the Eyes/eyeRedStart/teleportListener"
+  double_letters: true
+}
+doors {
+  name: "Lime Hexes"
+  type: LOCATION_ONLY
+  panels { room: "Tree Entrance" name: "RAT" }
+  panels { room: "Tree Entrance" name: "DIFFERENCE" }
+  panels { room: "Tree Entrance" name: "LEANS" }
+  panels { room: "Tree Entrance" name: "QUESTION" }
+  panels { room: "Tree Entrance" name: "WHERE" }
+  panels { room: "Tree Entrance" name: "SUNDER" }
+  location_room: "Tree Entrance"
+}
+doors {
+  name: "Theo Panels"
+  type: LOCATION_ONLY
+  panels { room: "House" name: "GOAT" }
+  panels { room: "House" name: "AMAZE" }
+  panels { room: "House" name: "SKINNYHIM" }
+  panels { room: "House" name: "THEO" }
+  location_room: "House"
+  location_name: "All Puzzles"
+}
@@ -1,5 +1,5 @@
 name: "After Bee Room"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "GAS"
   path: "Panels/Beehalls/beehalls_2"
@@ -1,5 +1,5 @@
 name: "Amber North 2"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "SONG"
   path: "Panels/Amber/amber_north_2"
@@ -1,5 +1,5 @@
 name: "Bee Room Obverse"
-display_name: "Bee Room"
+panel_display_name: "Bee Room"
 panels {
   name: "SINGLE"
   path: "Panels/Bee Room/bee_1"
@@ -1,5 +1,5 @@
 name: "Bee Room Reverse"
-display_name: "Bee Room"
+panel_display_name: "Bee Room"
 panels {
   name: "POCKET"
   path: "Panels/Bee Room/bee_9"
@@ -1,5 +1,5 @@
 name: "Beehalls Intersection"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "CLOUDS"
   path: "Panels/Halls/beehalls_4"
@@ -1,5 +1,5 @@
 name: "Black Hex"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "HIDE"
   path: "Panels/Hexes/black_1"
@@ -1,5 +1,5 @@
 name: "Blue Hallway Cut Side"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "CUT"
   path: "Panels/Halls/halls_6"
@@ -1,5 +1,5 @@
 name: "Blue Hallway Tall Side"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "TALL"
   path: "Panels/Halls/halls_9"
@@ -1,5 +1,5 @@
 name: "Blue Hallway"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "CHOP"
   path: "Panels/Halls/halls_10"
@@ -1,5 +1,5 @@
 name: "Blue Room"
-display_name: "East Area"
+panel_display_name: "Blue Room"
 panels {
   name: "RED"
   path: "Panels/Blue Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Blue Smiley Annex"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "ORANGE (1)"
   path: "Panels/Miscellaneous/yellow"
@@ -1,5 +1,5 @@
 name: "Blue Smiley"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/blue"
@@ -1,5 +1,5 @@
 name: "Book Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "BOOK (1)"
   path: "Panels/Book Room/book_1"
@@ -1,9 +1,10 @@
 name: "Bow Side"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "?"
   path: "Panels/Smiley Rooms/bow"
   clue: ""
   answer: "bow"
   symbols: QUESTION
+  display_name: "? (2)"
 }
@@ -1,5 +1,5 @@
 name: "Brown Smiley"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "OTHERS"
   path: "Panels/Smiley Rooms/rainbow2"
@@ -1,6 +1,7 @@
 name: "C Keyholder"
-display_name: "North Area"
+panel_display_name: "East Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolderC"
+  key: "c"
 }
@@ -1,5 +1,5 @@
 name: "Castle"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
   name: "REVERSE"
   path: "Panels/Castle Interior/panel_flip"
@@ -1,5 +1,5 @@
 name: "Coin Tower"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "RAIN"
   path: "Panels/Entry/db_2"
@@ -1,5 +1,5 @@
 name: "Composite Room NE"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "<-"
   path: "Panels/Combo Room NE/panel_1"
@@ -1,5 +1,5 @@
 name: "Composite Room NW"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "BEHOUSE"
   path: "Panels/Combo Room NW/panel_1"
@@ -1,5 +1,5 @@
 name: "Composite Room S"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "CONCAVE"
   path: "Panels/Combo Room SW/panel_1"
@@ -194,5 +194,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Composite Room Worldport"
   path: "Components/Warps/Worldports/worldport16"
+  destination { x: -84 y: 0 z: 81 }
+  rotation: 270
 }
@@ -1,5 +1,5 @@
 name: "Computer Room Seal"
-display_name: "Computer Room"
+panel_display_name: "Computer Room"
 panels {
   name: "SCROLL"
   path: "Panels/Computer/computer_11"
@@ -1,5 +1,5 @@
 name: "Computer Room"
-display_name: "Computer Room"
+panel_display_name: "Computer Room"
 panels {
   name: "MONITOR (1)"
   path: "Panels/Computer/computer_1"
@@ -1,5 +1,5 @@
 name: "Cyan Room"
-display_name: "West Area"
+panel_display_name: "Cyan Room"
 panels {
   name: "LIFE"
   path: "Panels/Brown Room/panel_1"
@@ -1,6 +1,7 @@
 name: "D Keyholder"
-display_name: "Plum Room"
+panel_display_name: "Plum Room"
 keyholders {
   name: "D"
   path: "Components/KeyHolders/keyHolderD"
+  key: "d"
 }
@@ -1,5 +1,5 @@
 name: "D2 Room"
-display_name: "Intense Room"
+panel_display_name: "Intense Room"
 letters {
   key: "d"
   level2: true
@@ -1,5 +1,5 @@
 name: "Dark Light Exit"
-display_name: "Outside Pumpkin"
+panel_display_name: "Dark Light Room"
 panels {
   name: "GASKET"
   path: "Panels/Dark Light Room/dark_7"
@@ -1,5 +1,5 @@
 name: "Dark Light Room"
-display_name: "Outside Pumpkin"
+panel_display_name: "Dark Light Room"
 panels {
   name: "COIN (1)"
   path: "Panels/Dark Light Room/dark_1"
@@ -1,5 +1,5 @@
 name: "Ending"
-display_name: "Castle"
+panel_display_name: "Castle"
 endings {
   name: "ORANGE"
   path: "Components/Triggers/orange_ending"
@@ -1,13 +1,17 @@
 name: "Entry Shortcut"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "WELCOME"
   path: "Panels/Entry/entry_3"
   clue: "welcome"
   answer: "back"
   symbols: QUESTION
+  display_name: "WELCOME (Red/Blue)"
 }
 ports {
   name: "ENTRY"
+  display_name: "Starting Room West Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport4"
+  destination { x: -21 y: 0 z: -4 }
+  rotation: 90
 }
@@ -1,5 +1,5 @@
 name: "Eye Painting"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 panels {
   name: "REVILED"
   path: "Panels/Entry/entry_5"
@@ -1,5 +1,5 @@
 name: "Eye Temple 1F Side"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDSIDE1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedSide1"
@@ -1,5 +1,5 @@
 name: "Eye Temple 1F"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDTOEXITMAIN2"
   path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain2"
@@ -1,5 +1,5 @@
 name: "Eye Temple 2F Side"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDTOEXITMAIN4"
   path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain4"
@@ -1,5 +1,5 @@
 name: "Eye Temple 2F"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITTOP1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitTop1"
@@ -1,5 +1,5 @@
 name: "Eye Temple Pillar 1"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITPILLAR1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar1"
@@ -1,5 +1,5 @@
 name: "Eye Temple Pillar 2"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITPILLAR2"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar2"
@@ -1,6 +1,7 @@
 name: "F Keyholder"
-display_name: "West Area"
+panel_display_name: "West Area"
 keyholders {
   name: "F"
   path: "Components/KeyHolders/keyHolderF"
+  key: "f"
 }
@@ -1,5 +1,5 @@
 name: "F2 Prize"
-display_name: "F2 Room"
+panel_display_name: "F2 Room"
 letters {
   key: "f"
   level2: true
@@ -1,5 +1,5 @@
 name: "F2 Room"
-display_name: "F2 Room"
+panel_display_name: "F2 Room"
 panels {
   name: "DULLS"
   path: "Panels/The Big F/o_1"
@@ -1,5 +1,5 @@
 name: "Flip Painting Destination"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
   name: "FLIP"
   path: "Components/Paintings/Group2/flip"
@@ -1,5 +1,5 @@
 name: "Flip Painting Hidden Panel"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "HIDDEN"
   path: "Panels/Halls/halls_2"
@@ -8,4 +8,5 @@ panels {
   symbols: SUN
   proxies { answer: "covert" path: "Panels/Halls/secret_proxy_1" }
   proxies { answer: "secret" path: "Panels/Halls/secret_proxy_2" }
+  display_name: "HIDDEN (East)"
 }
@@ -1,5 +1,5 @@
 name: "Flip Painting"
-display_name: "West Area"
+panel_display_name: "West Area"
 paintings {
   name: "FLIP2"
   path: "Components/Paintings/Group2/flip2"
@@ -1,5 +1,5 @@
 name: "Gallery Entrance"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
   name: "GALLERY"
   path: "Components/Warps/eyeWorldport"
@@ -1,5 +1,5 @@
 name: "Globe Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "NORTH"
   path: "Panels/Halls/directions_1"
@@ -1,5 +1,5 @@
 name: "Godot Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MOTORCYCLE"
   path: "Panels/Southwest Room/sw_1"
@@ -1,5 +1,5 @@
 name: "Gray Color Backside"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "ORANGE"
   path: "Panels/Hexes/lightgreen_1"
@@ -1,5 +1,5 @@
 name: "Gray Color Door"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "PATCH"
   path: "Panels/Halls/halls_3"
@@ -1,5 +1,5 @@
 name: "Green Color Door"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "OLD (1)"
   path: "Panels/Halls/halls_20"
@@ -1,5 +1,5 @@
 name: "Green Room"
-display_name: "Green Room"
+panel_display_name: "Green Room"
 panels {
   name: "TIMESCALE"
   path: "Panels/Green Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Green Smiley"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/green"
@@ -1,6 +1,8 @@
 name: "Hedges Tower"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
+  display_name: "Hedge Maze Tower"
   path: "Components/Warps/Worldports/worldport13"
+  no_shuffle: true
 }
@@ -1,5 +1,5 @@
 name: "Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "SOLVE"
   path: "Panels/Tower Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Hotel"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 # TODO: Something has to be changed in-game so that the puzzles don't disappear
 # and thus cause them to become unsolvable.
 panels {
@@ -1,5 +1,5 @@
 name: "House Entrance"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "ADULT"
   path: "Panels/Entry/entry_6"
@@ -1,5 +1,5 @@
 name: "House"
-display_name: "House"
+panel_display_name: "House"
 panels {
   name: "GOAT"
   path: "Panels/Theos House/panel_1"
@@ -1,5 +1,5 @@
 name: "I2 Room"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 letters {
   key: "i"
   level2: true
@@ -1,5 +1,5 @@
 name: "Intense Room"
-display_name: "Intense Room"
+panel_display_name: "Intense Room"
 panels {
   name: "BRILLIANT"
   path: "Panels/Intense Room/intense_1"
@@ -1,5 +1,5 @@
 name: "J2 Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 letters {
   key: "j"
   level2: true
@@ -1,9 +1,10 @@
 name: "J2 Vestibule"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "COLORFUL"
   path: "Panels/Entry/hotel_entry2"
   clue: "colorful"
   answer: "vivid"
   symbols: SUN
+  display_name: "COLORFUL (2)"
 }
@@ -1,5 +1,5 @@
 name: "Magic Room"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "1"
   path: "Panels/Magic Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Maze Paintings Area"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "Paintings"
   path: "Panels/Halls/halls_28"
@@ -1,2 +1,2 @@
 name: "Maze"
-display_name: "Maze"
+panel_display_name: "Maze"
@@ -1,10 +1,13 @@
 name: "Moat"
-display_name: "East Area"
+panel_display_name: "East Area"
 paintings {
   name: "CASTLE"
   path: "Components/Paintings/Group1/castle"
 }
 ports {
   name: "HIVE"
+  display_name: "Moat Worldport"
   path: "Components/Warps/Worldports/worldport9"
+  destination { x: 64 y: 1 z: 24.5 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "North Castle Area"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "A"
   path: "Panels/Castle Entrance/castle_north_helper"
@@ -1,5 +1,5 @@
 name: "Number Paintings Area"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "GOING"
   path: "Panels/Entry/g_hedge_1"
@@ -17,6 +17,7 @@ panels {
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolderG"
+  key: "g"
 }
 paintings {
   name: "WON"
@@ -1,5 +1,5 @@
 name: "Nursery"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "Paintings"
   path: "Panels/Entry/entry_2"
@@ -12,6 +12,7 @@ panels {
   path: "Panels/Halls/halls_17"
   clue: ""
   answer: "welcome"
+  display_name: "Nursery Behind"
 }
 paintings {
   name: "ARE"
@@ -1,5 +1,5 @@
 name: "O2 Prize"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 letters {
   key: "o"
   level2: true
@@ -1,5 +1,5 @@
 name: "O2 Room"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 panels {
   name: "LISTEN"
   path: "Panels/The Big O/o_1"
@@ -0,0 +1,4 @@
+name: "Orange Room Hallway"
+panel_display_name: "Orange Room"
+# This has the same door at both sides, and mainly just connects Z2 Room and
+# Orange Room. It's separate because you can also get here from the Roof.
@@ -1,5 +1,5 @@
 name: "Orange Room"
-display_name: "East Area"
+panel_display_name: "Orange Room"
 panels {
   name: "FRANCE"
   path: "Panels/Orange Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Outside Book Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 # This is behind a teal wall.
 panels {
   name: "TEAL"
@@ -1,5 +1,5 @@
 name: "Outside Eye Temple"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 panels {
   name: "Entrance"
   path: "Panels/Halls/eye_temple_entry_1"
@@ -1,5 +1,5 @@
 name: "Outside Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "GOURD (1)"
   path: "Panels/Halls/halls_11"
@@ -76,5 +76,8 @@ paintings {
 }
 ports {
   name: "REVITALIZED"
+  display_name: "Near Hedges Plum Hallway"
   path: "Components/Warps/Worldports/worldport7"
+  destination { x: 45 y: 0 z: 94 }
+  rotation: 270
 }
@@ -1,9 +1,10 @@
 name: "Outside Hotel"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "COLORFUL"
   path: "Panels/Entry/hotel_entry"
   clue: "colorful"
   answer: "bright"
   symbols: SUN
+  display_name: "COLORFUL (1)"
 }
@@ -1,5 +1,5 @@
 name: "Outside House"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "WHISPER"
   path: "Panels/Beehalls/beehalls_1"
@@ -75,6 +75,7 @@ panels {
 keyholders {
   name: "H"
   path: "Components/KeyHolders/keyHolderH"
+  key: "h"
 }
 paintings {
   name: "CASTLE2"
@@ -1,5 +1,5 @@
 name: "Outside Magic Room"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "WIZARD"
   path: "Panels/Magic Maze/maze_entry_1"
@@ -1,5 +1,5 @@
 name: "Outside Orange Room"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/orange"
@@ -1,5 +1,5 @@
 name: "Outside Pyramid"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "PEER"
   path: "Panels/Pyramid/pyramid_entry"
@@ -1,5 +1,5 @@
 name: "Outside Red Room"
-display_name: "Red Room"
+panel_display_name: "Red Room"
 panels {
   name: "ROCK"
   path: "Panels/Red Room/red_entry"
@@ -1,9 +1,10 @@
 name: "Outside Salt Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "Colors"
   path: "Panels/Color Reading/cr_1"
   clue: ""
   answer: "rob"
   symbols: LINGO
+  display_name: "Colors (White)"
 }
@@ -1,5 +1,5 @@
 name: "Outside Snake Room"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "TONGUE"
   path: "Panels/Pairs Room/pairs_7"
@@ -1,5 +1,5 @@
 name: "Pains Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MOO"
   path: "Panels/Gold/gold_1"
@@ -1,2 +1,2 @@
 name: "Pairs Room"
-display_name: "West Area"
+panel_display_name: "West Area"
@@ -1,9 +1,10 @@
 name: "Pepper Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SEASONING"
   path: "Panels/Color Reading/cr_4"
   clue: "seasoning"
   answer: "pepper"
   symbols: EXAMPLE
+  display_name: "SEASONING (Black)"
 }
@@ -1,5 +1,5 @@
 name: "Plum Room"
-display_name: "Plum Room"
+panel_display_name: "Plum Room"
 panels {
   name: "GOD"
   path: "Panels/Plum Room/plum_1"
@@ -1,2 +1,2 @@
 name: "Post Orange Smiley Three Way"
-display_name: "West Area"
+panel_display_name: "West Area"
@@ -1,5 +1,5 @@
 name: "Pumpkin Entrance"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "JACK"
   path: "Panels/Pumpkin Room/pumpkin_2"
@@ -1,5 +1,5 @@
 name: "Pumpkin Room"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "BONE"
   path: "Panels/Pumpkin Room/pumpkin_3"
@@ -1,6 +1,9 @@
 name: "Purple Hallway From Great"
-display_name: "South Area"
+panel_display_name: "South Area"
 ports {
   name: "GREAT"
+  display_name: "Near Sweet Purple Hallway"
   path: "Components/Warps/Worldports/worldport17"
+  destination { x: -24 y: 0 z: 61 }
+  rotation: 270
 }
@@ -1,5 +1,5 @@
 name: "Purple NW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MESSAGES"
   path: "Panels/Purple Exterior/purple_8"
@@ -1,2 +1,2 @@
 name: "Purple Room East"
-display_name: "Central"
+panel_display_name: "Central"
@@ -1,5 +1,5 @@
 name: "Purple Room South"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "LITTLE"
   path: "Panels/Halls/hof_1"
@@ -1,2 +1,2 @@
 name: "Purple Room West"
-display_name: "Central"
+panel_display_name: "Central"
@@ -1,5 +1,5 @@
 name: "Purple Room"
-display_name: "Central"
+panel_display_name: "Purple Room"
 panels {
   name: "HOIST"
   path: "Panels/Purple Room/purple_1"
@@ -1,5 +1,5 @@
 name: "Purple SE Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "RUN"
   path: "Panels/Purple Exterior/purple_1"
@@ -1,5 +1,5 @@
 name: "Purple SW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "LETTERS"
   path: "Panels/Purple Exterior/purple_11"
@@ -1,5 +1,5 @@
 name: "Purple Smiley"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/purple"
@@ -1,5 +1,5 @@
 name: "Pyramid 3"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "VEHICLE"
   path: "Panels/Pyramid/pyramid_3"
@@ -1,5 +1,5 @@
 name: "Pyramid 4"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "CAT"
   path: "Panels/Pyramid/pyramid_4"
@@ -1,5 +1,5 @@
 name: "Pyramid 5"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "ROYAL"
   path: "Panels/Pyramid/pyramid_5"
@@ -1,5 +1,5 @@
 name: "Pyramid 6"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TEA"
   path: "Panels/Pyramid/pyramid_6"
@@ -1,5 +1,5 @@
 name: "Pyramid 7"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "ARTIST"
   path: "Panels/Pyramid/pyramid_7"
@@ -1,9 +1,10 @@
 name: "Pyramid 8"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "INSTRUMENT"
   path: "Panels/Pyramid/pyramid_8"
   clue: "instrument"
   answer: "drum"
   symbols: EXAMPLE
+  display_name: "INSTRUMENT (1F)"
 }
@@ -1,5 +1,5 @@
 name: "Pyramid Entry"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TREE"
   path: "Panels/Pyramid/pyramid_1"
@@ -1,5 +1,5 @@
 name: "Pyramid Second Floor"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TOOL"
   path: "Panels/Pyramid/pyramid_10"
@@ -36,6 +36,7 @@ panels {
   answer: "organ"
   symbols: EXAMPLE
   required_door { name: "Pyramid 13 Blocker" }
+  display_name: "INSTRUMENT (2F)"
 }
 panels {
   name: "BEVERAGE"
@@ -1,5 +1,5 @@
 name: "Pyramid Top"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 letters {
   key: "r"
   level2: true
@@ -1,5 +1,5 @@
 name: "Quiet Entrance"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "HIDDEN"
   path: "Panels/Halls/halls_7"
@@ -8,6 +8,7 @@ panels {
   symbols: SUN
   proxies { answer: "covert" path: "Panels/Halls/secret_proxy_3" }
   proxies { answer: "secret" path: "Panels/Halls/secret_proxy_4" }
+  display_name: "HIDDEN (West)"
 }
 paintings {
   name: "PLANET2"
@@ -15,5 +16,8 @@ paintings {
 }
 ports {
   name: "QUIET"
+  display_name: "Near Planet Painting Worldport"
   path: "Components/Warps/Worldports/worldport5"
+  destination { x: -32 y: 0 z: -40 }
+  rotation: 90
 }
@@ -1,13 +1,17 @@
 name: "Rain Side"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "?"
   path: "Panels/Smiley Rooms/rain"
   clue: ""
   answer: "rain"
   symbols: QUESTION
+  display_name: "? (1)"
 }
 ports {
   name: "BEARER"
+  display_name: "Rain Panel Worldport"
   path: "Components/Warps/Worldports/worldport11"
+  destination { x: 93.5 y: 0 z: 27 }
+  rotation: 90
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Blue"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/blue2"
   clue: "theme"
   answer: "seasonings"
   symbols: QUESTION
+  display_name: "THEME (Blue)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Color Backside"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "BACKSIDE"
   path: "Panels/Halls/halls_1"
@@ -11,4 +11,5 @@ panels {
   path: "Panels/Halls/halls_4"
   clue: ""
   answer: "side"
+  display_name: "Backside Behind"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Color Doors"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "CROW"
   path: "Panels/Blue Room/panel_entry"
@@ -1,9 +1,10 @@
 name: "Rainbow Cyan"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/cyan"
   clue: "theme"
   answer: "apocalypse"
   symbols: QUESTION
+  display_name: "THEME (Cyan)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow End"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "POT"
   path: "Components/Warps/gold"
@@ -1,9 +1,10 @@
 name: "Rainbow Green"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/green2"
   clue: "theme"
   answer: "tea"
   symbols: QUESTION
+  display_name: "THEME (Green)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Orange"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/orange2"
   clue: "theme"
   answer: "fish"
   symbols: QUESTION
+  display_name: "THEME (Orange)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Purple"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/purple2"
   clue: "theme"
   answer: "fruit"
   symbols: QUESTION
+  display_name: "THEME (Purple)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Red"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/red2"
   clue: "theme"
   answer: "names"
   symbols: QUESTION
+  display_name: "THEME (Red)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Start"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "PAINTING"
   path: "Panels/Smiley Rooms/rainbow"
@@ -1,9 +1,10 @@
 name: "Rainbow Yellow"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/yellow2"
   clue: "theme"
   answer: "music"
   symbols: QUESTION
+  display_name: "THEME (Yellow)"
 }
@@ -1,7 +1,7 @@
 name: "Red Color Door"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
-  name: "Left"
+  name: "Near Obscured Puzzles"
   path: "Panels/Halls/wb_1"
   clue: ""
   answer: "sidewalk"
@@ -67,4 +67,5 @@ panels {
   clue: ""
   answer: "bank"
   symbols: LINGO
+  display_name: "Colors (Black)"
 }
@@ -1,5 +1,5 @@
 name: "Red Room"
-display_name: "Red Room"
+panel_display_name: "Red Room"
 panels {
   name: "BLINDING"
   path: "Panels/Red Room/red_1"
@@ -1,5 +1,5 @@
 name: "Red Smiley"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/red"
@@ -1,4 +1,5 @@
 name: "Roof"
+panel_display_name: "Roof"
 panels {
   name: "?"
   path: "Panels/Castle Entrance/moat"
@@ -1,9 +1,10 @@
 name: "Salt Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SEASONING"
   path: "Panels/Color Reading/cr_3"
   clue: "seasoning"
   answer: "salt"
   symbols: EXAMPLE
+  display_name: "SEASONING (White)"
 }
@@ -1,5 +1,5 @@
 name: "Seasoning Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "PARITY"
   path: "Panels/Color Reading/cr_5"
@@ -1,5 +1,5 @@
 name: "Snake Room"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "HISS"
   path: "Panels/Snake Room/snake_1"
@@ -1,5 +1,5 @@
 name: "South Castle Area"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 # There is a teal wall in the middle of this room.
 panels {
   name: "AN"
@@ -107,5 +107,5 @@ paintings {
   path: "Components/Paintings/Group2/triangle"
   move: true
   enter_only: true
-  # TODO: required_door
+  required_door { name: "Tenacious Color Painting" }
 }
@@ -1,5 +1,5 @@
 name: "Starting Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "ENTRANCE"
   path: "Panels/Entry/entry_1"
@@ -9,5 +9,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Starting Room South Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport"
+  destination { x: 0 y: 0 z: 11 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "Sweet Foyer"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "QUALITY"
   path: "Panels/Sweet Foyer/panel_1"
@@ -51,9 +51,15 @@ paintings {
 }
 ports {
   name: "SWEET1"
+  display_name: "Sweet East Entrance"
   path: "Components/Warps/Worldports/worldport14"
+  destination { x: -27 y: 0 z: 76.5 }
+  rotation: 270
 }
 ports {
   name: "SWEET2"
+  display_name: "Sweet West Entrance"
   path: "Components/Warps/Worldports/worldport15"
+  destination { x: -36 y: 0 z: 76.5 }
+  rotation: 90
 }
@@ -1,5 +1,5 @@
 name: "Tree Entrance"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "RAT"
   path: "Panels/Hexes/lime_1"
@@ -48,5 +48,8 @@ panels {
 }
 ports {
   name: "TREE"
+  display_name: "Near Pumpkin Brown Hallway"
   path: "Components/Warps/Worldports/worldport12"
+  destination { x: 41 y: 0 z: 50.5 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "U2 Prize"
-display_name: "U2 Room"
+panel_display_name: "U2 Room"
 letters {
   key: "u"
   level2: true
@@ -1,5 +1,5 @@
 name: "U2 Room"
-display_name: "U2 Room"
+panel_display_name: "U2 Room"
 panels {
   name: "DREAMSCAPE"
   path: "Panels/The Big U/o_1"
@@ -1,6 +1,9 @@
 name: "Unkempt Entrance"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 ports {
   name: "UNKEMPT"
+  display_name: "O2 Room Worldport"
   path: "Components/Warps/Worldports/worldport6"
+  destination { x: -61 y: 0 z: 95 }
+  rotation: 270
 }
@@ -1,5 +1,5 @@
 name: "Welcome Back Area"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "FAREWELL LITTLE LAMB"
   path: "Panels/Entry/wb_2"
@@ -1,5 +1,5 @@
 name: "Welcome Back Exit"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "WELCOME"
   path: "Panels/Entry/wb_1"
@@ -7,4 +7,5 @@ panels {
   answer: "welcome"
   symbols: QUESTION
   proxies { answer: "back" path: "Panels/Entry/wb_proxy" }
+  display_name: "WELCOME (White)"
 }
@@ -1,5 +1,5 @@
 name: "West Castle Area"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "SONG (1)"
   path: "Panels/Castle Entrance/castle_west_helper"
@@ -1,5 +1,5 @@
 name: "West Spire"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "MISSING"
   path: "Panels/Entry/wb_5"
@@ -1,12 +1,9 @@
 name: "White Hallway From Entry"
-display_name: "Southwest Area"
-# Not exactly sure what to do with this yet. In unshuffled connections, the door
-# here should be paired with the door on the other end (which is vanilla) even
-# if control center color doors are shuffled. But when connections are shuffled
-# maybe this should be shuffled separately? I might also want to find a way to
-# register when there's a door immediately outside of a connection so that when
-# two connections behind doors are shuffled together, their doors can be paired.
+panel_display_name: "Southwest Area"
 ports {
   name: "ENTRY"
+  display_name: "Near Globe White Hallway"
   path: "Components/Warps/Worldports/worldport10"
+  destination { x: -46 y: 0 z: 23 }
+  rotation: 90
 }
@@ -1,5 +1,5 @@
 name: "Wisdom Panel"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
   name: "INTELLIGENCE"
   path: "Components/Warps/numbers"
@@ -1,6 +1,5 @@
 name: "Wonderland"
-display_name: "Northwest Area"
-# TODO: There's a warp from The Entry into here.
+panel_display_name: "Northwest Area"
 panels {
   name: "APRIL"
   path: "Panels/Wonderland/wonderland_1"
@@ -38,5 +37,8 @@ panels {
 }
 ports {
   name: "WONDROUS"
+  display_name: "Wonderland Worldport"
   path: "Components/Warps/Worldports/worldport3"
+  destination { x: -104 y: 0 z: -69 }
+  rotation: 180
 }
@@ -1,5 +1,5 @@
 name: "Yellow Color Backside"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "WINDS"
   path: "Panels/Halls/halls_24"
@@ -1,5 +1,5 @@
 name: "Yellow Color Door"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "SUN"
   path: "Panels/Yellow Room/panel_entry"
@@ -26,9 +26,12 @@ paintings {
   path: "Components/Paintings/Temple of the Eyes/eyeRedStart"
   move: true
   enter_only: true
-  # TODO: requires double letters
+  required_door { name: "Eye Painting" }
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Near Yellow Worldport"
   path: "Components/Warps/Worldports/worldport8"
+  destination { x: 92.5 y: 0 z: -62 }
+  rotation: 90
 }
@@ -1,5 +1,5 @@
 name: "Yellow Room"
-display_name: "Northeast Area"
+panel_display_name: "Yellow Room"
 panels {
   name: "FREE"
   path: "Panels/Yellow Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Yellow Smiley Annex"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "COW"
   path: "Panels/Miscellaneous/plum1"
@@ -1,5 +1,5 @@
 name: "Z2 Prize"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 letters {
   key: "z"
   level2: true
@@ -1,5 +1,5 @@
 name: "Z2 Room"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 panels {
   name: "EXHIBIT"
   path: "Panels/V Maze/entry"
@@ -1,5 +1,5 @@
 name: "Zoo Center"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 letters {
   key: "v"
   level2: true
@@ -1,5 +1,5 @@
 name: "Zoo E"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "WING"
   path: "Panels/V Maze/four_1"
@@ -1,5 +1,5 @@
 name: "Zoo N"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "BILL"
   path: "Panels/V Maze/four_13"
@@ -13,6 +13,7 @@ panels {
   clue: "fin"
   answer: "whale"
   symbols: BOXES
+  display_name: "FIN (N)"
 }
 panels {
   name: "BLOWHOLE"
@@ -1,5 +1,5 @@
 name: "Zoo NE"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "FANG"
   path: "Panels/V Maze/four_5"
@@ -1,5 +1,5 @@
 name: "Zoo S"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "SHELL"
   path: "Panels/V Maze/four_9"
@@ -13,6 +13,7 @@ panels {
   clue: "fin"
   answer: "fish"
   symbols: BOXES
+  display_name: "FIN (S)"
 }
 panels {
   name: "PINCER"
@@ -1,2 +1,2 @@
 name: "Zoo SE"
-display_name: "Zoo"
+panel_display_name: "Zoo"
@@ -11,6 +11,7 @@ doors {
   panels { room: "Intensify Room" name: "INJURY" }
   panels { room: "Intensify Room" name: "SWAY" }
   location_room: "Intensify Room"
+  location_name: "Intensify Room"
 }
 doors {
   name: "Examples Door"
@@ -25,6 +26,7 @@ doors {
   panels { room: "Examples Room" name: "URN" }
   panels { room: "Examples Room" name: "ART" }
   location_room: "Examples Room"
+  location_name: "Examples Room"
 }
 doors {
   name: "Synonyms Door"
@@ -39,6 +41,7 @@ doors {
   panels { room: "Synonyms Room" name: "SERIOUS" }
   panels { room: "Synonyms Room" name: "FURY" }
   location_room: "Synonyms Room"
+  location_name: "Synonyms Room"
 }
 doors {
   name: "Time Door"
@@ -53,6 +56,7 @@ doors {
   panels { room: "Time Room" name: "HOLE" }
   panels { room: "Time Room" name: "RHYTHM" }
   location_room: "Time Room"
+  location_name: "Time Room"
 }
 doors {
   name: "A2 Door"
@@ -1,5 +1,4 @@
 name: "A2 Room"
-display_name: "Hallway"
 letters {
   key: "a"
   level2: true
@@ -1,5 +1,4 @@
 name: "Examples Room"
-display_name: "Examples Room"
 panels {
   name: "SIZE (1)"
   path: "Panels/Room 2 Examples/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Examples Room Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -40.5 }
+  rotation: 180
 }
@@ -1,5 +1,4 @@
 name: "Hallway"
-display_name: "Hallway"
 panels {
   name: "SUSPICION"
   path: "Panels/Reward Room/reward_1"
@@ -1,5 +1,4 @@
 name: "Intensify Room"
-display_name: "Intensify Room"
 panels {
   name: "SMALL"
   path: "Panels/Room 1 Intensify/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "IMPRESSIVE"
+  display_name: "Intensify Room Worldport"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -1,6 +1,6 @@
 name: "Keyholder Room"
-display_name: "Hallway"
 keyholders {
   name: "A"
   path: "Components/KeyHolders/keyHolderA"
+  key: "a"
 }
@@ -1,5 +1,4 @@
 name: "Synonyms Room"
-display_name: "Synonyms Room"
 panels {
   name: "MINUTE"
   path: "Panels/Room 3 Synonyms/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Synonyms Room Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "south"
+  destination { x: 20 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Time Room"
-display_name: "Time Room"
 panels {
   name: "BROODING"
   path: "Panels/Room 4 Time/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "OWL"
+  display_name: "Time Room Worldport"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -40.5 }
+  rotation: 180
 }
@@ -1,6 +1,7 @@
 doors {
   name: "Front Door"
   type: STANDARD
+  receivers: "Components/Doors/Front N Tree"
   panels { room: "Outside" name: "THIS" }
   location_room: "Outside"
 }
@@ -37,7 +38,8 @@ doors {
 }
 doors {
   name: "Lavender Cubes"
-  type: STANDARD
+  type: LOCATION_ONLY
   panels { room: "Inside" name: "COLOR" }
   location_room: "Inside"
+  location_name: "COLOR"
 }
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Ending"
 endings {
   name: "GREEN"
   path: "Components/Ending/green_ending"
@@ -1,10 +1,8 @@
 name: "Inside"
-display_name: "Inside"
 panels {
   name: "COLOR"
   path: "Panels/panel_2"
   clue: "color"
   answer: "lavender"
   symbols: EXAMPLE
-  # TODO: how does this connect to the "lavender_cubes" switch?
 }
@@ -1,8 +1,8 @@
 name: "Outside"
-display_name: "Outside"
 panels {
   name: "THIS"
   path: "Panels/panel_1"
   clue: "this"
   answer: "sphinx"
+  symbols: QUESTION
 }
@@ -263,3 +263,8 @@ connections {
   to_room: "Butterfly Room"
   door { name: "Butterfly Entrance" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "Tree Entrance"
+  door { name: "Control Center Brown Door" }
+}
@@ -211,7 +211,7 @@ doors {
 }
 doors {
   name: "Q2 Door"
-  type: STANDARD
+  type: EVENT
   receivers: "Components/Doors/entry_3"
   panels { room: "Entry" name: "SQUISH" }
   panels { room: "Entry" name: "MANE" }
@@ -237,7 +237,6 @@ doors {
   panels { room: "Red Vegetable" name: "CARD" }
   panels { room: "Yellow Planet" name: "ZEUS" }
   panels { room: "Yellow Vegetable" name: "CAKE" }
-  location_room: "Entry"
 }
 doors {
   name: "Control Center Brown Door"
@@ -249,5 +248,5 @@ doors {
   name: "Butterfly Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/brown_2"
-  switches: "double_letters"
+  double_letters: true
 }
@@ -1,5 +1,4 @@
 name: "Back Area"
-display_name: "Back Area"
 panels {
   name: "COLOR"
   path: "Panels/Entry/panel_3"
@@ -8,13 +7,9 @@ panels {
   symbols: EXAMPLE
 }
 ports {
-  name: "TREE"
-  path: "Components/Warps/worldport3"
-  orientation: "north"
-  required_door { name: "Control Center Brown Door" }
-}
-ports {
   name: "DAEDALUS"
+  display_name: "Dark Hallway"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 10 y: 0 z: -84.5 }
+  rotation: 180
 }
@@ -1,5 +1,4 @@
 name: "Blue Animal (View)"
-display_name: "Main Area"
 panels {
   name: "HALF"
   path: "Panels/Blue/panel_2"
@@ -1,2 +1 @@
 name: "Blue Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Planet (View)"
-display_name: "Main Area"
 panels {
   name: "TUNE"
   path: "Panels/Blue/panel_4"
@@ -1,2 +1 @@
 name: "Blue Planet"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Town (View)"
-display_name: "Main Area"
 panels {
   name: "LICE"
   path: "Panels/Blue/panel_3"
@@ -1,2 +1 @@
 name: "Blue Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "THORN"
   path: "Panels/Blue/panel_1"
@@ -1,2 +1 @@
 name: "Blue Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Butterfly Room"
-display_name: "Back Area"
 panels {
   name: "VIBRANT"
   path: "Panels/Entry/panel_4"
@@ -1,5 +1,4 @@
 name: "Entry"
-display_name: "Main Area"
 panels {
   name: "VIEW"
   path: "Panels/Entry/panel_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 4 z: 15 }
+  rotation: 90
 }
@@ -1,2 +1 @@
 name: "Green Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Green Planet (View)"
-display_name: "Main Area"
 panels {
   name: "SOIL"
   path: "Panels/Green/panel_4"
@@ -1,2 +1 @@
 name: "Green Planet"
-display_name: "Main Area"
@@ -1,2 +1 @@
 name: "Green Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Green Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "SPIN"
   path: "Panels/Green/panel_1"
@@ -1,2 +1 @@
 name: "Green Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Orange Planet"
-display_name: "Main Area"
 panels {
   name: "MAR"
   path: "Panels/Red/panel_4"
@@ -1,5 +1,4 @@
 name: "Orange Vegetable"
-display_name: "Main Area"
 panels {
   name: "POTATO"
   path: "Panels/Red/panel_1"
@@ -1,2 +1 @@
 name: "Overlook"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Animal (View)"
-display_name: "Main Area"
 panels {
   name: "SUNBASS"
   path: "Panels/Purple/panel_2"
@@ -1,2 +1 @@
 name: "Purple Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Planet (View)"
-display_name: "Main Area"
 panels {
   name: "DOG"
   path: "Panels/Purple/panel_4"
@@ -1,2 +1 @@
 name: "Purple Planet"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Town (View)"
-display_name: "Main Area"
 panels {
   name: "GRACEFUL"
   path: "Panels/Purple/panel_3"
@@ -1,2 +1 @@
 name: "Purple Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "AUBERGINE"
   path: "Panels/Purple/panel_1"
@@ -1,2 +1 @@
 name: "Purple Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Q2 Room"
-display_name: "Back Area"
 letters {
   key: "q"
   level2: true
@@ -1,5 +1,4 @@
 name: "Red Animal"
-display_name: "Main Area"
 panels {
   name: "FOOLSHARK"
   path: "Panels/Orange/panel_2"
@@ -1,5 +1,4 @@
 name: "Red Planet"
-display_name: "Main Area"
 panels {
   name: "FUEL"
   path: "Panels/Red/panel_3"
@@ -1,5 +1,4 @@
 name: "Red Town"
-display_name: "Main Area"
 panels {
   name: "DESTRUCTION"
   path: "Panels/Orange/panel_3"
@@ -1,5 +1,4 @@
 name: "Red Vegetable"
-display_name: "Main Area"
 panels {
   name: "CARD"
   path: "Panels/Red/panel_2"
@@ -0,0 +1,8 @@
+name: "Tree Entrance"
+ports {
+  name: "TREE"
+  display_name: "Brown Hallway"
+  path: "Components/Warps/worldport3"
+  destination { x: -19 y: 0 z: -83.5 }
+  rotation: 180
+}
@@ -1,5 +1,4 @@
 name: "Yellow Planet"
-display_name: "Main Area"
 panels {
   name: "ZEUS"
   path: "Panels/Orange/panel_4"
@@ -1,5 +1,4 @@
 name: "Yellow Vegetable"
-display_name: "Main Area"
 panels {
   name: "CAKE"
   path: "Panels/Orange/panel_1"
@@ -1,5 +1,4 @@
 name: "B2 Back Room"
-display_name: "B2 Room"
 letters {
   key: "b"
   level2: true
@@ -1,5 +1,4 @@
 name: "B2 Front Room"
-display_name: "B2 Room"
 paintings {
   name: "EYES"
   path: "Components/Paintings/eyes"
@@ -1,5 +1,4 @@
 name: "Control Center Side"
-display_name: "Control Center Side"
 panels {
   name: "RIGHT"
   path: "Panels/Helpers/panel_1"
@@ -14,11 +13,15 @@ paintings {
 }
 ports {
   name: "CC"
+  display_name: "Lavender Structure"
   path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: 36 y: 0 z: 1 }
+  rotation: 180
 }
 ports {
   name: "LIVELY"
+  display_name: "Near Painting Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 24 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "NEW"
   path: "Panels/Room 1/panel_1"
@@ -198,6 +197,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Salmon Hallway"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: -1 y: 0 z: 20 }
+  rotation: 90
 }
@@ -1,7 +1,8 @@
 name: "Plaza Entrance"
-display_name: "Main Area"
 ports {
   name: "PLAZA"
+  display_name: "Trick or Treat Worldport"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 1 }
+  rotation: 180
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "SPECIES"
   path: "Panels/Room_1/panel_1"
@@ -128,6 +127,8 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
-  orientation: "southwest" # uhhhh this is new
+  destination { x: -19 y: 0 z: 19 }
+  rotation: 315
 }
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Main Area"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/collectable"
@@ -46,13 +46,14 @@ doors {
   type: STANDARD
   receivers: "Components/Doors/entry_7"
   panels { room: "Yellow Room" name: "CIRCLE" }
-  panels { room: "Purple Room" name: "FISH" }
+  panels { room: "Purple Room" name: "FISH" answer: "fish" }
   location_room: "Purple Room"
 }
 doors {
   name: "Purple Side Entrance"
   type: STANDARD
   receivers: "Components/Doors/entry_7b3"
+  receivers: "Components/Doors/entry_7b4"
   panels { room: "Cyan Hallway" name: "KOI" }
   panels { room: "Cyan Hallway" name: "WISH" }
   location_room: "Cyan Hallway"
@@ -1,5 +1,4 @@
 name: "Black Room"
-display_name: "Black Room"
 panels {
   name: "STARK"
   path: "Panels/Hallway/panel_2"
@@ -1,5 +1,4 @@
 name: "Blue Room"
-display_name: "Blue Room"
 panels {
   name: "VINE"
   path: "Panels/Hallway/panel_4"
@@ -1,5 +1,4 @@
 name: "Brown Room"
-display_name: "Brown Room"
 panels {
   name: "FIRE"
   path: "Panels/Hallway/panel_9"
@@ -1,5 +1,4 @@
 name: "Cyan Hallway"
-display_name: "Cyan Hallway"
 panels {
   name: "KOI"
   path: "Panels/Extra/panel_12"
@@ -24,11 +23,15 @@ panels {
 }
 ports {
   name: "STURDY"
+  display_name: "North Cyan Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -75 }
+  rotation: 270
 }
 ports {
   name: "DARKROOM"
+  display_name: "South Cyan Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -51 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Cyan Room"
-display_name: "Cyan Room"
 panels {
   name: "BROTHER"
   path: "Panels/Cyan/panel_cyan_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Ending"
 endings {
   name: "GRAY"
   path: "Components/Endings/gray_ending"
@@ -1,5 +1,4 @@
 name: "Gray Room"
-display_name: "Gray Room"
 panels {
   name: "MEND"
   path: "Panels/Hallway/panel_11"
@@ -1,5 +1,4 @@
 name: "Green Room"
-display_name: "Green Room"
 panels {
   name: "MOTHER"
   path: "Panels/Hallway/panel_5"
@@ -1,5 +1,4 @@
 name: "Orange Room"
-display_name: "Orange Room"
 panels {
   name: "CLOUD"
   path: "Panels/Hallway/panel_8"
@@ -1,5 +1,4 @@
 name: "P2 Room"
-display_name: "Cyan Room"
 letters {
   key: "p"
   level2: true
@@ -1,10 +1,10 @@
 name: "Purple Room"
-display_name: "Purple Room"
 panels {
   name: "FISH"
   path: "Panels/Hallway/panel_7"
   clue: "fish"
   answer: "fish"
   symbols: PLANET
+  proxies { answer: "fish" path: "Panels/Hallway/panel_7a" }
   proxies { answer: "fishes" path: "Panels/Hallway/panel_7b" }
 }
@@ -1,5 +1,4 @@
 name: "Red Room"
-display_name: "Red Room"
 panels {
   name: "SANDWICH"
   path: "Panels/Hallway/panel_3"
@@ -1,5 +1,4 @@
 name: "White Room"
-display_name: "White Room"
 panels {
   name: "BRIGHT"
   path: "Panels/Hallway/panel_1"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 19 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Window Room"
-display_name: "Window Room"
 panels {
   name: "FADING"
   path: "Panels/Hallway/panel_10"
@@ -1,5 +1,4 @@
 name: "Yellow Room"
-display_name: "Yellow Room"
 panels {
   name: "CIRCLE"
   path: "Panels/Hallway/panel_6"
@@ -17,6 +17,7 @@ doors {
   panels { room: "Main Area" name: "LABS (1)" }
   panels { room: "Main Area" name: "LABS (2)" }
   location_room: "Main Area"
+  location_name: "Obverse Cyan Large Room"
 }
 doors {
   name: "Flipped Yellow Door"
@@ -33,6 +34,7 @@ doors {
   panels { room: "Flipped Magenta Room" name: "LUST" }
   panels { room: "Flipped Magenta Room" name: "LAND" }
   location_room: "Flipped Magenta Room"
+  location_name: "Flipped Magenta Room"
 }
 doors {
   name: "C Keyholder Blocker"
@@ -47,6 +49,7 @@ doors {
   panels { room: "Flipped Yellow Room" name: "CAVE (1)" }
   panels { room: "Flipped Yellow Room" name: "CAVE (2)" }
   location_room: "Flipped Yellow Room"
+  location_name: "Flipped Yellow Room"
 }
 doors {
   name: "C2 Door"
@@ -59,6 +62,7 @@ doors {
     key: "c"
   }
   location_room: "C Keyholder"
+  location_name: "C Keyholder"
 }
 doors {
   name: "Obverse Yellow Door"
@@ -111,10 +115,15 @@ doors {
     key: "g"
   }
   location_room: "G Keyholder"
+  location_name: "G Keyholder"
 }
 doors {
   name: "T Keyholder Blocker"
-  type: ITEM_ONLY
+  type: EVENT
   receivers: "Components/Doors/magenta_enterer3"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
@@ -1,5 +1,4 @@
 name: "C Keyholder"
-display_name: "Main Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolder"
@@ -1,5 +1,4 @@
 name: "C2 Room"
-display_name: "Main Area"
 letters {
   key: "c"
   level2: true
@@ -1,5 +1,4 @@
 name: "Flipped Magenta Room"
-display_name: "Flipped Magenta Room"
 panels {
   name: "LOOK"
   path: "Panels/Side Up 1/panel_1"
@@ -1,5 +1,4 @@
 name: "Flipped Yellow Room"
-display_name: "Flipped Yellow Room"
 panels {
   name: "DANCER"
   path: "Panels/Back 1/panel_1"
@@ -1,5 +1,4 @@
 name: "G Keyholder"
-display_name: "Obverse Yellow Room"
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolder2"
@@ -1,5 +1,4 @@
 name: "G2 Room"
-display_name: "Main Area"
 letters {
   key: "g"
   level2: true
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "LANE (1)"
   path: "Panels/Main/panel_1"
@@ -86,8 +85,10 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Entrance"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 7.5 }
+  rotation: 180
 }
 paintings {
   name: "P"
@@ -1,5 +1,4 @@
 name: "Obverse Magenta Room"
-display_name: "Obverse Magenta Room"
 # TODO: Should these two maybe not be randomizable because they hint the keyholder?
 paintings {
   name: "TEA"
@@ -1,5 +1,4 @@
 name: "Obverse Yellow Room"
-display_name: "Obverse Yellow Room"
 panels {
   name: "CIVIL"
   path: "Panels/Main/panel_6"
@@ -1,6 +1,6 @@
 name: "T Keyholder"
-display_name: "Obverse Magenta Room"
 keyholders {
   name: "T"
   path: "Components/KeyHolders/keyHolderT"
+  key: "t"
 }
@@ -1,7 +1,12 @@
 connections {
+  from_room: "First Room"
+  to_room: "First Room Exit"
+  door { name: "Second Room Entrance" }
+}
+connections {
   from {
     port {
-      room: "First Room"
+      room: "First Room Exit"
       name: "NEXT"
     }
   }
@@ -14,9 +19,14 @@ connections {
   oneway: true
 }
 connections {
+  from_room: "Second Room"
+  to_room: "Second Room Exit"
+  door { name: "Third Room Entrance" }
+}
+connections {
   from {
     port {
-      room: "Second Room"
+      room: "Second Room Exit"
       name: "NEXT"
     }
   }
@@ -33,3 +43,18 @@ connections {
   to_room: "S Room"
   door { name: "S1 Door" }
 }
+connections {
+  from_room: "First Room"
+  to_room: "Cyan Hallway"
+  door { name: "Colorful Entrance" }
+}
+connections {
+  from_room: "Second Room"
+  to_room: "Congruent Entrance"
+  door { name: "Congruent Entrance" }
+}
+connections {
+  from_room: "First Room"
+  to_room: "Double Sided Entrance"
+  door { name: "Double Sided Entrance" }
+}
@@ -1,11 +1,10 @@
 # TODO: gallery painting
 doors {
   name: "Double Letter Panel Blockers"
-  type: ITEM_ONLY
+  type: EVENT
   receivers: "Panels/Room 1/panel_3/visibilityListener"
   receivers: "Panels/Room 2/panel_3/visibilityListener"
-  # TODO: honestly idk if this should even exist
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Second Room Entrance"
@@ -23,8 +22,7 @@ doors {
 }
 doors {
   name: "S1 Door"
-  type: LOCATION_ONLY
-  receivers: "Components/Doors/entry_3"
+  type: EVENT
   panels { room: "Third Room" name: "CULTS" }
   panels { room: "Third Room" name: "TURNS" }
   panels { room: "Third Room" name: "COINS" }
@@ -34,7 +32,6 @@ doors {
   panels { room: "Third Room" name: "LOCKS" }
   panels { room: "Third Room" name: "TOUCHES" }
   panels { room: "Third Room" name: "KOI" }
-  location_room: "Third Room"
 }
 doors {
   name: "Colorful Entrance"
@@ -46,6 +43,7 @@ doors {
   panels { room: "First Room" name: "KOI" }
   panels { room: "First Room" name: "TUNA" }
   location_room: "First Room"
+  location_name: "All Puzzles"
 }
 doors {
   name: "Congruent Entrance"
@@ -57,6 +55,7 @@ doors {
   panels { room: "Second Room" name: "KOI" }
   panels { room: "Second Room" name: "TUNA" }
   location_room: "Second Room"
+  location_name: "All Puzzles"
 }
 doors {
   name: "Double Sided Entrance"
@@ -0,0 +1,9 @@
+name: "Congruent Entrance"
+panel_display_name: "Second Room"
+ports {
+  name: "CONGRUENT"
+  display_name: "Second Room Gray Hallway"
+  path: "Components/Warps/worldport7"
+  destination { x: 51.5 y: 0 z: 29 }
+  rotation: 90
+}
@@ -0,0 +1,9 @@
+name: "Cyan Hallway"
+panel_display_name: "First Room"
+ports {
+  name: "COLORFUL"
+  display_name: "First Room Cyan Hallway"
+  path: "Components/Warps/worldport8"
+  destination { x: 20 y: 0 z: -12 }
+  rotation: 180
+}
@@ -0,0 +1,9 @@
+name: "Double Sided Entrance"
+panel_display_name: "First Room"
+ports {
+  name: "DOUBLESIDED"
+  display_name: "First Room White Hallway"
+  path: "Components/Warps/worldport6"
+  destination { x: 15 y: 0 z: 23 }
+  rotation: 90
+}
@@ -0,0 +1,9 @@
+name: "First Room Exit"
+panel_display_name: "First Room"
+ports {
+  name: "NEXT"
+  display_name: "First Room Exit"
+  path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -15 }
+  rotation: 180
+}
@@ -1,5 +1,5 @@
 name: "First Room"
-display_name: "First Room"
+panel_display_name: "First Room"
 panels {
   name: "BISON"
   path: "Panels/Room 1/panel_1"
@@ -33,24 +33,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "First Room Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
-}
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport2"
-  orientation: "north"
-  required_door { name: "Second Room Entrance" }
-}
-ports {
-  name: "COLORFUL"
-  path: "Components/Warps/worldport8"
-  orientation: "north"
-  required_door { name: "Colorful Entrance" }
-}
-ports {
-  name: "DOUBLESIDED"
-  path: "Components/Warps/worldport6"
-  orientation: "east"
-  required_door { name: "Double Sided Entrance" }
+  destination { x: -10 y: 0 z: 10 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "S Room"
-display_name: "Third Room"
 letters {
   key: "s"
   path: "Components/Collectables/collectable"
@@ -0,0 +1,9 @@
+name: "Second Room Exit"
+panel_display_name: "Second Room"
+ports {
+  name: "NEXT"
+  display_name: "Second Room Exit"
+  path: "Components/Warps/worldport4"
+  destination { x: 48 y: 0 z: -15 }
+  rotation: 180
+}
@@ -1,5 +1,5 @@
 name: "Second Room"
-display_name: "Second Room"
+panel_display_name: "Second Room"
 panels {
   name: "BISON"
   path: "Panels/Room 2/panel_1"
@@ -38,18 +38,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Second Room Entrance"
   path: "Components/Warps/worldport3"
-  orientation: "south"
-}
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport4"
-  orientation: "north"
-  required_door { name: "Third Room Entrance" }
-}
-ports {
-  name: "CONGRUENT"
-  path: "Components/Warps/worldport7"
-  orientation: "east"
-  required_door { name: "Congruent Entrance" }
+  destination { x: 38 y: 0 z: 10 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "Third Room"
-display_name: "Third Room"
+panel_display_name: "Third Room"
 panels {
   name: "CULTS"
   path: "Panels/Room 3/panel_1"
@@ -65,6 +65,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Third Room Entrance"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }
@@ -24,11 +24,6 @@ connections {
   door { name: "Gallery Entrance" }
 }
 connections {
-  from_room: "Gallery Maze"
-  to_room: "Main Area"
-  oneway: true
-}
-connections {
   from_room: "Tree Area"
   to_room: "Main Area"
   door { name: "Tree Entrance" }
@@ -1,5 +1,4 @@
 name: "C Room"
-display_name: "Chamber"
 letters {
   key: "c"
   path: "Components/Collectables/c"
@@ -1,5 +1,4 @@
 name: "Chamber"
-display_name: "Chamber"
 panels {
   name: "I"
   path: "Panels/c1"
@@ -1,7 +1,8 @@
 name: "Gallery Maze"
-display_name: "Main Area"
 ports {
   name: "GALLERY"
+  display_name: "Gallery Maze Worldport"
   path: "Components/Warps/worldport4"
-  orientation: "east"
+  destination { x: -58 y: 0 z: -76 }
+  rotation: 90
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "HIT"
   path: "Panels/open_c"
@@ -28,16 +27,22 @@ panels {
 }
 ports {
   name: "ENTRY1"
+  display_name: "Maze NW Worldport"
   path: "Components/Worldports/worldport3"
-  orientation: "west"
+  destination { x: -33 y: 0 z: 28 }
+  rotation: 270
 }
 ports {
   name: "ENTRY2"
+  display_name: "Maze SW Worldport"
   path: "Components/Worldports/worldport"
-  orientation: "south"
+  destination { x: -30 y: 0 z: 51 }
+  rotation: 0
 }
 ports {
   name: "ENTRY3"
+  display_name: "Maze SE Worldport"
   path: "Components/Worldports/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 51 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Tree Area"
-display_name: "Main Area"
 panels {
   name: "TREE"
   path: "Panels/open_tree"
@@ -9,7 +8,8 @@ panels {
 }
 ports {
   name: "TREE"
+  display_name: "Brown Hallway"
   path: "Components/Worldports/worldport4"
-  orientation: "east"
-  # This is double sided.
+  destination { x: -16 y: 0 z: -31 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "U Room"
-display_name: "Chamber"
 letters {
   key: "u"
   path: "Components/Collectables/u"
@@ -1,6 +1,8 @@
 name: "Unyielding Entrance"
 ports {
   name: "UNYIELDING"
+  display_name: "Blue Door Worldport"
   path: "Components/Warps/worldport5"
-  orientation: "east"
+  destination { x: 14 y: 0 z: 5 }
+  rotation: 90
 }
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Main Area"
 endings {
   name: "PLUM"
   path: "Components/plum_ending"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "HAIR"
   path: "Panels/Room_1/panel"
@@ -1,5 +1,4 @@
 name: "Brown Area"
-display_name: "Maze"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Flipped Black Area"
-display_name: "Maze"
 panels {
   name: "SEAPLANE"
   path: "Panels/Maze/panel_15"
@@ -1,5 +1,4 @@
 name: "Flipped Blue Area"
-display_name: "Maze"
 panels {
   name: "SKY"
   path: "Panels/Maze/panel_5"
@@ -1,5 +1,4 @@
 name: "Flipped Green Area"
-display_name: "Maze"
 panels {
   name: "HIGH"
   path: "Panels/Maze/panel_3"
@@ -1,5 +1,4 @@
 name: "Flipped Orange Area"
-display_name: "Maze"
 panels {
   name: "HEAVEN"
   path: "Panels/Maze/panel_6"
@@ -1,2 +1 @@
 name: "Flipped Pink Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Flipped Purple Area"
-display_name: "Maze"
 panels {
   name: "CEILING"
   path: "Panels/Maze/panel_8"
@@ -1,5 +1,4 @@
 name: "Flipped Red Area"
-display_name: "Maze"
 panels {
   name: "RAISED"
   path: "Panels/Maze/panel_12"
@@ -1,5 +1,4 @@
 name: "Flipped Yellow Back Area"
-display_name: "Maze"
 panels {
   name: "ANGELS"
   path: "Panels/Maze/panel_13"
@@ -1,2 +1 @@
 name: "Flipped Yellow Front Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Obverse Black Area"
-display_name: "Maze"
 panels {
   name: "MOUNTAIN"
   path: "Panels/Maze/panel_16"
@@ -1,2 +1 @@
 name: "Obverse Blue Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Obverse Green Area"
-display_name: "Maze"
 panels {
   name: "UPSIDE"
   path: "Panels/Maze/panel_7"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Back Area"
-display_name: "Maze"
 panels {
   name: "OVER"
   path: "Panels/Maze/panel_2b"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Front Area"
-display_name: "Maze"
 panels {
   name: "UP"
   path: "Panels/Maze/panel_2"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Isolated Section"
-display_name: "Maze"
 panels {
   name: "TOP"
   path: "Panels/Maze/panel_4"
@@ -1,5 +1,4 @@
 name: "Obverse Pink Area"
-display_name: "Maze"
 panels {
   name: "CLOUD"
   path: "Panels/Maze/panel_14"
@@ -1,5 +1,4 @@
 name: "Obverse Purple Area"
-display_name: "Maze"
 panels {
   name: "DRAGON"
   path: "Panels/Maze/panel_18"
@@ -1,2 +1 @@
 name: "Obverse Red Area"
-display_name: "Maze"
@@ -1,2 +1 @@
 name: "Obverse Yellow Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Start"
-display_name: "Maze"
 panels {
   name: "ATTIC"
   path: "Panels/Maze/panel_11"
@@ -16,6 +15,8 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 8 }
+  rotation: 270
 }
@@ -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
+}
@@ -62,9 +62,9 @@ doors {
   name: "Rabbithole Door"
   type: STANDARD
   receivers: "Components/Doors/second_right8"
-  panels { room: "Wrath Room" name: "RABBIT" }
-  panels { room: "Wrath Room" name: "HOLE" }
-  location_room: "Wrath Room"
+  panels { room: "Rabbit Hole Lock" name: "RABBIT" }
+  panels { room: "Rabbit Hole Lock" name: "HOLE" }
+  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"
 }
@@ -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"
@@ -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"
@@ -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"
@@ -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
 }
@@ -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"
@@ -1,5 +1,5 @@
 name: "D Room Final"
-display_name: "D Room"
+panel_display_name: "D Room"
 letters {
   key: "d"
   path: "Components/Collectables/d"
@@ -1,5 +1,5 @@
 name: "D Room"
-display_name: "D Room"
+panel_display_name: "D Room"
 panels {
   name: "BASEBALL"
   path: "Panels/D/d_2"
@@ -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
 }
@@ -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
 }
@@ -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
 }
@@ -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
 }
@@ -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"
@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
-display_name: "Pyramid Area"
-panels {
-  name: "TURN (1)"
-  path: "Panels/Entry/l_opener_3"
-  clue: "turn"
-  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
+panel_display_name: "Pyramid Area"
+# The fact that the doors here cover up the panels once they open is a problem
+# since you're not guaranteed to have access to the lower area if painting
+# shuffle is a thing. So we need to edit these doors so that they don't cover up
+# the panels.
@@ -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"
@@ -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
@@ -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
+}
@@ -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
@@ -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"
@@ -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
+}
@@ -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
+}
@@ -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
@@ -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
@@ -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
+}
@@ -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
+}
@@ -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"
-}
\ No newline at end of file
+  destination { x: -5.5 y: 0 z: 18 }
+  rotation: 180
+}
@@ -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
+}
@@ -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"
-}
\ No newline at end of file
+  destination { x: 74 y: 0 z: -43 }
+  rotation: 0
+}
@@ -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"
@@ -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"
@@ -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
 }
@@ -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
+}
@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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
 }
@@ -1,21 +1,5 @@
 name: "Wrath Room"
-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
-}
+panel_display_name: "Red Blue Area"
 panels {
   name: "WREATH"
   path: "Panels/Back Right/br_17"
@@ -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
 }
@@ -1,5 +1,4 @@
 name: "E Room"
-display_name: "3"
 letters {
   key: "e"
   path: "Components/Collectables/e"
@@ -1,5 +1,4 @@
 name: "Engine Room"
-display_name: "Engine Room"
 panels {
   name: "ENGINE"
   path: "Panels/panel_8"
@@ -23,7 +22,9 @@ paintings {
 }
 ports {
   name: "GALLERY"
+  display_name: "Engine Room Worldport"
   path: "Components/Warps/worldport2"
   gravity: Z_PLUS
-  # TODO: orientation is not well defined with Z-axis gravity
+  # TODO: entrance shuffling for non Y axis gravity
+  no_shuffle: true
 }
@@ -1,5 +1,4 @@
 name: "Hat Chamber"
-display_name: "3"
 panels {
   name: "BRIM"
   path: "Panels/panel_14"
@@ -1,5 +1,4 @@
 name: "X Minus Middle Leg"
-display_name: "W"
 panels {
   name: "ANTENNA"
   path: "Panels/panel_7"
@@ -1,5 +1,4 @@
 name: "X Minus Right Leg"
-display_name: "W"
 panels {
   name: "ROWBOAT"
   path: "Panels/panel_13"
@@ -1,5 +1,4 @@
 name: "X Minus"
-display_name: "W"
 panels {
   name: "DUO"
   path: "Panels/panel_1"
@@ -1,5 +1,4 @@
 name: "X Plus Middle Leg"
-display_name: "M"
 panels {
   name: "COLONY"
   path: "Panels/panel_10"
@@ -1,5 +1,4 @@
 name: "X Plus Right Leg"
-display_name: "M"
 panels {
   name: "HEAD"
   path: "Panels/panel_4"
@@ -1,5 +1,4 @@
 name: "X Plus"
-display_name: "M"
 panels {
   name: "ROSE"
   path: "Panels/panel_16"
@@ -24,4 +23,5 @@ paintings {
 keyholders {
   name: "M"
   path: "Components/KeyHolders/keyHolderM"
+  key: "m"
 }
@@ -1,5 +1,4 @@
 name: "Y Minus First Floor"
-display_name: "3"
 panels {
   name: "RHINO"
   path: "Panels/panel_2"
@@ -1,5 +1,4 @@
 name: "Y Minus Second Floor"
-display_name: "3"
 panels {
   name: "COMPASS"
   path: "Panels/panel_5"
@@ -1,5 +1,4 @@
 name: "Y Minus Third Floor"
-display_name: "3"
 panels {
   name: "WHISKERS"
   path: "Panels/panel_11"
@@ -1,5 +1,4 @@
 name: "Y Plus First Floor"
-display_name: "E"
 paintings {
   name: "UNDUE"
   path: "Components/Paintings/undue4"
@@ -1,6 +1,5 @@
 name: "Y Plus Third Floor"
 # It's the second floor too...
-display_name: "E"
 panels {
   name: "CACTUS"
   path: "Panels/panel_6"
@@ -1,8 +1,9 @@
 # The Gallery is interesting because there's so many cross-map requirements.
 doors {
   name: "Darkroom Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "DARKROOM" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "DARKROOM" }
+  receivers: "Components/Paintings/darkroom/teleportListener"
   panels { map: "the_darkroom" room: "First Room" name: "BISON" }
   panels { map: "the_darkroom" room: "First Room" name: "FISH" }
   panels { map: "the_darkroom" room: "First Room" name: "SHEEP" }
@@ -26,14 +27,16 @@ doors {
 }
 doors {
   name: "Butterfly Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "BUTTERFLY" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "BUTTERFLY" }
+  receivers: "Components/Paintings/butterfly/teleportListener"
   rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
   name: "Between Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "BETWEEN" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "BETWEEN" }
+  receivers: "Components/Paintings/between/teleportListener"
   panels { map: "the_between" room: "Main Area" name: "SUN" }
   panels { map: "the_between" room: "Main Area" name: "KOI" }
   panels { map: "the_between" room: "Main Area" name: "SUN KOI" }
@@ -67,14 +70,16 @@ doors {
 }
 doors {
   name: "Entry Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "ENTRY" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "ENTRY" }
+  receivers: "Components/Paintings/eyes/teleportListener"
   panels { map: "the_entry" room: "Eye Room" name: "I" }
 }
 doors {
   name: "Wise Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "WISE" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "WISE" }
+  receivers: "Components/Paintings/triangle/teleportListener"
   panels { map: "the_wise" room: "Entry" name: "INK" }
   panels { map: "the_wise" room: "Puzzles" name: "STORY" }
   panels { map: "the_wise" room: "Puzzles" name: "VENTURE" }
@@ -100,8 +105,9 @@ doors {
 }
 doors {
   name: "Tree Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "TREE" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "TREE" }
+  receivers: "Components/Paintings/Clue Maps/tree/teleportListener"
   panels { map: "the_tree" room: "Main Area" name: "COLOR" }
   panels { map: "the_tree" room: "Main Area" name: "DAMAGE (1)" }
   panels { map: "the_tree" room: "Main Area" name: "DAMAGE (2)" }
@@ -136,32 +142,37 @@ doors {
 }
 doors {
   name: "Unyielding Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "UNYIELDING" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "UNYIELDING" }
+  receivers: "Components/Paintings/Clue Maps/unyielding/teleportListener"
   rooms { map: "the_unyielding" name: "Digital Entrance" }
 }
 doors {
   name: "Graveyard Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "GRAVEYARD" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "GRAVEYARD" }
+  receivers: "Components/Paintings/Endings/grave/teleportListener"
   rooms { map: "the_graveyard" name: "Outside" }
 }
 doors {
   name: "Control Center Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "CC" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "CC" }
+  receivers: "Components/Paintings/Endings/desert/teleportListener"
   rooms { map: "the_impressive" name: "M2 Room" }
 }
 doors {
   name: "Tower Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "TOWER" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "TOWER" }
+  receivers: "Components/Paintings/Endings/red/teleportListener"
   rooms { map: "the_tower" name: "First Floor" }
 }
 doors {
   name: "Wondrous Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "WONDROUS" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "WONDROUS" }
+  receivers: "Components/Paintings/Endings/window/teleportListener"
   panels { map: "the_wondrous" room: "Entry" name: "WONDER" }
   panels { map: "the_wondrous" room: "Regular" name: "SHRINK" }
   panels { map: "the_wondrous" room: "Huge" name: "SHRINK" }
@@ -176,38 +187,44 @@ doors {
 }
 doors {
   name: "Rainbow Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "RAINBOW" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "RAINBOW" }
+  receivers: "Components/Paintings/Endings/rainbow/teleportListener"
   rooms { map: "daedalus" name: "Rainbow Start" }
 }
 doors {
   name: "Words Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "WORDS" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "WORDS" }
+  receivers: "Components/Paintings/Endings/words/teleportListener"
   rooms { map: "the_words" name: "Main Area" }
 }
 doors {
   name: "Colorful Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "COLORFUL" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "COLORFUL" }
+  receivers: "Components/Paintings/Endings/colorful/teleportListener"
   rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
   name: "Castle Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "CASTLE" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "CASTLE" }
+  receivers: "Components/Paintings/Endings/castle/teleportListener"
   rooms { map: "daedalus" name: "Castle" }
 }
 doors {
   name: "Sun Temple Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "SUNTEMPLE" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "SUNTEMPLE" }
+  receivers: "Components/Paintings/Endings/temple/teleportListener"
   rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
   name: "Ancient Painting"
-  type: ITEM_ONLY
-  move_paintings { room: "Main Area" name: "ANCIENT" }
+  type: GALLERY_PAINTING
+  #move_paintings { room: "Main Area" name: "ANCIENT" }
+  receivers: "Components/Paintings/Endings/cubes/teleportListener"
   rooms { map: "the_ancient" name: "Outside" }
 }
 doors {
@@ -1,5 +1,4 @@
 name: "Back Room"
-display_name: "Back Room"
 panels {
   name: "UNYIELDING"
   path: "Panels/entry_2"
@@ -1,5 +1,4 @@
 name: "Daedalus Extension"
-display_name: "Daedalus Extension"
 panels {
   name: "WHERE"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Back Room"
 endings {
   name: "YELLOW"
   path: "Components/Endings/yellow_ending"
@@ -1,8 +1,8 @@
 name: "Main Area"
-display_name: "Main Area"
 keyholders {
   name: "P"
   path: "Components/KeyHolders/keyHolderP"
+  key: "p"
 }
 paintings {
   name: "OWL"
@@ -162,6 +162,8 @@ paintings {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 16 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "The Whole Thing"
-display_name: "The Whole Thing"
 panels {
   name: "PANEL"
   path: "Panels/Room_1/panel_1"
@@ -19,6 +19,7 @@ doors {
 doors {
   name: "Double Letters"
   type: EVENT
-  switches: "double_letters"
-  # TODO: once again, not sure whether this is how it should work
+  receivers: "Panels/panel_3/teleportListener"
+  receivers: "Components/Paintings/omrt/teleportListener"
+  double_letters: true
 }
@@ -1,5 +1,4 @@
 name: "Inside"
-display_name: "Inside"
 panels {
   name: "REMEMBER"
   path: "Panels/panel_3"
@@ -1,5 +1,4 @@
 name: "Outside"
-display_name: "Outside"
 panels {
   name: "FOOT"
   path: "Panels/panel_1"
@@ -256,3 +256,7 @@ connections {
   to_room: "Zero Room"
   door { name: "Lavender Cube" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "The Landscapes"
+}
@@ -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"
@@ -59,13 +60,13 @@ doors {
 doors {
   name: "Control Center Gray Door"
   type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  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"
+  receivers: "Components/Doors/entry_18"
   control_center_color: "red"
 }
 doors {
@@ -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"
@@ -122,6 +124,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"
@@ -141,6 +144,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"
@@ -202,29 +206,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: "Back Area" name: "Top Landscape Right" }
-  panels { room: "Back Area" name: "Top Landscape Bottom" }
-  panels { room: "Back Area" name: "Top Landscape Left" }
-  panels { room: "Back Area" name: "Left Landscape Top" }
-  panels { room: "Back Area" name: "Left Landscape Right" }
-  panels { room: "Back Area" name: "Left Landscape Bottom" }
-  panels { room: "Back Area" name: "Left Landscape Left" }
-  panels { room: "Back Area" name: "Right Landscape Top" }
-  panels { room: "Back Area" name: "Right Landscape Right" }
-  panels { room: "Back Area" name: "Right Landscape Bottom" }
-  panels { room: "Back Area" name: "Right Landscape Left" }
-  location_room: "Back Area"
+  panels { room: "The Landscapes" name: "Top Landscape Top" }
+  panels { room: "The Landscapes" name: "Top Landscape Right" }
+  panels { room: "The Landscapes" name: "Top Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Top Landscape Left" }
+  panels { room: "The Landscapes" name: "Left Landscape Top" }
+  panels { room: "The Landscapes" name: "Left Landscape Right" }
+  panels { room: "The Landscapes" name: "Left Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Left Landscape Left" }
+  panels { room: "The Landscapes" name: "Right Landscape Top" }
+  panels { room: "The Landscapes" name: "Right Landscape Right" }
+  panels { room: "The Landscapes" name: "Right Landscape Bottom" }
+  panels { room: "The Landscapes" name: "Right Landscape Left" }
+  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"
@@ -315,6 +321,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"
@@ -390,11 +397,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"
@@ -414,9 +423,10 @@ doors {
   name: "Invisible Entrance"
   type: STANDARD
   receivers: "Components/Doors/entry_36"
-  panels { room: "Back Area" name: "Right Landscape Top" answer: "tell" }
-  panels { room: "Back Area" name: "Right Landscape Left" answer: "eyes" }
-  location_room: "Back Area"
+  panels { room: "The Landscapes" name: "Right Landscape Top" answer: "tell" }
+  panels { room: "The Landscapes" name: "Right Landscape Left" answer: "eyes" }
+  location_room: "The Landscapes"
+  location_name: "Alternate Answers"
 }
 doors {
   name: "Nature Room Door"
@@ -462,12 +472,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"
@@ -484,6 +499,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"
@@ -492,3 +508,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" }
+}
@@ -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
 }
@@ -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"
@@ -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
 }
@@ -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.
 }
@@ -1,5 +1,5 @@
 name: "East Landscape"
-display_name: "East Landscape"
+panel_display_name: "East Landscape"
 panels {
   name: "COLOR"
   path: "Panels/General/entry_10"
@@ -1,5 +1,5 @@
 name: "G Room"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 letters {
   key: "g"
   path: "Components/Collectables/g"
@@ -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
 }
@@ -1,5 +1,5 @@
 name: "Jail Part 1"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "FLAP"
   path: "Panels/Throat/throat_1"
@@ -1,5 +1,5 @@
 name: "Jail Part 2"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "DIGEST"
   path: "Panels/Bowels3/bowels_1"
@@ -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
 }
@@ -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"
@@ -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" }
 }
@@ -1,5 +1,5 @@
 name: "Maze Center"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "POOR"
   path: "Panels/Maze/maze_7"
@@ -1,5 +1,5 @@
 name: "Maze Cold Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "COLD"
   path: "Panels/Maze/maze_11"
@@ -1,2 +1,2 @@
 name: "Maze Empty Vestibule"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
@@ -1,5 +1,5 @@
 name: "Maze In Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "IN"
   path: "Panels/Maze/maze_3"
@@ -1,5 +1,5 @@
 name: "Maze Moon Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "MOON"
   path: "Panels/Maze/maze_9"
@@ -1,5 +1,5 @@
 name: "Maze Off Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OFF"
   path: "Panels/Maze/maze_14"
@@ -1,5 +1,5 @@
 name: "Maze Slice Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SLICE"
   path: "Panels/Maze/maze_4"
@@ -1,5 +1,5 @@
 name: "Maze Smooth Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SMOOTH"
   path: "Panels/Maze/maze_5"
@@ -1,5 +1,5 @@
 name: "Maze South Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SOUTH"
   path: "Panels/Maze/maze_2"
@@ -1,5 +1,5 @@
 name: "Maze Start"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OUT"
   path: "Panels/Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Maze Tower"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "FEEL"
   path: "Panels/Maze/maze_12"
@@ -1,5 +1,5 @@
 name: "Maze Up Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "UP"
   path: "Panels/Maze/maze_15"
@@ -1,5 +1,5 @@
 name: "Maze Wreck Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "WRECK"
   path: "Panels/Maze/maze_8"
@@ -1,5 +1,5 @@
 name: "Nature Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "SEVERE"
   path: "Panels/General/nature_2"
@@ -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"
-  # Note that this can be easily entered from the other side.
+  destination { x: 33 y: 0 z: -66.5 }
+  rotation: 0
   required_door { name: "Invisible Entrance" }
 }
@@ -1,5 +1,5 @@
 name: "Outside Jail"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "GUT"
   path: "Panels/Head/head_1"
@@ -1,5 +1,5 @@
 name: "Pillar Room"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 panels {
   name: "EYE"
   path: "Panels/Impressive/entry_2"
@@ -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
 }
@@ -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
+  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" }
+  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,5 +1,5 @@
 name: "Question Room When"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_1"
@@ -8,10 +8,11 @@ panels {
   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,5 +1,5 @@
 name: "Question Room Who"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_2"
@@ -7,9 +7,10 @@ panels {
   answer: "who"
   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,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
 }
@@ -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
 }
@@ -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" }
+}
@@ -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
+  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,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" }
 }
@@ -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"
@@ -1,5 +1,5 @@
 name: "Y Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 letters {
   key: "y"
   path: "Components/Collectables/y"
@@ -1,5 +1,5 @@
 name: "Zero Room"
-display_name: "Zero Room"
+panel_display_name: "Zero Room"
 panels {
   name: "HERO"
   path: "Panels/General/zero_1"
@@ -1,13 +1,16 @@
 name: "Main Area"
-display_name: "Main Area"
 # I'm probably not going to include any of the panels in here.
 ports {
   name: "RIGHT"
+  display_name: "South Worldport"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 30 y: 0 z: 19 }
+  rotation: 270
 }
 ports {
   name: "LEFT"
+  display_name: "North Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 30 y: 0 z: -76 }
+  rotation: 270
 }
@@ -1,6 +1,7 @@
 doors {
   name: "Room 8 Door"
-  type: LOCATION_ONLY
+  type: STANDARD
+  receivers: "Components/Doors/entry_10"
   panels { room: "Main Area" name: "STEM" }
   panels { room: "Main Area" name: "PETAL" }
   panels { room: "Main Area" name: "SOIL" }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Hive"
 panels {
   name: "ASP"
   path: "Panels/Room 1/panel_1"
@@ -269,24 +268,33 @@ panels {
 keyholders {
   name: "B"
   path: "Components/KeyHolders/keyHolderB"
+  key: "b"
 }
 ports {
   name: "DAED1"
+  display_name: "Blue Area Worldport"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -1.5 y: 0 z: 24 }
+  rotation: 270
 }
 ports {
   name: "DAED2"
+  display_name: "Pink Area South Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -26.5 y: 0 z: -22 }
+  rotation: 270
 }
 ports {
   name: "DAED3"
+  display_name: "Lime Area Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -44.5 y: 0 z: -13 }
+  rotation: 90
 }
 ports {
   name: "GREAT"
+  display_name: "Pink Area North Worldport"
   path: "Components/Warps/worldport4"
-  orientation: "west"
+  destination { x: -29.5 y: 0 z: -62 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Hive"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Room 8"
-display_name: "Hive"
 panels {
   name: "BUMBLE"
   path: "Panels/Room 8/panel_1"
@@ -1,5 +1,5 @@
 name: "Green Eye"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "RETURN"
   path: "Panels/entry_5"
@@ -22,6 +22,8 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Green Hallway"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -33 y: 0 z: 1 }
+  rotation: 90
 }
@@ -1,5 +1,5 @@
 name: "Lobby"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "RIGHT"
   path: "Panels/entry_1"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 11.5 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "M Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "m"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,5 @@
 name: "M2 Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "m"
   level2: true
@@ -1,5 +1,5 @@
 name: "Side Area"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "COLOR"
   path: "Panels/entry_4"
@@ -9,6 +9,8 @@ panels {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Four Rooms Entrance"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -27 y: 0 z: 25.5 }
+  rotation: 0
 }
@@ -1,5 +1,5 @@
 name: "W Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "w"
   path: "Components/Collectables/collectable2"
@@ -1,5 +1,5 @@
 name: "WM Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 panels {
   name: "LEFT"
   path: "Panels/entry_2"
@@ -13,4 +13,5 @@ panels {
   clue: "right"
   answer: "right"
   proxies { answer: "left" path: "Panels/proxied_1" }
+  proxies { answer: "right" path: "Panels/proxied_2" }
 }
@@ -1,5 +1,4 @@
 name: "Entrance"
-display_name: "Invisible"
 panels {
   name: "VISIBLE"
   path: "Panels/Room_1/panel_1"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -57 }
+  rotation: 180
 }
@@ -1,11 +1,13 @@
 name: "Maze"
-display_name: "Invisible"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
 }
 ports {
   name: "ENTRY"
+  display_name: "Exit"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  # Should this be shuffleable? It skips the maze lol.
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "J Room"
-display_name: "Jubilant"
 letters {
   key: "j"
   path: "Components/Collectables/q" # yeah lol
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Jubilant"
 panels {
   name: "GEMSTONE"
   path: "Panels/Main/panel_1"
@@ -98,6 +97,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 9 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Side Area"
-display_name: "Jubilant"
 panels {
   name: "CALLBACK"
   path: "Panels/Back Helpers/back_1"
@@ -39,4 +38,5 @@ panels {
 keyholders {
   name: "J"
   path: "Components/KeyHolders/keyHolderJ"
+  key: "j"
 }
@@ -1,5 +1,4 @@
 name: "K Room"
-display_name: "Keen"
 letters {
   key: "k"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Keen"
 panels {
   name: "TIN (1)"
   path: "Panels/entry_3"
@@ -70,6 +69,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -11,4 +11,5 @@ doors {
   panels { room: "Puzzle Room" name: "WOLF" }
   panels { room: "Puzzle Room" name: "FOOT" }
   location_room: "Puzzle Room"
+  location_name: "Puzzles"
 }
@@ -1,5 +1,4 @@
 name: "Painting Room"
-display_name: "Liberated"
 paintings {
   name: "PYRAMID"
   path: "Components/triangle"
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Liberated"
 panels {
   name: "CORPSE"
   path: "Panels/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -10,4 +10,5 @@ doors {
   panels { room: "Room" name: "INTO" }
   panels { room: "Room" name: "NOR" }
   location_room: "Room"
+  location_name: "Gravestone"
 }
@@ -1,5 +1,4 @@
 name: "Room"
-display_name: "Room"
 panels {
   name: "HORN"
   path: "Panels/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "E2 Room"
-display_name: "Lionized"
 letters {
   key: "e"
   level2: true
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Lionized"
 panels {
   name: "CHILD"
   path: "Panels/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -11,4 +11,5 @@ doors {
   panels { room: "Puzzle Room" name: "STICK" }
   panels { room: "Puzzle Room" name: "BREAD" }
   location_room: "Puzzle Room"
+  location_name: "Puzzles"
 }
@@ -1,5 +1,4 @@
 name: "Painting Room"
-display_name: "Literate"
 paintings {
   name: "PYRAMID"
   path: "Components/triangle"
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Literate"
 panels {
   name: "WATER"
   path: "Panels/entry_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "L2 Room"
-display_name: "Lively"
 letters {
   key: "l"
   level2: true
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Lively"
 panels {
   name: "LIONESS"
   path: "Panels/entry_1"
@@ -58,5 +57,8 @@ panels {
 }
 ports {
   name: "BETWEEN"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
@@ -1,7 +1,7 @@
 connections {
   from_room: "Main Room"
   to_room: "Back Room"
-  door { name: "Main Room Puzzles" }
+  door { name: "Main Room Door" }
 }
 connections {
   from_room: "Back Room"
@@ -1,5 +1,5 @@
 doors {
-  name: "Left Room Puzzles"
+  name: "Blue Side Puzzles"
   type: LOCATION_ONLY
   panels { room: "Main Room" name: "HOARSE" }
   panels { room: "Main Room" name: "NAY" }
@@ -11,7 +11,7 @@ doors {
   location_room: "Main Room"
 }
 doors {
-  name: "Right Room Puzzles"
+  name: "Green Side Puzzles"
   type: LOCATION_ONLY
   panels { room: "Main Room" name: "HOSE" }
   panels { room: "Main Room" name: "NIGH" }
@@ -23,7 +23,7 @@ doors {
   location_room: "Main Room"
 }
 doors {
-  name: "Main Room Puzzles"
+  name: "Main Room Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_1"
   panels { room: "Main Room" name: "HOARSE" }
@@ -1,5 +1,4 @@
 name: "Back Room"
-display_name: "Nuanced"
 panels {
   name: "COURSE"
   path: "Panels/Rhymes/panel_1"
@@ -1,5 +1,4 @@
 name: "Main Room"
-display_name: "Nuanced"
 panels {
   name: "HOARSE"
   path: "Panels/Eyes/panel_1"
@@ -107,10 +106,13 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
 keyholders {
   name: "S"
   path: "Components/KeyHolders/keyHolderS"
+  key: "s"
 }
@@ -1,5 +1,4 @@
 name: "N2 Room"
-display_name: "Nuanced"
 letters {
   key: "n"
   level2: true
@@ -10,10 +10,20 @@ connections {
 }
 connections {
   from_room: "Main Area"
-  to_room: "B Room"
+  to_room: "Middle Room"
   door { name: "B Puzzles" }
 }
 connections {
+  from_room: "Middle Room"
+  to_room: "B Room"
+  oneway: true
+}
+connections {
+  from_room: "Middle Room"
+  to_room: "Main Area"
+  oneway: true
+}
+connections {
   from_room: "B Room"
   to_room: "Main Area"
   oneway: true
@@ -1,5 +1,4 @@
 name: "B Room"
-display_name: "Orb"
 letters {
   key: "b"
   path: "Components/Collectables/b"
@@ -10,19 +9,10 @@ paintings {
   # TODO: This is too high up to enter. It's also a hint painting.
   exit_only: true
 }
-# TODO: Should these two be independent for shuffling purposes, or always tied
-# to the Main Area's port?
-ports {
-  name: "MID"
-  path: "Components/Warps/worldport4"
-  orientation: "south"
-  # This port is in the room immediately after solving the B puzzles, which
-  # means it seems like it would be inaccessible if you enter the map from the
-  # painting or from the final port, but entering the O or R areas brings you
-  # back to the beginning.
-}
 ports {
   name: "FINAL"
+  display_name: "Final Worldport"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 87 }
+  rotation: 90
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Orb"
 panels {
   name: "STRIKE"
   path: "Panels/O/entry_1"
@@ -86,6 +85,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 39 }
+  rotation: 90
 }
@@ -0,0 +1,12 @@
+name: "Middle Room"
+# This is the room after solving the B puzzles but before getting to B1 itself.
+# It has to be a separate region because if you are shuffling worldports and you
+# warp to the B1 room port, you can't access this port if you're not able to
+# solve the B puzzles.
+ports {
+  name: "MID"
+  display_name: "Middle Worldport"
+  path: "Components/Warps/worldport4"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 90
+}
@@ -1,5 +1,4 @@
 name: "O Room"
-display_name: "Orb"
 letters {
   key: "o"
   path: "Components/Collectables/o"
@@ -1,5 +1,4 @@
 name: "R Room"
-display_name: "Orb"
 letters {
   key: "r"
   path: "Components/Collectables/r"
@@ -10,12 +10,27 @@ connections {
 }
 connections {
   from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C2 Top"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "R2C2 Bottom"
+  to_room: "Connected Area"
   door { name: "Gray Owl" }
 }
 connections {
   from_room: "R2C2 Bottom"
-  to_room: "R2C2.5 Bottom"
+  to_room: "Connected Area"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "R2C3 Bottom"
+  to_room: "Connected Area"
+  oneway: true
+}
+connections {
+  from_room: "R2C2 Bottom"
+  to_room: "Connected Area"
   door { name: "First Room Shortcut" }
 }
 connections {
@@ -30,18 +45,18 @@ connections {
 }
 connections {
   from_room: "R2C2 Top"
-  to_room: "R2C2.5 Bottom"
+  to_room: "R2C3 Bottom"
   door { name: "Gray Bottom Door" }
 }
 connections {
-  from_room: "R2C2 Top"
-  to_room: "R2C2.5 Bottom"
+  from_room: "Connected Area"
+  to_room: "R2C3 Bottom"
   door { name: "Gray Owl" }
 }
 connections {
   from_room: "Connected Area"
-  to_room: "R2C2.5 Bottom"
-  door { name: "Gray Owl" }
+  to_room: "R2C3 Bottom"
+  door { name: "Sky Owl" }
 }
 connections {
   from_room: "Connected Area"
@@ -70,6 +85,11 @@ connections {
 }
 connections {
   from_room: "Connected Area"
+  to_room: "R1C4 Left"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "Connected Area"
   to_room: "R2C1 Left"
   door { name: "Sky Top Doors" }
 }
@@ -84,6 +104,11 @@ connections {
   door { name: "Gray Owl" }
 }
 connections {
+  from_room: "Connected Area"
+  to_room: "R2C1 Left"
+  door { name: "Sky Owl" }
+}
+connections {
   from {
     painting {
       room: "Connected Area"
@@ -25,8 +25,8 @@ doors {
   name: "First Room Shortcut"
   type: STANDARD
   receivers: "Components/Doors/entry_6"
-  panels { room: "R2C2.5 Bottom" name: "FIZZLE" }
-  location_room: "R2C2.5 Bottom"
+  panels { room: "Connected Area" name: "FIZZLE" }
+  location_room: "Connected Area"
 }
 doors {
   name: "First Door"
@@ -171,8 +171,8 @@ doors {
   receivers: "Components/Owl/Room 10/WG"
   receivers: "Components/Owl/Room 11/W"
   receivers: "Components/Owl/Room 11/WG"
-  panels { room: "R2C2.5 Bottom" name: "BLACK" }
-  location_room: "R2C2.5 Bottom"
+  panels { room: "R2C3 Bottom" name: "BLACK" }
+  location_room: "R2C3 Bottom"
 }
 doors {
   name: "Black Owl"
@@ -233,19 +233,20 @@ doors {
 doors {
   name: "Gray Panel"
   type: EVENT
-  # TODO: Is it okay to have an event with an in-game effect?
-  receivers: "Panels/Colors/owl_2/animationListener2"
-  doors { name: "Orange Owl" }
-  doors { name: "Black Owl" }
-  doors { name: "Blue Owl" }
+  #receivers: "Panels/Colors/owl_2/animationListener2"
+  panels { room: "Connected Area" name: "RANGE" }
+  panels { room: "Connected Area" name: "WHITE" }
+  panels { room: "Blue Room" name: "SKY" }
 }
 doors {
   name: "Owl Painting"
   type: EVENT
-  move_paintings { room: "Connected Area" name: "OWL" }
-  doors { name: "Orange Owl" }
-  doors { name: "Black Owl" }
-  doors { name: "Blue Owl" }
-  doors { name: "White Owl" }
-  doors { name: "Sky Owl" }
+  #move_paintings { room: "Connected Area" name: "OWL" }
+  #receivers: "Components/Paintings/owl/teleportListener"
+  panels { room: "R2C1 Left" name: "DUSKY" }
+  panels { room: "R2C2 Top" name: "RAY" }
+  panels { room: "Connected Area" name: "RANGE" }
+  panels { room: "R2C3 Bottom" name: "BLACK" }
+  panels { room: "Connected Area" name: "WHITE" }
+  panels { room: "Blue Room" name: "SKY" }
 }
@@ -1,5 +1,4 @@
 name: "Blue Room"
-display_name: "Owl"
 panels {
   name: "SKY"
   path: "Panels/Colors/owl_7"
@@ -1,5 +1,4 @@
 name: "Connected Area"
-display_name: "Owl"
 panels {
   name: "MODE"
   path: "Panels/Noncritical/owl_12"
@@ -133,6 +132,13 @@ panels {
   answer: "orange"
   symbols: SPARKLES
 }
+panels {
+  name: "FIZZLE"
+  path: "Panels/Bottom Mid/owl_10"
+  clue: "fizzle"
+  answer: "chisel"
+  symbols: ZERO
+}
 paintings {
   name: "OWL"
   path: "Components/Paintings/owl"
@@ -143,7 +149,9 @@ paintings {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Four Rooms Entrance"
   path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 71.5 y: 0 z: -9 }
+  rotation: 90
   # Note that this is behind teal walls.
 }
@@ -1,7 +1,8 @@
 name: "Magenta Hallway"
-display_name: "Owl"
 ports {
   name: "STURDY"
+  display_name: "Magenta Hallway"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: 17 y: 0 z: -46 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "R1C4 Left"
-display_name: "Owl"
 panels {
   name: "WALK"
   path: "Panels/Noncritical/owl_5"
@@ -1,5 +1,4 @@
 name: "R2C1 Left"
-display_name: "Owl"
 panels {
   name: "VERB"
   path: "Panels/Bottom Left/owl_8"
@@ -1,5 +1,4 @@
 name: "R2C2 Bottom"
-display_name: "Owl"
 panels {
   name: "FOUL"
   path: "Panels/Bottom Mid/owl_11"
@@ -9,7 +8,10 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Worldport"
   path: "Components/Warps/worldport"
-  orientation: "south"
-  # Note that this port is accessible from the other side in the Z1 room. Hmm.
+  destination { x: 0 y: 0 z: 9 }
+  rotation: 0
+  # TODO: Note that this port is accessible from the other side in the Z1
+  # room. Hmm.
 }
@@ -1,5 +1,4 @@
 name: "R2C2 Top"
-display_name: "Owl"
 panels {
   name: "CRUSH"
   path: "Panels/Bottom Mid/owl_1"
@@ -1,12 +1,4 @@
-name: "R2C2.5 Bottom"
-display_name: "Owl"
-panels {
-  name: "FIZZLE"
-  path: "Panels/Bottom Mid/owl_10"
-  clue: "fizzle"
-  answer: "chisel"
-  symbols: ZERO
-}
+name: "R2C3 Bottom"
 panels {
   name: "FIGMENT"
   path: "Panels/Noncritical/owl_14"
@@ -1,5 +1,4 @@
 name: "Z Room"
-display_name: "Owl"
 panels {
   name: "MAZE"
   path: "Panels/Noncritical/owl_10"
@@ -7,6 +7,7 @@ connections {
   from_room: "Main Area"
   to_room: "Ending"
   door { name: "Ending Door" }
+  cyan_ending: true
 }
 connections {
   from_room: "Main Area"
@@ -1,12 +1,24 @@
 doors {
   name: "Double Letters"
   type: EVENT
-  switches: "double_letters"
+  receivers: "Components/Doors/entry_11"
+  receivers: "Components/Doors/entry_5"
+  receivers: "Components/Doors/entry_6"
+  receivers: "Components/Doors/entry_7"
+  receivers: "Components/Doors/entry_8"
+  receivers: "Components/Doors/entry_9"
+  receivers: "Components/Doors/entry_10"
+  double_letters: true
 }
 doors {
   name: "Lavender Cubes"
   type: EVENT
-  switches: "lavender_cubes"
+  receivers: "Components/Doors/entry_3"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
   name: "K2 Door"
@@ -19,6 +31,7 @@ doors {
   panels { room: "Main Area" name: "ALEXANDER" answer: "greece" }
   panels { room: "Main Area" name: "CAESAR" answer: "rome" }
   location_room: "Main Area"
+  location_name: "Empires"
 }
 doors {
   name: "Ending Door"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Parthenon"
 endings {
   name: "CYAN"
   path: "Components/cyan_end"
@@ -1,5 +1,4 @@
 name: "K2 Room"
-display_name: "Parthenon"
 letters {
   key: "k"
   level2: true
@@ -1,5 +1,4 @@
 name: "Lavender Area"
-display_name: "Parthenon"
 panels {
   name: "ME"
   path: "Panels/Lavender/panel_7"
@@ -1,12 +1,11 @@
 name: "Main Area"
-display_name: "Parthenon"
 panels {
   name: "XERXES"
   path: "Panels/Main/panel_1"
   clue: "xerxes"
   answer: "xerxes"
   proxies { answer: "persia" path: "Panels/Empires/panel_7" }
-  #proxies { answer: "xerxes" path: "Panels/Rulers/panel_13" }
+  proxies { answer: "xerxes" path: "Panels/Rulers/panel_13" }
   required_door { name: "Double Letters" }
 }
 panels {
@@ -15,7 +14,7 @@ panels {
   clue: "arthur"
   answer: "arthur"
   proxies { answer: "england" path: "Panels/Empires/panel_8" }
-  #proxies { answer: "arthur" path: "Panels/Rulers/panel_14" }
+  proxies { answer: "arthur" path: "Panels/Rulers/panel_14" }
   required_door { name: "Double Letters" }
 }
 panels {
@@ -24,7 +23,7 @@ panels {
   clue: "cleopatra"
   answer: "cleopatra"
   proxies { answer: "egypt" path: "Panels/Empires/panel_9" }
-  #proxies { answer: "cleopatra" path: "Panels/Rulers/panel_15" }
+  proxies { answer: "cleopatra" path: "Panels/Rulers/panel_15" }
   required_door { name: "Double Letters" }
 }
 panels {
@@ -33,7 +32,7 @@ panels {
   clue: "napoleon"
   answer: "napoleon"
   proxies { answer: "france" path: "Panels/Empires/panel_10" }
-  #proxies { answer: "napoleon" path: "Panels/Rulers/panel_16" }
+  proxies { answer: "napoleon" path: "Panels/Rulers/panel_16" }
   required_door { name: "Double Letters" }
 }
 panels {
@@ -42,7 +41,7 @@ panels {
   clue: "alexander"
   answer: "alexander"
   proxies { answer: "greece" path: "Panels/Empires/panel_11" }
-  #proxies { answer: "alexander" path: "Panels/Rulers/panel_17" }
+  proxies { answer: "alexander" path: "Panels/Rulers/panel_17" }
   required_door { name: "Double Letters" }
 }
 panels {
@@ -51,21 +50,27 @@ panels {
   clue: "caesar"
   answer: "caesar"
   proxies { answer: "rome" path: "Panels/Empires/panel_12" }
-  #proxies { answer: "caesar" path: "Panels/Rulers/panel_18" }
+  proxies { answer: "caesar" path: "Panels/Rulers/panel_18" }
   required_door { name: "Double Letters" }
 }
 ports {
   name: "GALLERY"
+  display_name: "Columns Worldport"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
 ports {
   name: "ENTRY"
+  display_name: "Building Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: -21 }
+  rotation: 0
 }
 ports {
   name: "REVITALIZED"
+  display_name: "Plum Hallway"
   path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: -24 y: 0 z: -39 }
+  rotation: 180
 }
@@ -1,6 +1,6 @@
 name: "U Keyholder"
-display_name: "Parthenon"
 keyholders {
   name: "U"
   path: "Components/KeyHolders/keyHolderU"
+  key: "u"
 }
@@ -22,6 +22,7 @@ doors {
   panels { room: "Obverse Side" name: "CUT" }
   panels { room: "Obverse Side" name: "FUN" }
   location_room: "Obverse Side"
+  location_name: "Obverse Side Room"
 }
 doors {
   name: "Giant P"
@@ -1,5 +1,4 @@
 name: "Control Center Entrance"
-display_name: "Partial"
 panels {
   name: "RETURN"
   path: "Panels/Control/panel_10"
@@ -9,6 +8,10 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 8 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -1,5 +1,4 @@
 name: "F Room"
-display_name: "Partial"
 letters {
   key: "f"
   path: "Components/Collectables/collectable2"
@@ -1,5 +1,4 @@
 name: "Obverse Side"
-display_name: "Partial"
 panels {
   name: "PUN"
   path: "Panels/Main/panel_1"
@@ -100,13 +99,16 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 20 }
+  rotation: 270
 }
 keyholders {
   # This is one of the ones that's misnamed within the game.
   name: "L"
   path: "Components/KeyHolders/keyHolderI"
+  key: "l"
 }
 paintings {
   name: "F"
@@ -1,5 +1,4 @@
 name: "P Room"
-display_name: "Partial"
 letters {
   key: "p"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Reverse Side"
-display_name: "Partial"
 panels {
   name: "BRO"
   path: "Panels/Side 2/panel_2"
@@ -1,7 +1,10 @@
 name: "Main Area"
-display_name: "Perceptive"
 ports {
   name: "CC"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 13 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -21,22 +21,22 @@ connections {
 connections {
   from_room: "Center Room"
   to_room: "Top Left Room"
-  door { name: "Top Left Door" }
+  door { name: "Northwest Door" }
 }
 connections {
   from_room: "Center Room"
   to_room: "Top Right Room"
-  door { name: "Top Right Door" }
+  door { name: "Northeast Door" }
 }
 connections {
   from_room: "Center Room"
   to_room: "Bottom Left Room"
-  door { name: "Bottom Left Door" }
+  door { name: "Southwest Door" }
 }
 connections {
   from_room: "Center Room"
   to_room: "Bottom Right Room"
-  door { name: "Bottom Right Door" }
+  door { name: "Southeast Door" }
 }
 connections {
   from_room: "Center Room"
@@ -31,7 +31,7 @@ doors {
   location_room: "Main Area"
 }
 doors {
-  name: "Top Left Door"
+  name: "Northwest Door"
   type: STANDARD
   receivers: "Components/Doors/entry_6"
   panels { room: "Center Room" name: "REPORTER" }
@@ -41,9 +41,10 @@ doors {
   panels { room: "Center Room" name: "DENTIST" }
   panels { room: "Center Room" name: "SQUIRREL" }
   location_room: "Center Room"
+  location_name: "First Room"
 }
 doors {
-  name: "Top Right Door"
+  name: "Northeast Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_7"
   panels { room: "Center Room" name: "REPORTER" }
@@ -54,7 +55,7 @@ doors {
   panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Bottom Left Door"
+  name: "Southwest Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_5"
   panels { room: "Center Room" name: "REPORTER" }
@@ -65,7 +66,7 @@ doors {
   panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Bottom Right Door"
+  name: "Southeast Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_4"
   panels { room: "Center Room" name: "REPORTER" }
@@ -76,7 +77,7 @@ doors {
   panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Top Left Puzzles"
+  name: "Northwest Puzzles"
   type: LOCATION_ONLY
   panels { room: "Top Left Room" name: "BARE SOD" }
   panels { room: "Top Left Room" name: "SOD" }
@@ -103,7 +104,7 @@ doors {
   location_room: "Top Left Room"
 }
 doors {
-  name: "Top Right Puzzles"
+  name: "Northeast Puzzles"
   type: LOCATION_ONLY
   panels { room: "Top Right Room" name: "RIGHT WING" }
   panels { room: "Top Right Room" name: "WING" }
@@ -129,7 +130,7 @@ doors {
   location_room: "Top Right Room"
 }
 doors {
-  name: "Bottom Left Puzzles"
+  name: "Southwest Puzzles"
   type: LOCATION_ONLY
   panels { room: "Bottom Left Room" name: "SHELL (1)" }
   panels { room: "Bottom Left Room" name: "SHELL (2)" }
@@ -140,7 +141,7 @@ doors {
   location_room: "Bottom Left Room"
 }
 doors {
-  name: "Bottom Right Puzzles"
+  name: "Southeast Puzzles"
   type: LOCATION_ONLY
   panels { room: "Bottom Right Room" name: "FLY" }
   panels { room: "Bottom Right Room" name: "DECLOG" }
@@ -1,5 +1,4 @@
 name: "Bottom Left Room"
-display_name: "Plaza"
 panels {
   name: "SHELL (1)"
   path: "Panels/Room 4/panel_1"
@@ -1,5 +1,4 @@
 name: "Bottom Right Room"
-display_name: "Plaza"
 panels {
   name: "FLY"
   path: "Panels/Room 3/panel_1"
@@ -1,5 +1,4 @@
 name: "Center Room"
-display_name: "Plaza"
 panels {
   name: "REPORTER"
   path: "Panels/Room 2/panel_1"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Plaza"
 panels {
   name: "COURTYARD"
   path: "Panels/Entrances/panel_1"
@@ -37,16 +36,22 @@ panels {
 }
 ports {
   name: "UNYIELDING"
+  display_name: "Unyielding Hallway"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: 1 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
   name: "IMPRESSIVE"
+  display_name: "Impressive Hallway"
   path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: 11 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
   name: "BETWEEN"
+  display_name: "Between Hallway"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -9 y: 0 z: 10 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Plaza"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Repetitive Entrance"
-display_name: "Plaza"
 panels {
   name: "TEDIOUS"
   path: "Panels/Entrances/panel_6"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport5"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 16 }
+  rotation: 180
 }
@@ -1,5 +1,4 @@
 name: "Sirenic Entrance"
-display_name: "Plaza"
 panels {
   name: "SIREN"
   path: "Panels/Entrances/panel_8"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "SIRENIC"
+  display_name: "Sirenic Entrance"
   path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -51 y: 0 z: -43 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Symbolic Entrance"
-display_name: "Plaza"
 panels {
   name: "FIGURATIVE"
   path: "Panels/Entrances/panel_5"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "SYMBOLIC"
+  display_name: "Symbolic Entrance"
   path: "Components/Warps/worldport4"
-  orientation: "south"
+  destination { x: 28 y: 0 z: 4 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Top Left Room"
-display_name: "Plaza"
 panels {
   name: "BARE SOD"
   path: "Panels/Room 6/panel_1"
@@ -42,6 +41,7 @@ panels {
   clue: "knot"
   answer: "not"
   symbols: ZERO
+  display_name: "KNOT (TL)"
 }
 panels {
   name: "SURE TEMPER"
@@ -129,6 +129,7 @@ panels {
   clue: "bear"
   answer: "bearer"
   symbols: SPARKLES
+  display_name: "BEAR (TL)"
 }
 panels {
   name: "CHILL"
@@ -1,5 +1,4 @@
 name: "Top Right Room"
-display_name: "Plaza"
 panels {
   name: "RIGHT WING"
   path: "Panels/Room 5/panel_1"
@@ -34,6 +33,7 @@ panels {
   clue: "bear"
   answer: "cave"
   symbols: STARS
+  display_name: "BEAR (TR)"
 }
 panels {
   name: "TYPIST"
@@ -125,6 +125,7 @@ panels {
   clue: "knot"
   answer: "not"
   symbols: ZERO
+  display_name: "KNOT (TR)"
 }
 panels {
   name: "HALVES ANNOYED SOUR GOOD"
@@ -1,6 +1,6 @@
 name: "Keyholder Room"
-display_name: "Quiet"
 keyholders {
   name: "Q"
   path: "Components/KeyHolders/keyHolderQ"
+  key: "q"
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Quiet"
 panels {
   name: "SOLID"
   path: "Panels/Main/panel_1"
@@ -98,6 +97,8 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 8 }
+  rotation: 90
 }
@@ -1,5 +1,4 @@
 name: "Q Room"
-display_name: "Quiet"
 letters {
   key: "q"
   path: "Components/Collectables/q"
@@ -1,5 +1,4 @@
 name: "All"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_1/panel_6"
@@ -1,5 +1,4 @@
 name: "Left And Turn"
-display_name: "Relentless"
 panels {
   name: "HIDE (1)"
   path: "Panels/Room_1/panel_2"
@@ -1,5 +1,4 @@
 name: "Left Room"
-display_name: "Relentless"
 panels {
   name: "HIDE"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Relentless"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Shop Room"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_3/panel_5"
@@ -1,5 +1,4 @@
 name: "Turn And Shop"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_2/panel_5"
@@ -1,5 +1,4 @@
 name: "Turn Room"
-display_name: "Relentless"
 panels {
   name: "HIDE (1)"
   path: "Panels/Room_2/panel_2"
@@ -6,13 +6,13 @@ connections {
 connections {
   from_room: "Main Room"
   to_room: "Plaza Connector"
-  door { name: "Plaza Entrance" }
-  oneway: true
+  door { name: "Black Hallway" }
 }
 connections {
   from_room: "Plaza Connector"
   to_room: "Main Room"
   oneway: true
+  vanilla_only: true
 }
 connections {
   from_room: "Main Room"
@@ -6,7 +6,7 @@ doors {
   location_room: "Main Room"
 }
 doors {
-  name: "Plaza Entrance"
+  name: "Black Hallway"
   type: STANDARD
   receivers: "Components/Doors/Door12"
   panels { room: "Main Room" name: "I" }
@@ -194,3 +194,9 @@ doors {
   panels { room: "Yellow Room" name: "ASSESSES" }
   panels { room: "Yellow Room" name: "TINTING" }
 }
+doors {
+  name: "Anti-Collectable"
+  type: LOCATION_ONLY
+  senders: "Components/Collectables/anticollectable"
+  location_room: "Anti Room"
+}
@@ -1,10 +1,6 @@
 display_name: "The Repetitive"
-# The anti-collectable doesn't fit into our system right now so let's ignore it.
-excluded_nodes: "Components/Collectables/anticollectable"
 # These paintings are directly above/behind panels and thus can't be entered.
 excluded_nodes: "Meshes/eyeRed3"
 excluded_nodes: "Meshes/eyeRed4"
-# I do not know what this is.
-excluded_nodes: "Components/Doors/Door3/Hinge/panel_i"
 # This has something to do with the magenta room entrance proxy panel.
 excluded_nodes: "Panels/Eval/panel_26_proxyied_fake"
@@ -1,6 +1,4 @@
 name: "Anti Room"
-display_name: "Repetitive"
-# Ignore the collectible. The mod should remove it and the back wall too.
 panels {
   name: "HA (1)"
   path: "Panels/Entry/panel_7"
@@ -39,9 +37,17 @@ panels {
   symbols: EXAMPLE
 }
 panels {
-  name: "EYE"
+  name: "EYE (1)"
   path: "Panels/Entry/panel4"
   clue: "eye"
   answer: "iris"
   symbols: BOXES
 }
+panels {
+  # This appears after grabbing the anti-collectable.
+  name: "EYE (2)"
+  path: "Components/Doors/Door3/Hinge/panel_i"
+  clue: "eye"
+  answer: "i"
+  symbols: ZERO
+}
@@ -1,5 +1,4 @@
 name: "Cyan Room"
-display_name: "Repetitive"
 panels {
   name: "ALFA"
   path: "Panels/Lingo2/panel_3"
@@ -1,5 +1,4 @@
 name: "Dot Area"
-display_name: "Repetitive"
 panels {
   name: "TUTU (1)"
   path: "Panels/Lingo2/panel"
@@ -96,7 +95,7 @@ panels {
   clue: "door"
   answer: "door"
   symbols: EVAL
-  #proxies { answer: "door" path: "Panels/Eval/panel_26_proxyied_1" }
+  proxies { answer: "door" path: "Panels/Eval/panel_26_proxyied_1" }
   proxies { answer: "do" path: "Panels/Eval/panel_26_proxyied_2" }
 }
 panels {
@@ -1,7 +1,11 @@
 name: "Entry Connector"
-display_name: "Repetitive"
 ports {
   name: "ENTRY"
+  display_name: "Northwest Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -11 y: 0 z: 13 }
+  rotation: 0
+  # TODO: this is part of what makes the keyholder dependent connection form CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
@@ -1,5 +1,4 @@
 name: "Lime Room"
-display_name: "Repetitive"
 panels {
   name: "RAT"
   path: "Panels/Lingo2/panel_1"
@@ -1,5 +1,4 @@
 name: "Magenta Room"
-display_name: "Repetitive"
 panels {
   name: "WRITE"
   path: "Panels/Eval/panel_9"
@@ -1,5 +1,4 @@
 name: "Main Room"
-display_name: "Repetitive"
 panels {
   name: "HOTS (2)"
   path: "Panels/Entry/panel_3"
@@ -139,6 +138,10 @@ paintings {
 }
 ports {
   name: "CC"
+  display_name: "Southwest Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -5.5 y: 0 z: 56 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Repetitive"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,7 +1,8 @@
 name: "Plaza Connector"
-display_name: "Repetitive"
 ports {
   name: "PLAZA"
+  display_name: "Northeast Worldport"
   path: "Components/Warps/worldport"
-  orientation: "north"
+  destination { x: 15 y: 0 z: 13 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Yellow Room"
-display_name: "Repetitive"
 panels {
   name: "W"
   path: "Panels/Eval/panel_1"
@@ -1,5 +1,4 @@
 name: "Bye Room"
-display_name: "Revitalized"
 panels {
   name: "BYE"
   path: "Panels/panel_1"
@@ -9,6 +8,8 @@ panels {
 }
 ports {
   name: "PARTHENON"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 30 y: 0 z: 16 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Hidden Room"
-display_name: "Revitalized"
 panels {
   name: "HIDDEN"
   path: "Panels/panel_3"
@@ -1,5 +1,4 @@
 name: "Hide Room"
-display_name: "Revitalized"
 panels {
   name: "HIDE"
   path: "Panels/panel_2"
@@ -1,5 +1,4 @@
 name: "High Room"
-display_name: "Revitalized"
 panels {
   name: "HIGH"
   path: "Panels/panel_4"
@@ -1,5 +1,4 @@
 name: "Return Room"
-display_name: "Revitalized"
 panels {
   name: "RETURN"
   path: "Components/panel_7"
@@ -1,5 +1,4 @@
 name: "Too Room"
-display_name: "Revitalized"
 panels {
   name: "TOO"
   path: "Panels/panel_6"
@@ -1,5 +1,4 @@
 name: "Won Room"
-display_name: "Revitalized"
 panels {
   name: "WON"
   path: "Panels/panel_5"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Shop"
 panels {
   name: "DUCKS"
   path: "Panels/Books/panel_1"
@@ -156,9 +155,13 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 4 y: 0 z: 12 }
+  rotation: 90
 }
 keyholders {
   name: "N"
   path: "Components/KeyHolders/keyHolderN"
+  key: "n"
 }
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Sirenic"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Puzzles"
-display_name: "Sirenic"
 panels {
   name: "Left Top 1"
   path: "Panels/Room_1/pip_1"
@@ -1,5 +1,4 @@
 name: "Start"
-display_name: "Sirenic"
 panels {
   name: "Flipped"
   path: "Panels/Entry/entry_2"
@@ -16,6 +15,8 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 26 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Center"
-display_name: "Stormy"
 panels {
   name: "REACTOR"
   path: "Panels/Room_1/panel_7"
@@ -20,6 +19,7 @@ panels {
   clue: "cloud"
   answer: "rain"
   symbols: AGE
+  display_name: "CLOUD (1)"
 }
 panels {
   name: "WIND"
@@ -27,9 +27,12 @@ panels {
   clue: "wind"
   answer: "tornado"
   symbols: CROSS
+  display_name: "WIND (1)"
 }
 ports {
   name: "ENTRY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -8.5 y: 0 z: 6 }
+  rotation: 270
 }
@@ -1,5 +1,4 @@
 name: "Nuclear Side"
-display_name: "Stormy"
 panels {
   name: "GERM"
   path: "Panels/Room_1/panel_2"
@@ -1,5 +1,4 @@
 name: "Nuclear Vestibule"
-display_name: "Stormy"
 panels {
   name: "STORM"
   path: "Panels/Room 2/panel_11"
@@ -1,11 +1,11 @@
 name: "Rain Side"
-display_name: "Stormy"
 panels {
   name: "CLOUD"
   path: "Panels/Room_1/panel_4"
   clue: "cloud"
   answer: "lightning"
   symbols: CROSS
+  display_name: "CLOUD (2)"
 }
 panels {
   name: "WIND"
@@ -13,4 +13,5 @@ panels {
   clue: "wind"
   answer: "whirlwind"
   symbols: PYRAMID
+  display_name: "WIND (2)"
 }
@@ -1,5 +1,4 @@
 name: "Tornado Side"
-display_name: "Stormy"
 panels {
   name: "PUDDLE"
   path: "Panels/Room_1/panel_6"
@@ -1,5 +1,4 @@
 name: "Tornado Vestibule"
-display_name: "Stormy"
 panels {
   name: "SHIP"
   path: "Panels/Room 2/panel_12"
@@ -1,5 +1,4 @@
 name: "Volcano Side"
-display_name: "Stormy"
 panels {
   name: "SNOW"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "X2 Room"
-display_name: "Stormy"
 letters {
   key: "x"
   level2: true
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Sturdy"
 panels {
   name: "MOVE (1)"
   path: "Panels/Main/panel_1"
@@ -11,7 +10,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_1" }
   proxies { answer: "left" path: "Panels/Left/left_1" }
   proxies { answer: "right" path: "Panels/Right/right_1" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_1" }
+  proxies { answer: "move" path: "Panels/Secret/secret_1" }
 }
 panels {
   name: "MOVE (2)"
@@ -24,7 +23,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_2" }
   proxies { answer: "left" path: "Panels/Left/left_2" }
   proxies { answer: "right" path: "Panels/Right/right_2" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_2" }
+  proxies { answer: "move" path: "Panels/Secret/secret_2" }
 }
 panels {
   name: "MOVE (3)"
@@ -37,7 +36,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_3" }
   proxies { answer: "left" path: "Panels/Left/left_3" }
   proxies { answer: "right" path: "Panels/Right/right_3" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_3" }
+  proxies { answer: "move" path: "Panels/Secret/secret_3" }
 }
 panels {
   name: "MOVE (4)"
@@ -50,7 +49,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_4" }
   proxies { answer: "left" path: "Panels/Left/left_4" }
   proxies { answer: "right" path: "Panels/Right/right_4" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_4" }
+  proxies { answer: "move" path: "Panels/Secret/secret_4" }
 }
 panels {
   name: "MOVE (5)"
@@ -63,7 +62,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_5" }
   proxies { answer: "left" path: "Panels/Left/left_5" }
   proxies { answer: "right" path: "Panels/Right/right_5" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_5" }
+  proxies { answer: "move" path: "Panels/Secret/secret_5" }
 }
 panels {
   name: "MOVE (6)"
@@ -76,7 +75,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_6" }
   proxies { answer: "left" path: "Panels/Left/left_6" }
   proxies { answer: "right" path: "Panels/Right/right_6" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_6" }
+  proxies { answer: "move" path: "Panels/Secret/secret_6" }
 }
 panels {
   name: "MOVE (7)"
@@ -89,7 +88,7 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_7" }
   proxies { answer: "left" path: "Panels/Left/left_7" }
   proxies { answer: "right" path: "Panels/Right/right_7" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_7" }
+  proxies { answer: "move" path: "Panels/Secret/secret_7" }
 }
 panels {
   name: "MOVE (8)"
@@ -102,13 +101,19 @@ panels {
   proxies { answer: "down" path: "Panels/Down/down_8" }
   proxies { answer: "left" path: "Panels/Left/left_8" }
   proxies { answer: "right" path: "Panels/Right/right_8" }
-  #proxies { answer: "move" path: "Panels/Secret/secret_8" }
+  proxies { answer: "move" path: "Panels/Secret/secret_8" }
 }
 ports {
   name: "OWL"
+  display_name: "Magenta Hallway"
   path: "Components/Warps/worldport"
+  destination { x: 17 y: 0 z: 41 }
+  rotation: 90
 }
 ports {
   name: "COLORFUL"
+  display_name: "Cyan Hallway"
   path: "Components/Warps/worldport2"
+  destination { x: 17 y: 0 z: -33 }
+  rotation: 90
 }
@@ -1,5 +1,4 @@
 name: "S2 Area"
-display_name: "Sturdy"
 panels {
   name: "COLORS"
   path: "Panels/Rainbow/panel_1"
@@ -7,6 +7,7 @@ connections {
   from_room: "Temple"
   to_room: "Ending"
   door { name: "Ending" }
+  purple_ending: true
 }
 connections {
   from_room: "Temple"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Sun Temple"
 endings {
   name: "PURPLE"
   path: "Components/purple_ending"
@@ -1,14 +1,16 @@
 name: "Entrance"
-display_name: "Sun Temple"
 panels {
   name: "SUN"
   path: "Panels/Main/panel_1"
   clue: "sun"
   answer: "sun"
-  #proxies { answer: "sun" path: "Panels/Sun/panel_8" }
+  proxies { answer: "sun" path: "Panels/Sun/panel_8" }
   proxies { answer: "moon" path: "Panels/Moon/panel_15" }
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Sun Temple"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/collectable"
@@ -1,12 +1,11 @@
 name: "Temple"
-display_name: "Sun Temple"
 panels {
   name: "DELAY"
   path: "Panels/Main/panel_2"
   clue: "delay"
   answer: "day"
   symbols: SPARKLES
-  #proxies { answer: "day" path: "Panels/Sun/panel_9" }
+  proxies { answer: "day" path: "Panels/Sun/panel_9" }
   proxies { answer: "night" path: "Panels/Moon/panel_16" }
 }
 panels {
@@ -15,7 +14,7 @@ panels {
   clue: "lawn"
   answer: "dawn"
   symbols: SPARKLES
-  #proxies { answer: "dawn" path: "Panels/Sun/panel_10" }
+  proxies { answer: "dawn" path: "Panels/Sun/panel_10" }
   proxies { answer: "dusk" path: "Panels/Moon/panel_17" }
 }
 panels {
@@ -24,7 +23,7 @@ panels {
   clue: "jump"
   answer: "spring"
   symbols: SUN
-  #proxies { answer: "spring" path: "Panels/Sun/panel_11" }
+  proxies { answer: "spring" path: "Panels/Sun/panel_11" }
   proxies { answer: "autumn" path: "Panels/Moon/panel_18" }
 }
 panels {
@@ -33,7 +32,7 @@ panels {
   clue: "heavy"
   answer: "light"
   symbols: SUN
-  #proxies { answer: "light" path: "Panels/Sun/panel_12" }
+  proxies { answer: "light" path: "Panels/Sun/panel_12" }
   proxies { answer: "dark" path: "Panels/Moon/panel_19" }
 }
 panels {
@@ -42,7 +41,7 @@ panels {
   clue: "knife"
   answer: "life"
   symbols: ZERO
-  #proxies { answer: "life" path: "Panels/Sun/panel_13" }
+  proxies { answer: "life" path: "Panels/Sun/panel_13" }
   proxies { answer: "death" path: "Panels/Moon/panel_20" }
 }
 panels {
@@ -51,7 +50,7 @@ panels {
   clue: "arm"
   answer: "warmth"
   symbols: SPARKLES
-  #proxies { answer: "warmth" path: "Panels/Sun/panel_14" }
+  proxies { answer: "warmth" path: "Panels/Sun/panel_14" }
   proxies { answer: "chill" path: "Panels/Moon/panel_21" }
 }
 panels {
@@ -60,5 +59,5 @@ panels {
   clue: "equinox"
   answer: "equinox"
   proxies { answer: "solstice" path: "Panels/End/panel_23" }
-  #proxies { answer: "equinox" path: "Panels/End/panel_24" }
+  proxies { answer: "equinox" path: "Panels/End/panel_24" }
 }
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Sweet"
 panels {
   name: "POTATO"
   path: "Panels/Sweetening Room/panel_1"
@@ -201,9 +200,15 @@ panels {
 }
 ports {
   name: "EXIT1"
+  display_name: "South Worldport"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -11.5 }
+  rotation: 180
 }
 ports {
   name: "EXIT2"
+  display_name: "North Worldport"
   path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -17.5 }
+  rotation: 0
 }
@@ -1,5 +1,4 @@
 name: "Y2 Room"
-display_name: "Sweet"
 letters {
   key: "y"
   level2: true
@@ -1,62 +1,55 @@
 doors {
   name: "White Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door18"
+  type: EVENT
+  #receivers: "Components/Doors/Door18"
   panels { room: "White Room" name: "WRITE" }
-  location_room: "White Room"
 }
 doors {
   name: "Black Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door19"
+  type: EVENT
+  #receivers: "Components/Doors/Door19"
   panels { room: "Black Room" name: "HERE" }
-  location_room: "Black Room"
 }
 doors {
   name: "Red Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door20"
+  type: EVENT
+  #receivers: "Components/Doors/Door20"
   panels { room: "Red Room" name: "SYNONYM" }
-  location_room: "Red Room"
 }
 doors {
   name: "Blue Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door21"
+  type: EVENT
+  #receivers: "Components/Doors/Door21"
   panels { room: "Blue Room" name: "DEPLETE" }
-  location_room: "Blue Room"
 }
 doors {
   name: "Green Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door22"
+  type: EVENT
+  #receivers: "Components/Doors/Door22"
   panels { room: "Green Room" name: "INERT" }
-  location_room: "Green Room"
 }
 doors {
   name: "Yellow Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door23"
+  type: EVENT
+  #receivers: "Components/Doors/Door23"
   panels { room: "Yellow Room" name: "WHOLE" }
-  location_room: "Yellow Room"
 }
 doors {
   name: "Purple Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door24"
+  type: EVENT
+  #receivers: "Components/Doors/Door24"
   panels { room: "Purple Room" name: "TIME" }
-  location_room: "Purple Room"
 }
 doors {
   name: "Orange Door"
-  type: STANDARD
-  receivers: "Components/Doors/Door25"
+  type: EVENT
+  #receivers: "Components/Doors/Door25"
   panels { room: "Orange Room" name: "YOUNG" }
-  location_room: "Orange Room"
 }
 doors {
   name: "Tutorial Door"
-  type: EVENT
+  type: ITEM_ONLY
+  receivers: "Components/Doors/Door"
   panels { room: "Tutorial" name: "<- (1)" }
   panels { room: "Tutorial" name: "<- (2)" }
   panels { room: "Tutorial" name: "<- (3)" }
@@ -5,7 +5,7 @@ panels {
   clue: "absorbed"
   answer: "abs"
   symbols: EVAL
-  #proxies { answer: "abs" path: "Panels/Proxy/absorbed_proxied_1" }
+  proxies { answer: "abs" path: "Panels/Proxy/absorbed_proxied_1" }
   proxies { answer: "bed" path: "Panels/Proxy/absorbed_proxied_2" }
 }
 panels {
@@ -14,6 +14,6 @@ panels {
   clue: "primordial"
   answer: "prim"
   symbols: EVAL
-  #proxies { answer: "prim" path: "Panels/Proxy/primordial_proxied_1" }
+  proxies { answer: "prim" path: "Panels/Proxy/primordial_proxied_1" }
   proxies { answer: "dial" path: "Panels/Proxy/primordial_proxied_2" }
 }
@@ -18,6 +18,6 @@ panels {
   answer: "ugly"
   symbols: EVAL
   symbols: LINGO
-  #proxies { answer: "ugly" path: "Panels/NotNoT/not_pretty_proxied_1" }
+  proxies { answer: "ugly" path: "Panels/NotNoT/not_pretty_proxied_1" }
   proxies { answer: "prey" path: "Panels/NotNoT/not_pretty_proxied_2" }
 }
@@ -18,6 +18,6 @@ panels {
   answer: "false"
   symbols: EVAL
   symbols: LINGO
-  #proxies { answer: "false" path: "Panels/NotNoT/not_true_proxied_1" }
+  proxies { answer: "false" path: "Panels/NotNoT/not_true_proxied_1" }
   proxies { answer: "rue" path: "Panels/NotNoT/not_true_proxied_2" }
 }
@@ -18,6 +18,6 @@ panels {
   answer: "worse"
   symbols: EVAL
   symbols: LINGO
-  #proxies { answer: "worse" path: "Panels/NotNoT/not_better_proxied_1" }
+  proxies { answer: "worse" path: "Panels/NotNoT/not_better_proxied_1" }
   proxies { answer: "beer" path: "Panels/NotNoT/not_better_proxied_2" }
 }
@@ -6,7 +6,7 @@ panels {
   answer: "word"
   symbols: ZERO
   symbols: EVAL
-  #proxies { answer: "word" path: "Panels/Entry/rightward_proxyied_1" }
+  proxies { answer: "word" path: "Panels/Entry/rightward_proxyied_1" }
   proxies { answer: "whirred" path: "Panels/Entry/rightward_proxyied_2" }
 }
 panels {
@@ -15,6 +15,6 @@ panels {
   clue: "typewriting"
   answer: "writing"
   symbols: EVAL
-  #proxies { answer: "writing" path: "Panels/Entry/typewriter_proxied_1" }
+  proxies { answer: "writing" path: "Panels/Entry/typewriter_proxied_1" }
   proxies { answer: "poetry" path: "Panels/Entry/typewriter_proxied_2" }
 }
@@ -7,5 +7,8 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 2.5 }
+  rotation: 0
 }
@@ -107,8 +107,12 @@ panels {
 keyholders {
   name: "Y"
   path: "Components/KeyHolders/keyHolderY"
+  key: "y"
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
@@ -8,5 +8,10 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 10 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -2,4 +2,5 @@ name: "Main Area"
 keyholders {
   name: "K"
   path: "Components/KeyHolders/keyHolderK"
+  key: "k"
 }
@@ -50,4 +50,5 @@ doors {
   panels { room: "Dead End Room" name: "DEAD" }
   panels { room: "Dead End Room" name: "END" }
   location_room: "Loose Strings Room"
+  location_name: "Gravestone"
 }
@@ -29,9 +29,15 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Door Ways Worldport"
   path: "Components/Warps/worldport6"
+  destination { x: -38 y: 0 z: 41.5 }
+  rotation: 0
 }
 ports {
   name: "BEGIN2"
+  display_name: "Dead End Worldport"
   path: "Components/Warps/worldport5"
+  destination { x: -38 y: 0 z: 27.5 }
+  rotation: 180
 }
@@ -29,9 +29,15 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "First Worldport"
   path: "Components/Warps/worldport"
+  destination { x: -16 y: 0 z: 0.5 }
+  rotation: 180
 }
 ports {
   name: "TTD"
+  display_name: "Second Worldport"
   path: "Components/Warps/worldport2"
+  destination { x: -16 y: 0 z: 14.5 }
+  rotation: 0
 }
@@ -15,5 +15,8 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Loose Strings Worldport"
   path: "Components/Warps/worldport7"
+  destination { x: -16 y: 0 z: 41.5 }
+  rotation: 0
 }
@@ -15,5 +15,8 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Lone Chance Worldport"
   path: "Components/Warps/worldport8"
+  destination { x: -16 y: 0 z: 27.5 }
+  rotation: 180
 }
@@ -27,9 +27,15 @@ panels {
 }
 ports {
   name: "BEGIN"
+  display_name: "Third Fourth Worldport"
   path: "Components/Warps/worldport3"
+  destination { x: -38 y: 0 z: 14.5 }
+  rotation: 0
 }
 ports {
   name: "NEXT"
+  display_name: "Silver Portal Worldport"
   path: "Components/Warps/worldport4"
+  destination { x: -38 y: 0 z: 0.5 }
+  rotation: 180
 }
@@ -97,5 +97,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: -0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -38,4 +38,5 @@ doors {
   panels { room: "Main Area" name: "SMALL (3)" }
   panels { room: "Main Area" name: "SPRINKLE" }
   location_room: "Main Area"
+  location_name: "Gravestone"
 }
@@ -1,5 +1,8 @@
 name: "Bearer Entrance"
 ports {
   name: "BEARER"
+  display_name: "Brown Control Center Hallway"
   path: "Components/Warps/worldport"
+  destination { x: -15.5 y: 0 z: 20 }
+  rotation: 270
 }
@@ -211,19 +211,33 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "SW Worldport"
   path: "Components/Warps/worldport4"
+  destination { x: -21 y: 0 z: 7 }
+  rotation: 0
+  # enterable from either side
 }
 ports {
   name: "DIGITAL"
+  display_name: "NW Worldport"
   path: "Components/Warps/worldport5"
+  destination { x: -21 y: 0 z: -7 }
+  rotation: 180
+  # enterable from either side
 }
 ports {
   name: "GREAT"
+  display_name: "E Worldport"
   path: "Components/Warps/worldport2"
+  destination { x: 21 y: 0 z: -4 }
+  rotation: 180
 }
 ports {
   name: "DAEDALUS"
+  display_name: "NE Worldport"
   path: "Components/Warps/worldport3"
+  destination { x: 15.5 y: 0 z: -19 }
+  rotation: 90
 }
 paintings {
   name: "SEA"
@@ -1,7 +1,7 @@
 connections {
   from_room: "Main Area"
   to_room: "Right Area"
-  door { name: "Right Door" }
+  door { name: "East Door" }
 }
 connections {
   from_room: "Middle Room"
@@ -1,5 +1,5 @@
 doors {
-  name: "Right Door"
+  name: "East Door"
   type: STANDARD
   receivers: "Components/Doors/entry_2"
   panels { room: "Main Area" name: "EYE" }
@@ -21,7 +21,8 @@ doors {
 doors {
   name: "Cyan Doors"
   type: EVENT
-  switches: "double_letters"
+  receivers: "Components/Doors/entry_12"
+  double_letters: true
 }
 doors {
   name: "Sun Temple Entrance"
@@ -65,8 +66,11 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  receivers: "Components/Doors/entry_6"
   receivers: "Components/Doors/entry_13"
+  receivers: "Panels/Assorted/panel_1/teleportListener"
   control_center_color: "orange"
+  double_letters: true
 }
 doors {
   name: "W2 Door"
@@ -8,5 +8,10 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
+  destination { x: -4.5 y: 0 z: 7 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
@@ -1,5 +1,8 @@
 name: "Daedalus Entrance"
 ports {
   name: "DAEDALUS"
+  display_name: "Orange Hallway"
   path: "Components/Warps/worldport4"
+  destination { x: 33 y: 0 z: -10 }
+  rotation: 90
 }
@@ -212,17 +212,27 @@ panels {
 keyholders {
   name: "I"
   path: "Components/KeyHolders/keyHolderL"
+  key: "i"
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
+  destination { x: -3 y: 0 z: 11 }
+  rotation: 270
 }
 ports {
   name: "TREE"
+  display_name: "Brown Hallway"
   path: "Components/Warps/worldport5"
+  destination { x: -34 y: 0 z: 7 }
+  rotation: 270
 }
 ports {
   name: "SUNTEMPLE"
+  display_name: "Sun Temple Entrance"
   path: "Components/Warps/worldport3"
+  destination { x: -42 y: 0 z: -2 }
+  rotation: 270
   required_door { name: "Sun Temple Entrance" }
 }
@@ -159,6 +159,5 @@ panels {
   clue: "color"
   answer: "orange"
   symbols: EXAMPLE
-  # TODO: This is hidden in-game until double letters are unlocked AND "orange"
-  # is entered in the control center.
+  required_door { name: "Control Center Orange Door" }
 }
@@ -1,5 +1,6 @@
 name: "V Keyholder"
 keyholders {
-  name: "KEYHOLDERV"
+  name: "V"
   path: "Components/KeyHolders/keyHolderV"
+  key: "v"
 }
@@ -2,4 +2,5 @@ name: "W Keyholder"
 keyholders {
   name: "W"
   path: "Components/KeyHolders/keyHolderW"
+  key: "w"
 }
@@ -183,6 +183,21 @@ doors {
   panels { room: "Central Connected Area" name: "CHIN" }
   panels { room: "Central Connected Area" name: "DING" }
   location_room: "Central Connected Area"
+  location_name: "East Room 2"
+}
+doors {
+  name: "East Room 1"
+  type: LOCATION_ONLY
+  panels { room: "East Room 1" name: "CHIN" }
+  panels { room: "East Room 1" name: "HEAT" }
+  panels { room: "East Room 1" name: "END" }
+  panels { room: "East Room 1" name: "FLY" }
+  panels { room: "East Room 1" name: "OUCH" }
+  panels { room: "East Room 1" name: "HAG" }
+  panels { room: "East Room 1" name: "TIN" }
+  panels { room: "East Room 1" name: "RID" }
+  panels { room: "East Room 1" name: "TUG" }
+  location_room: "East Room 1"
 }
 doors {
   name: "Orange Alcove"
@@ -199,6 +214,7 @@ doors {
 }
 doors {
   name: "Black Alcove"
+  type: EVENT
   panels { room: "Star Rooms" name: "TURN" }
   panels { room: "Central Connected Area" name: "HAD" }
   panels { room: "Central Connected Area" name: "SOW" }
@@ -218,6 +234,7 @@ doors {
   panels { room: "Northeast Room 1" name: "CAR" }
   panels { room: "Northeast Room 1" name: "SIR" }
   location_room: "Northeast Room 1"
+  location_name: "Northeast Room 1"
 }
 doors {
   name: "Northeast Corner Behind"
@@ -245,6 +262,7 @@ doors {
   panels { room: "Northwest Room" name: "HER" }
   panels { room: "Northwest Room" name: "DAM" }
   location_room: "Northwest Room"
+  location_name: "Northwest Room"
 }
 doors {
   name: "Cyan Alcove"
@@ -274,6 +292,7 @@ doors {
   panels { room: "Southwest Room 3" name: "HOST" }
   panels { room: "Southwest Room 3" name: "MUG" }
   location_room: "Southwest Room 3"
+  location_name: "Southwest Room 3"
 }
 doors {
   name: "Southwest Room 2 Entrance"
@@ -293,6 +312,7 @@ doors {
   panels { room: "Southwest Room 2" name: "ION" }
   panels { room: "Southwest Room 2" name: "INN" }
   location_room: "Southwest Room 2"
+  location_name: "Southwest Room 2"
 }
 doors {
   name: "Southwest 4"
@@ -411,6 +431,7 @@ doors {
   panels { room: "Central Connected Area" name: "SON (1)" }
   panels { room: "Central Connected Area" name: "URGE" }
   location_room: "Central Connected Area"
+  location_name: "Northeast Room 2"
 }
 doors {
   name: "South Right Painting"
@@ -478,5 +499,8 @@ doors {
 doors {
   name: "Cyan Doors"
   type: EVENT
-  switches: "double_letters"
+  receivers: "Components/Doors/entry_4"
+  receivers: "Panels/Miscellaneous/entry_2/teleportListener"
+  receivers: "Panels/Miscellaneous/entry_3/teleportListener"
+  double_letters: true
 }
@@ -1,5 +1,8 @@
 name: "Bearer Entrance"
 ports {
   name: "BEARER"
+  display_name: "East of Yellow Worldport"
   path: "Components/Warps/worldport4"
+  destination { x: 23 y: 0 z: -29 }
+  rotation: 90
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "DIGITAL"
+  display_name: "South of Yellow Worldport"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
@@ -1,5 +1,8 @@
 name: "Nuanced Entrance"
 ports {
   name: "NUANCED"
+  display_name: "West of Yellow Worldport"
   path: "Components/Warps/worldport3"
+  destination { x: -23 y: 0 z: -29 }
+  rotation: 270
 }
@@ -15,5 +15,8 @@ panels {
 }
 ports {
   name: "PLAZA"
+  display_name: "Dark Hallway"
   path: "Components/Warps/worldport5"
+  destination { x: 35 y: 0 z: 44 }
+  rotation: 270
 }
@@ -5,4 +5,5 @@ panels {
   clue: "sickness"
   answer: "health"
   symbols: SUN
+  required_door { name: "Cyan Doors" }
 }
@@ -5,4 +5,5 @@ panels {
   clue: "health"
   answer: "sickness"
   symbols: SUN
+  required_door { name: "Cyan Doors" }
 }
@@ -7,5 +7,8 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 18 y: 0 z: 41 }
+  rotation: 180
 }
@@ -4,6 +4,7 @@ panels {
   path: "Panels/panel_3"
   clue: "shrink"
   answer: "shrink"
+  display_name: "SHRINK (2)"
 }
 panels {
   name: "IRE"
@@ -4,4 +4,5 @@ panels {
   path: "Panels/panel_2"
   clue: "shrink"
   answer: "shrink"
+  display_name: "SHRINK (1)"
 }
@@ -57,5 +57,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
 }
@@ -0,0 +1,54 @@
+version {
+  major: 7
+  minor: 1
+  patch: 0
+}
+# Filler item.
+special_names: "A Job Well Done"
+# Symbol items.
+special_names: "Age Symbol"
+special_names: "Anagram Symbol"
+special_names: "Boxes Symbol"
+special_names: "Cross Symbol"
+special_names: "Eval Symbol"
+special_names: "Example Symbol"
+special_names: "Gender Symbol"
+special_names: "Job Symbol"
+special_names: "Lingo Symbol"
+special_names: "Null Symbol"
+special_names: "Planet Symbol"
+special_names: "Pyramid Symbol"
+special_names: "Question Symbol"
+special_names: "Sound Symbol"
+special_names: "Sparkles Symbol"
+special_names: "Stars Symbol"
+special_names: "Sun Symbol"
+special_names: "Sweet Symbol"
+special_names: "Zero Symbol"
+# Anti collectable traps
+special_names: "Anti A"
+special_names: "Anti B"
+special_names: "Anti C"
+special_names: "Anti D"
+special_names: "Anti E"
+special_names: "Anti F"
+special_names: "Anti G"
+special_names: "Anti H"
+special_names: "Anti I"
+special_names: "Anti J"
+special_names: "Anti K"
+special_names: "Anti L"
+special_names: "Anti M"
+special_names: "Anti N"
+special_names: "Anti O"
+special_names: "Anti P"
+special_names: "Anti Q"
+special_names: "Anti R"
+special_names: "Anti S"
+special_names: "Anti T"
+special_names: "Anti U"
+special_names: "Anti V"
+special_names: "Anti W"
+special_names: "Anti X"
+special_names: "Anti Y"
+special_names: "Anti Z"
@@ -0,0 +1,11 @@
+progressives {
+  name: "Progressive Gold Ending"
+  doors { map: "daedalus" name: "Red Rainbow Room" }
+  doors { map: "daedalus" name: "Orange Rainbow Room" }
+  doors { map: "daedalus" name: "Yellow Rainbow Room" }
+  doors { map: "daedalus" name: "Green Rainbow Room" }
+  doors { map: "daedalus" name: "Blue Rainbow Room" }
+  doors { map: "daedalus" name: "Purple Rainbow Room" }
+  doors { map: "daedalus" name: "Cyan Rainbow Room" }
+  doors { map: "daedalus" name: "Brown Rainbow Room" }
+}