321 files changed, 6765 insertions, 578 deletions

@@ -0,0 +1,32 @@
+Used in vanilla doors:
+
+The Between - RIGHT
+
+
+
+
+Used in a pseudo-connection:
+
+The Sturdy - COLORS
+
+
+
+
+Unsolved panels in letter rooms:
+
+Daedalus (F2 Room) - DEADLY
+Daedalus (F2 Room) - DIMS
+Daedalus (F2 Room) - GRAVE
+Daedalus (F2 Room) - LETHAL
+Daedalus (O2 Room) - ACCEPT
+Daedalus (O2 Room) - FOLLOW
+Daedalus (O2 Room) - PLEDGE
+Daedalus (O2 Room) - WARNING
+Daedalus (U2 Room) - EFFECTIVE
+Daedalus (U2 Room) - HELPFUL
+Daedalus (U2 Room) - INFERNAL
+Daedalus (U2 Room) - PRACTICAL
+Daedalus (U2 Room) - PRODUCTIVE
+Daedalus (U2 Room) - WONDERLAND
+The Digital - EYE
+The Digital - HIGH
@@ -1,5 +1,3 @@
-# TODO
-# daedalus/roof -> icarus
 connections {
   from {
     port {
@@ -20,7 +18,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Flipped Second Room"
+      room: "Four Rooms Entrance"
       name: "FOUR"
     }
   }
@@ -141,7 +139,7 @@ connections {
   to {
     port {
       map: "the_darkroom"
-      room: "First Room"
+      room: "Cyan Hallway"
       name: "COLORFUL"
     }
   }
@@ -157,7 +155,7 @@ connections {
   to {
     port {
       map: "the_darkroom"
-      room: "Second Room"
+      room: "Congruent Entrance"
       name: "CONGRUENT"
     }
   }
@@ -233,7 +231,7 @@ connections {
   from {
     port {
       map: "the_darkroom"
-      room: "First Room"
+      room: "Double Sided Entrance"
       name: "DOUBLESIDED"
     }
   }
@@ -308,6 +306,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 +633,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Link Area"
+      room: "Liberated Entrance"
       name: "BLUE"
     }
   }
@@ -666,7 +681,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Link Area"
+      room: "Literate Entrance"
       name: "BROWN"
     }
   }
@@ -714,7 +729,7 @@ connections {
   from {
     port {
       map: "the_orb"
-      room: "B Room"
+      room: "Middle Room"
       name: "MID"
     }
   }
@@ -841,6 +856,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 +873,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 +961,7 @@ connections {
   from {
     port {
       map: "the_entry"
-      room: "Lime Room"
+      room: "Revitalized Entrance"
       name: "REVITALIZED"
     }
   }
@@ -1435,7 +1471,6 @@ connections {
       name: "GREAT"
     }
   }
-  door { map: "the_great" name: "Daedalus Entrance" }
   oneway: true
 }
 connections {
@@ -1454,6 +1489,7 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
@@ -1526,6 +1562,23 @@ connections {
     painting {
       map: "the_sturdy"
       room: "S2 Area"
+      name: "RAINBOW2"
+    }
+  }
+  to {
+    painting {
+      map: "daedalus"
+      room: "Rainbow Start"
+      name: "RAINBOW"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      map: "the_sturdy"
+      room: "Hidden Rainbow"
       name: "RAINBOW"
     }
   }
@@ -1749,12 +1802,13 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
     port {
       map: "the_bearer"
-      room: "Back Area"
+      room: "Tree Entrance"
       name: "TREE"
     }
   }
@@ -1831,7 +1885,6 @@ connections {
   }
 }
 connections {
-  # Two one-way connections because the door only blocks one direction.
   from {
     port {
       map: "the_great"
@@ -1848,6 +1901,7 @@ connections {
   }
 }
 connections {
+  # Two one-way connections because the door only blocks one direction.
   from {
     port {
       map: "the_unkempt"
@@ -1880,6 +1934,7 @@ connections {
     }
   }
   oneway: true
+  bypass_target_door: true
 }
 connections {
   from {
@@ -2405,3 +2460,281 @@ 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
+}
+connections {
+  from {
+    room {
+      map: "daedalus"
+      name: "Roof"
+    }
+  }
+  to {
+    port {
+      map: "icarus"
+      room: "Welcome Spine (Obverse)"
+      name: "WORLDPORT"
+    }
+  }
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "icely"
+    }
+  }
+  to {
+    room {
+      map: "the_advanced"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_advanced"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "souvey"
+    }
+  }
+  to {
+    room {
+      map: "the_charismatic"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_charismatic"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "q"
+    }
+  }
+  to {
+    room {
+      map: "the_crystalline"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_crystalline"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  # Possibly the most cursed connection in the entire game.
+  from {
+    room {
+      map: "the_crystalline"
+      name: "Flip Area"
+    }
+  }
+  to {
+    room {
+      map: "icarus"
+      name: "Welcome Spine (Obverse)"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "hatkirby"
+    }
+  }
+  to {
+    room {
+      map: "the_stellar"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "kirby"
+    }
+  }
+  to {
+    room {
+      map: "the_stellar"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "star"
+    }
+  }
+  to {
+    room {
+      map: "the_stellar"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_stellar"
+      room: "Starting Room"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "gongus"
+    }
+  }
+  to {
+    room {
+      map: "the_fuzzy"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "kiwi"
+    }
+  }
+  to {
+    room {
+      map: "the_fuzzy"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_fuzzy"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
@@ -1,6 +1,9 @@
 door_groups {
   name: "The Entry - Repetitive Entrance"
-  type: CONNECTOR
+  # 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"
@@ -107,6 +110,10 @@ door_groups {
   }
   doors {
     map: "the_entry"
+    name: "Gift Maps Entrance"
+  }
+  doors {
+    map: "the_entry"
     name: "Near D Room Painting"
   }
   doors {
@@ -122,6 +129,10 @@ door_groups {
     name: "Cyan Doors"
   }
   doors {
+    map: "the_owl"
+    name: "Double Letters"
+  }
+  doors {
     map: "the_parthenon"
     name: "Double Letters"
   }
@@ -4,15 +4,21 @@ maps:
       Between Entrance:
         panels:
           RIGHT: 2721
+        ports:
+          BETWEEN: 3106
       Desert Room:
         panels:
           LESS: 2722
       Entry:
         panels:
           HELLO: 2724
+        ports:
+          GREAT: 3108
       Entry Entrance:
         panels:
           ENTRY: 2723
+        ports:
+          ENTRY: 3107
       Hide Room:
         panels:
           HIDE: 2725
@@ -25,13 +31,23 @@ maps:
           2: 2761
           3: 2762
           4: 2763
+        ports:
+          LEFT: 3110
+          RIGHT: 3109
       Partial Entrance:
         panels:
           PARTIAL: 2729
+        ports:
+          PARTIAL: 3111
       Perceptive Entrance:
         panels:
           COLORS: 2731
           PART: 2730
+        ports:
+          PERCEPTIVE: 3112
+      Repetitive Entrance:
+        ports:
+          REPETITIVE: 3113
       Shop Entrance:
         panels:
           HOPS: 2732
@@ -41,9 +57,13 @@ maps:
       Tenacious Entrance:
         panels:
           HERO: 2734
+        ports:
+          TENACIOUS: 3114
       Unkempt Entrance:
         panels:
           RETURN: 2735
+        ports:
+          UNKEMPT: 3115
       Unyielding Entrance:
         panels:
           FORTH: 2736
@@ -53,7 +73,12 @@ maps:
       Between Door: 2716
       Desert Door: 2717
       Front Door: 2709
+      Hidden Door: 2840
+      Letters Panel: 3285
+      Near Perceptive Panel: 3284
       Partial Door: 2713
+      Perceptive From Inside: 2842
+      Perceptive From Outside: 2841
       Repetitive Entrance: 2714
       Shop Door: 2718
       Stormy Entrance: 2710
@@ -245,6 +270,8 @@ maps:
           TICKETBORNE: 1737
           TWOGOTHIM: 1735
           UNDERPANTS: 1732
+        ports:
+          ENTRY: 3116
       Computer Room:
         panels:
           KEYBOARD (1): 1746
@@ -295,6 +322,8 @@ maps:
       Entry Shortcut:
         panels:
           WELCOME: 1776
+        ports:
+          ENTRY: 3117
       Eye Painting:
         panels:
           REVILED: 1777
@@ -484,6 +513,9 @@ maps:
       Maze Paintings Area:
         panels:
           Paintings: 1929
+      Moat:
+        ports:
+          HIVE: 3118
       North Castle Area:
         panels:
           A: 1930
@@ -548,6 +580,8 @@ maps:
           PETAL: 1976
           PLUM (1): 1971
           PLUM (2): 1972
+        ports:
+          REVITALIZED: 3119
       Outside Hotel:
         panels:
           COLORFUL: 1977
@@ -627,6 +661,9 @@ maps:
           PHARAOH: 2021
           SHEET: 2020
           STRAW: 2024
+      Purple Hallway From Great:
+        ports:
+          GREAT: 3120
       Purple NW Vestibule:
         panels:
           LOSE: 2029
@@ -693,9 +730,13 @@ maps:
       Quiet Entrance:
         panels:
           HIDDEN: 2064
+        ports:
+          QUIET: 3121
       Rain Side:
         panels:
           "?": 2065
+        ports:
+          BEARER: 3122
       Rainbow Blue:
         panels:
           THEME: 2066
@@ -748,7 +789,7 @@ maps:
           Back (2): 2090
           Colors: 2097
           FIR: 2095
-          Left: 2088
+          Near Obscured Puzzles: 2088
           OAK: 2093
           PINE: 2094
           WALK BACK: 2091
@@ -798,6 +839,8 @@ maps:
       Starting Room:
         panels:
           ENTRANCE: 2127
+        ports:
+          GREAT: 3123
       Sweet Foyer:
         panels:
           EQUAL: 2129
@@ -806,6 +849,9 @@ maps:
           RENT (2): 2132
           RENT (3): 2133
           RENT (4): 2131
+        ports:
+          SWEET1: 3124
+          SWEET2: 3125
       Tree Entrance:
         panels:
           DIFFERENCE: 2135
@@ -814,6 +860,8 @@ maps:
           RAT: 2134
           SUNDER: 2139
           WHERE: 2138
+        ports:
+          TREE: 3126
       U2 Room:
         panels:
           CHAOS: 2147
@@ -832,6 +880,9 @@ maps:
           TROUBLE: 2148
           WICKED: 2142
           WONDERLAND: 2156
+      Unkempt Entrance:
+        ports:
+          UNKEMPT: 3127
       Welcome Back Area:
         panels:
           FAREWELL LITTLE LAMB: 2157
@@ -881,6 +932,9 @@ maps:
           CUT: 2194
           MISSING: 2192
           STONES: 2195
+      White Hallway From Entry:
+        ports:
+          ENTRY: 3128
       Wisdom Panel:
         panels:
           INTELLIGENCE: 2198
@@ -891,6 +945,8 @@ maps:
           ARTS: 2202
           SONG: 2203
           UNDER: 2200
+        ports:
+          WONDROUS: 3129
       Yellow Color Backside:
         panels:
           BRASS: 2206
@@ -902,6 +958,8 @@ maps:
           Paintings: 2210
           SPIN: 2209
           SUN: 2208
+        ports:
+          FOURROOMS: 3130
       Yellow Room:
         panels:
           COLOR: 2217
@@ -971,6 +1029,7 @@ maps:
     doors:
       Amber East Doors: 1511
       Amber North Door: 1510
+      Amber Room Panels: 3289
       Amber South Door: 1509
       Bee Room Back Door: 1523
       Bee Room Entrance: 1521
@@ -987,7 +1046,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
@@ -1014,14 +1072,17 @@ maps:
       Dark Light Room Entrance: 1569
       Dark Light Room Exit: 1570
       Dark Light Room Exit Panel: 1571
+      Direction Panels: 3297
       Entry Shortcut Secret Exit: 1437
+      Equality Panels: 3292
       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
+      Farewell Little Lamb Panels: 3302
       Flip Painting Blocker: 1552
       Globe Room East Door: 1589
       Globe Room South Door: 1591
@@ -1044,6 +1105,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
@@ -1051,12 +1113,16 @@ maps:
       Maze North Door: 1502
       Maze South Door: 1503
       Near Flip Painting Door: 1474
+      Near H Keyholder Panel: 3299
       Near Pyramid Gate: 1447
       Near Sweet Blue Door: 1573
       Near Sweet Brown Door: 1561
       Near Yellow Room Door: 1565
       North Castle Panel: 2742
-      O2 Room Back Door: 1485
+      Nursery Panels: 3298
+      O2 Room Northeast Door: 1485
+      O2 Room Southeast Door: 1478
+      Orange Panels: 3293
       Orange Rainbow Panel: 2267
       Orange Rainbow Room: 1535
       Orange Room: 1507
@@ -1071,6 +1137,7 @@ maps:
       Pink Hallway: 1555
       Planet Room Divider: 1513
       Planet Room Secret Door: 1578
+      Plum Panels: 3300
       Plum Room Entrance: 1576
       Plum Room Exit: 1577
       Pumpkin Door: 1583
@@ -1095,6 +1162,7 @@ maps:
       Purple West Area West Door: 1466
       Pyramid Entrance: 1505
       Rain Side Panel: 1546
+      Rainbow Color Backside Panels: 3286
       Rainbow Rooms Entrance: 1533
       Red Rainbow Panel: 2266
       Red Rainbow Room: 1534
@@ -1102,6 +1170,7 @@ maps:
       Red Room Entrance: 1562
       Red Smiley: 1554
       Red Smiley Entrance: 1553
+      Rent Panels: 3291
       Roof Access: 1528
       Salt Room Entrance: 1532
       Seasoning Doors: 1544
@@ -1110,8 +1179,9 @@ maps:
       South Castle Area Entrance: 1575
       South Castle Panel: 2744
       Southwest Area Intersection: 1475
-      Splintering Exit Left Door: 1449
-      Splintering Exit Right Door: 1450
+      Splintering Area Panels: 3287
+      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
@@ -1123,21 +1193,28 @@ maps:
       Starting Room West Wall North Door: 1438
       Starting Room West Wall South Door: 1433
       Sticks And Stones Door: 1593
+      Teal Panel: 3296
       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
+      Tree Panels: 3295
+      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
+      West Spire Panel: 3294
+      West Sticks And Stones Panel: 3288
       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 Roof Puzzles: 3290
       Yellow Room: 1568
       Yellow Room Entrance: 1567
+      Yellow Smiley Annex Panels: 3301
       Yellow Smiley Door: 1548
       Z2 Room Back Exit: 1451
       Z2 Room Northeast Door: 1454
@@ -1151,6 +1228,84 @@ maps:
       Zoo Prize Door: 1599
       Zoo South Entrance: 1596
       Zoo West Entrance: 1594
+  demo:
+    rooms:
+      Backside Area:
+        panels:
+          BACKSIDE: 3049
+          DOORWAYS: 3050
+          ENDS (2): 3052
+          SEE: 3051
+      Castle:
+        panels:
+          G: 3054
+          SERIES: 3053
+      Center Building:
+        panels:
+          FUZZIES: 3056
+          WORLD: 3055
+      Flower Hallway:
+        panels:
+          LACES: 3057
+      Main Area:
+        panels:
+          A: 3089
+          AGES: 3063
+          ANY: 3071
+          ART: 3059
+          Blank: 3095
+          C: 3088
+          CASTS: 3086
+          CLOCKWISE: 3067
+          COLORFUL: 3061
+          COUNTER: 3070
+          DAZES: 3084
+          DEN: 3064
+          DISCOVER: 3096
+          E (1): 3091
+          E (2): 3093
+          END: 3079
+          FAMILY: 3097
+          GAZES: 3085
+          HAZES: 3083
+          HI: 3058
+          HID: 3065
+          MESS: 3066
+          MIND: 3078
+          N: 3092
+          PACES: 3069
+          POSSIBLE: 3068
+          R: 3094
+          RAD: 3080
+          RODS: 3072
+          S: 3087
+          SECRETIVE: 3075
+          STALK: 3082
+          TALK: 3074
+          TEES: 3060
+          TOADS: 3076
+          TON: 3077
+          TOO: 3081
+          TWO: 3073
+          V: 3090
+          WORD: 3062
+      Mastery:
+        masteries:
+          MASTERY: 3098
+      Tower:
+        panels:
+          ENDS (1): 3099
+    doors:
+      Castle: 3046
+      Center Building: 3039
+      Center Building Panels: 3041
+      Flower Hallway: 3040
+      Gold Door: 3048
+      Orange Door: 3042
+      Purple Door: 3043
+      Red Door: 3045
+      Scavenger Hunt: 3047
+      Yellow Door: 3044
   four_rooms:
     rooms:
       Examples Room:
@@ -1163,6 +1318,8 @@ maps:
           SONNET: 12
           SUPERLATIVE: 11
           URN: 13
+        ports:
+          DAEDALUS: 3131
       Hallway:
         panels:
           HUNCHBACK: 16
@@ -1177,6 +1334,8 @@ maps:
           SWAY: 24
           TERROR: 20
           TURN: 22
+        ports:
+          IMPRESSIVE: 3132
       Keyholder Room:
         keyholders:
           A: 2773
@@ -1190,6 +1349,8 @@ maps:
           SERIOUS: 31
           SURPASS: 29
           VERSE: 30
+        ports:
+          ENTRY: 3133
       Time Room:
         panels:
           BROODING: 33
@@ -1200,6 +1361,8 @@ maps:
           RHYTHM: 40
           SUSPENSE: 36
           WRITING: 38
+        ports:
+          OWL: 3134
     doors:
       A2 Door: 4
       Examples Door: 1
@@ -1207,6 +1370,179 @@ maps:
       Keyholder Door: 5
       Synonyms Door: 2
       Time Door: 3
+  icarus:
+    rooms:
+      Above Trans Rights:
+        panels:
+          ANT: 2877
+      Big U:
+        panels:
+          COLONY: 2879
+          DECK: 2878
+          MANOR: 2880
+      Fatherland:
+        panels:
+          FATHERLAND: 2881
+      Highest Point:
+        panels:
+          DIAGNOSIS: 2882
+          QUEEN: 2883
+      Mastery:
+        masteries:
+          MASTERY: 2994
+      Maze:
+        panels:
+          ANALYSIS: 2887
+          BOOKS: 2890
+          KING (1): 2886
+          MANSLAUGHTER: 2888
+          MEDIUMS: 2889
+      Maze Back:
+        panels:
+          THESE: 2884
+      Maze King Panel:
+        panels:
+          KING (2): 2885
+      Mini Icarus 2:
+        panels:
+          ANIMALS: 2893
+          ARROWS: 2894
+          BATTERY: 2891
+          SQUAD: 2895
+          TROUPE: 2892
+      Pillar Ramp:
+        panels:
+          ASTEROID: 2896
+          BUNCH: 2897
+          DRONE: 2900
+          PATRICIDE: 2899
+          PEA (1): 2901
+          PRINCES: 2898
+      Spiral Ramp:
+        panels:
+          FIREMAN: 2902
+      The Orb:
+        panels:
+          ADDERS: 2903
+          AXIS: 2913
+          BASIS (2): 2912
+          CLUTCH (1): 2911
+          CLUTCH (2): 2918
+          DEADLINE: 2908
+          DISCUS: 2916
+          FISH: 2907
+          HISS: 2915
+          NEEDLE: 2905
+          PEA (2): 2909
+          PUPPY: 2904
+          SON: 2917
+          STRAIGHT: 2914
+          THESIS: 2910
+          US: 2906
+      Through Woman (Obverse):
+        panels:
+          COW: 2920
+          HUMAN (2): 2919
+      Through Woman (Reverse):
+        panels:
+          BASIS (1): 2922
+          PRINCE: 2921
+      Trans Rights:
+        panels:
+          SERVANT (1): 2926
+          SERVANT (2): 2927
+      Trans Rights Panels:
+        panels:
+          AGENDER: 2923
+          HUMAN (3): 2924
+          HUMAN (4): 2925
+      Welcome Spine (Obverse):
+        panels:
+          FISHWIFE: 2928
+          HUMAN (1): 2929
+        ports:
+          WORLDPORT: 3135
+      Welcome Spine (Reverse):
+        panels:
+          FATHER: 2930
+          SISTER: 2932
+          TERMITE: 2931
+    doors:
+      Agender Door: 2846
+      Animals Door: 2866
+      Ant Door: 2855
+      Arrows Door: 2865
+      Asteroid Bunch Door: 2852
+      Battery Door: 2863
+      Cow Door: 2853
+      Fatherland Door: 2860
+      Man Door: 2856
+      Mediums Door: 2850
+      Murder Panels: 2871
+      Near Fireman Wings Painting: 2876
+      Orb Panels: 2875
+      Patricide Door: 2873
+      Pea Door: 2848
+      Quick Travel 1: 2851
+      Quick Travel 10: 2862
+      Quick Travel 2: 2857
+      Quick Travel 3: 2847
+      Quick Travel 4: 2858
+      Quick Travel 5: 2854
+      Quick Travel 6: 2870
+      Quick Travel 7: 2849
+      Quick Travel 8: 2861
+      Quick Travel 9: 2864
+      Reversed Arrows Door: 2868
+      Sun Painting To Drone: 2872
+      Termite Door: 2869
+      These Door: 2874
+      Troupe Door: 2867
+      Woman Door: 2859
+  the_advanced:
+    rooms:
+      CBA:
+        panels:
+          CBA (1): 2938
+          CBA (2): 2939
+          CBA (3): 2940
+      Main Area:
+        panels:
+          BIRD: 2955
+          Blank (1): 2964
+          Blank (2): 2965
+          Blank (3): 2966
+          Blank (4): 2967
+          Blank (5): 2968
+          DAIRY (1): 2946
+          DAIRY (2): 2947
+          DAIRY SAUCE: 2948
+          DECK (1): 2961
+          DECK (2): 2962
+          DECK (3): 2963
+          FRUIT (1): 2952
+          FRUIT (2): 2953
+          FRUIT FRUIT: 2954
+          GULLIBLE (1): 2949
+          GULLIBLE (2): 2950
+          GULLIBLE (3): 2951
+          I: 2942
+          LIVES: 2945
+          OBSERVE: 2941
+          ORDER (1): 2958
+          ORDER (2): 2959
+          ORDER (3): 2960
+          ORGANIZATION: 2957
+          REST: 2943
+          THE: 2944
+          UNBOTTLING: 2956
+        ports:
+          WORLDPORT: 3136
+      Mastery:
+        masteries:
+          MASTERY: 2969
+    doors:
+      Side Room Puzzles: 2934
   the_ancient:
     rooms:
       Inside:
@@ -1223,6 +1559,8 @@ maps:
       Back Area:
         panels:
           COLOR: 51
+        ports:
+          DAEDALUS: 3137
       Blue Animal (View):
         panels:
           HALF: 52
@@ -1249,6 +1587,8 @@ maps:
           SQUISH: 60
           TOAD: 64
           VIEW: 58
+        ports:
+          UNYIELDING: 3138
       Green Planet (View):
         panels:
           SOIL: 66
@@ -1285,6 +1625,9 @@ maps:
       Red Vegetable:
         panels:
           CARD: 78
+      Tree Entrance:
+        ports:
+          TREE: 3139
       Yellow Planet:
         panels:
           ZEUS: 79
@@ -1293,7 +1636,9 @@ maps:
           CAKE: 80
     doors:
       Butterfly Entrance: 50
+      Butterfly Room Panels: 3304
       Control Center Brown Door: 49
+      Control Center Color Panel: 3303
       Exit Door: 47
       Overlook Door: 46
   the_between:
@@ -1301,6 +1646,9 @@ maps:
       Control Center Side:
         panels:
           RIGHT: 93
+        ports:
+          CC: 3140
+          LIVELY: 3141
       Main Area:
         panels:
           CAUGHT: 107
@@ -1331,6 +1679,11 @@ maps:
           SUN KOI: 102
           THINK: 119
           YOU: 115
+        ports:
+          GREAT: 3142
+      Plaza Entrance:
+        ports:
+          PLAZA: 3143
     doors:
       B2 Door: 91
       Blue Puzzles: 88
@@ -1365,9 +1718,48 @@ maps:
           SPECIES: 122
           STRUCTURE: 129
           TEXT: 136
+        ports:
+          GALLERY: 3144
       Mastery:
         masteries:
           MASTERY: 140
+  the_charismatic:
+    rooms:
+      Latitude Middle:
+        panels:
+          FUNNY: 2972
+      Latitude North:
+        panels:
+          DEPENDABLE: 2973
+      Latitude South:
+        panels:
+          CHARISMA: 2974
+      Longitude East:
+        panels:
+          FUN: 2975
+      Longitude Middle:
+        panels:
+          INTELLIGENT: 2976
+      Longitude West:
+        panels:
+          CREATIVE: 2977
+      Main Area:
+        panels:
+          AQUA: 2981
+          ARC: 2978
+          Blank: 2987
+          HERE: 2984
+          IT: 2985
+          KING: 2979
+          NAIL: 2983
+          PINS: 2986
+          TILE: 2982
+          TIP: 2980
+        ports:
+          WORLDPORT: 3145
+      Mastery:
+        masteries:
+          MASTERY: 2988
   the_colorful:
     rooms:
       Black Room:
@@ -1384,6 +1776,9 @@ maps:
           CHAOS: 159
           KOI: 157
           WISH: 158
+        ports:
+          DARKROOM: 3147
+          STURDY: 3146
       Cyan Room:
         panels:
           BROTHER: 160
@@ -1408,6 +1803,8 @@ maps:
       White Room:
         panels:
           BRIGHT: 170
+        ports:
+          GREAT: 3148
       Window Room:
         panels:
           FADING: 171
@@ -1418,6 +1815,7 @@ maps:
       Black Door: 142
       Blue Door: 144
       Brown Door: 151
+      Chaos Panel: 3305
       Cyan Door: 149
       Gray Door: 153
       Green Door: 145
@@ -1466,6 +1864,8 @@ maps:
           LIGHT: 209
           LOVES: 210
           RANGER: 211
+        ports:
+          DARKROOM: 3149
       Obverse Yellow Room:
         panels:
           CIVIL: 216
@@ -1480,12 +1880,39 @@ maps:
       Flipped Yellow Door: 175
       G Keyholder Blocker: 181
       G2 Door: 182
+      Main Area Puzzles: 3306
       Near C Keyholder Puzzles: 180
       Obverse Magenta Door: 173
       Obverse Yellow Door: 178
       Obverse Yellow Puzzles: 179
+  the_crystalline:
+    rooms:
+      Flip Area:
+        panels:
+          SUCCEED: 2989
+      Main Area:
+        panels:
+          DROP: 2991
+          LEAP: 2990
+          SPIN: 2992
+        ports:
+          WORLDPORT: 3150
+      Mastery:
+        masteries:
+          MASTERY: 2993
+    doors:
+      Checkpoint Panels: 3307
   the_darkroom:
     rooms:
+      Congruent Entrance:
+        ports:
+          CONGRUENT: 3151
+      Cyan Hallway:
+        ports:
+          COLORFUL: 3152
+      Double Sided Entrance:
+        ports:
+          DOUBLESIDED: 3153
       First Room:
         panels:
           BISON: 225
@@ -1493,6 +1920,11 @@ maps:
           KOI: 228
           SHEEP: 227
           TUNA: 229
+        ports:
+          ENTRY: 3155
+      First Room Exit:
+        ports:
+          NEXT: 3154
       Second Room:
         panels:
           BISON: 231
@@ -1500,6 +1932,11 @@ maps:
           KOI: 234
           SHEEP: 233
           TUNA: 235
+        ports:
+          ENTRY: 3157
+      Second Room Exit:
+        ports:
+          NEXT: 3156
       Third Room:
         panels:
           COINS: 238
@@ -1511,6 +1948,8 @@ maps:
           LOCKS: 242
           TOUCHES: 243
           TURNS: 237
+        ports:
+          ENTRY: 3158
     doors:
       Colorful Entrance: 222
       Congruent Entrance: 223
@@ -1530,17 +1969,30 @@ maps:
           INN: 254
           OUT: 257
           YOU: 255
+      Gallery Maze:
+        ports:
+          GALLERY: 3159
       Main Area:
         panels:
           COLOR: 261
           HIT: 258
           PAINTING: 260
           TIN: 259
+        ports:
+          ENTRY1: 3160
+          ENTRY2: 3161
+          ENTRY3: 3162
       Tree Area:
         panels:
           TREE: 262
+        ports:
+          TREE: 3163
+      Unyielding Entrance:
+        ports:
+          UNYIELDING: 3164
     doors:
       Control Center Blue Door: 246
+      Control Center Blue Panel: 3308
       Gallery Entrance: 245
       Tree Entrance: 247
   the_door:
@@ -1604,6 +2056,12 @@ maps:
         panels:
           ATTIC: 285
           FULL: 286
+        ports:
+          DARKROOM: 3165
+    doors:
+      10 Panels: 3310
+      15 Panels: 3311
+      5 Panels: 3309
   the_entry:
     rooms:
       Blue Alcove:
@@ -1613,6 +2071,9 @@ maps:
       Colored Doors Area:
         panels:
           OPEN: 327
+      Composite Room Entrance:
+        ports:
+          COMPOSITE: 3166
       Ctrl Tutorial:
         panels:
           RIGHT: 328
@@ -1627,16 +2088,23 @@ maps:
           RED: 332
           SPRAY: 336
           SUN: 333
+      Daedalus Entrance:
+        ports:
+          DAEDALUS: 3167
+      Digital Entrance:
+        ports:
+          DIGITAL: 3168
+      Entry Exit:
+        ports:
+          GREAT: 3169
       Eye Room:
         panels:
           I: 339
+        ports:
+          LIONIZED: 3170
       Flipped Link Area:
         panels:
           WANDER: 340
-      Flipped Pyramid Area:
-        panels:
-          TURN (1): 341
-          TURN (2): 342
       Flipped Right Eye:
         panels:
           HERE: 344
@@ -1645,9 +2113,14 @@ maps:
         panels:
           CLUE: 345
           SLENDER: 346
+      Four Rooms Entrance:
+        ports:
+          FOUR: 3171
       Gallery Return:
         panels:
           RETURN: 347
+        ports:
+          GALLERY: 3172
       Least Blue Last:
         panels:
           AIL: 356
@@ -1660,6 +2133,14 @@ maps:
           STEALER: 352
           TRUST: 354
           WANT: 351
+        ports:
+          DARKROOM: 3173
+      Liberated Entrance:
+        ports:
+          BLUE: 3174
+      Liberated Entrance Panel:
+        panels:
+          TURN (1): 341
       Lime Room:
         panels:
           COLOR: 361
@@ -1668,12 +2149,22 @@ maps:
       Link Area:
         panels:
           WANDER: 362
+      Literate Entrance:
+        ports:
+          BROWN: 3175
+      Literate Entrance Panel:
+        panels:
+          TURN (2): 342
       Parthenon Return:
         panels:
           RETURN: 363
+        ports:
+          PARTHENON: 3176
       Rabbit Hole:
         panels:
-          PUZZLE: 364
+          Blank: 364
+        ports:
+          HOLE: 3177
       Rabbit Hole Lock:
         panels:
           HOLE: 2749
@@ -1691,6 +2182,12 @@ maps:
           RAIN WOMAN: 373
           WANDER: 370
           WOMAN: 372
+      Repetitive Entrance:
+        ports:
+          REPETITIVE: 3178
+      Revitalized Entrance:
+        ports:
+          REVITALIZED: 3179
       Right Eye:
         panels:
           EYE: 374
@@ -1699,9 +2196,12 @@ maps:
       Shop Entrance:
         panels:
           TURN: 377
+        ports:
+          SHOP: 3180
       Starting Room:
         panels:
           EYE: 380
+          Gift Maps: 2970
           HI: 378
           HINT: 381
           THAN: 383
@@ -1710,33 +2210,45 @@ maps:
       Trick Room:
         panels:
           INK: 388
+      White Hallway To Daedalus:
+        ports:
+          DAEDALUS: 3181
       Wrath Room:
         panels:
           CORN: 393
           DICE: 392
           WREATH: 391
+      X Area:
+        ports:
+          CC: 3182
     doors:
+      Big Eyes: 3316
       Blue Alcove Entrance: 297
       Blue Alcove Exit: 293
       Colored Doors Area Entrance: 318
       Composite Room Entrance: 309
       Control Center White Door: 307
+      Control Center White Panel: 3318
       Corners Painting: 292
       D Room Entrance: 319
       Daedalus Entrance: 311
       Flip Area Entrance: 310
+      Flipped Right Eye Panels: 3315
       Flipped Second Room Left Door: 300
       Flipped Second Room Right Door: 299
       Gallery Entrance: 321
       L Room Entrance: 322
+      Least Blue Last: 3317
       Liberated Entrance: 314
       Lime Room Entrance: 305
       Link Area Entrance: 288
       Literate Entrance: 316
       Near D Room Painting: 320
       Noon Door: 295
+      Noon Door Panels: 3312
       Orange Door Hider: 304
       Parthenon Entrance: 317
+      Rabbit Hole Blank Puzzle: 3319
       Rabbithole Door: 294
       Red Alcove Exit: 291
       Red Blue Area Left Door: 302
@@ -1745,6 +2257,7 @@ maps:
       Revitalized Entrance: 306
       Right Eye Entrance: 301
       Scarf Door: 296
+      Scarf Door Panels: 3313
       Second Room Left Door: 298
       Second Room Right Door: 290
       Shop Entrance: 313
@@ -1752,6 +2265,8 @@ maps:
       Third Eye Painting: 324
       Trick Door: 287
       Trick To Shop Door: 289
+      Wander Panels: 3314
+      Wrath Room Puzzles: 3320
       X Area Entrance: 308
   the_extravagant:
     rooms:
@@ -1797,6 +2312,33 @@ maps:
         panels:
           CACTUS: 410
           TAIL: 411
+  the_fuzzy:
+    rooms:
+      Main Area:
+        panels:
+          ACHIEVES: 3033
+          BEFORE: 3028
+          BOTH: 3036
+          Blank: 3022
+          CAGED: 3027
+          COMBINED: 3032
+          DICE: 3026
+          FIRST: 3035
+          FORGED: 3030
+          LOTTO: 3024
+          OTHERS: 3031
+          TOED: 3029
+          TUTU: 3023
+          UNVEILED: 3034
+          WHERETO: 3025
+        ports:
+          WORLDPORT: 3183
+      Mastery:
+        masteries:
+          MASTERY: 3037
+    doors:
+      Black Panels: 3021
+      Green Panels: 3321
   the_gallery:
     rooms:
       Back Room:
@@ -1809,6 +2351,8 @@ maps:
       Main Area:
         keyholders:
           P: 2765
+        ports:
+          ENTRY: 3184
     doors:
       Ancient Painting: 428
       Between Painting: 414
@@ -1834,6 +2378,8 @@ maps:
       The Whole Thing:
         panels:
           PANEL: 434
+    doors:
+      The Panel: 3322
   the_graveyard:
     rooms:
       Inside:
@@ -1843,34 +2389,34 @@ maps:
         panels:
           FOOT: 436
           SEVERE: 437
+    doors:
+      Remember Panel: 3323
   the_great:
     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
+        ports:
+          THREEDOORS: 3186
+          TOWER: 3187
+          TREE: 3188
+          UNKEMPT: 3185
       Behind Question Area:
         panels:
           DEW: 488
           NO: 490
           YEW: 489
+      Colorful Entrance:
+        ports:
+          COLORFUL: 3189
       Daedalus Entrance:
         panels:
           MISSING: 491
+        ports:
+          DAEDALUS: 3190
       East Landscape:
         panels:
           COLOR: 492
@@ -1878,6 +2424,8 @@ maps:
       Hive Entrance:
         panels:
           LOST: 495
+        ports:
+          HIVE: 3191
       Jail Part 1:
         panels:
           DECATHLON: 506
@@ -1902,6 +2450,9 @@ maps:
           NECROTIZE (2): 511
           PILGRIM: 513
           TORMENTS: 512
+      Jubilant Entrance:
+        ports:
+          JUBILANT: 3192
       Magnet Room:
         panels:
           AIRPLANE: 516
@@ -1938,6 +2489,12 @@ maps:
           SMILE: 539
           WHY: 540
           YOU: 537
+        ports:
+          DIGITAL: 3197
+          ENTRY: 3193
+          KEEN: 3194
+          LINEAR: 3196
+          ORB: 3195
       Maze Center:
         panels:
           CHASE: 549
@@ -1995,6 +2552,8 @@ maps:
           WEATHER: 568
         keyholders:
           X: 2770
+        ports:
+          INVISIBLE: 3198
       Outside Jail:
         panels:
           GUT: 575
@@ -2008,6 +2567,9 @@ maps:
           FOUR: 581
           HAVE: 580
           TEN: 583
+      Purple Room:
+        ports:
+          DAEDALUS: 3199
       Question Room How:
         panels:
           QUESTION: 584
@@ -2020,6 +2582,26 @@ maps:
       Question Room Who:
         panels:
           QUESTION: 587
+      Salmon Room:
+        ports:
+          BETWEEN: 3200
+      Talented Entrance:
+        ports:
+          TALENTED: 3201
+      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
@@ -2032,6 +2614,10 @@ maps:
           RIGHT: 591
           SAVORY: 592
           TEACH: 590
+        ports:
+          CC: 3203
+          IMPRESSIVE: 3202
+          PARTIAL: 3204
       Whole Room:
         panels:
           BATHROOM: 604
@@ -2067,13 +2653,19 @@ maps:
           SHIFT: 624
     doors:
       Back Area Entrance: 439
+      Behind Orb Panel: 3336
+      Behind Question Room Panels: 3332
       Between Entrance: 440
       Big Y: 462
+      Broken Shed Panels: 3333
       Building Building Gravestone: 468
       Colorful Entrance: 455
       Control Center Gray Door: 446
+      Control Center Gray Panel: 3326
       Control Center Purple Door: 445
+      Control Center Purple Panel: 3327
       Control Center Red Door: 447
+      Control Center Red Panel: 3328
       Courtyard Entrance: 442
       Courtyard Side Door: 461
       Daedalus Entrance: 448
@@ -2084,8 +2676,11 @@ maps:
       Invisible Entrance: 465
       Jail Entrance: 451
       Magnet Room Entrance: 449
+      Mistreat Panel: 3329
+      Nature Panels: 3334
       Nature Room Door: 466
       Nature Room Panels: 467
+      Near Linear Panels: 3324
       Near UC Painting Door: 441
       North Landscape Entrance: 456
       Pillar Room Entrance: 450
@@ -2094,11 +2689,21 @@ maps:
       Savory Painting: 452
       Spiral Painting: 471
       Talented Entrance: 463
+      Teal Panel: 3335
       The Landscapes Gravestone: 458
       The Maze Gravestone: 460
       Tower Entrance: 459
+      Tower Panels: 3330
+      Tree Panels: 3331
       West/East Divider: 443
+      Why Is It Not Red: 3325
       Zero Room Panels: 470
+  the_hinterlands:
+    rooms:
+      Main Area:
+        ports:
+          LEFT: 3206
+          RIGHT: 3205
   the_hive:
     rooms:
       Main Area:
@@ -2143,6 +2748,11 @@ maps:
           YELL: 636
         keyholders:
           B: 2769
+        ports:
+          DAED1: 3207
+          DAED2: 3208
+          DAED3: 3209
+          GREAT: 3210
       Mastery Room:
         masteries:
           MASTERY: 666
@@ -2161,28 +2771,40 @@ maps:
           LEFT: 676
           RETURN: 674
           TO: 675
+        ports:
+          PLAZA: 3211
       Lobby:
         panels:
           RIGHT: 677
+        ports:
+          GREAT: 3212
       Side Area:
         panels:
           COLOR: 680
+        ports:
+          FOURROOMS: 3213
       WM Room:
         panels:
           LEFT: 682
           RIGHT: 683
     doors:
       Control Center Green Door: 673
+      Control Center Green Panel: 3338
       Front Door: 671
+      Green Eye Panels: 3337
       Side Door: 672
   the_invisible:
     rooms:
       Entrance:
         panels:
           VISIBLE: 685
+        ports:
+          ENTRY: 3214
       Maze:
         masteries:
           MASTERY: 686
+        ports:
+          ENTRY: 3215
     doors:
       Maze Entrance: 684
   the_jubilant:
@@ -2201,6 +2823,8 @@ maps:
           SPRINT: 695
           TREE: 698
           UNFAIR: 694
+        ports:
+          GREAT: 3216
       Side Area:
         panels:
           CALL: 704
@@ -2213,6 +2837,7 @@ maps:
           J: 2772
     doors:
       Side Door: 687
+      Side Room Puzzles: 3339
   the_keen:
     rooms:
       Main Area:
@@ -2226,6 +2851,8 @@ maps:
           TIN (3): 711
           TIN (4): 712
           TIN (5): 713
+        ports:
+          GREAT: 3217
     doors:
       All Panels: 707
   the_liberated:
@@ -2240,6 +2867,8 @@ maps:
           PERSON: 720
           SAND: 723
           WOLF: 725
+        ports:
+          ENTRY: 3218
     doors:
       Door: 718
   the_linear:
@@ -2254,6 +2883,8 @@ maps:
           NOR: 735
           ROT: 731
           TON: 730
+        ports:
+          GREAT: 3219
     doors:
       Behind The Keen Gravestone: 727
   the_lionized:
@@ -2268,6 +2899,8 @@ maps:
           LION: 741
           PIG: 743
           ROCK: 740
+        ports:
+          ENTRY: 3220
   the_literate:
     rooms:
       Puzzle Room:
@@ -2280,6 +2913,8 @@ maps:
           SAND: 750
           STICK: 752
           WATER: 746
+        ports:
+          ENTRY: 3221
     doors:
       Door: 745
   the_lively:
@@ -2294,6 +2929,8 @@ maps:
           ROOSTER: 762
           SON: 759
           SOPRANO: 757
+        ports:
+          BETWEEN: 3222
   the_nuanced:
     rooms:
       Back Room:
@@ -2324,12 +2961,18 @@ maps:
           TORE: 787
         keyholders:
           S: 2767
+        ports:
+          UNYIELDING: 3223
     doors:
-      Left Room Puzzles: 763
+      Blue Side Puzzles: 763
+      Green Side Puzzles: 764
       Main Room Door: 2750
-      Right Room Puzzles: 764
+      Stores Panel: 3340
   the_orb:
     rooms:
+      B Room:
+        ports:
+          FINAL: 3224
       Main Area:
         panels:
           ACT: 799
@@ -2344,6 +2987,11 @@ maps:
           STRIKE: 790
           THICK: 797
           THIN: 793
+        ports:
+          GREAT: 3225
+      Middle Room:
+        ports:
+          MID: 3226
   the_owl:
     rooms:
       Blue Room:
@@ -2371,6 +3019,11 @@ maps:
           SKETCH: 832
           WHITE: 824
           WING: 826
+        ports:
+          FOURROOMS: 3227
+      Magenta Hallway:
+        ports:
+          STURDY: 3228
       R1C4 Left:
         panels:
           STENCIL: 840
@@ -2383,6 +3036,8 @@ maps:
       R2C2 Bottom:
         panels:
           FOUL: 844
+        ports:
+          GALLERY: 3229
       R2C2 Top:
         panels:
           CRUSH: 845
@@ -2400,12 +3055,22 @@ maps:
       Blue Owl: 818
       Brush Door: 804
       Control Center Magenta Door: 812
+      Control Center Magenta Panel: 3343
       First Door: 808
       First Room Shortcut: 807
       Gray Bottom Door: 811
       Gray Owl: 814
       Gray Top Door: 810
+      Near Z1 Panel: 3350
       Orange Owl: 815
+      R1C1 Panels: 3341
+      R1C2 Panels: 3342
+      R1C3 Panels: 3344
+      R1C4 Panels: 3345
+      R2C1 Panels: 3346
+      R2C2 Panels: 3347
+      R2C3 Panels: 3348
+      R2C4 Panels: 3349
       Sky Bottom Doors: 806
       Sky Owl: 813
       Sky Top Doors: 805
@@ -2425,16 +3090,23 @@ maps:
           CLEOPATRA: 859
           NAPOLEON: 860
           XERXES: 857
+        ports:
+          ENTRY: 3231
+          GALLERY: 3230
+          REVITALIZED: 3232
       U Keyholder:
         keyholders:
           U: 2777
     doors:
       K2 Door: 852
+      Lavender Area Puzzles: 3351
   the_partial:
     rooms:
       Control Center Entrance:
         panels:
           RETURN: 867
+        ports:
+          CC: 3233
       Obverse Side:
         panels:
           CUT: 881
@@ -2453,6 +3125,8 @@ maps:
           UP: 870
         keyholders:
           L: 2771
+        ports:
+          GREAT: 3234
       Reverse Side:
         panels:
           BRO: 884
@@ -2462,8 +3136,14 @@ maps:
     doors:
       Control Center Entrance: 865
       F Door: 866
+      L Entered: 2843
       Main Room Puzzles: 863
       P Door: 864
+  the_perceptive:
+    rooms:
+      Main Area:
+        ports:
+          CC: 3235
   the_plaza:
     rooms:
       Bottom Left Room:
@@ -2497,18 +3177,28 @@ maps:
           ASTOUNDING: 919
           COURTYARD: 918
           INFLEXIBLE: 920
+        ports:
+          BETWEEN: 3238
+          IMPRESSIVE: 3237
+          UNYIELDING: 3236
       Mastery:
         masteries:
           MASTERY: 923
       Repetitive Entrance:
         panels:
           TEDIOUS: 924
+        ports:
+          REPETITIVE: 3239
       Sirenic Entrance:
         panels:
           SIREN: 925
+        ports:
+          SIRENIC: 3240
       Symbolic Entrance:
         panels:
           FIGURATIVE: 926
+        ports:
+          SYMBOLIC: 3241
       Top Left Room:
         panels:
           BACKPACK: 939
@@ -2557,17 +3247,21 @@ 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
+      Near Broken Portal Panel: 3355
+      Near Repetitive Panel: 3354
+      Near Sirenic Panel: 3352
+      Near Symbolic Panel: 3353
+      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:
@@ -2588,6 +3282,8 @@ maps:
           RODENT: 972
           RULE: 974
           SOLID: 971
+        ports:
+          DAEDALUS: 3242
     doors:
       Side Door: 970
   the_relentless:
@@ -2644,13 +3340,17 @@ maps:
           HIDE (2): 1021
           MORE: 1022
     doors:
+      Left Only Puzzles: 3020
       Left/Turn Door: 984
+      Shop Only Puzzles: 3019
+      Turn Only Puzzles: 3018
       Turn/Shop Door: 985
   the_repetitive:
     rooms:
       Anti Room:
         panels:
-          EYE: 1041
+          EYE (1): 1041
+          EYE (2): 2813
           HA (1): 1035
           HA (2): 1036
           HA (3): 1037
@@ -2688,6 +3388,9 @@ maps:
           TO (2): 1056
           TUTU (1): 1054
           TUTU (2): 1068
+      Entry Connector:
+        ports:
+          ENTRY: 3243
       Lime Room:
         panels:
           BIRD: 1074
@@ -2740,9 +3443,14 @@ maps:
           MISHMASH: 1114
           QUESTION: 1105
           RICHES: 1112
+        ports:
+          CC: 3244
       Mastery Room:
         masteries:
           MASTERY: 1116
+      Plaza Connector:
+        ports:
+          PLAZA: 3245
       Yellow Room:
         panels:
           3D: 1123
@@ -2757,12 +3465,16 @@ maps:
           W: 1117
           ZEROING: 1118
     doors:
+      Anti-Collectable: 2812
       Anti-Collectable Room: 1025
+      Anti-Collectable Room Panels: 3358
       Black Hallway: 2780
       Cyan Door: 1028
       Cyan Puzzles: 1032
       Dot Area Entrance: 1026
       Entry Entrance: 1023
+      H2 Room Puzzles: 3357
+      Hots Panels: 3356
       Lime Door: 1027
       Lime Puzzles: 1031
       Magenta Door: 1029
@@ -2774,6 +3486,8 @@ maps:
       Bye Room:
         panels:
           BYE: 1129
+        ports:
+          PARTHENON: 3246
       Hidden Room:
         panels:
           HIDDEN: 1130
@@ -2822,9 +3536,12 @@ maps:
           TADPOLES: 1159
         keyholders:
           N: 2779
+        ports:
+          ENTRY: 3247
     doors:
       Books Puzzles: 1136
       Games Puzzles: 1137
+      N Entered: 2971
   the_sirenic:
     rooms:
       Mastery:
@@ -2851,8 +3568,62 @@ maps:
         panels:
           Flipped: 1178
           Obverse: 1179
+        ports:
+          PLAZA: 3248
     doors:
       Entrance: 1161
+  the_stellar:
+    rooms:
+      Blue Panel:
+        panels:
+          BLUE: 2996
+      Connected Area:
+        panels:
+          BEHIND: 3003
+          Blank: 3004
+          GREETINGS: 3002
+          HERE: 2997
+          HI: 3000
+          QUESTION (1): 2999
+          QUESTION (2): 3016
+          START: 3005
+          WHERE: 3001
+      Green Area:
+        panels:
+          STRAYS: 3006
+      Green Panel:
+        panels:
+          GREEN: 3007
+      Hi Room:
+        panels:
+          HI: 3008
+      Mastery:
+        masteries:
+          MASTERY: 3009
+      Old Crossroads:
+        panels:
+          DOORWAY: 3010
+      Orange Panel:
+        panels:
+          ORANGE: 3011
+      Purple Panel:
+        panels:
+          PURPLE: 3012
+      Red Panel:
+        panels:
+          RED: 3013
+      Starting Room:
+        panels:
+          STARLIKE: 3014
+        ports:
+          WORLDPORT: 3249
+      Yellow Panel:
+        panels:
+          YELLOW: 3015
+    doors:
+      Entrance: 2995
+      Question Panels: 3017
+      Welcome Back Panels: 3359
   the_stormy:
     rooms:
       Center:
@@ -2861,6 +3632,8 @@ maps:
           REACTOR: 1180
           VOLCANO: 1181
           WIND: 1183
+        ports:
+          ENTRY: 3250
       Nuclear Side:
         panels:
           GERM: 1184
@@ -2893,6 +3666,9 @@ maps:
           MOVE (6): 1198
           MOVE (7): 1199
           MOVE (8): 1200
+        ports:
+          COLORFUL: 3252
+          OWL: 3251
       S2 Area:
         panels:
           COLORS: 1201
@@ -2901,6 +3677,8 @@ maps:
       Entrance:
         panels:
           SUN: 1212
+        ports:
+          UNKEMPT: 3253
       Mastery:
         masteries:
           MASTERY: 1213
@@ -2947,6 +3725,9 @@ maps:
           SQUISH: 1241
           VEGETABLE: 1232
           WATER: 1226
+        ports:
+          EXIT1: 3254
+          EXIT2: 3255
   the_symbolic:
     rooms:
       Black Room:
@@ -3128,6 +3909,8 @@ maps:
       White Room:
         panels:
           WRITE: 2425
+        ports:
+          PLAZA: 3256
       Yellow Room:
         panels:
           WHOLE: 2426
@@ -3171,9 +3954,12 @@ maps:
           WIFE (Brown): 2447
         keyholders:
           Y: 2764
+        ports:
+          GREAT: 3257
     doors:
       Black Side Panels: 2427
       Brown Side Panels: 2428
+      Keyholder Hint Panel: 3360
       Main Room Door: 2429
   the_tenacious:
     rooms:
@@ -3183,6 +3969,8 @@ maps:
       Control Center Entrance:
         panels:
           ZERO: 2455
+        ports:
+          CC: 3258
       Main Area:
         keyholders:
           K: 2768
@@ -3199,6 +3987,7 @@ maps:
         panels:
           WISDOM: 2459
     doors:
+      K Entered: 2844
       Paintings Door: 2453
   the_three_doors:
     rooms:
@@ -3208,26 +3997,39 @@ maps:
           DOOR: 2461
           END: 2464
           WAYS: 2462
+        ports:
+          BEGIN: 3259
+          BEGIN2: 3260
       First Second Room:
         panels:
           FIRS: 2465
           INITIAL: 2466
           MINUTE (1): 2467
           MINUTE (2): 2468
+        ports:
+          GREAT: 3261
+          TTD: 3262
       Loose Strings Room:
         panels:
           LOOSE: 2469
           STRINGS: 2470
+        ports:
+          BEGIN: 3263
       One Luck Room:
         panels:
           CHANCE: 2472
           LONE: 2471
+        ports:
+          BEGIN: 3264
       Silver Portal Room:
         panels:
           GOLD: 2473
           Left: 2475
           PORT: 2474
           Right: 2476
+        ports:
+          BEGIN: 3265
+          NEXT: 3266
     doors:
       The Three Doors Gravestone: 2460
   the_tower:
@@ -3246,6 +4048,8 @@ maps:
           PROD: 2485
           RIDE: 2484
           WARM: 2486
+        ports:
+          GREAT: 3267
       Tower:
         panels:
           ANNOY (1): 2508
@@ -3309,6 +4113,9 @@ maps:
       Third Floor Puzzles: 2480
   the_tree:
     rooms:
+      Bearer Entrance:
+        ports:
+          BEARER: 3268
       Main Area:
         panels:
           COLOR: 2550
@@ -3341,6 +4148,11 @@ maps:
           WADE: 2562
           WALK (1): 2555
           WALK (2): 2556
+        ports:
+          DAEDALUS: 3272
+          DIGITAL: 3270
+          GREAT: 3271
+          UNKEMPT: 3269
     doors:
       Control Center Brown Door: 2548
       The Tree Gravestone: 2549
@@ -3349,6 +4161,11 @@ maps:
       Control Center Entrance:
         panels:
           RETURN: 2587
+        ports:
+          CC: 3273
+      Daedalus Entrance:
+        ports:
+          DAEDALUS: 3274
       Exit Room 2:
         panels:
           DOOR: 2590
@@ -3392,6 +4209,10 @@ maps:
           ZOO: 2615
         keyholders:
           I: 2775
+        ports:
+          GREAT: 3275
+          SUNTEMPLE: 3277
+          TREE: 3276
       Middle Room:
         panels:
           FELLOW: 2624
@@ -3448,13 +4269,19 @@ maps:
     doors:
       Cog Rhino Hug Rug: 2586
       Control Center Orange Door: 2582
+      Control Center Orange Panel: 3362
+      East Door: 2580
       Honor Our Hint: 2585
+      I Entered: 2845
       Let Untrue Tie: 2583
-      Right Door: 2580
+      Near Teal Door Panels: 3361
       Routine Out Chute: 2584
       W2 Room Door: 2581
   the_unyielding:
     rooms:
+      Bearer Entrance:
+        ports:
+          BEARER: 3278
       Behind Northeast:
         panels:
           FIND: 1260
@@ -3542,6 +4369,8 @@ maps:
       Digital Entrance:
         panels:
           ORANGE: 1326
+        ports:
+          DIGITAL: 3279
       Directions Room:
         panels:
           ABS: 1327
@@ -3623,6 +4452,9 @@ maps:
           RAT: 1380
           SEE: 1377
           TIC: 1379
+      Nuanced Entrance:
+        ports:
+          NUANCED: 3280
       Orange Alcove:
         panels:
           ON: 1386
@@ -3630,6 +4462,8 @@ maps:
         panels:
           GEE: 1387
           SEA: 1388
+        ports:
+          PLAZA: 3281
       Red Eyes:
         panels:
           RED EYES: 1389
@@ -3690,7 +4524,9 @@ maps:
           HEALTH: 1428
     doors:
       Bearer Entrance: 1259
+      Blue D Room Puzzles: 3363
       Brown Alcove: 1255
+      Color Hallway Panels: 3364
       Digital Entrance: 1257
       East Room 1: 2740
       East Room 1 Entrance: 1251
@@ -3740,6 +4576,8 @@ maps:
       Entry:
         panels:
           WONDER: 2690
+        ports:
+          DAEDALUS: 3282
       Huge:
         panels:
           BARK: 2695
@@ -3767,6 +4605,8 @@ maps:
           METAL: 2706
           SPICE: 2708
           TREE: 2705
+        ports:
+          ENTRY: 3283
 letters:
   a1: 596
   a2: 6
@@ -3836,7 +4676,54 @@ endings:
   YELLOW: 1206
 special:
   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
+  Numbers: 3038
+  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:
+  Icarus Quick Travel: 2933
   Progressive Gold Ending: 2753
 door_groups:
   Control Center Blue Doors: 2788
@@ -15,6 +15,8 @@ doors {
 doors {
   name: "Hidden Door"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_12"
   keyholders { room: "Main Area" name: "1" key: "h" }
   keyholders { room: "Main Area" name: "2" key: "i" }
   keyholders { room: "Main Area" name: "3" key: "d" }
@@ -84,25 +86,12 @@ doors {
 doors {
   name: "White Ending Door"
   type: EVENT
-  # This is the only time a door depends on endings. However, it's nice to do it
-  # this way instead of just checking for ending room access because this lets
-  # us use events, which makes the playthrough more readable.
-  endings: "MINT"
-  endings: "ORANGE"
-  endings: "GREEN"
-  endings: "GRAY"
-  endings: "PLUM"
-  endings: "YELLOW"
-  endings: "GOLD"
-  endings: "BLACK"
-  endings: "CYAN"
-  endings: "PURPLE"
-  endings: "RED"
-  endings: "BLUE"
+  white_ending: true
 }
 doors {
   name: "Repetitive Entrance"
   type: STANDARD
+  latch: true
   receivers: "Components/Doors/entry_7"
   keyholders { room: "Main Area" name: "1" key: "m" }
   keyholders { room: "Main Area" name: "2" key: "o" }
@@ -113,20 +102,26 @@ doors {
 }
 doors {
   name: "Perceptive From Outside"
-  type: EVENT
+  type: STANDARD
+  latch: true
+  receivers: "Components/Doors/entry_26"
   keyholders { room: "Main Area" name: "1" key: "p" }
   keyholders { room: "Main Area" name: "2" key: "a" }
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "t" }
+  location_room: "Main Area"
+  location_name: "Keyword PART"
 }
 doors {
   name: "Perceptive From Inside"
-  type: EVENT
+  type: LOCATION_ONLY
   panels { room: "Perceptive Entrance" name: "PART" }
+  location_room: "Perceptive Entrance"
 }
 doors {
   name: "Ancient Entrance"
   type: STANDARD
+  latch: true
   receivers: "Components/Doors/entry_20"
   keyholders { room: "Main Area" name: "1" key: "z" }
   keyholders { room: "Main Area" name: "2" key: "e" }
@@ -170,3 +165,16 @@ doors {
   panels { room: "Unyielding Entrance" name: "SEEK" }
   location_room: "Unyielding Entrance"
 }
+doors {
+  name: "Near Perceptive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Perceptive Entrance" name: "COLORS" }
+  location_room: "Perceptive Entrance"
+  location_name: "COLORS"
+}
+doors {
+  name: "Letters Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "Letters" }
+  location_room: "Main Area"
+}
@@ -1,5 +1,12 @@
 name: "Ancient Entrance"
 ports {
   name: "ANCIENT"
+  display_name: "Ancient Entrance"
   path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
+  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
 }
@@ -49,22 +49,33 @@ keyholders {
 }
 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,8 @@ panels {
 }
 ports {
   name: "PARTIAL"
+  display_name: "Partial Connector"
   path: "Components/Warps/worldport4"
+  destination { x: 21 y: 0 z: -41 }
+  rotation: 270
 }
@@ -16,5 +16,8 @@ panels {
 }
 ports {
   name: "PERCEPTIVE"
+  display_name: "Perceptive Entrance"
   path: "Components/Warps/worldport12"
+  destination { x: -23 y: 0 z: -11 }
+  rotation: 0
 }
@@ -1,5 +1,8 @@
 name: "Repetitive Entrance"
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport14"
+  destination { x: -16 y: 0 z: -17.5 }
+  rotation: 0
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "TENACIOUS"
+  display_name: "Tenacious Connector"
   path: "Components/Warps/worldport13"
+  destination { x: 56 y: 0 z: -38 }
+  rotation: 180
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Unkempt Connector"
   path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
 }
@@ -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
@@ -222,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"
@@ -378,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"
@@ -408,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"
@@ -423,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"
@@ -438,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.
@@ -461,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"
@@ -476,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"
@@ -511,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"
@@ -601,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"
@@ -1857,3 +1862,15 @@ connections {
   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,17 +188,20 @@ doors {
 }
 doors {
   name: "Welcome Back Secret Door"
-  type: ITEM_ONLY
+  type: STANDARD
   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"
+  location_name: "BYE, FAREWELL LITTLE LAMB"
 }
 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 {
@@ -224,12 +227,21 @@ doors {
 }
 doors {
   name: "Starting Room East Wall Center Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Entry/entry_6"
   panels { room: "Rainbow Color Backside" name: "?" }
   location_room: "Rainbow Color Backside"
 }
 doors {
+  name: "Rainbow Color Backside Panels"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Color Backside" name: "?" }
+  panels { room: "Rainbow Color Backside" name: "BACKSIDE" }
+  location_room: "Rainbow Color Backside"
+  location_name: "BACKSIDE, ?"
+}
+doors {
   name: "Starting Room East Wall North Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_7"
@@ -298,8 +310,9 @@ doors {
   location_name: "Black Hex"
 }
 doors {
-  name: "Splintering Exit Left Door"
-  type: STANDARD
+  name: "Splintering Exit North Door"
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Entry/gate_4"
   panels { room: "West Castle Area" name: "EVER" }
   panels { room: "West Castle Area" name: "AXES" }
@@ -308,7 +321,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" }
@@ -317,6 +330,48 @@ doors {
   panels { room: "West Castle Area" name: "SLOT" }
 }
 doors {
+  name: "Splintering Area Panels"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "EVER" }
+  panels { room: "West Castle Area" name: "AXES" }
+  panels { room: "West Castle Area" name: "FLIP (1)" }
+  panels { room: "West Castle Area" name: "SLOT" }
+  panels { room: "West Castle Area" name: "WICKEDLY" }
+  panels { room: "West Castle Area" name: "CATHOLIC" }
+  panels { room: "West Castle Area" name: "SISTERLY" }
+  panels { room: "West Castle Area" name: "SQUEALED" }
+  panels { room: "West Castle Area" name: "READ" }
+  panels { room: "West Castle Area" name: "WORD" }
+  panels { room: "West Castle Area" name: "EACH" }
+  panels { room: "West Castle Area" name: "RANK" }
+  panels { room: "West Castle Area" name: "TEAR" }
+  panels { room: "West Castle Area" name: "SHUT" }
+  panels { room: "West Castle Area" name: "FLIP (2)" }
+  panels { room: "West Castle Area" name: "STUN" }
+  panels { room: "West Castle Area" name: "CHAT" }
+  panels { room: "West Castle Area" name: "LOST" }
+  panels { room: "West Castle Area" name: "PODS" }
+  panels { room: "West Castle Area" name: "FAME" }
+  location_room: "West Castle Area"
+}
+doors {
+  name: "West Sticks And Stones Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "LETTERS" }
+  location_room: "West Castle Area"
+  location_name: "LETTERS"
+}
+doors {
+  name: "Amber Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "HARMONY" }
+  panels { room: "West Castle Area" name: "MELODY" }
+  panels { room: "West Castle Area" name: "RHYTHM" }
+  panels { room: "West Castle Area" name: "TEXTURE" }
+  location_room: "West Castle Area"
+  location_name: "HARMONY, MELODY, RHYTHM, TEXTURE"
+}
+doors {
   name: "Z2 Room Back Exit"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/gate_2"
@@ -493,7 +548,6 @@ doors {
   panels { room: "Outside House" name: "WALLS" }
   panels { room: "Outside House" name: "LOCK" }
   location_room: "Outside House"
-  location_name: "North Purple Vestibules"
 }
 doors {
   name: "Purple NW Vestibule"
@@ -716,7 +770,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" }
@@ -820,9 +874,20 @@ doors {
 }
 doors {
   name: "Composite Room NW Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   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 {
+  name: "Yellow Roof Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Red Color Door" name: "BACKSIDE" }
+  panels { room: "Red Color Door" name: "WALK BACK" }
+  panels { room: "Red Color Door" name: "Back (1)" }
+  panels { room: "Red Color Door" name: "Back (2)" }
+  panels { room: "Red Color Door" name: "Near Obscured Puzzles" }
   location_room: "Red Color Door"
 }
 doors {
@@ -857,7 +922,7 @@ doors {
   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" }
@@ -866,6 +931,7 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/oroom_6"
   control_center_color: "orange"
 }
@@ -884,8 +950,9 @@ doors {
   panels { room: "F2 Room" name: "SHAPE" }
 }
 doors {
-  name: "F2 Room Entrance"
-  type: STANDARD
+  name: "F2 Room Southeast Door"
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls/froom_2"
   panels { room: "Sweet Foyer" name: "RENT (1)" }
   location_room: "Sweet Foyer"
@@ -893,31 +960,33 @@ doors {
 doors {
   name: "White Hallway From Entry"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/froom_6"
   control_center_color: "white"
 }
 doors {
   name: "Purple Hallway From Great"
   type: CONTROL_CENTER_COLOR
+  latch: true
   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" }
@@ -938,7 +1007,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" }
@@ -959,21 +1028,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" }
@@ -1017,7 +1086,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" }
@@ -1208,70 +1277,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"
@@ -1307,7 +1343,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" }
@@ -1421,6 +1457,9 @@ doors {
   receivers: "Meshes/Stairs/staircase31/teleportListener"
   receivers: "Meshes/Stairs/staircase32/teleportListener2"
   receivers: "Meshes/Stairs/staircase33/teleportListener3"
+  receivers: "Panels/Castle Entrance/castle_direction_1/teleportListener"
+  receivers: "Panels/Castle Entrance/castle_direction_2/teleportListener"
+  receivers: "Panels/Castle Entrance/castle_direction_3/teleportListener"
   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" }
@@ -1613,6 +1652,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"
@@ -1648,6 +1688,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"
@@ -1679,6 +1720,7 @@ doors {
   receivers: "Components/Doors/Smileys/yellow_2"
   panels { room: "Hedges" name: "SMILE" }
   location_room: "Hedges"
+  location_name: "Yellow SMILE"
 }
 doors {
   name: "Green Smiley"
@@ -1687,6 +1729,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"
@@ -1694,6 +1737,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"
@@ -1718,6 +1762,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Red Smiley" name: "SMILE" }
   location_room: "Red Smiley"
+  location_name: "Red SMILE"
 }
 doors {
   name: "Pink Hallway"
@@ -1792,12 +1837,37 @@ doors {
 }
 doors {
   name: "Near Sweet Brown Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls 2/halls_2"
   panels { room: "Sweet Foyer" name: "RENT (4)" }
   location_room: "Sweet Foyer"
 }
 doors {
+  name: "Rent Panels"
+  type: LOCATION_ONLY
+  panels { room: "Sweet Foyer" name: "RENT (1)" }
+  panels { room: "Sweet Foyer" name: "RENT (2)" }
+  panels { room: "Sweet Foyer" name: "RENT (3)" }
+  panels { room: "Sweet Foyer" name: "RENT (4)" }
+  location_room: "Sweet Foyer"
+}
+doors {
+  name: "Equality Panels"
+  type: LOCATION_ONLY
+  panels { room: "Sweet Foyer" name: "EQUAL" }
+  panels { room: "Sweet Foyer" name: "QUALITY" }
+  location_room: "Sweet Foyer"
+  location_name: "EQUAL, QUALITY"
+}
+doors {
+  name: "Orange Panels"
+  type: LOCATION_ONLY
+  panels { room: "Blue Smiley Annex" name: "ORANGE (1)" }
+  panels { room: "Blue Smiley Annex" name: "ORANGE (2)" }
+  location_room: "Blue Smiley Annex"
+}
+doors {
   name: "Red Room Entrance"
   type: STANDARD
   receivers: "Components/Doors/Halls 2/halls_3"
@@ -1952,7 +2022,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"
+  location_name: "Pale Green Hex"
 }
 doors {
   name: "South Castle Area Back Door"
@@ -2187,6 +2257,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"
@@ -2306,3 +2377,95 @@ doors {
   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"
+}
+doors {
+  name: "West Spire Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Spire" name: "MISSING" }
+  location_room: "West Spire"
+  location_name: "MISSING"
+}
+doors {
+  name: "Tree Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Color Door" name: "FIR" }
+  panels { room: "Red Color Door" name: "OAK" }
+  panels { room: "Red Color Door" name: "PINE" }
+  panels { room: "Red Color Door" name: "ASH" }
+  location_room: "Red Color Door"
+  location_name: "ASH, FIR, OAK, PINE"
+}
+doors {
+  name: "Teal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Outside Book Room" name: "TEAL" }
+  location_room: "Outside Book Room"
+  location_name: "TEAL"
+}
+doors {
+  name: "Direction Panels"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (1)" }
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (2)" }
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (3)" }
+  location_room: "Rainbow Color Doors"
+}
+doors {
+  name: "Nursery Panels"
+  type: LOCATION_ONLY
+  panels { room: "Nursery" name: "Paintings" }
+  panels { room: "Nursery" name: "?" }
+  location_room: "Nursery"
+  location_name: "Paintings, ?"
+}
+doors {
+  name: "Near H Keyholder Panel"
+  type: LOCATION_ONLY
+  panels { room: "Outside House" name: "SILENCE" }
+  location_room: "Outside House"
+  location_name: "SILENCE"
+}
+doors {
+  name: "Plum Panels"
+  type: LOCATION_ONLY
+  panels { room: "Outside Hedges" name: "PLUM (1)" }
+  panels { room: "Outside Hedges" name: "PLUM (2)" }
+  location_room: "Outside Hedges"
+}
+doors {
+  name: "Yellow Smiley Annex Panels"
+  type: LOCATION_ONLY
+  panels { room: "Yellow Smiley Annex" name: "BELL" }
+  panels { room: "Yellow Smiley Annex" name: "COW" }
+  location_room: "Yellow Smiley Annex"
+  location_name: "BELL, COW"
+}
+doors {
+  name: "Farewell Little Lamb Panels"
+  type: LOCATION_ONLY
+  panels { room: "Purple Room South" name: "FAREWELL" }
+  panels { room: "Purple Room South" name: "LITTLE" }
+  panels { room: "Purple Room South" name: "LAMB" }
+  location_room: "Purple Room South"
+  location_name: "FAREWELL, LITTLE, LAMB"
+}
@@ -1,5 +1,5 @@
 name: "C Keyholder"
-panel_display_name: "North Area"
+panel_display_name: "East Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolderC"
@@ -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
 }
@@ -10,5 +10,8 @@ panels {
 }
 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
 }
@@ -2,5 +2,7 @@ name: "Hedges Tower"
 panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
+  display_name: "Hedge Maze Tower"
   path: "Components/Warps/Worldports/worldport13"
+  no_shuffle: true
 }
@@ -1,7 +1,5 @@
 name: "Hotel"
 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 {
   name: "MARLIN"
   path: "Panels/Connections/connections_2"
@@ -6,5 +6,8 @@ paintings {
 }
 ports {
   name: "HIVE"
+  display_name: "Moat Worldport"
   path: "Components/Warps/Worldports/worldport9"
+  destination { x: 64 y: 1 z: 24.5 }
+  rotation: 0
 }
@@ -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
 }
@@ -2,5 +2,8 @@ name: "Purple Hallway From Great"
 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
 }
@@ -16,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
 }
@@ -10,5 +10,8 @@ panels {
 }
 ports {
   name: "BEARER"
+  display_name: "Rain Panel Worldport"
   path: "Components/Warps/Worldports/worldport11"
+  destination { x: 93.5 y: 0 z: 27 }
+  rotation: 90
 }
@@ -1,7 +1,7 @@
 name: "Red Color Door"
 panel_display_name: "Southwest Area"
 panels {
-  name: "Left"
+  name: "Near Obscured Puzzles"
   path: "Panels/Halls/wb_1"
   clue: ""
   answer: "sidewalk"
@@ -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
 }
@@ -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
 }
@@ -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
 }
@@ -2,5 +2,8 @@ name: "Unkempt Entrance"
 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,12 +1,9 @@
 name: "White Hallway From Entry"
 panel_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.
 ports {
   name: "ENTRY"
+  display_name: "Near Globe White Hallway"
   path: "Components/Warps/Worldports/worldport10"
+  destination { x: -46 y: 0 z: 23 }
+  rotation: 90
 }
@@ -1,6 +1,5 @@
 name: "Wonderland"
 panel_display_name: "Northwest Area"
-# TODO: There's a warp from The Entry into here.
 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
 }
@@ -30,5 +30,8 @@ paintings {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Near Yellow Worldport"
   path: "Components/Warps/Worldports/worldport8"
+  destination { x: 92.5 y: 0 z: -62 }
+  rotation: 90
 }
@@ -0,0 +1,30 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Center Building"
+  door { name: "Center Building" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Flower Hallway"
+  door { name: "Flower Hallway" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Tower"
+  door { name: "Tower Entrance" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Castle"
+  door { name: "Castle" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Backside Area"
+  door { name: "Backside Entrance" }
+}
+connections {
+  from_room: "Backside Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,161 @@
+doors {
+  name: "Center Building"
+  type: STANDARD
+  receivers: "Components/Doors/demo_1"
+  panels { room: "Main Area" name: "HI" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Flower Hallway"
+  type: STANDARD
+  receivers: "Components/Doors/demo_32"
+  panels { room: "Main Area" name: "TEES" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Center Building Panels"
+  type: LOCATION_ONLY
+  panels { room: "Center Building" name: "WORLD" }
+  panels { room: "Center Building" name: "FUZZIES" }
+  panels { room: "Main Area" name: "COLORFUL" }
+  panels { room: "Main Area" name: "WORD" }
+  location_room: "Center Building"
+  location_name: "COLORFUL, FUZZIES, WORD, WORLD"
+}
+doors {
+  name: "Orange Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "HID" }
+  panels { room: "Main Area" name: "MESS" }
+  panels { room: "Main Area" name: "DEN" }
+  panels { room: "Main Area" name: "AGES" }
+  location_room: "Main Area"
+  location_name: "AGES, DEN, HID, MESS"
+}
+doors {
+  name: "Purple Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COUNTER" }
+  panels { room: "Main Area" name: "POSSIBLE" }
+  panels { room: "Main Area" name: "PACES" }
+  panels { room: "Main Area" name: "CLOCKWISE" }
+  location_room: "Main Area"
+  location_name: "CLOCKWISE, COUNTER, PACES, POSSIBLE"
+}
+doors {
+  name: "Yellow Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "ANY" }
+  panels { room: "Main Area" name: "RODS" }
+  panels { room: "Main Area" name: "TWO" }
+  panels { room: "Main Area" name: "TALK" }
+  panels { room: "Main Area" name: "SECRETIVE" }
+  panels { room: "Main Area" name: "TOADS" }
+  panels { room: "Main Area" name: "TON" }
+  panels { room: "Main Area" name: "MIND" }
+  panels { room: "Main Area" name: "END" }
+  panels { room: "Main Area" name: "RAD" }
+  panels { room: "Main Area" name: "TOO" }
+  panels { room: "Main Area" name: "STALK" }
+  location_room: "Main Area"
+  location_name: "Yellow Area Puzzles"
+}
+doors {
+  name: "Red Door"
+  type: LOCATION_ONLY
+  panels { room: "Castle" name: "SERIES" }
+  location_room: "Castle"
+  location_name: "SERIES"
+}
+doors {
+  name: "Castle"
+  type: STANDARD
+  receivers: "Components/Doors/demo_15"
+  panels { room: "Main Area" name: "CASTS" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Scavenger Hunt"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "S" }
+  panels { room: "Main Area" name: "C" }
+  panels { room: "Main Area" name: "A" }
+  panels { room: "Main Area" name: "V" }
+  panels { room: "Main Area" name: "E (1)" }
+  panels { room: "Main Area" name: "N" }
+  panels { room: "Castle" name: "G" }
+  panels { room: "Main Area" name: "E (2)" }
+  panels { room: "Main Area" name: "R" }
+  location_room: "Castle"
+}
+doors {
+  name: "Gold Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DISCOVER" }
+  panels { room: "Main Area" name: "FAMILY" }
+  panels { room: "Flower Hallway" name: "LACES" }
+  location_room: "Flower Hallway"
+  location_name: "DISCOVER, FAMILY, LACES"
+}
+doors {
+  name: "Tower Entrance"
+  type: EVENT
+  panels { room: "Main Area" name: "HI" }
+  panels { room: "Main Area" name: "ART" }
+  panels { room: "Main Area" name: "TEES" }
+  panels { room: "Center Building" name: "WORLD" }
+  panels { room: "Center Building" name: "FUZZIES" }
+  panels { room: "Main Area" name: "COLORFUL" }
+  panels { room: "Main Area" name: "WORD" }
+  panels { room: "Main Area" name: "HID" }
+  panels { room: "Main Area" name: "MESS" }
+  panels { room: "Main Area" name: "DEN" }
+  panels { room: "Main Area" name: "AGES" }
+  panels { room: "Main Area" name: "COUNTER" }
+  panels { room: "Main Area" name: "POSSIBLE" }
+  panels { room: "Main Area" name: "PACES" }
+  panels { room: "Main Area" name: "CLOCKWISE" }
+  panels { room: "Main Area" name: "ANY" }
+  panels { room: "Main Area" name: "RODS" }
+  panels { room: "Main Area" name: "TWO" }
+  panels { room: "Main Area" name: "TALK" }
+  panels { room: "Main Area" name: "SECRETIVE" }
+  panels { room: "Main Area" name: "TOADS" }
+  panels { room: "Main Area" name: "TON" }
+  panels { room: "Main Area" name: "MIND" }
+  panels { room: "Main Area" name: "END" }
+  panels { room: "Main Area" name: "RAD" }
+  panels { room: "Main Area" name: "TOO" }
+  panels { room: "Main Area" name: "STALK" }
+  panels { room: "Castle" name: "SERIES" }
+  panels { room: "Main Area" name: "CASTS" }
+  panels { room: "Main Area" name: "HAZES" }
+  panels { room: "Main Area" name: "DAZES" }
+  panels { room: "Main Area" name: "GAZES" }
+  panels { room: "Main Area" name: "S" }
+  panels { room: "Main Area" name: "C" }
+  panels { room: "Main Area" name: "A" }
+  panels { room: "Main Area" name: "V" }
+  panels { room: "Main Area" name: "E (1)" }
+  panels { room: "Main Area" name: "N" }
+  panels { room: "Castle" name: "G" }
+  panels { room: "Main Area" name: "E (2)" }
+  panels { room: "Main Area" name: "R" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Main Area" name: "DISCOVER" }
+  panels { room: "Main Area" name: "FAMILY" }
+  panels { room: "Flower Hallway" name: "LACES" }
+}
+doors {
+  name: "Backside Entrance"
+  type: EVENT
+  panels { room: "Tower" name: "ENDS (1)" }
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Backside Area" name: "BACKSIDE" }
+  panels { room: "Backside Area" name: "DOORWAYS" }
+  panels { room: "Backside Area" name: "SEE" }
+  panels { room: "Backside Area" name: "ENDS (2)" }
+}
@@ -0,0 +1,6 @@
+display_name: "Demo"
+type: DEMO
+# This painting is above a panel and can't be entered.
+excluded_nodes: "Meshes/owl"
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,25 @@
+name: "Backside Area"
+panels {
+  name: "BACKSIDE"
+  path: "Panels/Endings/demo_41"
+  clue: "backside"
+  answer: "back"
+}
+panels {
+  name: "DOORWAYS"
+  path: "Panels/Endings/demo_42"
+  clue: "doorways"
+  answer: "doors"
+}
+panels {
+  name: "SEE"
+  path: "Panels/Endings/demo_43"
+  clue: "see"
+  answer: "secret"
+}
+panels {
+  name: "ENDS (2)"
+  path: "Panels/Endings/demo_44"
+  clue: "ends"
+  answer: "endings"
+}
@@ -0,0 +1,13 @@
+name: "Castle"
+panels {
+  name: "SERIES"
+  path: "Panels/Red/demo_26"
+  clue: "series"
+  answer: "mysteries"
+}
+panels {
+  name: "G"
+  path: "Panels/Blue/demo_37"
+  clue: "g"
+  answer: "g"
+}
@@ -0,0 +1,13 @@
+name: "Center Building"
+panels {
+  name: "WORLD"
+  path: "Panels/Room 1/demo_3"
+  clue: "world"
+  answer: "word"
+}
+panels {
+  name: "FUZZIES"
+  path: "Panels/Room 1/demo_4"
+  clue: "fuzzies"
+  answer: "puzzles"
+}
@@ -0,0 +1,7 @@
+name: "Flower Hallway"
+panels {
+  name: "LACES"
+  path: "Panels/Gold/demo_47"
+  clue: "laces"
+  answer: "places"
+}
@@ -0,0 +1,241 @@
+name: "Main Area"
+panels {
+  name: "HI"
+  path: "Panels/Entry/demo_1"
+  clue: "hi"
+  answer: "hi"
+}
+panels {
+  name: "ART"
+  path: "Panels/Entry/demo_49"
+  clue: "\"art\""
+  answer: "art"
+}
+panels {
+  name: "TEES"
+  path: "Panels/Entry/demo_50"
+  clue: "tees"
+  answer: "trees"
+}
+panels {
+  name: "COLORFUL"
+  path: "Panels/Room 1/demo_5"
+  clue: "colorful"
+  answer: "colorful"
+}
+panels {
+  name: "WORD"
+  path: "Panels/Room 1/demo_6"
+  clue: "word"
+  answer: "world"
+}
+panels {
+  name: "AGES"
+  path: "Panels/Orange/demo_7"
+  clue: "ages"
+  answer: "messages"
+}
+panels {
+  name: "DEN"
+  path: "Panels/Orange/demo_8"
+  clue: "den"
+  answer: "hidden"
+}
+panels {
+  name: "HID"
+  path: "Panels/Orange/demo_9"
+  clue: "hid"
+  answer: "hidden"
+}
+panels {
+  name: "MESS"
+  path: "Panels/Orange/demo_10"
+  clue: "mess"
+  answer: "messages"
+}
+panels {
+  name: "CLOCKWISE"
+  path: "Panels/Purple/demo_2"
+  clue: "clockwise"
+  answer: "counter"
+}
+panels {
+  name: "POSSIBLE"
+  path: "Panels/Purple/demo_12"
+  clue: "possible"
+  answer: "impossible"
+}
+panels {
+  name: "PACES"
+  path: "Panels/Purple/demo_13"
+  clue: "paces"
+  answer: "spaces"
+}
+panels {
+  name: "COUNTER"
+  path: "Panels/Purple/demo_30"
+  clue: "counter"
+  answer: "clockwise"
+}
+panels {
+  name: "ANY"
+  path: "Panels/Yellow/demo_14"
+  clue: "any"
+  answer: "many"
+}
+panels {
+  name: "RODS"
+  path: "Panels/Yellow/demo_15"
+  clue: "rods"
+  answer: "roads"
+}
+panels {
+  name: "TWO"
+  path: "Panels/Yellow/demo_16"
+  clue: "two"
+  answer: "to"
+}
+panels {
+  name: "TALK"
+  path: "Panels/Yellow/demo_17"
+  clue: "talk"
+  answer: "walk"
+}
+panels {
+  name: "SECRETIVE"
+  path: "Panels/Yellow/demo_18"
+  clue: "secretive"
+  answer: "secret"
+}
+panels {
+  name: "TOADS"
+  path: "Panels/Yellow/demo_19"
+  clue: "toads"
+  answer: "roads"
+}
+panels {
+  name: "TON"
+  path: "Panels/Yellow/demo_20"
+  clue: "ton"
+  answer: "to"
+}
+panels {
+  name: "MIND"
+  path: "Panels/Yellow/demo_21"
+  clue: "mind"
+  answer: "find"
+}
+panels {
+  name: "END"
+  path: "Panels/Yellow/demo_22"
+  clue: "end"
+  answer: "endless"
+}
+panels {
+  name: "RAD"
+  path: "Panels/Yellow/demo_23"
+  clue: "rad"
+  answer: "roads"
+}
+panels {
+  name: "TOO"
+  path: "Panels/Yellow/demo_24"
+  clue: "too"
+  answer: "to"
+}
+panels {
+  name: "STALK"
+  path: "Panels/Yellow/demo_25"
+  clue: "stalk"
+  answer: "walk"
+}
+panels {
+  name: "HAZES"
+  path: "Panels/Green/demo_27"
+  clue: "hazes"
+  answer: "mazes"
+}
+panels {
+  name: "DAZES"
+  path: "Panels/Green/demo_28"
+  clue: "dazes"
+  answer: "mazes"
+}
+panels {
+  name: "GAZES"
+  path: "Panels/Green/demo_29"
+  clue: "gazes"
+  answer: "mazes"
+}
+panels {
+  name: "CASTS"
+  path: "Panels/Green/demo_30"
+  clue: "casts"
+  answer: "castles"
+}
+panels {
+  name: "S"
+  path: "Panels/Blue/demo_31"
+  clue: "s"
+  answer: "s"
+}
+panels {
+  name: "C"
+  path: "Panels/Blue/demo_32"
+  clue: "c"
+  answer: "c"
+}
+panels {
+  name: "A"
+  path: "Panels/Blue/demo_33"
+  clue: "a"
+  answer: "a"
+}
+panels {
+  name: "V"
+  path: "Panels/Blue/demo_34"
+  clue: "v"
+  answer: "v"
+}
+panels {
+  name: "E (1)"
+  path: "Panels/Blue/demo_35"
+  clue: "e"
+  answer: "e"
+}
+panels {
+  name: "N"
+  path: "Panels/Blue/demo_36"
+  clue: "n"
+  answer: "n"
+}
+panels {
+  name: "E (2)"
+  path: "Panels/Blue/demo_38"
+  clue: "e"
+  answer: "e"
+}
+panels {
+  name: "R"
+  path: "Panels/Blue/demo_39"
+  clue: "r"
+  answer: "r"
+}
+panels {
+  name: "Blank"
+  path: "Panels/Blue/demo_40"
+  clue: ""
+  answer: "hunts"
+}
+panels {
+  name: "DISCOVER"
+  path: "Panels/Gold/demo_45"
+  clue: "discover"
+  answer: "rediscover"
+}
+panels {
+  name: "FAMILY"
+  path: "Panels/Gold/demo_46"
+  clue: "family"
+  answer: "familiar"
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,7 @@
+name: "Tower"
+panels {
+  name: "ENDS (1)"
+  path: "Panels/Endings/demo_48"
+  clue: "ends"
+  answer: "endings"
+}
@@ -57,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
 }
@@ -57,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
 }
@@ -57,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
 }
@@ -57,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
 }
@@ -0,0 +1,766 @@
+# It is supposed to be in logic to jump from Maze to Maze King Painting, but I
+# find this difficult to do, and unshuffled paintings never requires it, so I am
+# making it not in logic.
+connections {
+  from_room: "Welcome Spine (Obverse)"
+  to_room: "Trans Rights"
+  door { name: "Agender Door" }
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Welcome Spine (Reverse)"
+  door { name: "Agender Door" }
+  oneway: true
+}
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Through Woman (Reverse)"
+  door { name: "Agender Door" }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Big U"
+      name: "GO3"
+    }
+  }
+  to {
+    painting {
+      room: "Trans Rights"
+      name: "STOP2"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Spiral Ramp"
+  to_room: "Highest Point"
+  door { name: "Pea Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Fatherland Quicktravel"
+      name: "GO7"
+    }
+  }
+  to {
+    painting {
+      room: "Pillar Ramp"
+      name: "STOP6"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Maze"
+  to_room: "Mediums Quicktravel"
+  door { name: "Mediums Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Big U"
+      name: "GO1"
+    }
+  }
+  to {
+    painting {
+      room: "Pillar Ramp"
+      name: "STOP10"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Pillar Ramp"
+  to_room: "Banana Belt Door"
+  door { name: "Asteroid Bunch Door" }
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Cow Quicktravel"
+  door { name: "Cow Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Welcome Spine Quicktravel"
+      name: "GO5"
+    }
+  }
+  to {
+    painting {
+      room: "Cow Quicktravel"
+      name: "STOP4"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Behind Welcome Spine"
+  door { name: "Ant Door" }
+}
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Behind Welcome Spine"
+  door { name: "Ant Door" }
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Big U"
+  door { name: "Man Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Trans Rights"
+      name: "GO2"
+    }
+  }
+  to {
+    painting {
+      room: "Big U"
+      name: "STOP1"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Cow Quicktravel"
+      name: "GO4"
+    }
+  }
+  to {
+    painting {
+      room: "Big U"
+      name: "STOP3"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine (Obverse)"
+  to_room: "Through Woman (Obverse)"
+  door { name: "Woman Door" }
+}
+connections {
+  from_room: "Fatherland"
+  to_room: "Fatherland Quicktravel"
+  door { name: "Fatherland Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Mini Icarus Sun Loop"
+      name: "GO8"
+    }
+  }
+  to {
+    painting {
+      room: "Fatherland Quicktravel"
+      name: "STOP7"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Pillar Ramp"
+      name: "GO10"
+    }
+  }
+  to {
+    painting {
+      room: "Mediums Quicktravel"
+      name: "STOP9"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus Wings Painting"
+  to_room: "Mini Icarus 2"
+  door { name: "Battery Door" }
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus 2"
+  to_room: "Mini Icarus Sun Loop"
+  door { name: "Battery Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Mediums Quicktravel"
+      name: "GO9"
+    }
+  }
+  to {
+    painting {
+      room: "Mini Icarus Sun Loop"
+      name: "STOP8"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus 2"
+  to_room: "Mini Icarus 3"
+  door { name: "Animals Door" }
+}
+connections {
+  from_room: "Mini Icarus 2"
+  to_room: "Mini Icarus Wings Painting"
+  door { name: "Troupe Door" }
+}
+connections {
+  from_room: "Mini Icarus 2"
+  to_room: "Mini Icarus Sun Loop"
+  door { name: "Reversed Arrows Door" }
+}
+connections {
+  from_room: "Welcome Spine (Reverse)"
+  to_room: "Welcome Spine Quicktravel"
+  door { name: "Termite Door" }
+}
+connections {
+  from {
+    painting {
+      room: "Pillar Ramp"
+      name: "GO6"
+    }
+  }
+  to {
+    painting {
+      room: "Welcome Spine Quicktravel"
+      name: "STOP5"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Spiral Ramp"
+      name: "SUN5"
+    }
+  }
+  to {
+    painting {
+      room: "Pillar Ramp"
+      name: "SUN6"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Pillar Ramp"
+  to_room: "Patricide Room"
+  door { name: "Patricide Door" }
+}
+connections {
+  from_room: "Maze"
+  to_room: "Maze Back"
+  door { name: "These Door" }
+}
+connections {
+  from_room: "Welcome Spine (Reverse)"
+  to_room: "Maze Back"
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine (Obverse)"
+  to_room: "Through Woman (Reverse)"
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Through Woman (Obverse)"
+      name: "SUN2"
+    }
+  }
+  to {
+    painting {
+      room: "Above Trans Rights"
+      name: "SUN"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze"
+      name: "WINGS14"
+    }
+  }
+  to {
+    painting {
+      room: "Through Woman (Obverse)"
+      name: "WINGS6"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Behind Welcome Spine"
+  door { name: "Woman Door" }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Cow Quicktravel"
+      name: "SUN4"
+    }
+  }
+  to {
+    painting {
+      room: "Highest Point"
+      name: "SUN3"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Through Woman (Reverse)"
+      name: "WINGS8"
+    }
+  }
+  to {
+    painting {
+      room: "Spiral Ramp"
+      name: "WINGS7"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Reverse)"
+  to_room: "Big U"
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Spiral Ramp"
+      name: "WINGS6"
+    }
+  }
+  to {
+    painting {
+      room: "Through Woman (Obverse)"
+      name: "WINGS3"
+    }
+  }
+  # rare two-way painting!
+  bypass_target_door: true
+}
+connections {
+  from_room: "Spiral Ramp"
+  to_room: "Pillar Ramp"
+  oneway: true
+}
+connections {
+  from_room: "Pillar Ramp"
+  to_room: "The Orb"
+}
+connections {
+  from {
+    painting {
+      room: "Banana Belt Door"
+      name: "SUN14"
+    }
+  }
+  to {
+    painting {
+      room: "Above Trans Rights"
+      name: "SUN"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Trans Rights"
+  to_room: "Mini Icarus Wings Painting"
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Mini Icarus Wings Painting"
+      name: "WINGS4"
+    }
+  }
+  to {
+    painting {
+      room: "Mini Icarus Sun Loop"
+      name: "TROUBLEDESTINATION"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Painting Maze 1"
+      name: "SUN9"
+    }
+  }
+  to {
+    painting {
+      room: "Mini Icarus 2"
+      name: "SUN10"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Mini Icarus 2"
+      name: "SUN11"
+    }
+  }
+  to {
+    painting {
+      room: "Mini Icarus Sun Loop"
+      name: "SUN12"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Mini Icarus Sun Loop"
+      name: "SUN13"
+    }
+  }
+  to {
+    painting {
+      room: "Maze"
+      name: "SUN14"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus 3"
+  to_room: "Mini Icarus Sun Loop"
+  door { name: "Battery Door" }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze"
+      name: "SUN5"
+    }
+  }
+  to {
+    painting {
+      room: "Painting Maze 2"
+      name: "SUN6"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze"
+      name: "WINGS16"
+    }
+  }
+  to {
+    painting {
+      room: "Maze Wings Passage"
+      name: "WINGS12"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze Wings Passage"
+      name: "WINGS12"
+    }
+  }
+  to {
+    painting {
+      room: "Patricide Room"
+      name: "WINGS10"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Patricide Room"
+      name: "SUN4"
+    }
+  }
+  to {
+    painting {
+      room: "Maze"
+      name: "SUN4"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze"
+      name: "WINGS9"
+    }
+  }
+  to {
+    painting {
+      room: "Patricide Room"
+      name: "WINGS10"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Maze"
+  to_room: "Maze King Panel"
+  oneway: true
+}
+connections {
+  from_room: "Maze King Painting"
+  to_room: "Maze King Panel"
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Maze King Painting"
+      name: "WINGS13"
+    }
+  }
+  to {
+    painting {
+      room: "Maze Wings Passage"
+      name: "WINGS12"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Fatherland"
+      name: "SUN7"
+    }
+  }
+  to {
+    painting {
+      room: "Painting Maze 1"
+      name: "SUN8"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Painting Maze 2"
+      name: "WINGS11"
+    }
+  }
+  to {
+    painting {
+      room: "Fatherland"
+      name: "WINGS2"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Painting Maze 1"
+      name: "WINGS3"
+    }
+  }
+  to {
+    painting {
+      room: "Maze Wings Passage"
+      name: "WINGS12"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine (Obverse)"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
+# It is possible to fall out of the map from every room, which always sends you
+# back to the beginning.
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Banana Belt Door"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Behind Welcome Spine"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Big U"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Cow Quicktravel"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Fatherland Quicktravel"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Fatherland"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Highest Point"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Maze Back"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Maze King Painting"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Maze Wings Passage"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Maze"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Mediums Quicktravel"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus 2"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus 3"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus Sun Loop"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Mini Icarus Wings Painting"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Painting Maze 1"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Painting Maze 2"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Patricide Room"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Pillar Ramp"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Spiral Ramp"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "The Orb"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Obverse)"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Through Woman (Reverse)"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Trans Rights"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine (Reverse)"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
+connections {
+  from_room: "Welcome Spine Quicktravel"
+  to_room: "Welcome Spine (Obverse)"
+  oneway: true
+}
@@ -0,0 +1,286 @@
+doors {
+  name: "Agender Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel3"
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+  location_room: "Trans Rights Panels"
+}
+doors {
+  name: "Quick Travel 3"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go3"
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+}
+doors {
+  name: "Pea Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel5"
+  panels { room: "Pillar Ramp" name: "PEA (1)" }
+  location_room: "Pillar Ramp"
+}
+doors {
+  name: "Quick Travel 7"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go7"
+  panels { room: "Pillar Ramp" name: "PEA (1)" }
+}
+doors {
+  name: "Mediums Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel12"
+  panels { room: "Maze" name: "MEDIUMS" }
+  location_room: "Maze"
+}
+doors {
+  name: "Quick Travel 1"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go1"
+  panels { room: "Maze" name: "MEDIUMS" }
+}
+doors {
+  name: "Asteroid Bunch Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel13"
+  panels { room: "Pillar Ramp" name: "ASTEROID" }
+  panels { room: "Pillar Ramp" name: "BUNCH" }
+  location_room: "Pillar Ramp"
+}
+doors {
+  name: "Cow Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel2"
+  panels { room: "Through Woman (Obverse)" name: "COW" }
+  location_room: "Through Woman (Obverse)"
+}
+doors {
+  name: "Quick Travel 5"
+  type: STANDARD
+  receivers: "Components/Paintings/QuickTravel/go5"
+  panels { room: "Highest Point" name: "QUEEN" }
+  location_room: "Highest Point"
+}
+doors {
+  name: "Ant Door"
+  type: STANDARD
+  receivers: "Components/Doors/by sun"
+  panels { room: "Above Trans Rights" name: "ANT" }
+  location_room: "Above Trans Rights"
+}
+doors {
+  name: "Man Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel"
+  panels { room: "Through Woman (Obverse)" name: "HUMAN (2)" }
+  location_room: "Through Woman (Obverse)"
+}
+doors {
+  name: "Quick Travel 2"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go2"
+  panels { room: "Through Woman (Obverse)" name: "HUMAN (2)" }
+}
+doors {
+  name: "Quick Travel 4"
+  type: STANDARD
+  receivers: "Components/Paintings/QuickTravel/go4"
+  panels { room: "Big U" name: "COLONY" }
+  location_room: "Big U"
+}
+doors {
+  name: "Woman Door"
+  type: STANDARD
+  receivers: "Components/Doors/entry"
+  panels { room: "Welcome Spine (Obverse)" name: "HUMAN (1)" }
+  location_room: "Welcome Spine (Obverse)"
+}
+doors {
+  name: "Fatherland Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel6"
+  panels { room: "Fatherland" name: "FATHERLAND" }
+  location_room: "Fatherland"
+}
+doors {
+  name: "Quick Travel 8"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go8"
+  panels { room: "Fatherland" name: "FATHERLAND" }
+}
+doors {
+  name: "Quick Travel 10"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go10"
+  panels { room: "Fatherland" name: "FATHERLAND" }
+}
+doors {
+  name: "Battery Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel7"
+  panels { room: "Mini Icarus 2" name: "BATTERY" }
+  location_room: "Mini Icarus 2"
+}
+doors {
+  name: "Quick Travel 9"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go9"
+  panels { room: "Mini Icarus 2" name: "BATTERY" }
+}
+doors {
+  name: "Arrows Door"
+  type: LOCATION_ONLY
+  #receivers: "Components/Doors/quicktravel8"
+  panels { room: "Mini Icarus 2" name: "ARROWS" }
+  location_room: "Mini Icarus 2"
+  location_name: "ARROWS"
+}
+doors {
+  name: "Animals Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel8"
+  panels { room: "Mini Icarus 2" name: "ANIMALS" }
+  location_room: "Mini Icarus 2"
+}
+doors {
+  name: "Troupe Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel10"
+  panels { room: "Mini Icarus 2" name: "TROUPE" }
+  location_room: "Mini Icarus 2"
+}
+doors {
+  name: "Reversed Arrows Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel11"
+  panels { room: "Mini Icarus 2" name: "SQUAD" }
+  location_room: "Mini Icarus 2"
+}
+doors {
+  name: "Termite Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel4"
+  panels { room: "Welcome Spine (Reverse)" name: "TERMITE" }
+  location_room: "Welcome Spine (Reverse)"
+}
+doors {
+  name: "Quick Travel 6"
+  type: ITEM_ONLY
+  receivers: "Components/Paintings/QuickTravel/go6"
+  panels { room: "Welcome Spine (Reverse)" name: "TERMITE" }
+}
+doors {
+  name: "Murder Panels"
+  type: LOCATION_ONLY
+  panels { room: "Maze" name: "MANSLAUGHTER" }
+  panels { room: "Pillar Ramp" name: "PATRICIDE" }
+  location_room: "Maze"
+}
+doors {
+  name: "Sun Painting To Drone"
+  type: STANDARD
+  receivers: "Components/Paintings/sun5"
+  panels { room: "Pillar Ramp" name: "DRONE" }
+  location_room: "Pillar Ramp"
+}
+doors {
+  name: "Patricide Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel15"
+  panels { room: "Pillar Ramp" name: "PATRICIDE" }
+  location_room: "Pillar Ramp"
+}
+doors {
+  name: "These Door"
+  type: STANDARD
+  receivers: "Components/Doors/quicktravel14"
+  panels { room: "Maze Back" name: "THESE" }
+  location_room: "Maze Back"
+}
+doors {
+  name: "Orb Panels"
+  type: LOCATION_ONLY
+  panels { room: "The Orb" name: "ADDERS" }
+  panels { room: "The Orb" name: "PUPPY" }
+  panels { room: "The Orb" name: "NEEDLE" }
+  panels { room: "The Orb" name: "US" }
+  panels { room: "The Orb" name: "FISH" }
+  panels { room: "The Orb" name: "DEADLINE" }
+  panels { room: "The Orb" name: "PEA (2)" }
+  panels { room: "The Orb" name: "THESIS" }
+  panels { room: "The Orb" name: "CLUTCH (1)" }
+  panels { room: "The Orb" name: "BASIS (2)" }
+  panels { room: "The Orb" name: "AXIS" }
+  panels { room: "The Orb" name: "STRAIGHT" }
+  panels { room: "The Orb" name: "HISS" }
+  panels { room: "The Orb" name: "DISCUS" }
+  panels { room: "The Orb" name: "SON" }
+  panels { room: "The Orb" name: "CLUTCH (2)" }
+  location_room: "The Orb"
+}
+doors {
+  name: "Near Fireman Wings Painting"
+  type: STANDARD
+  receivers: "Components/Paintings/oneways/wings6"
+  receivers: "Components/Paintings/oneways/wings3"
+  panels { room: "Spiral Ramp" name: "FIREMAN" }
+  location_room: "Spiral Ramp"
+}
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "Above Trans Rights" name: "ANT" }
+  panels { room: "Big U" name: "DECK" }
+  panels { room: "Big U" name: "COLONY" }
+  panels { room: "Big U" name: "MANOR" }
+  panels { room: "Fatherland" name: "FATHERLAND" }
+  panels { room: "Highest Point" name: "DIAGNOSIS" }
+  panels { room: "Highest Point" name: "QUEEN" }
+  panels { room: "Maze Back" name: "THESE" }
+  panels { room: "Maze King Panel" name: "KING (2)" }
+  panels { room: "Maze" name: "KING (1)" }
+  panels { room: "Maze" name: "ANALYSIS" }
+  panels { room: "Maze" name: "MANSLAUGHTER" }
+  panels { room: "Maze" name: "MEDIUMS" }
+  panels { room: "Maze" name: "BOOKS" }
+  panels { room: "Mini Icarus 2" name: "BATTERY" }
+  panels { room: "Mini Icarus 2" name: "TROUPE" }
+  panels { room: "Mini Icarus 2" name: "ANIMALS" }
+  panels { room: "Mini Icarus 2" name: "ARROWS" }
+  panels { room: "Mini Icarus 2" name: "SQUAD" }
+  panels { room: "Pillar Ramp" name: "ASTEROID" }
+  panels { room: "Pillar Ramp" name: "BUNCH" }
+  panels { room: "Pillar Ramp" name: "PRINCES" }
+  panels { room: "Pillar Ramp" name: "PATRICIDE" }
+  panels { room: "Pillar Ramp" name: "DRONE" }
+  panels { room: "Pillar Ramp" name: "PEA (1)" }
+  panels { room: "Spiral Ramp" name: "FIREMAN" }
+  panels { room: "The Orb" name: "ADDERS" }
+  panels { room: "The Orb" name: "PUPPY" }
+  panels { room: "The Orb" name: "NEEDLE" }
+  panels { room: "The Orb" name: "US" }
+  panels { room: "The Orb" name: "FISH" }
+  panels { room: "The Orb" name: "DEADLINE" }
+  panels { room: "The Orb" name: "PEA (2)" }
+  panels { room: "The Orb" name: "THESIS" }
+  panels { room: "The Orb" name: "CLUTCH (1)" }
+  panels { room: "The Orb" name: "BASIS (2)" }
+  panels { room: "The Orb" name: "AXIS" }
+  panels { room: "The Orb" name: "STRAIGHT" }
+  panels { room: "The Orb" name: "HISS" }
+  panels { room: "The Orb" name: "DISCUS" }
+  panels { room: "The Orb" name: "SON" }
+  panels { room: "The Orb" name: "CLUTCH (2)" }
+  panels { room: "Through Woman (Obverse)" name: "HUMAN (2)" }
+  panels { room: "Through Woman (Obverse)" name: "COW" }
+  panels { room: "Through Woman (Reverse)" name: "PRINCE" }
+  panels { room: "Through Woman (Reverse)" name: "BASIS (1)" }
+  panels { room: "Trans Rights" name: "SERVANT (1)" }
+  panels { room: "Trans Rights" name: "SERVANT (2)" }
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+  panels { room: "Trans Rights Panels" name: "HUMAN (3)" }
+  panels { room: "Trans Rights Panels" name: "HUMAN (4)" }
+  panels { room: "Welcome Spine (Obverse)" name: "FISHWIFE" }
+  panels { room: "Welcome Spine (Obverse)" name: "HUMAN (1)" }
+  panels { room: "Welcome Spine (Reverse)" name: "FATHER" }
+  panels { room: "Welcome Spine (Reverse)" name: "TERMITE" }
+  panels { room: "Welcome Spine (Reverse)" name: "SISTER" }
+}
@@ -0,0 +1,4 @@
+display_name: "Icarus"
+type: ICARUS
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,12 @@
+name: "Above Trans Rights"
+panels {
+  name: "ANT"
+  path: "Panels/Room_1/ant"
+  clue: "ant"
+  answer: "colony"
+  symbols: PLANET
+}
+paintings {
+  name: "SUN"
+  path: "Components/Paintings/sun"
+}
@@ -0,0 +1,5 @@
+name: "Banana Belt Door"
+paintings {
+  name: "SUN14"
+  path: "Components/Paintings/sun14"
+}
@@ -0,0 +1 @@
+name: "Behind Welcome Spine"
@@ -0,0 +1,40 @@
+name: "Big U"
+panels {
+  name: "DECK"
+  path: "Panels/Room_1/deck"
+  clue: "deck"
+  answer: "card"
+  symbols: PLANET
+}
+panels {
+  name: "COLONY"
+  path: "Panels/Room_1/ant2"
+  clue: "colony"
+  answer: "ant"
+  symbols: PLANET
+}
+panels {
+  name: "MANOR"
+  path: "Panels/Room_1/manor"
+  clue: "manor"
+  answer: "mentor"
+  symbols: SPARKLES
+  symbols: PLANET
+}
+paintings {
+  name: "STOP3"
+  path: "Components/Paintings/QuickTravel/stop3"
+}
+paintings {
+  name: "GO3"
+  path: "Components/Paintings/QuickTravel/go3"
+  required_door { name: "Quick Travel 3" }
+}
+paintings {
+  name: "STOP1"
+  path: "Components/Paintings/QuickTravel/stop1"
+}
+paintings {
+  name: "GO1"
+  path: "Components/Paintings/QuickTravel/go1"
+}
@@ -0,0 +1,14 @@
+name: "Cow Quicktravel"
+paintings {
+  name: "SUN4"
+  path: "Components/Paintings/sun4"
+}
+paintings {
+  name: "GO4"
+  path: "Components/Paintings/QuickTravel/go4"
+  required_door { name: "Quick Travel 4" }
+}
+paintings {
+  name: "STOP4"
+  path: "Components/Paintings/QuickTravel/stop4"
+}
@@ -0,0 +1,10 @@
+name: "Fatherland Quicktravel"
+paintings {
+  name: "STOP7"
+  path: "Components/Paintings/QuickTravel/stop7"
+}
+paintings {
+  name: "GO7"
+  path: "Components/Paintings/QuickTravel/go7"
+  required_door { name: "Quick Travel 7" }
+}
@@ -0,0 +1,16 @@
+name: "Fatherland"
+panels {
+  name: "FATHERLAND"
+  path: "Panels/Room_1/fatherland"
+  clue: "fatherland"
+  answer: "homeland"
+  symbols: GENDER
+}
+paintings {
+  name: "SUN7"
+  path: "Components/Paintings/sun7"
+}
+paintings {
+  name: "WINGS2"
+  path: "Components/Paintings/wings2"
+}
@@ -0,0 +1,19 @@
+name: "Highest Point"
+panels {
+  name: "DIAGNOSIS"
+  path: "Panels/Room_1/diagnosis"
+  clue: "diagnosis"
+  answer: "diagnose"
+  symbols: PLANET
+}
+panels {
+  name: "QUEEN"
+  path: "Panels/Room_1/queen"
+  clue: "queen"
+  answer: "ant"
+  symbols: GENDER
+}
+paintings {
+  name: "SUN3"
+  path: "Components/Paintings/sun3"
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,8 @@
+name: "Maze Back"
+panels {
+  name: "THESE"
+  path: "Panels/30DegreePanels/thesis"
+  clue: "these"
+  answer: "thesis"
+  symbols: PLANET
+}
@@ -0,0 +1,8 @@
+name: "Maze King Painting"
+paintings {
+  name: "WINGS13"
+  path: "Components/Paintings/30 degrees/wings13"
+  # There's no other entrance to this region (or any entrance at all in vanilla)
+  # so we can't allow this painting to be an entrance.
+  exit_only: true
+}
@@ -0,0 +1,8 @@
+name: "Maze King Panel"
+panels {
+  name: "KING (2)"
+  path: "Panels/Other30degree panels/king2"
+  clue: "king"
+  answer: "royal"
+  symbols: GENDER
+}
@@ -0,0 +1,9 @@
+name: "Maze Wings Passage"
+paintings {
+  name: "WINGS12"
+  path: "Components/Paintings/30 degrees/wings12"
+}
+paintings {
+  name: "WINGS15"
+  path: "Components/Paintings/30 degrees/wings15"
+}
@@ -0,0 +1,60 @@
+name: "Maze"
+panels {
+  name: "KING (1)"
+  path: "Panels/Other30degree panels/king"
+  clue: "king"
+  answer: "ruler"
+  symbols: GENDER
+}
+panels {
+  name: "ANALYSIS"
+  path: "Panels/Room_1/princes2"
+  clue: "analysis"
+  answer: "analyse"
+  symbols: PLANET
+}
+panels {
+  name: "MANSLAUGHTER"
+  path: "Panels/Room_1/manslaughter"
+  clue: "manslaughter"
+  answer: "murder"
+  symbols: GENDER
+}
+panels {
+  name: "MEDIUMS"
+  path: "Panels/Room_1/mediums"
+  clue: "mediums"
+  answer: "media"
+  symbols: PLANET
+}
+panels {
+  name: "BOOKS"
+  path: "Panels/Other30degree panels/books"
+  clue: "books"
+  answer: "library"
+  symbols: PLANET
+}
+paintings {
+  name: "SUN14"
+  path: "Components/Paintings/30 degrees/sun14"
+}
+paintings {
+  name: "WINGS14"
+  path: "Components/Paintings/30 degrees/wings14"
+}
+paintings {
+  name: "SUN5"
+  path: "Components/Paintings/30 degrees/sun5"
+}
+paintings {
+  name: "WINGS9"
+  path: "Components/Paintings/30 degrees/wings9"
+}
+paintings {
+  name: "SUN4"
+  path: "Components/Paintings/30 degrees/sun4"
+}
+paintings {
+  name: "WINGS16"
+  path: "Components/Paintings/30 degrees/wings16"
+}
@@ -0,0 +1,10 @@
+name: "Mediums Quicktravel"
+paintings {
+  name: "STOP9"
+  path: "Components/Paintings/QuickTravel/stop9"
+}
+paintings {
+  name: "GO9"
+  path: "Components/Paintings/QuickTravel/go9"
+  required_door { name: "Quick Travel 9" }
+}
@@ -0,0 +1,45 @@
+name: "Mini Icarus 2"
+panels {
+  name: "BATTERY"
+  path: "Panels/Room_1/battery"
+  clue: "battery"
+  answer: "cell"
+  symbols: PLANET
+}
+panels {
+  name: "TROUPE"
+  path: "Panels/Room_1/troupe"
+  clue: "troupe"
+  answer: "actor"
+  symbols: PLANET
+}
+panels {
+  name: "ANIMALS"
+  path: "Panels/Room_1/animals"
+  clue: "animals"
+  answer: "zoo"
+  symbols: PLANET
+  # Intended to be solved upside down.
+}
+panels {
+  name: "ARROWS"
+  path: "Panels/Room_1/arrow"
+  clue: "arrows"
+  answer: "quiver"
+  symbols: PLANET
+}
+panels {
+  name: "SQUAD"
+  path: "Panels/Room_1/ammo"
+  clue: "squad"
+  answer: "soldier"
+  symbols: PLANET
+}
+paintings {
+  name: "SUN10"
+  path: "Components/Paintings/sun10"
+}
+paintings {
+  name: "SUN11"
+  path: "Components/Paintings/sun11"
+}
@@ -0,0 +1 @@
+name: "Mini Icarus 3"
@@ -0,0 +1,22 @@
+name: "Mini Icarus Sun Loop"
+paintings {
+  name: "GO8"
+  path: "Components/Paintings/QuickTravel/go8"
+  required_door { name: "Quick Travel 8" }
+}
+paintings {
+  name: "STOP8"
+  path: "Components/Paintings/QuickTravel/stop8"
+}
+paintings {
+  name: "TROUBLEDESTINATION"
+  path: "Components/Paintings/TroubleDestination"
+}
+paintings {
+  name: "SUN12"
+  path: "Components/Paintings/sun12"
+}
+paintings {
+  name: "SUN13"
+  path: "Components/Paintings/sun13"
+}
@@ -0,0 +1,5 @@
+name: "Mini Icarus Wings Painting"
+paintings {
+  name: "WINGS4"
+  path: "Components/Paintings/wings4"
+}
@@ -0,0 +1,13 @@
+name: "Painting Maze 1"
+paintings {
+  name: "SUN9"
+  path: "Components/Paintings/sun9"
+}
+paintings {
+  name: "WINGS3"
+  path: "Components/Paintings/wings3"
+}
+paintings {
+  name: "SUN8"
+  path: "Components/Paintings/sun8"
+}
@@ -0,0 +1,13 @@
+name: "Painting Maze 2"
+paintings {
+  name: "WINGS10"
+  path: "Components/Paintings/30 degrees/wings10"
+}
+paintings {
+  name: "WINGS11"
+  path: "Components/Paintings/30 degrees/wings11"
+}
+paintings {
+  name: "SUN6"
+  path: "Components/Paintings/30 degrees/sun6"
+}
@@ -0,0 +1,9 @@
+name: "Patricide Room"
+paintings {
+  name: "WINGS10"
+  path: "Components/Paintings/other 30 degrees/wings10"
+}
+paintings {
+  name: "SUN4"
+  path: "Components/Paintings/other 30 degrees/sun4"
+}
@@ -0,0 +1,65 @@
+name: "Pillar Ramp"
+panels {
+  name: "ASTEROID"
+  path: "Panels/Room_1/asteroid"
+  clue: "asteroid"
+  answer: "belt"
+  symbols: PLANET
+}
+panels {
+  name: "BUNCH"
+  path: "Panels/Room_1/bunch"
+  clue: "bunch"
+  answer: "banana"
+  symbols: PLANET
+}
+panels {
+  name: "PRINCES"
+  path: "Panels/Room_1/princes"
+  clue: "princes"
+  answer: "princess"
+  symbols: PLANET
+}
+panels {
+  name: "PATRICIDE"
+  path: "Panels/Room_1/patricide"
+  clue: "patricide"
+  answer: "murder"
+  symbols: GENDER
+}
+panels {
+  name: "DRONE"
+  path: "Panels/Room_1/ant3"
+  clue: "drone"
+  answer: "ant"
+  symbols: GENDER
+}
+panels {
+  name: "PEA (1)"
+  path: "Panels/Room_1/pea"
+  clue: "pea"
+  answer: "pod"
+  symbols: PLANET
+}
+paintings {
+  name: "SUN6"
+  path: "Components/Paintings/sun6"
+}
+paintings {
+  name: "GO10"
+  path: "Components/Paintings/QuickTravel/go10"
+  required_door { name: "Quick Travel 10" }
+}
+paintings {
+  name: "STOP10"
+  path: "Components/Paintings/QuickTravel/stop10"
+}
+paintings {
+  name: "GO6"
+  path: "Components/Paintings/QuickTravel/go6"
+  required_door { name: "Quick Travel 6" }
+}
+paintings {
+  name: "STOP6"
+  path: "Components/Paintings/QuickTravel/stop6"
+}
@@ -0,0 +1,29 @@
+name: "Spiral Ramp"
+panels {
+  name: "FIREMAN"
+  path: "Panels/Room_1/fireman"
+  clue: "fireman"
+  answer: "firefighter"
+  symbols: GENDER
+}
+paintings {
+  name: "WINGS6"
+  path: "Components/Paintings/oneways/wings6"
+  required_door { name: "Near Fireman Wings Painting" }
+}
+paintings {
+  name: "SUN5"
+  path: "Components/Paintings/sun5"
+  required_door { name: "Sun Painting To Drone" }
+}
+paintings {
+  name: "WINGS7"
+  path: "Components/Paintings/oneways/wings7"
+}
+paintings {
+  name: "WINGS11"
+  path: "Components/Paintings/other 30 degrees/wings11"
+  exit_only: true
+  # There is a ledge near the painting so we might want to turn off exit_only
+  # at some point.
+}
@@ -0,0 +1,117 @@
+name: "The Orb"
+panels {
+  name: "ADDERS"
+  path: "Panels/Room_1/needle2"
+  clue: "adders"
+  answer: "sum"
+  symbols: PLANET
+}
+panels {
+  name: "PUPPY"
+  path: "Panels/Room_1/puppy"
+  clue: "puppy"
+  answer: "garbage"
+  symbols: SUN
+  symbols: PLANET
+}
+panels {
+  name: "NEEDLE"
+  path: "Panels/Room_1/needle"
+  clue: "needle"
+  answer: "needless"
+  symbols: PLANET
+}
+panels {
+  name: "US"
+  path: "Panels/Room_1/us"
+  clue: "us"
+  answer: "mess"
+  symbols: PLANET
+}
+panels {
+  name: "FISH"
+  path: "Panels/Room_1/fish"
+  clue: "fish"
+  answer: "student"
+  symbols: BOXES
+  symbols: PLANET
+}
+panels {
+  name: "DEADLINE"
+  path: "Panels/Room_1/deadline"
+  clue: "deadline"
+  answer: "deadliness"
+  symbols: PLANET
+}
+panels {
+  name: "PEA (2)"
+  path: "Panels/Room_1/pea2"
+  clue: "pea"
+  answer: "dolphin"
+  symbols: PLANET
+}
+panels {
+  name: "THESIS"
+  path: "Panels/Room_1/thesis"
+  clue: "thesis"
+  answer: "these"
+  symbols: PLANET
+}
+panels {
+  name: "CLUTCH (1)"
+  path: "Panels/Room_1/clutch"
+  clue: "clutch"
+  answer: "dude"
+  symbols: PLANET
+  symbols: GENDER
+}
+panels {
+  name: "BASIS (2)"
+  path: "Panels/Room_1/basis2"
+  clue: "basis"
+  answer: "base"
+  symbols: PLANET
+}
+panels {
+  name: "AXIS"
+  path: "Panels/Room_1/axis"
+  clue: "axis"
+  answer: "Axe"
+  symbols: PLANET
+}
+panels {
+  name: "STRAIGHT"
+  path: "Panels/Room_1/straight"
+  clue: "straight"
+  answer: "queer"
+  symbols: GENDER
+}
+panels {
+  name: "HISS"
+  path: "Panels/Room_1/hiss"
+  clue: "hiss"
+  answer: "their"
+  symbols: PLANET
+  symbols: GENDER
+}
+panels {
+  name: "DISCUS"
+  path: "Panels/Room_1/discus"
+  clue: "discus"
+  answer: "discuss"
+  symbols: PLANET
+}
+panels {
+  name: "SON"
+  path: "Panels/Room_1/son"
+  clue: "son"
+  answer: "child"
+  symbols: GENDER
+}
+panels {
+  name: "CLUTCH (2)"
+  path: "Panels/Room_1/clutch2"
+  clue: "clutch"
+  answer: "chick"
+  symbols: PLANET
+}
@@ -0,0 +1,28 @@
+name: "Through Woman (Obverse)"
+panels {
+  name: "HUMAN (2)"
+  path: "Panels/Room_1/human"
+  clue: "human"
+  answer: "man"
+  symbols: GENDER
+}
+panels {
+  name: "COW"
+  path: "Panels/Room_1/cow"
+  clue: "cow"
+  answer: "elephant"
+  symbols: GENDER
+}
+paintings {
+  name: "SUN2"
+  path: "Components/Paintings/sun2"
+}
+paintings {
+  name: "WINGS6"
+  path: "Components/Paintings/wings6"
+}
+paintings {
+  name: "WINGS3"
+  path: "Components/Paintings/oneways/wings3"
+  required_door { name: "Near Fireman Wings Painting" }
+}
@@ -0,0 +1,19 @@
+name: "Through Woman (Reverse)"
+panels {
+  name: "PRINCE"
+  path: "Panels/Room_1/prince"
+  clue: "prince"
+  answer: "princess"
+  symbols: GENDER
+}
+panels {
+  name: "BASIS (1)"
+  path: "Panels/Room_1/basis"
+  clue: "basis"
+  answer: "bases"
+  symbols: PLANET
+}
+paintings {
+  name: "WINGS8"
+  path: "Components/Paintings/oneways/wings8"
+}
@@ -0,0 +1,22 @@
+name: "Trans Rights Panels"
+panels {
+  name: "AGENDER"
+  path: "Panels/Room_1/human4"
+  clue: "agender"
+  answer: "human"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (3)"
+  path: "Panels/Room_1/human5"
+  clue: "human"
+  answer: "female"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (4)"
+  path: "Panels/Room_1/human6"
+  clue: "human"
+  answer: "male"
+  symbols: GENDER
+}
@@ -0,0 +1,25 @@
+name: "Trans Rights"
+# slay
+panels {
+  name: "SERVANT (1)"
+  path: "Panels/Room_1/servant"
+  clue: "servant"
+  answer: "butler"
+  symbols: GENDER
+}
+panels {
+  name: "SERVANT (2)"
+  path: "Panels/Room_1/servant2"
+  clue: "servant"
+  answer: "maid"
+  symbols: GENDER
+}
+paintings {
+  name: "GO2"
+  path: "Components/Paintings/QuickTravel/go2"
+  required_door { name: "Quick Travel 2" }
+}
+paintings {
+  name: "STOP2"
+  path: "Components/Paintings/QuickTravel/stop2"
+}
@@ -0,0 +1,22 @@
+name: "Welcome Spine (Obverse)"
+panels {
+  name: "FISHWIFE"
+  path: "Panels/Room_1/fishwife"
+  clue: "fishwife"
+  answer: "fishmonger"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (1)"
+  path: "Panels/Room_1/human3"
+  clue: "human"
+  answer: "woman"
+  symbols: GENDER
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Signs/worldport"
+  destination { x: 55 y: -3.5 z: 7.75 }
+  rotation: 0
+}
@@ -0,0 +1,22 @@
+name: "Welcome Spine (Reverse)"
+panels {
+  name: "FATHER"
+  path: "Panels/Room_1/father"
+  clue: "father"
+  answer: "parent"
+  symbols: GENDER
+}
+panels {
+  name: "TERMITE"
+  path: "Panels/Room_1/bat"
+  clue: "termite"
+  answer: "colony"
+  symbols: PLANET
+}
+panels {
+  name: "SISTER"
+  path: "Panels/Room_1/sister"
+  clue: "sister"
+  answer: "sibling"
+  symbols: GENDER
+}
@@ -0,0 +1,10 @@
+name: "Welcome Spine Quicktravel"
+paintings {
+  name: "STOP5"
+  path: "Components/Paintings/QuickTravel/stop5"
+}
+paintings {
+  name: "GO5"
+  path: "Components/Paintings/QuickTravel/go5"
+  required_door { name: "Quick Travel 5" }
+}
@@ -0,0 +1,10 @@
+connections {
+  from_room: "Main Area"
+  to_room: "CBA"
+  door { name: "CBA Door" }
+}
+connections {
+  from_room: "CBA"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
@@ -0,0 +1,50 @@
+doors {
+  name: "Side Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "Blank (1)" }
+  panels { room: "Main Area" name: "Blank (2)" }
+  panels { room: "Main Area" name: "Blank (3)" }
+  panels { room: "Main Area" name: "Blank (4)" }
+  panels { room: "Main Area" name: "Blank (5)" }
+  location_room: "Main Area"
+}
+doors {
+  name: "CBA Door"
+  type: EVENT
+  panels { room: "Main Area" name: "Blank (1)" }
+  panels { room: "Main Area" name: "Blank (2)" }
+  panels { room: "Main Area" name: "Blank (3)" }
+  panels { room: "Main Area" name: "Blank (4)" }
+  panels { room: "Main Area" name: "Blank (5)" }
+  panels { room: "Main Area" name: "BIRD" }
+  panels { room: "Main Area" name: "UNBOTTLING" }
+  panels { room: "Main Area" name: "ORGANIZATION" }
+  panels { room: "Main Area" name: "ORDER (1)" }
+  panels { room: "Main Area" name: "ORDER (2)" }
+  panels { room: "Main Area" name: "ORDER (3)" }
+  panels { room: "Main Area" name: "DECK (1)" }
+  panels { room: "Main Area" name: "DECK (2)" }
+  panels { room: "Main Area" name: "DECK (3)" }
+  panels { room: "Main Area" name: "OBSERVE" }
+  panels { room: "Main Area" name: "I" }
+  panels { room: "Main Area" name: "REST" }
+  panels { room: "Main Area" name: "THE" }
+  panels { room: "Main Area" name: "LIVES" }
+  panels { room: "Main Area" name: "DAIRY (1)" }
+  panels { room: "Main Area" name: "DAIRY (2)" }
+  panels { room: "Main Area" name: "DAIRY SAUCE" }
+  panels { room: "Main Area" name: "GULLIBLE (1)" }
+  panels { room: "Main Area" name: "GULLIBLE (2)" }
+  panels { room: "Main Area" name: "GULLIBLE (3)" }
+  panels { room: "Main Area" name: "FRUIT (1)" }
+  panels { room: "Main Area" name: "FRUIT (2)" }
+  panels { room: "Main Area" name: "FRUIT FRUIT" }
+  complete_at: 23 # ????
+}
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "CBA" name: "CBA (1)" }
+  panels { room: "CBA" name: "CBA (2)" }
+  panels { room: "CBA" name: "CBA (3)" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Advanced"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,22 @@
+name: "CBA"
+panels {
+  name: "CBA (1)"
+  path: "Panels/Room_1/panel_29"
+  clue: ""
+  answer: "chess"
+  symbols: QUESTION
+}
+panels {
+  name: "CBA (2)"
+  path: "Panels/Room_1/panel_30"
+  clue: ""
+  answer: "battle"
+  symbols: QUESTION
+}
+panels {
+  name: "CBA (3)"
+  path: "Panels/Room_1/panel_31"
+  clue: ""
+  answer: "advanced"
+  symbols: QUESTION
+}
@@ -0,0 +1,200 @@
+name: "Main Area"
+panels {
+  name: "OBSERVE"
+  path: "Panels/Room_1/panel_1"
+  clue: "observe"
+  answer: "watch"
+  symbols: SUN
+}
+panels {
+  name: "I"
+  path: "Panels/Room_1/panel_2"
+  clue: "i"
+  answer: "eye"
+  symbols: ZERO
+}
+panels {
+  name: "REST"
+  path: "Panels/Room_1/panel_3"
+  clue: "rest"
+  answer: "sleep"
+  symbols: SUN
+}
+panels {
+  name: "THE"
+  path: "Panels/Room_1/panel_4"
+  clue: "the"
+  answer: "a"
+  symbols: ZERO
+}
+panels {
+  name: "LIVES"
+  path: "Panels/Room_1/panel_5"
+  clue: "lives"
+  answer: "souls"
+  symbols: SUN
+}
+panels {
+  name: "DAIRY (1)"
+  path: "Panels/Room_1/panel_6"
+  clue: "dairy"
+  answer: "cheese"
+  symbols: EXAMPLE
+}
+panels {
+  name: "DAIRY (2)"
+  path: "Panels/Room_1/panel_7"
+  clue: "dairy"
+  answer: "butter"
+  symbols: EXAMPLE
+}
+panels {
+  name: "DAIRY SAUCE"
+  path: "Panels/Room_1/panel_8"
+  clue: "dairy? sauce."
+  answer: "alfredo"
+  symbols: EXAMPLE
+}
+panels {
+  name: "GULLIBLE (1)"
+  path: "Panels/Room_1/panel_9"
+  clue: "gullible"
+  answer: "credulous"
+  symbols: SUN
+}
+panels {
+  name: "GULLIBLE (2)"
+  path: "Panels/Room_1/panel_10"
+  clue: "gullible"
+  answer: "bird"
+  symbols: SPARKLES
+  symbols: EXAMPLE
+}
+panels {
+  name: "GULLIBLE (3)"
+  path: "Panels/Room_1/panel_11"
+  clue: "gullible"
+  answer: "advice"
+  symbols: QUESTION
+}
+panels {
+  name: "FRUIT (1)"
+  path: "Panels/Room_1/panel_12"
+  clue: "fruit"
+  answer: "cherry"
+  symbols: EXAMPLE
+}
+panels {
+  name: "FRUIT (2)"
+  path: "Panels/Room_1/panel_13"
+  clue: "fruit"
+  answer: "banana"
+  symbols: EXAMPLE
+}
+panels {
+  name: "FRUIT FRUIT"
+  path: "Panels/Room_1/panel_14"
+  clue: "fruit? fruit!"
+  answer: "avocado"
+  symbols: EXAMPLE
+}
+panels {
+  name: "BIRD"
+  path: "Panels/Room_1/panel_15"
+  clue: "bird"
+  answer: "canary"
+  symbols: EXAMPLE
+}
+panels {
+  name: "UNBOTTLING"
+  path: "Panels/Room_1/panel_16"
+  clue: "unbottling"
+  answer: "bottling"
+  symbols: SUN
+}
+panels {
+  name: "ORGANIZATION"
+  path: "Panels/Room_1/panel_17"
+  clue: "organization"
+  answer: "association"
+  symbols: SUN
+}
+panels {
+  name: "ORDER (1)"
+  path: "Panels/Room_1/panel_18"
+  clue: "order"
+  answer: "chaos"
+  symbols: SUN
+}
+panels {
+  name: "ORDER (2)"
+  path: "Panels/Room_1/panel_19"
+  clue: "order"
+  answer: "border"
+  symbols: SPARKLES
+}
+panels {
+  name: "ORDER (3)"
+  path: "Panels/Room_1/panel_20"
+  clue: "order"
+  answer: "arrange"
+  symbols: SUN
+}
+panels {
+  name: "DECK (1)"
+  path: "Panels/Room_1/panel_21"
+  clue: "deck"
+  answer: "card"
+  symbols: BOXES
+}
+panels {
+  name: "DECK (2)"
+  path: "Panels/Room_1/panel_22"
+  clue: "deck"
+  answer: "black"
+  symbols: BOXES
+}
+panels {
+  name: "DECK (3)"
+  path: "Panels/Room_1/panel_23"
+  clue: "deck"
+  answer: "ace"
+  symbols: BOXES
+}
+panels {
+  name: "Blank (1)"
+  path: "Panels/Room_1/panel_24"
+  clue: ""
+  answer: "identity"
+}
+panels {
+  name: "Blank (2)"
+  path: "Panels/Room_1/panel_25"
+  clue: ""
+  answer: "theft"
+}
+panels {
+  name: "Blank (3)"
+  path: "Panels/Room_1/panel_26"
+  clue: ""
+  answer: "is"
+}
+panels {
+  name: "Blank (4)"
+  path: "Panels/Room_1/panel_27"
+  clue: ""
+  answer: "a"
+}
+panels {
+  name: "Blank (5)"
+  path: "Panels/Room_1/panel_28"
+  clue: ""
+  answer: "crime"
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -4,4 +4,5 @@ panels {
   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" }
+}
@@ -241,6 +241,7 @@ doors {
 doors {
   name: "Control Center Brown Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/brown_1"
   control_center_color: "brown"
 }
@@ -250,3 +251,18 @@ doors {
   receivers: "Components/Doors/brown_2"
   double_letters: true
 }
+doors {
+  name: "Control Center Color Panel"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "COLOR" }
+  location_room: "Back Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Butterfly Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Butterfly Room" name: "DARKNESS" }
+  panels { room: "Butterfly Room" name: "VIBRANT" }
+  location_room: "Butterfly Room"
+  location_name: "DARKNESS, VIBRANT"
+}
@@ -7,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
 }
@@ -57,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
 }
@@ -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
+}
@@ -13,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
 }
@@ -197,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,6 +1,8 @@
 name: "Plaza Entrance"
 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,4 +1,3 @@
-# TODO: The gallery painting
 doors {
   name: "Panels"
   type: EVENT
@@ -127,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
 }
@@ -0,0 +1,35 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude South"
+  door { name: "Latitude South Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude Middle"
+  door { name: "Latitude Middle Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Latitude North"
+  door { name: "Latitude North Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude West"
+  door { name: "Longitude West Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude Middle"
+  door { name: "Longitude Middle Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Longitude East"
+  door { name: "Longitude East Door" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,56 @@
+doors {
+  name: "Latitude South Door"
+  type: EVENT
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "KING" }
+  panels { room: "Main Area" name: "ARC" }
+}
+doors {
+  name: "Latitude Middle Door"
+  type: EVENT
+  panels { room: "Main Area" name: "NAIL" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "AQUA" }
+}
+doors {
+  name: "Latitude North Door"
+  type: EVENT
+  panels { room: "Main Area" name: "PINS" }
+  panels { room: "Main Area" name: "IT" }
+  panels { room: "Main Area" name: "HERE" }
+}
+doors {
+  name: "Longitude West Door"
+  type: EVENT
+  panels { room: "Main Area" name: "ARC" }
+  panels { room: "Main Area" name: "AQUA" }
+  panels { room: "Main Area" name: "HERE" }
+}
+doors {
+  name: "Longitude Middle Door"
+  type: EVENT
+  panels { room: "Main Area" name: "KING" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "IT" }
+}
+doors {
+  name: "Longitude East Door"
+  type: EVENT
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "NAIL" }
+  panels { room: "Main Area" name: "PINS" }
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Main Area" name: "HERE" }
+  panels { room: "Main Area" name: "TILE" }
+  panels { room: "Main Area" name: "TIP" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Latitude South" name: "CHARISMA" }
+  panels { room: "Latitude Middle" name: "FUNNY" }
+  panels { room: "Latitude North" name: "DEPENDABLE" }
+  panels { room: "Longitude West" name: "CREATIVE" }
+  panels { room: "Longitude Middle" name: "INTELLIGENT" }
+  panels { room: "Longitude East" name: "FUN" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Charismatic"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,8 @@
+name: "Latitude Middle"
+panels {
+  name: "FUNNY"
+  path: "Panels/Room 2/panel_h"
+  clue: "funny"
+  answer: "hilarious"
+  symbols: PYRAMID
+}
@@ -0,0 +1,8 @@
+name: "Latitude North"
+panels {
+  name: "DEPENDABLE"
+  path: "Panels/Room 2/panel_r"
+  clue: "dependable"
+  answer: "reliable"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Latitude South"
+panels {
+  name: "CHARISMA"
+  path: "Panels/Room 2/panel_c"
+  clue: "charisma"
+  answer: "charismatic"
+  symbols: QUESTION
+}
@@ -0,0 +1,8 @@
+name: "Longitude East"
+panels {
+  name: "FUN"
+  path: "Panels/Room 2/panel_s2"
+  clue: "fun"
+  answer: "silly"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Longitude Middle"
+panels {
+  name: "INTELLIGENT"
+  path: "Panels/Room 2/panel_s"
+  clue: "intelligent"
+  answer: "smart"
+  symbols: SUN
+}
@@ -0,0 +1,8 @@
+name: "Longitude West"
+panels {
+  name: "CREATIVE"
+  path: "Panels/Room 2/panel_i"
+  clue: "creative"
+  answer: "imaginative"
+  symbols: SUN
+}
@@ -0,0 +1,78 @@
+name: "Main Area"
+panels {
+  name: "ARC"
+  path: "Panels/Room_1/panel_1"
+  clue: "arc"
+  answer: "arctic"
+  symbols: QUESTION
+}
+panels {
+  name: "KING"
+  path: "Panels/Room_1/panel_2"
+  clue: "king"
+  answer: "tacking"
+  symbols: QUESTION
+}
+panels {
+  name: "TIP"
+  path: "Panels/Room_1/panel_3"
+  clue: "tip"
+  answer: "tiptoe"
+  symbols: QUESTION
+}
+panels {
+  name: "AQUA"
+  path: "Panels/Room_1/panel_4"
+  clue: "aqua"
+  answer: "aquatic"
+  symbols: QUESTION
+}
+panels {
+  name: "TILE"
+  path: "Panels/Room_1/panel_5"
+  clue: "tile"
+  answer: "tactile"
+  symbols: QUESTION
+}
+panels {
+  name: "NAIL"
+  path: "Panels/Room_1/panel_6"
+  clue: "nail"
+  answer: "toenail"
+  symbols: QUESTION
+}
+panels {
+  name: "HERE"
+  path: "Panels/Room_1/panel_7"
+  clue: "here"
+  answer: "heretic"
+  symbols: QUESTION
+}
+panels {
+  name: "IT"
+  path: "Panels/Room_1/panel_8"
+  clue: "it"
+  answer: "tacit"
+  symbols: QUESTION
+}
+panels {
+  name: "PINS"
+  path: "Panels/Room_1/panel_9"
+  clue: "pins"
+  answer: "pintoes"
+  symbols: QUESTION
+}
+panels {
+  name: "Blank"
+  path: "Panels/Room 3/panel_10"
+  clue: ""
+  answer: "tactic"
+  symbols: QUESTION
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "White Door"
   type: STANDARD
@@ -104,3 +103,10 @@ doors {
   panels { room: "Gray Room" name: "MEND" }
   location_room: "Gray Room"
 }
+doors {
+  name: "Chaos Panel"
+  type: LOCATION_ONLY
+  panels { room: "Cyan Hallway" name: "CHAOS" }
+  location_room: "Cyan Hallway"
+  location_name: "CHAOS"
+}
@@ -23,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
 }
@@ -8,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,12 +1,22 @@
 doors {
   name: "Obverse Magenta Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/magenta_enterer2"
   panels { room: "Main Area" name: "LAKE" }
   panels { room: "Main Area" name: "DIE" }
   location_room: "Main Area"
 }
 doors {
+  name: "Main Area Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "LAKE" }
+  panels { room: "Main Area" name: "DIE" }
+  panels { room: "Main Area" name: "LIGHT" }
+  location_room: "Main Area"
+  location_name: "DIE, LAKE, LIGHT"
+}
+doors {
   name: "Flipped Magenta Door"
   type: STANDARD
   receivers: "Components/Doors/magenta_enterer"
@@ -1 +1,5 @@
 display_name: "The Congruent"
+worldport_entrance {
+  room: "Main Area"
+  name: "DARKROOM"
+}
@@ -2,5 +2,4 @@ name: "C Keyholder"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolder"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -2,5 +2,4 @@ name: "G Keyholder"
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolder2"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -85,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"
@@ -0,0 +1,26 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Painting Divot"
+  door { name: "Checkpoint Panels" }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      room: "Painting Divot"
+      name: "SNAKE"
+    }
+  }
+  to {
+    painting {
+      room: "Flip Area"
+      name: "SNAKE2"
+    }
+  }
+  oneway: true
+}
+connections {
+  from_room: "Flip Area"
+  to_room: "Mastery"
+  door { name: "Mastery" }
+}
@@ -0,0 +1,14 @@
+doors {
+  name: "Mastery"
+  type: EVENT
+  panels { room: "Flip Area" name: "SUCCEED" }
+}
+doors {
+  name: "Checkpoint Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DROP" }
+  panels { room: "Main Area" name: "LEAP" }
+  panels { room: "Main Area" name: "SPIN" }
+  location_room: "Main Area"
+  location_name: "DROP, LEAP, SPIN"
+}
@@ -0,0 +1,4 @@
+display_name: "The Crystalline"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,14 @@
+name: "Flip Area"
+panels {
+  name: "SUCCEED"
+  path: "Panels/Room_1/panel_3"
+  clue: "succeed"
+  answer: "win"
+  symbols: SUN
+}
+paintings {
+  name: "SNAKE2"
+  path: "Components/snake2"
+  exit_only: true
+  gravity: Y_PLUS
+}
@@ -0,0 +1,29 @@
+name: "Main Area"
+panels {
+  name: "LEAP"
+  path: "Panels/Room_1/panel_1"
+  clue: "leap"
+  answer: "jump"
+  symbols: SUN
+}
+panels {
+  name: "DROP"
+  path: "Panels/Room_1/panel_2"
+  clue: "drop"
+  answer: "fall"
+  symbols: SUN
+}
+panels {
+  name: "SPIN"
+  path: "Panels/Room_1/panel_4"
+  clue: "spin"
+  answer: "flip"
+  symbols: SUN
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,5 @@
+name: "Painting Divot"
+paintings {
+  name: "SNAKE"
+  path: "Components/snake"
+}
@@ -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,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "Double Letter Panel Blockers"
   type: EVENT
@@ -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
+}
@@ -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
 }
@@ -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
+}
@@ -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
 }
@@ -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" }
@@ -42,6 +42,7 @@ doors {
 doors {
   name: "Control Center Blue Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/maze2"
   control_center_color: "blue"
 }
@@ -52,3 +53,10 @@ doors {
   panels { room: "Tree Area" name: "TREE" }
   location_room: "Tree Area"
 }
+doors {
+  name: "Control Center Blue Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COLOR" }
+  location_room: "Main Area"
+  location_name: "COLOR"
+}
@@ -1,6 +1,8 @@
 name: "Gallery Maze"
 ports {
   name: "GALLERY"
+  display_name: "Gallery Maze Worldport"
   path: "Components/Warps/worldport4"
-  orientation: "east"
+  destination { x: -58 y: 0 z: -76 }
+  rotation: 90
 }
@@ -27,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
 }
@@ -8,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,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
 }
@@ -113,3 +113,82 @@ doors {
   # The panel blocks your way; there's no door.
   panels { room: "Flipped Black Area" name: "SEAPLANE" }
 }
+# These locations are kind of deranged but hey. Welcome to The Double Sided.
+doors {
+  name: "5 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 5
+}
+doors {
+  name: "10 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 10
+}
+doors {
+  name: "15 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 15
+}
@@ -1 +1,5 @@
 display_name: "The Double Sided"
+worldport_entrance {
+  room: "Start"
+  name: "DARKROOM"
+}
@@ -15,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" }
@@ -97,6 +107,12 @@ 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"
@@ -154,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
@@ -172,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"
@@ -199,3 +220,28 @@ connections {
   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
+}
@@ -69,20 +69,40 @@ doors {
 # second_right is vanilla because it's like LOST door.
 doors {
   name: "Noon Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/second_right5"
   receivers: "Components/Doors/second_right10"
   panels { room: "Red Blue Halls" name: "CENTER DAY" }
   location_room: "Red Blue Halls"
 }
 doors {
+  name: "Noon Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "CENTER" }
+  panels { room: "Red Blue Halls" name: "DAY" }
+  panels { room: "Red Blue Halls" name: "CENTER DAY" }
+  location_room: "Red Blue Halls"
+  location_name: "CENTER, DAY, CENTER DAY"
+}
+doors {
   name: "Scarf Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/second_right6"
   panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
   location_room: "Red Blue Halls"
 }
 doors {
+  name: "Scarf Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "RAIN" }
+  panels { room: "Red Blue Halls" name: "WOMAN" }
+  panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
+  location_room: "Red Blue Halls"
+  location_name: "RAIN, WOMAN, RAIN WOMAN"
+}
+doors {
   name: "Blue Alcove Entrance"
   type: STANDARD
   receivers: "Components/Doors/second_right9"
@@ -119,7 +139,8 @@ doors {
 }
 doors {
   name: "Red Blue Area Left Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/fourth_right"
   panels { room: "Right Eye" name: "WANDER" }
   location_room: "Right Eye"
@@ -131,14 +152,41 @@ doors {
   panels { room: "Right Eye" name: "WANDER" }
   location_room: "Right Eye"
 }
+doors {
+  name: "Wander Panels"
+  type: LOCATION_ONLY
+  panels { room: "Right Eye" name: "WANDER" }
+  panels { room: "Red Blue Halls" name: "WANDER" }
+  panels { room: "Link Area" name: "WANDER" }
+  panels { room: "Flipped Link Area" name: "WANDER" }
+  location_room: "Flipped Link Area"
+}
+doors {
+  name: "Flipped Right Eye Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Right Eye" name: "HERE" }
+  panels { room: "Flipped Right Eye" name: "WHERE" }
+  location_room: "Flipped Right Eye"
+  location_name: "HERE, WHERE"
+}
+doors {
+  name: "Big Eyes"
+  type: LOCATION_ONLY
+  panels { room: "Starting Room" name: "EYE" }
+  panels { room: "Right Eye" name: "EYE" }
+  location_room: "Right Eye"
+  location_name: "EYE"
+}
 # Components/Doors/back_left_1, _3, _4, _6 are vanilla because they're nothing.
 doors {
   name: "Orange Door Hider"
   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"
@@ -159,6 +207,7 @@ doors {
 doors {
   name: "Control Center White Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/back_left_7"
   control_center_color: "white"
 }
@@ -209,7 +258,7 @@ 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 {
@@ -222,7 +271,7 @@ 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 {
@@ -301,7 +350,6 @@ doors {
 doors {
   name: "Red Room Painting"
   type: STANDARD
-  #move_paintings { room: "Right Eye" name: "PSYCHIC" }
   receivers: "Components/Paintings/psychic/teleportListener"
   panels { room: "Right Eye" name: "FAINT" }
   location_room: "Right Eye"
@@ -309,8 +357,49 @@ doors {
 doors {
   name: "Third Eye Painting"
   type: LOCATION_ONLY
-  # move_paintings { room: "Eye Room" name: "GALLERY" }
   # TODO: ummmm
   panels { room: "Eye Room" name: "I" }
   location_room: "Eye Room"
-}
\ No newline at end of file
+}
+doors {
+  name: "Gift Maps Entrance"
+  type: EVENT
+  receivers: "Components/GiftMapEntrance/PanelTeleporter"
+  double_letters: true
+}
+doors {
+  name: "Least Blue Last"
+  type: LOCATION_ONLY
+  panels { room: "Least Blue Last" name: "CAPABLE (1)" }
+  panels { room: "Least Blue Last" name: "CAPABLE (2)" }
+  panels { room: "Least Blue Last" name: "LUSTRE" }
+  panels { room: "Least Blue Last" name: "WANT" }
+  panels { room: "Least Blue Last" name: "STEALER" }
+  panels { room: "Least Blue Last" name: "OLD" }
+  panels { room: "Least Blue Last" name: "TRUST" }
+  panels { room: "Least Blue Last" name: "LABEL" }
+  panels { room: "Least Blue Last" name: "AIL" }
+  location_room: "Least Blue Last"
+}
+doors {
+  name: "Control Center White Panel"
+  type: LOCATION_ONLY
+  panels { room: "Lime Room" name: "COLOR" }
+  location_room: "Lime Room"
+  location_name: "COLOR"
+}
+doors {
+  name: "Rabbit Hole Blank Puzzle"
+  type: LOCATION_ONLY
+  panels { room: "Rabbit Hole" name: "Blank" }
+  location_room: "Rabbit Hole"
+  location_name: "Blank Puzzle"
+}
+doors {
+  name: "Wrath Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Wrath Room" name: "DICE" }
+  panels { room: "Wrath Room" name: "WREATH" }
+  location_room: "Wrath Room"
+  location_name: "DICE, WRATH"
+}
@@ -11,3 +11,13 @@ 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"
+# The gift map entrance is created by the mod.
+custom_nodes: "Components/GiftMapEntrance/GongusPanel"
+custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
+custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
+custom_nodes: "Components/GiftMapEntrance/Panel"
+custom_nodes: "Components/GiftMapEntrance/QPanel"
+custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
+custom_nodes: "Components/GiftMapEntrance/StarPanel"
@@ -2,6 +2,8 @@ name: "Composite Room Entrance"
 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
 }
@@ -2,6 +2,8 @@ name: "Daedalus Entrance"
 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
 }
@@ -2,6 +2,8 @@ name: "Digital Entrance"
 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
 }
@@ -2,6 +2,8 @@ name: "Entry Exit"
 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
 }
@@ -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,16 +1,6 @@
 name: "Flipped Pyramid Area"
 panel_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
+# 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.
@@ -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
+  # This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
+}
@@ -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
@@ -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
+}
@@ -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
@@ -26,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
+}
@@ -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
+}
@@ -1,13 +1,15 @@
 name: "Rabbit Hole"
 panel_display_name: "Red Blue Area"
 panels {
-  name: "PUZZLE"
+  name: "Blank"
   path: "Panels/Back Right/br_6"
   clue: ""
   answer: "down"
 }
 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
+}
@@ -2,6 +2,8 @@ name: "Repetitive Entrance"
 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
 }
@@ -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: "Shop Entrance"
-panel_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
@@ -24,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"
@@ -44,6 +46,25 @@ panels {
   clue: "than"
   answer: "than"
 }
+panels {
+  name: "Gift Maps"
+  # TODO: exclude from panelsanity
+  path: "Components/GiftMapEntrance/Panel"
+  clue: "player"
+  answer: ""
+  # The puzzle solution doesn't matter. We'll change it to the player's name
+  # for fun.
+  symbols: QUESTION
+  proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
+  proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
+  proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
+  proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
+  proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
+  proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
+  proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
+  proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
+  required_door { name: "Gift Maps Entrance" }
+}
 letters {
   key: "h"
   path: "Components/Collectables/h"
@@ -2,6 +2,8 @@ name: "White Hallway To Daedalus"
 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
 }
@@ -6,6 +6,8 @@ letters {
 }
 ports {
   name: "CC"
+  display_name: "Near X1 Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }
@@ -22,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_MINUS gravity
+  no_shuffle: true
 }
@@ -0,0 +1,5 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,29 @@
+doors {
+  name: "Black Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHERETO" }
+  panels { room: "Main Area" name: "COMBINED" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Green Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "ACHIEVES" }
+  panels { room: "Main Area" name: "BEFORE" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Main Area" name: "BOTH" }
+  panels { room: "Main Area" name: "CAGED" }
+  panels { room: "Main Area" name: "DICE" }
+  panels { room: "Main Area" name: "FIRST" }
+  panels { room: "Main Area" name: "FORGED" }
+  panels { room: "Main Area" name: "LOTTO" }
+  panels { room: "Main Area" name: "TOED" }
+  panels { room: "Main Area" name: "TUTU" }
+  panels { room: "Main Area" name: "UNVEILED" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Main Area" name: "OTHERS" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Fuzzy"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,119 @@
+name: "Main Area"
+panels {
+  name: "Blank"
+  path: "Panels/Room_1/panel_1"
+  clue: ""
+  answer: "2475"
+  symbols: LINGO
+  symbols: QUESTION
+}
+panels {
+  name: "TUTU"
+  path: "Panels/Room_1/panel_2"
+  clue: "tutu"
+  answer: "22"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "LOTTO"
+  path: "Panels/Room_1/panel_3"
+  clue: "lotto"
+  answer: "22222222"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "WHERETO"
+  path: "Panels/Room_1/panel_10"
+  clue: "whereto"
+  answer: "sides"
+  symbols: QUESTION
+}
+panels {
+  name: "DICE"
+  path: "Panels/Room_1/panel_11"
+  clue: "dice"
+  answer: "4935"
+  symbols: QUESTION
+}
+panels {
+  name: "CAGED"
+  path: "Panels/Room_1/panel_12"
+  clue: "caged"
+  answer: "31754"
+  symbols: QUESTION
+}
+panels {
+  name: "BEFORE"
+  path: "Panels/Room_1/panel_13"
+  clue: "before"
+  answer: "100"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "TOED"
+  path: "Panels/Room_1/panel_14"
+  clue: "toed"
+  answer: "108"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "FORGED"
+  path: "Panels/Room_1/panel_15"
+  clue: "forged"
+  answer: "3016"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "OTHERS"
+  path: "Panels/Room_1/panel_4"
+  clue: "others"
+  answer: "34390869"
+  symbols: QUESTION
+}
+panels {
+  name: "COMBINED"
+  path: "Panels/Room_1/panel_9"
+  clue: "combined"
+  answer: "added"
+  symbols: SUN
+}
+panels {
+  name: "ACHIEVES"
+  path: "Panels/Room_1/panel_5"
+  clue: "achieves"
+  answer: "4214"
+  symbols: QUESTION
+}
+panels {
+  name: "UNVEILED"
+  path: "Panels/Room_1/panel_6"
+  clue: "unveiled"
+  answer: "12122021"
+  symbols: QUESTION
+}
+panels {
+  name: "FIRST"
+  path: "Panels/Room_1/panel_8"
+  clue: "first"
+  answer: "1"
+  symbols: QUESTION
+}
+panels {
+  name: "BOTH"
+  path: "Panels/Room_1/panel_7"
+  clue: "both"
+  answer: "2"
+  symbols: QUESTION
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -1,9 +1,9 @@
 # The Gallery is interesting because there's so many cross-map requirements.
 doors {
   name: "Darkroom Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "DARKROOM" }
-  receivers: "Components/Paintings/darkroom/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerDarkroom"
   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" }
@@ -27,16 +27,16 @@ doors {
 }
 doors {
   name: "Butterfly Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "BUTTERFLY" }
-  receivers: "Components/Paintings/butterfly/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerButterfly"
   rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
   name: "Between Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "BETWEEN" }
-  receivers: "Components/Paintings/between/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerBetween"
   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" }
@@ -70,16 +70,16 @@ doors {
 }
 doors {
   name: "Entry Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "ENTRY" }
-  receivers: "Components/Paintings/eyes/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerEyes"
   panels { map: "the_entry" room: "Eye Room" name: "I" }
 }
 doors {
   name: "Wise Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WISE" }
-  receivers: "Components/Paintings/triangle/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTriangle"
   panels { map: "the_wise" room: "Entry" name: "INK" }
   panels { map: "the_wise" room: "Puzzles" name: "STORY" }
   panels { map: "the_wise" room: "Puzzles" name: "VENTURE" }
@@ -105,9 +105,9 @@ doors {
 }
 doors {
   name: "Tree Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "TREE" }
-  receivers: "Components/Paintings/Clue Maps/tree/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTree"
   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)" }
@@ -142,37 +142,37 @@ doors {
 }
 doors {
   name: "Unyielding Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "UNYIELDING" }
-  receivers: "Components/Paintings/Clue Maps/unyielding/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerUnyielding"
   rooms { map: "the_unyielding" name: "Digital Entrance" }
 }
 doors {
   name: "Graveyard Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "GRAVEYARD" }
-  receivers: "Components/Paintings/Endings/grave/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerGraveyard"
   rooms { map: "the_graveyard" name: "Outside" }
 }
 doors {
   name: "Control Center Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "CC" }
-  receivers: "Components/Paintings/Endings/desert/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerDesert"
   rooms { map: "the_impressive" name: "M2 Room" }
 }
 doors {
   name: "Tower Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "TOWER" }
-  receivers: "Components/Paintings/Endings/red/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTower"
   rooms { map: "the_tower" name: "First Floor" }
 }
 doors {
   name: "Wondrous Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WONDROUS" }
-  receivers: "Components/Paintings/Endings/window/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWonderland"
   panels { map: "the_wondrous" room: "Entry" name: "WONDER" }
   panels { map: "the_wondrous" room: "Regular" name: "SHRINK" }
   panels { map: "the_wondrous" room: "Huge" name: "SHRINK" }
@@ -187,44 +187,44 @@ doors {
 }
 doors {
   name: "Rainbow Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "RAINBOW" }
-  receivers: "Components/Paintings/Endings/rainbow/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerRainbow"
   rooms { map: "daedalus" name: "Rainbow Start" }
 }
 doors {
   name: "Words Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WORDS" }
-  receivers: "Components/Paintings/Endings/words/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWords"
   rooms { map: "the_words" name: "Main Area" }
 }
 doors {
   name: "Colorful Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "COLORFUL" }
-  receivers: "Components/Paintings/Endings/colorful/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerColorful"
   rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
   name: "Castle Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "CASTLE" }
-  receivers: "Components/Paintings/Endings/castle/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerCastle"
   rooms { map: "daedalus" name: "Castle" }
 }
 doors {
   name: "Sun Temple Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "SUNTEMPLE" }
-  receivers: "Components/Paintings/Endings/temple/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTemple"
   rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
   name: "Ancient Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "ANCIENT" }
-  receivers: "Components/Paintings/Endings/cubes/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerQuartz"
   rooms { map: "the_ancient" name: "Outside" }
 }
 doors {
@@ -255,7 +255,8 @@ doors {
   doors { name: "Castle Painting" }
   doors { name: "Sun Temple Painting" }
   doors { name: "Ancient Painting" }
-  doors { name: "Gallery Extension" }
+  panels { room: "Daedalus Extension" name: "WHERE" }
+  double_letters: true
 }
 doors {
   name: "Ending Door"
@@ -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
 }
@@ -0,0 +1,7 @@
+doors {
+  name: "The Panel"
+  type: LOCATION_ONLY
+  panels { room: "The Whole Thing" name: "PANEL" }
+  location_room: "The Whole Thing"
+  location_name: "Panel"
+}
@@ -23,3 +23,10 @@ doors {
   receivers: "Components/Paintings/omrt/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Remember Panel"
+  type: LOCATION_ONLY
+  panels { room: "Inside" name: "REMEMBER" }
+  location_room: "Inside"
+  location_name: "REMEMBER"
+}
@@ -256,3 +256,7 @@ connections {
   to_room: "Zero Room"
   door { name: "Lavender Cube" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "The Landscapes"
+}
@@ -29,6 +29,15 @@ doors {
   location_room: "Main Area"
 }
 doors {
+  name: "Near Linear Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DEW" }
+  panels { room: "Main Area" name: "EWE" }
+  panels { room: "Main Area" name: "NO" }
+  location_room: "Main Area"
+  location_name: "DEW, EWE, NO"
+}
+doors {
   name: "Courtyard Entrance"
   type: STANDARD
   receivers: "Components/Doors/entry_1"
@@ -54,19 +63,22 @@ doors {
 doors {
   name: "Control Center Purple Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_23"
   control_center_color: "purple"
 }
 doors {
   name: "Control Center Gray Door"
   type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  latch: true
+  receivers: "Components/Doors/Gates/Gate/animationListener"
   control_center_color: "gray"
 }
 doors {
   name: "Control Center Red Door"
   type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  latch: true
+  receivers: "Components/Doors/entry_18"
   control_center_color: "red"
 }
 doors {
@@ -124,6 +136,7 @@ doors {
   panels { room: "Magnet Room" name: "SAW" }
   panels { room: "Magnet Room" name: "BLENDER" }
   location_room: "Magnet Room"
+  location_name: "Gravestone"
 }
 doors {
   name: "Hive Entrance"
@@ -205,23 +218,25 @@ 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"
@@ -318,6 +333,7 @@ doors {
   panels { room: "Maze Up Area" name: "UP" }
   panels { room: "Maze Wreck Area" name: "WRECK" }
   location_room: "Maze Slice Area"
+  location_name: "Gravestone"
 }
 doors {
   name: "Courtyard Side Door"
@@ -410,7 +426,8 @@ doors {
 }
 doors {
   name: "Question Room Back Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/question_11"
   panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
   location_room: "Behind Question Area"
@@ -419,10 +436,10 @@ doors {
   name: "Invisible Entrance"
   type: STANDARD
   receivers: "Components/Doors/entry_36"
-  panels { room: "Back Area" name: "Right Landscape Top" answer: "tell" }
-  panels { room: "Back Area" name: "Right Landscape Left" answer: "eyes" }
-  location_room: "Back Area"
-  location_name: "Landscapes Room Alternate Answers"
+  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"
@@ -468,6 +485,7 @@ doors {
   panels { room: "Whole Room" name: "CHIPS" }
   panels { room: "Whole Room" name: "TOWER" }
   location_room: "Whole Room"
+  location_name: "Gravestone"
 }
 doors {
   name: "Lavender Cube"
@@ -494,6 +512,7 @@ doors {
   panels { room: "Zero Room" name: "MANY" }
   panels { room: "Zero Room" name: "REMAINING" }
   location_room: "Zero Room"
+  location_name: "Panels"
 }
 doors {
   name: "Spiral Painting"
@@ -508,3 +527,104 @@ doors {
   receivers: "Panels/General/entry_7/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Partial Entrance"
+  type: EVENT
+  panels { room: "West Side" name: "CLUE" }
+}
+doors {
+  name: "Why Is It Not Red"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHY" }
+  panels { room: "Main Area" name: "IS" }
+  panels { room: "Main Area" name: "IT" }
+  panels { room: "Main Area" name: "NOT" }
+  panels { room: "Main Area" name: "RED" }
+  location_room: "Main Area"
+  location_name: "WHY, IS, IT, NOT, RED"
+}
+doors {
+  name: "Control Center Gray Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COLOR" }
+  location_room: "Main Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Purple Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "COLOR" }
+  location_room: "East Landscape"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Red Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Side" name: "COLOR" }
+  location_room: "West Side"
+  location_name: "COLOR"
+}
+doors {
+  name: "Mistreat Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "MISTREAT" }
+  location_room: "East Landscape"
+  location_name: "MISTREAT"
+}
+doors {
+  name: "Tower Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "TOWEL" }
+  panels { room: "Maze Tower" name: "SPIRE" }
+  location_room: "Maze Tower"
+  location_name: "SPIRE, TOWEL"
+}
+doors {
+  name: "Tree Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "PLANT" }
+  panels { room: "Back Area" name: "TREE" }
+  location_room: "Back Area"
+  location_name: "PLANT, TREE"
+}
+doors {
+  name: "Behind Question Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Behind Question Area" name: "DEW" }
+  panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
+  panels { room: "Behind Question Area" name: "NO" }
+  location_room: "Behind Question Area"
+  location_name: "DEW, YEW/EWE, NO"
+}
+doors {
+  name: "Broken Shed Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "LAUGH" }
+  panels { room: "North Landscape" name: "FINISHED" }
+  panels { room: "North Landscape" name: "LAUGH FINISHED" }
+  location_room: "North Landscape"
+  location_name: "LAUGH, FINISHED, LAUGH FINISHED"
+}
+doors {
+  name: "Nature Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "WEATHER" }
+  panels { room: "North Landscape" name: "ANIMALS" }
+  panels { room: "North Landscape" name: "PLANTS" }
+  location_room: "North Landscape"
+  location_name: "ANIMALS, PLANTS, WEATHER"
+}
+doors {
+  name: "Teal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Maze Wreck Area" name: "MAROON" }
+  location_room: "Maze Wreck Area"
+  location_name: "MAROON"
+}
+doors {
+  name: "Behind Orb Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "BROWN RED ORANGE" }
+  location_room: "Main Area"
+  location_name: "Brown Red Orange"
+}
@@ -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
 }
@@ -2,6 +2,8 @@ name: "Colorful Entrance"
 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
 }
@@ -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.
 }
@@ -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
 }
@@ -2,6 +2,8 @@ name: "Jubilant Entrance"
 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
 }
@@ -122,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,4 @@
 name: "Maze Tower"
-panel_display_name: "Courtyard"
 panels {
   name: "FEEL"
   path: "Panels/Maze/maze_12"
@@ -56,8 +56,9 @@ keyholders {
 }
 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" }
 }
@@ -2,6 +2,8 @@ name: "Purple Room"
 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
 }
@@ -2,6 +2,8 @@ name: "Salmon Room"
 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
 }
@@ -2,6 +2,8 @@ name: "Talented Entrance"
 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" }
+}
@@ -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"
-panel_display_name: "North Landscape"
+panel_display_name: "Building Building"
 panels {
   name: "VAULT"
   path: "Panels/Whole Room/whole_1"
@@ -2,11 +2,15 @@ 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
 }
@@ -272,21 +272,29 @@ keyholders {
 }
 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
 }
@@ -30,8 +30,25 @@ doors {
   panels { room: "Green Eye" name: "LEFT" }
 }
 doors {
+  name: "Green Eye Panels"
+  type: LOCATION_ONLY
+  panels { room: "Green Eye" name: "RETURN" }
+  panels { room: "Green Eye" name: "TO" }
+  panels { room: "Green Eye" name: "LEFT" }
+  location_room: "Green Eye"
+  location_name: "RETURN, TO, LEFT"
+}
+doors {
   name: "Control Center Green Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_2"
   control_center_color: "green"
 }
+doors {
+  name: "Control Center Green Panel"
+  type: LOCATION_ONLY
+  panels { room: "Side Area" name: "COLOR" }
+  location_room: "Side Area"
+  location_name: "COLOR"
+}
@@ -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
 }
@@ -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
 }
@@ -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
 }
@@ -8,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
 }
@@ -5,6 +5,9 @@ masteries {
 }
 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
 }
@@ -31,3 +31,14 @@ doors {
   panels { room: "Main Area" name: "QUEEN" answer: "jack" }
   location_room: "Main Area"
 }
+doors {
+  name: "Side Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Side Area" name: "CALLBACK" }
+  panels { room: "Side Area" name: "CALL" }
+  panels { room: "Side Area" name: "PUSHBACK" }
+  panels { room: "Side Area" name: "PUSH" }
+  panels { room: "Side Area" name: "FLASHBACK" }
+  panels { room: "Side Area" name: "FLASH" }
+  location_room: "Side Area"
+}
@@ -1 +1,5 @@
 display_name: "The Jubilant"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -97,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 +1,5 @@
 display_name: "The Keen"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -69,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
 }
@@ -1 +1,5 @@
 display_name: "The Liberated"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -57,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 +1,5 @@
 display_name: "The Linear"
+worldport_entrance {
+  room: "Room"
+  name: "GREAT"
+}
@@ -57,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 +1,5 @@
 display_name: "The Lionized"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -57,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
 }
@@ -1 +1,5 @@
 display_name: "The Literate"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "ENTRY"
+}
@@ -57,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 +1,5 @@
 display_name: "The Lively"
+worldport_entrance {
+  room: "Puzzle Room"
+  name: "BETWEEN"
+}
@@ -57,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,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" }
@@ -52,3 +52,10 @@ doors {
   panels { room: "Back Room" name: "LIMB" }
   panels { room: "Back Room" name: "SPARE" }
 }
+doors {
+  name: "Stores Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "TORE" }
+  location_room: "Main Room"
+  location_name: "TORE"
+}
@@ -1 +1,5 @@
 display_name: "The Nuanced"
+worldport_entrance {
+  room: "Main Room"
+  name: "UNYIELDING"
+}
@@ -106,8 +106,10 @@ 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"
@@ -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
@@ -9,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
 }
@@ -85,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,13 +1,15 @@
 doors {
   name: "Brush Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_1"
   panels { room: "R2C2 Top" name: "CRUSH" }
   location_room: "R2C2 Top"
 }
 doors {
   name: "Sky Top Doors"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_2"
   receivers: "Components/Doors/entry_4"
   panels { room: "R2C1 Left" name: "VERB" }
@@ -15,7 +17,8 @@ doors {
 }
 doors {
   name: "Sky Bottom Doors"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_3"
   receivers: "Components/Doors/entry_5"
   panels { room: "R2C1 Left" name: "FOIL" }
@@ -23,21 +26,24 @@ doors {
 }
 doors {
   name: "First Room Shortcut"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_6"
   panels { room: "Connected Area" name: "FIZZLE" }
   location_room: "Connected Area"
 }
 doors {
   name: "First Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_7"
   panels { room: "R2C2 Bottom" name: "FOUL" }
   location_room: "R2C2 Bottom"
 }
 doors {
   name: "Blue Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_8"
   panels { room: "Connected Area" name: "PAST" }
   panels { room: "Connected Area" name: "LAY" }
@@ -59,12 +65,14 @@ doors {
 doors {
   name: "Control Center Magenta Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_18"
   control_center_color: "magenta"
 }
 doors {
   name: "Sky Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/LB"
   receivers: "Components/Owl/Room 1/LBG"
   receivers: "Components/Owl/Room 2/LB"
@@ -92,7 +100,8 @@ doors {
 }
 doors {
   name: "Gray Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/G"
   receivers: "Components/Owl/Room 1/GG"
   receivers: "Components/Owl/Room 2/G"
@@ -120,7 +129,8 @@ doors {
 }
 doors {
   name: "Orange Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/O"
   receivers: "Components/Owl/Room 1/OG"
   receivers: "Components/Owl/Room 2/O"
@@ -148,7 +158,8 @@ doors {
 }
 doors {
   name: "White Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/W"
   receivers: "Components/Owl/Room 1/WG"
   receivers: "Components/Owl/Room 2/W"
@@ -176,7 +187,8 @@ doors {
 }
 doors {
   name: "Black Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/BK"
   receivers: "Components/Owl/Room 1/BKG"
   receivers: "Components/Owl/Room 2/BK"
@@ -204,7 +216,8 @@ doors {
 }
 doors {
   name: "Blue Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/BL"
   receivers: "Components/Owl/Room 1/BLG"
   receivers: "Components/Owl/Room 2/BL"
@@ -235,7 +248,7 @@ doors {
   type: EVENT
   #receivers: "Panels/Colors/owl_2/animationListener2"
   panels { room: "Connected Area" name: "RANGE" }
-  panels { room: "R2C3 Bottom" name: "BLACK" }
+  panels { room: "Connected Area" name: "WHITE" }
   panels { room: "Blue Room" name: "SKY" }
 }
 doors {
@@ -250,3 +263,95 @@ doors {
   panels { room: "Connected Area" name: "WHITE" }
   panels { room: "Blue Room" name: "SKY" }
 }
+doors {
+  name: "R1C1 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "ETCH" }
+  panels { room: "Connected Area" name: "SHOE" }
+  panels { room: "Connected Area" name: "MARKER" }
+  location_room: "Connected Area"
+  location_name: "ETCH, MARKER, SHOE"
+}
+doors {
+  name: "R1C2 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "FAINT" }
+  panels { room: "Connected Area" name: "PURE" }
+  panels { room: "Connected Area" name: "MODE" }
+  location_room: "Connected Area"
+  location_name: "FAINT, MODE, PURE"
+}
+doors {
+  name: "Control Center Magenta Panel"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "COLOR" }
+  location_room: "Connected Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "R1C3 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "PENCIL" }
+  panels { room: "Connected Area" name: "WING" }
+  location_room: "Connected Area"
+  location_name: "PENCIL, WING"
+}
+doors {
+  name: "R1C4 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "SKETCH" }
+  panels { room: "Connected Area" name: "PHOTO" }
+  panels { room: "R1C4 Left" name: "WALK" }
+  panels { room: "R1C4 Left" name: "STENCIL" }
+  location_room: "R1C4 Left"
+  location_name: "PHOTO, SKETCH, STENCIL, WALK"
+}
+doors {
+  name: "R2C1 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "LAY" }
+  panels { room: "Connected Area" name: "PAST" }
+  panels { room: "R2C1 Left" name: "VERB" }
+  panels { room: "R2C1 Left" name: "FOIL" }
+  location_room: "R2C1 Left"
+  location_name: "FOIL, LAY, PAST, VERB"
+}
+doors {
+  name: "R2C2 Panels"
+  type: LOCATION_ONLY
+  panels { room: "R2C2 Bottom" name: "FOUL" }
+  panels { room: "R2C2 Top" name: "CRUSH" }
+  panels { room: "Connected Area" name: "FIZZLE" }
+  location_room: "R2C2 Top"
+  location_name: "CRUSH, FOUL, FIZZLE"
+}
+doors {
+  name: "R2C3 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "PRIMARY" }
+  panels { room: "R2C3 Bottom" name: "FIGMENT" }
+  location_room: "R2C3 Bottom"
+  location_name: "FIGMENT, PRIMARY"
+}
+doors {
+  name: "R2C4 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "SHOW" }
+  panels { room: "Connected Area" name: "HAD" }
+  panels { room: "Connected Area" name: "HEAVY" }
+  location_room: "Connected Area"
+  location_name: "HAD, HEAVY, SHOW"
+}
+doors {
+  name: "Near Z1 Panel"
+  type: LOCATION_ONLY
+  panels { room: "Z Room" name: "MAZE" }
+  location_room: "Z Room"
+  location_name: "MAZE"
+}
+doors {
+  name: "Double Letters"
+  type: EVENT
+  receivers: "Panels/Warps/magenta/visibilityListener"
+  double_letters: true
+}
@@ -26,6 +26,7 @@ panels {
   clue: "color"
   answer: "magenta"
   symbols: EXAMPLE
+  required_door { name: "Double Letters" }
 }
 panels {
   name: "WHITE"
@@ -149,7 +150,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,6 +1,8 @@
 name: "Magenta Hallway"
 ports {
   name: "STURDY"
+  display_name: "Magenta Hallway"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: 17 y: 0 z: -46 }
+  rotation: 270
 }
@@ -8,8 +8,10 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Worldport"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  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.
 }
@@ -7,6 +7,7 @@ connections {
   from_room: "Main Area"
   to_room: "Ending"
   door { name: "Ending Door" }
+  cyan_ending: true
 }
 connections {
   from_room: "Main Area"
@@ -43,3 +43,12 @@ doors {
   panels { room: "Main Area" name: "ALEXANDER" answer: "alexander" }
   panels { room: "Main Area" name: "CAESAR" answer: "caesar" }
 }
+doors {
+  name: "Lavender Area Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Lavender Area" name: "ME" }
+  panels { room: "Lavender Area" name: "SHEEP" }
+  panels { room: "Lavender Area" name: "WOOD" }
+  location_room: "Lavender Area"
+  location_name: "ME, SHEEP, WOOD"
+}
@@ -55,16 +55,22 @@ panels {
 }
 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
 }
@@ -43,14 +43,14 @@ doors {
 doors {
   name: "L Entered"
   type: EVENT
-  # It does this in vanilla, but I'm specifying it so that the Control Center
-  # Entrance door doesn't override it.
+  latch: true
   receivers: "Components/Doors/controlDoor"
   keyholders { room: "Obverse Side" name: "L" key: "l" }
 }
 doors {
   name: "Control Center Entrance"
-  type: LOCATION_ONLY
+  type: EVENT
+  legacy_location: true
   #receivers: "Components/Doors/controlDoor"
   panels { room: "Control Center Entrance" name: "RETURN" }
   location_room: "Control Center Entrance"
@@ -8,6 +8,8 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 8 }
+  rotation: 180
 }
@@ -99,8 +99,10 @@ 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.
@@ -1 +1,5 @@
 display_name: "The Perceptive"
+worldport_entrance {
+  room: "Main Area"
+  name: "CC"
+}
@@ -1,6 +1,8 @@
 name: "Main Area"
 ports {
   name: "CC"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 13 }
+  rotation: 90
 }
@@ -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" }
@@ -44,7 +44,7 @@ doors {
   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" }
@@ -55,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" }
@@ -66,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" }
@@ -77,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" }
@@ -104,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" }
@@ -130,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)" }
@@ -141,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" }
@@ -210,3 +210,31 @@ doors {
   panels { room: "Bottom Right Room" name: "HONEY" }
   panels { room: "Bottom Right Room" name: "INJECT" }
 }
+doors {
+  name: "Near Sirenic Panel"
+  type: LOCATION_ONLY
+  panels { room: "Sirenic Entrance" name: "SIREN" }
+  location_room: "Sirenic Entrance"
+  location_name: "SIREN"
+}
+doors {
+  name: "Near Symbolic Panel"
+  type: LOCATION_ONLY
+  panels { room: "Symbolic Entrance" name: "FIGURATIVE" }
+  location_room: "Symbolic Entrance"
+  location_name: "FIGURATIVE"
+}
+doors {
+  name: "Near Repetitive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Repetitive Entrance" name: "TEDIOUS" }
+  location_room: "Repetitive Entrance"
+  location_name: "TEDIOUS"
+}
+doors {
+  name: "Near Broken Portal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "AFFABLE" }
+  location_room: "Main Area"
+  location_name: "AFFABLE"
+}
@@ -36,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
 }
@@ -8,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
 }
@@ -8,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
 }
@@ -8,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 +1,5 @@
 display_name: "The Quiet"
+worldport_entrance {
+  room: "Main Area"
+  name: "DAEDALUS"
+}
@@ -97,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,6 +1,33 @@
 doors {
-  name: "Left/Turn Door"
+  name: "Turn Only Puzzles"
   type: LOCATION_ONLY
+  panels { room: "Turn Room" name: "HIDE (1)" }
+  panels { room: "Turn Room" name: "HIDE (2)" }
+  panels { room: "Turn Room" name: "MORE" }
+  location_room: "Turn Room"
+}
+doors {
+  name: "Shop Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Shop Room" name: "LEFT (1)" }
+  panels { room: "Shop Room" name: "LEFT (2)" }
+  panels { room: "Shop Room" name: "EXIT (1)" }
+  panels { room: "Shop Room" name: "EXIT (2)" }
+  panels { room: "Shop Room" name: "EXIT (3)" }
+  location_room: "Shop Room"
+}
+doors {
+  name: "Left Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Left Room" name: "HIDE" }
+  panels { room: "Left Room" name: "LEFT" }
+  panels { room: "Left Room" name: "MORE" }
+  location_room: "Left Room"
+}
+doors {
+  name: "Left/Turn Door"
+  type: EVENT
+  legacy_location: true
   panels { room: "Left Room" name: "HIDE" }
   panels { room: "Left Room" name: "LEFT" }
   panels { room: "Left Room" name: "MORE" }
@@ -11,7 +38,8 @@ doors {
 }
 doors {
   name: "Turn/Shop Door"
-  type: LOCATION_ONLY
+  type: EVENT
+  legacy_location: true
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
@@ -7,12 +7,12 @@ connections {
   from_room: "Main Room"
   to_room: "Plaza Connector"
   door { name: "Black Hallway" }
-  oneway: true
 }
 connections {
   from_room: "Plaza Connector"
   to_room: "Main Room"
   oneway: true
+  vanilla_only: true
 }
 connections {
   from_room: "Main Room"
@@ -20,12 +20,21 @@ doors {
 }
 doors {
   name: "Dot Area Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Door8"
   panels { room: "Main Room" name: "HOTS (2)" }
   location_room: "Main Room"
 }
 doors {
+  name: "Hots Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HOTS (1)" }
+  panels { room: "Main Room" name: "HOTS (2)" }
+  location_room: "Main Room"
+  location_name: "HOTS (1), HOTS (2)"
+}
+doors {
   name: "Lime Door"
   type: STANDARD
   receivers: "Components/Doors/Door9"
@@ -194,3 +203,41 @@ 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"
+}
+doors {
+  name: "H2 Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HEIGHT (1)" }
+  panels { room: "Main Room" name: "HEIGHT (2)" }
+  panels { room: "Main Room" name: "HEIGHT (3)" }
+  panels { room: "Main Room" name: "HEIGHT (4)" }
+  panels { room: "Main Room" name: "HEIGHT (5)" }
+  panels { room: "Main Room" name: "HEIGHT (6)" }
+  panels { room: "Main Room" name: "QUESTION" }
+  panels { room: "Main Room" name: "INTUITION" }
+  panels { room: "Main Room" name: "?" }
+  panels { room: "Main Room" name: "HAND" }
+  panels { room: "Main Room" name: "? HAND" }
+  panels { room: "Main Room" name: "RICHES" }
+  panels { room: "Main Room" name: "? RICHES" }
+  panels { room: "Main Room" name: "MISHMASH" }
+  location_room: "Main Room"
+}
+doors {
+  name: "Anti-Collectable Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Anti Room" name: "EYE (1)" }
+  panels { room: "Anti Room" name: "EYE (2)" }
+  panels { room: "Anti Room" name: "HA (1)" }
+  panels { room: "Anti Room" name: "HA (2)" }
+  panels { room: "Anti Room" name: "HA (3)" }
+  panels { room: "Anti Room" name: "HA (4)" }
+  panels { room: "Anti Room" name: "HA (5)" }
+  panels { room: "Anti Room" name: "TWO" }
+  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,5 +1,4 @@
 name: "Anti Room"
-# Ignore the collectible. The mod should remove it and the back wall too.
 panels {
   name: "HA (1)"
   path: "Panels/Entry/panel_7"
@@ -38,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,6 +1,8 @@
 name: "Entry Connector"
 ports {
   name: "ENTRY"
+  display_name: "Northwest Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -11 y: 0 z: 13 }
+  rotation: 90
 }
@@ -138,6 +138,8 @@ paintings {
 }
 ports {
   name: "CC"
+  display_name: "Southwest Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -5.5 y: 0 z: 56 }
+  rotation: 90
 }
@@ -1,6 +1,8 @@
 name: "Plaza Connector"
 ports {
   name: "PLAZA"
+  display_name: "Northeast Worldport"
   path: "Components/Warps/worldport"
-  orientation: "north"
+  destination { x: 15 y: 0 z: 13 }
+  rotation: 0
 }
@@ -8,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
 }
@@ -33,5 +33,8 @@ doors {
 doors {
   name: "N Entered"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_1"
+  receivers: "Components/Doors/entry_2"
   keyholders { room: "Main Area" name: "N" key: "n" }
 }
@@ -155,7 +155,10 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 4 y: 0 z: 12 }
+  rotation: 90
 }
 keyholders {
   name: "N"
@@ -1 +1,5 @@
 display_name: "The Sirenic"
+worldport_entrance {
+  room: "Start"
+  name: "PLAZA"
+}
@@ -15,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
 }
@@ -0,0 +1,70 @@
+connections {
+  from_room: "Starting Room"
+  to_room: "Connected Area"
+  door { name: "Entrance" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Hi Room"
+  door { name: "Hi Room Front Door" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Hi Room"
+  door { name: "Hi Room Back Door" }
+}
+connections {
+  from_room: "Green Area"
+  to_room: "Connected Area"
+  door { name: "Green Area Door" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Old Crossroads"
+  door { name: "Crossroads Shortcut" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Old Crossroads"
+  oneway: true
+}
+connections {
+  from_room: "Old Crossroads"
+  to_room: "Green Area"
+  oneway: true
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Red Panel"
+  door { name: "Red Panel" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Orange Panel"
+  door { name: "Orange Panel" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Yellow Panel"
+  door { name: "Yellow Panel" }
+}
+connections {
+  from_room: "Green Area"
+  to_room: "Green Panel"
+  door { name: "Green Panel" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Blue Panel"
+  door { name: "Blue Panel" }
+}
+connections {
+  from_room: "Connected Area"
+  to_room: "Purple Panel"
+  door { name: "Purple Panel" }
+}
@@ -0,0 +1,104 @@
+# Shortcuts from Connected Area -> Starting Room:
+# - Components/Doors/entry_3
+# - Components/Doors/entry_11
+# - Components/Doors/entry_12
+# Unopenable door:
+# - Components/Doors/entry_4
+# - Components/Doors/entry_6
+# - Components/Doors/entry_7
+# This opens and closes automatically:
+# - Components/Doors/entry_5
+doors {
+  name: "Entrance"
+  type: STANDARD
+  receivers: "Components/Doors/entry_1"
+  receivers: "Components/Doors/entry_2"
+  panels { room: "Starting Room" name: "STARLIKE" }
+  location_room: "Starting Room"
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  receivers: "Components/Doors/entry_18"
+  panels { room: "Purple Panel" name: "PURPLE" }
+}
+doors {
+  name: "Hi Room Front Door"
+  type: EVENT
+  receivers: "Components/Doors/entry_21"
+  panels { room: "Connected Area" name: "HI" }
+}
+doors {
+  name: "Hi Room Back Door"
+  type: EVENT
+  receivers: "Components/Doors/entry_20"
+  panels { room: "Hi Room" name: "HI" }
+}
+doors {
+  name: "Green Area Door"
+  type: EVENT
+  receivers: "Components/Doors/entry_15"
+  panels { room: "Green Area" name: "STRAYS" }
+}
+doors {
+  name: "Crossroads Shortcut"
+  type: EVENT
+  receivers: "Components/Doors/entry_14"
+  panels { room: "Old Crossroads" name: "DOORWAY" }
+}
+doors {
+  name: "Red Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_8"
+  panels { room: "Connected Area" name: "START" }
+}
+doors {
+  name: "Orange Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_19"
+  panels { room: "Red Panel" name: "RED" }
+}
+doors {
+  name: "Yellow Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_10"
+  receivers: "Components/Doors/entry_17"
+  panels { room: "Connected Area" name: "START" }
+  panels { room: "Orange Panel" name: "ORANGE" }
+}
+doors {
+  name: "Green Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_16"
+  panels { room: "Yellow Panel" name: "YELLOW" }
+}
+doors {
+  name: "Blue Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_9"
+  panels { room: "Green Panel" name: "GREEN" }
+}
+doors {
+  name: "Purple Panel"
+  type: EVENT
+  receivers: "Components/Doors/entry_13"
+  panels { room: "Blue Panel" name: "BLUE" }
+}
+doors {
+  name: "Question Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "HERE" }
+  panels { room: "Connected Area" name: "WHERE" }
+  panels { room: "Connected Area" name: "QUESTION (1)" }
+  panels { room: "Connected Area" name: "QUESTION (2)" }
+  location_room: "Connected Area"
+}
+doors {
+  name: "Welcome Back Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "GREETINGS" }
+  panels { room: "Connected Area" name: "BEHIND" }
+  panels { room: "Connected Area" name: "Blank" }
+  location_room: "Connected Area"
+  location_name: "BEHIND, GREETINGS, Blank"
+}
@@ -0,0 +1,6 @@
+display_name: "The Stellar"
+type: GIFT_MAP
+# This panel does not appear to be accessible without sniping.
+excluded_nodes: "Panels/Room_1/panel_2"
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,8 @@
+name: "Blue Panel"
+panels {
+  name: "BLUE"
+  path: "Panels/Colors/blue"
+  clue: "blue"
+  answer: "purple"
+  symbols: BOXES
+}
@@ -0,0 +1,63 @@
+name: "Connected Area"
+panels {
+  name: "HERE"
+  path: "Panels/Room_1/panel_3"
+  clue: "here"
+  answer: "where"
+  symbols: SPARKLES
+}
+panels {
+  name: "QUESTION (1)"
+  path: "Panels/Room_1/panel_4"
+  clue: "question"
+  answer: "what"
+  symbols: EXAMPLE
+}
+panels {
+  name: "QUESTION (2)"
+  path: "Panels/Room_1/panel_5"
+  clue: "question"
+  answer: "how"
+  symbols: EXAMPLE
+}
+panels {
+  name: "HI"
+  path: "Panels/Room_1/panel_12"
+  clue: "hi"
+  answer: "hi"
+  symbols: QUESTION
+}
+panels {
+  name: "WHERE"
+  path: "Panels/Room_1/panel_6"
+  clue: "where"
+  answer: "there"
+  symbols: SPARKLES
+}
+panels {
+  name: "GREETINGS"
+  path: "Panels/Room_1/panel_7"
+  clue: "greetings"
+  answer: "welcome"
+  symbols: SUN
+}
+panels {
+  name: "BEHIND"
+  path: "Panels/Room_1/panel_8"
+  clue: "behind"
+  answer: "back"
+  symbols: SUN
+}
+panels {
+  name: "Blank"
+  path: "Panels/Room_1/panel_9"
+  clue: ""
+  answer: "behind"
+}
+panels {
+  name: "START"
+  path: "Panels/Colors/start"
+  clue: "start"
+  answer: "red"
+  symbols: QUESTION
+}
@@ -0,0 +1,8 @@
+name: "Green Area"
+panels {
+  name: "STRAYS"
+  path: "Panels/Room_1/panel_11"
+  clue: "strays"
+  answer: "maze"
+  symbols: ZERO
+}
@@ -0,0 +1,8 @@
+name: "Green Panel"
+panels {
+  name: "GREEN"
+  path: "Panels/Colors/green"
+  clue: "green"
+  answer: "blue"
+  symbols: BOXES
+}
@@ -0,0 +1,8 @@
+name: "Hi Room"
+panels {
+  name: "HI"
+  path: "Panels/Room_1/panel_13"
+  clue: "hi"
+  answer: "hi"
+  symbols: QUESTION
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,8 @@
+name: "Old Crossroads"
+panels {
+  name: "DOORWAY"
+  path: "Panels/Room_1/panel_10"
+  clue: "doorway"
+  answer: "hallway"
+  symbols: BOXES
+}
@@ -0,0 +1,8 @@
+name: "Orange Panel"
+panels {
+  name: "ORANGE"
+  path: "Panels/Colors/orange"
+  clue: "orange"
+  answer: "yellow"
+  symbols: BOXES
+}
@@ -0,0 +1,8 @@
+name: "Purple Panel"
+panels {
+  name: "PURPLE"
+  path: "Panels/Colors/purple"
+  clue: "purple"
+  answer: "end"
+  symbols: QUESTION
+}
@@ -0,0 +1,8 @@
+name: "Red Panel"
+panels {
+  name: "RED"
+  path: "Panels/Colors/red"
+  clue: "red"
+  answer: "orange"
+  symbols: BOXES
+}
@@ -0,0 +1,15 @@
+name: "Starting Room"
+panels {
+  name: "STARLIKE"
+  path: "Panels/Room_1/panel_1"
+  clue: "starlike"
+  answer: "stellar"
+  symbols: SUN
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
+}
@@ -0,0 +1,8 @@
+name: "Yellow Panel"
+panels {
+  name: "YELLOW"
+  path: "Panels/Colors/yellow"
+  clue: "yellow"
+  answer: "green"
+  symbols: BOXES
+}
@@ -31,6 +31,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Worldport"
   path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -8.5 y: 0 z: 6 }
+  rotation: 270
 }
@@ -3,3 +3,8 @@ connections {
   to_room: "S2 Area"
   door { name: "Color Puzzle" }
 }
+connections {
+  from_room: "Main Area"
+  to_room: "Hidden Rainbow"
+  door { name: "Hidden Rainbow" }
+}
@@ -10,3 +10,9 @@ doors {
   panels { room: "Main Area" name: "MOVE (7)" answer: "back" }
   panels { room: "Main Area" name: "MOVE (8)" answer: "down" }
 }
+doors {
+  name: "Hidden Rainbow"
+  type: EVENT
+  panels { room: "Main Area" name: "MOVE (2)" answer: "move" }
+  panels { room: "Main Area" name: "MOVE (4)" answer: "move" }
+}
@@ -1,6 +1,8 @@
 display_name: "The Sturdy"
-# Let's ignore the second half of the rainbow for now.
+# Let's ignore the second half of the rainbows for now.
 #excluded_nodes: "Components/Doors/Rainbow2/Hinge/rainbowMirrored"
-# I don't know why there's a second copy of the rainbow.
-#excluded_nodes: "Components/Doors/Rainbow/Hinge/rainbow"
 #excluded_nodes: "Components/Doors/Rainbow/Hinge/rainbowMirrored"
+# The validator doesn't know that these node exist because they are part of a
+# sub-scene.
+custom_nodes: "Components/Doors/Rainbow/Hinge/rainbow"
+custom_nodes: "Components/Doors/Rainbow2/Hinge/rainbow"
@@ -0,0 +1,6 @@
+name: "Hidden Rainbow"
+paintings {
+  name: "RAINBOW"
+  path: "Components/Doors/Rainbow/Hinge/rainbow"
+  enter_only: true
+}
@@ -105,9 +105,15 @@ panels {
 }
 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
 }
@@ -12,9 +12,7 @@ letters {
   path: "Components/Collectables/collectable"
 }
 paintings {
-  name: "RAINBOW"
-  # The validator is wrong about this node not existing, because it's in a
-  # sub-scene.
+  name: "RAINBOW2"
   path: "Components/Doors/Rainbow2/Hinge/rainbow"
   enter_only: true
 }
@@ -7,6 +7,7 @@ connections {
   from_room: "Temple"
   to_room: "Ending"
   door { name: "Ending" }
+  purple_ending: true
 }
 connections {
   from_room: "Temple"
@@ -1 +1,5 @@
 display_name: "The Sun Temple"
+worldport_entrance {
+  room: "Entrance"
+  name: "UNKEMPT"
+}
@@ -9,5 +9,8 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -200,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 +1,5 @@
 display_name: "The Symbolic"
+worldport_entrance {
+  room: "White Room"
+  name: "PLAZA"
+}
@@ -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
 }
@@ -52,3 +52,10 @@ doors {
   panels { room: "Back Room" name: "RELEVANT" }
   panels { room: "Back Room" name: "LONE" }
 }
+doors {
+  name: "Keyholder Hint Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "EARL" }
+  location_room: "Main Area"
+  location_name: "EARL"
+}
@@ -1 +1,5 @@
 display_name: "The Talented"
+worldport_entrance {
+  room: "Main Area"
+  name: "GREAT"
+}
@@ -111,5 +111,8 @@ keyholders {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
@@ -6,6 +6,8 @@ doors {
 doors {
   name: "K Entered"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_6"
   keyholders { room: "Main Area" name: "K" key: "k" }
 }
 doors {
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 10 }
+  rotation: 0
 }
@@ -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
 }
@@ -1 +1,5 @@
 display_name: "The Tower"
+worldport_entrance {
+  room: "First Floor"
+  name: "GREAT"
+}
@@ -97,5 +97,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: -0 y: 0 z: 13 }
+  rotation: 0
 }
@@ -1,6 +1,7 @@
 doors {
   name: "Control Center Brown Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_1"
   control_center_color: "brown"
 }
@@ -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" }
@@ -48,6 +48,8 @@ doors {
 doors {
   name: "I Entered"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_4"
   keyholders { room: "Main Area" name: "I" key: "i" }
 }
 doors {
@@ -66,9 +68,9 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/entry_6"
   receivers: "Components/Doors/entry_13"
-  receivers: "Panels/Assorted/panel_1/teleportListener"
   control_center_color: "orange"
   double_letters: true
 }
@@ -182,3 +184,20 @@ doors {
   panels { room: "Right Area" name: "TOUGH" }
   location_room: "Right Area"
 }
+doors {
+  name: "Near Teal Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "I" }
+  panels { room: "Main Area" name: "SPY" }
+  panels { room: "Main Area" name: "HEFT" }
+  panels { room: "Main Area" name: "THEFT" }
+  location_room: "Main Area"
+  location_name: "HEFT, I, SPY, THEFT"
+}
+doors {
+  name: "Control Center Orange Panel"
+  type: LOCATION_ONLY
+  panels { room: "Right Area" name: "COLOR" }
+  location_room: "Right Area"
+  location_name: "COLOR"
+}
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "CC"
+  display_name: "Control Center Connector"
   path: "Components/Warps/worldport2"
+  destination { x: -4.5 y: 0 z: 7 }
+  rotation: 0
 }
@@ -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
 }
@@ -216,14 +216,23 @@ keyholders {
 }
 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,5 +159,4 @@ panels {
   clue: "color"
   answer: "orange"
   symbols: EXAMPLE
-  required_door { name: "Control Center Orange Door" }
 }
@@ -504,3 +504,42 @@ doors {
   receivers: "Panels/Miscellaneous/entry_3/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Blue D Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Central Connected Area" name: "FOX" }
+  panels { room: "Central Connected Area" name: "LOCKS" }
+  panels { room: "Central Connected Area" name: "BOX" }
+  panels { room: "Central Connected Area" name: "SQUAWKS" }
+  panels { room: "Central Connected Area" name: "HAWKS" }
+  panels { room: "Central Connected Area" name: "TALKS" }
+  location_room: "Central Connected Area"
+}
+doors {
+  name: "Color Hallway Panels"
+  type: LOCATION_ONLY
+  panels { room: "Brown Alcove" name: "BROW" }
+  panels { room: "Central Connected Area" name: "RANGE" }
+  panels { room: "Central Connected Area" name: "WHIT" }
+  panels { room: "Central Connected Area" name: "ALMOND" }
+  panels { room: "Central Connected Area" name: "DAY" }
+  panels { room: "Central Connected Area" name: "REAM" }
+  panels { room: "Central Connected Area" name: "SON (2)" }
+  panels { room: "Central Connected Area" name: "RAY" }
+  panels { room: "Central Connected Area" name: "BURROWING" }
+  panels { room: "Orange Alcove" name: "ON" }
+  panels { room: "Plaza Entrance" name: "GEE" }
+  panels { room: "Plaza Entrance" name: "SEA" }
+  panels { room: "Gray Alcove" name: "GRAVELY" }
+  panels { room: "Cyan Alcove" name: "CAN" }
+  panels { room: "Star Rooms" name: "CYANIDE" }
+  panels { room: "Star Rooms" name: "BACK" }
+  panels { room: "Black Alcove" name: "LACK" }
+  panels { room: "White Corners" name: "ARCH" }
+  panels { room: "White Corners" name: "ZERO" }
+  panels { room: "White Corners" name: "DAM" }
+  panels { room: "White Corners" name: "WHEN" }
+  panels { room: "Hero Room" name: "HER" }
+  panels { room: "Daisy Alcove" name: "CYANIDES" }
+  location_room: "Central Connected Area"
+}
@@ -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
 }
@@ -1 +1,5 @@
 display_name: "The Wondrous"
+worldport_entrance {
+  room: "Entry"
+  name: "DAEDALUS"
+}
@@ -7,5 +7,8 @@ panels {
 }
 ports {
   name: "DAEDALUS"
+  display_name: "Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 18 y: 0 z: 41 }
+  rotation: 180
 }
@@ -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,56 @@
+version {
+  major: 8
+  minor: 0
+  patch: 1
+}
+# 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"
+# Numbers for The Fuzzy
+special_names: "Numbers"
@@ -9,3 +9,16 @@ progressives {
   doors { map: "daedalus" name: "Cyan Rainbow Room" }
   doors { map: "daedalus" name: "Brown Rainbow Room" }
 }
+progressives {
+  name: "Icarus Quick Travel"
+  doors { map: "icarus" name: "Quick Travel 2" }
+  doors { map: "icarus" name: "Quick Travel 3" }
+  doors { map: "icarus" name: "Quick Travel 4" }
+  doors { map: "icarus" name: "Quick Travel 5" }
+  doors { map: "icarus" name: "Quick Travel 6" }
+  doors { map: "icarus" name: "Quick Travel 7" }
+  doors { map: "icarus" name: "Quick Travel 8" }
+  doors { map: "icarus" name: "Quick Travel 9" }
+  doors { map: "icarus" name: "Quick Travel 10" }
+  doors { map: "icarus" name: "Quick Travel 1" }
+}