145 files changed, 421 insertions, 142 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb
index 17f71a3..46939c8 100644
--- a/data/connections.txtpb
+++ b/data/connections.txtpb

@@ -963,7 +963,7 @@ connections {
  from {
    port {
      map: "the_entry"
-      room: "Lime Room"
+      room: "Revitalized Entrance"
      name: "REVITALIZED"
    }
  }
diff --git a/data/maps/control_center/rooms/Ancient Entrance.txtpb b/data/maps/control_center/rooms/Ancient Entrance.txtpb
index 9fe50c5..20b1440 100644
--- a/data/maps/control_center/rooms/Ancient Entrance.txtpb
+++ b/data/maps/control_center/rooms/Ancient Entrance.txtpb

@@ -2,4 +2,8 @@ name: "Ancient Entrance"
 ports {
  name: "ANCIENT"
  path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Between Entrance.txtpb b/data/maps/control_center/rooms/Between Entrance.txtpb
index 2c21bdd..e3d4e73 100644
--- a/data/maps/control_center/rooms/Between Entrance.txtpb
+++ b/data/maps/control_center/rooms/Between Entrance.txtpb

@@ -9,4 +9,6 @@ panels {
 ports {
  name: "BETWEEN"
  path: "Components/Warps/worldport5"
+  destination { x: 39 y: 0 z: -17 }
+  rotation: 270
 }
diff --git a/data/maps/control_center/rooms/Entry Entrance.txtpb b/data/maps/control_center/rooms/Entry Entrance.txtpb
index d920523..f9924d8 100644
--- a/data/maps/control_center/rooms/Entry Entrance.txtpb
+++ b/data/maps/control_center/rooms/Entry Entrance.txtpb

@@ -9,4 +9,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport2"
+  destination { x: 26 y: 0 z: -16.5 }
+  rotation: 0
 }
diff --git a/data/maps/control_center/rooms/Entry.txtpb b/data/maps/control_center/rooms/Entry.txtpb
index 7ef380c..3f95021 100644
--- a/data/maps/control_center/rooms/Entry.txtpb
+++ b/data/maps/control_center/rooms/Entry.txtpb

@@ -9,4 +9,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -1.5 }
+  rotation: 0
 }
diff --git a/data/maps/control_center/rooms/Main Area.txtpb b/data/maps/control_center/rooms/Main Area.txtpb
index bf81e26..71e6284 100644
--- a/data/maps/control_center/rooms/Main Area.txtpb
+++ b/data/maps/control_center/rooms/Main Area.txtpb

@@ -50,21 +50,27 @@ keyholders {
 ports {
  name: "RIGHT"
  path: "Components/Warps/worldport6"
+  destination { x: 82 y: 0 z: -10 }
+  rotation: 90
 }
 ports {
  name: "LEFT"
  path: "Components/Warps/worldport7"
-  # Check that this is correct.
+  destination { x: 82 y: 0 z: -48 }
+  rotation: 90
 }
 ports {
  name: "RELENTLESS_LEFT"
  path: "Components/Warps/worldport9"
+  no_shuffle: true
 }
 ports {
  name: "RELENTLESS_SHOP"
  path: "Components/Warps/worldport11"
+  no_shuffle: true
 }
 ports {
  name: "RELENTLESS_TURN"
  path: "Components/Warps/worldport10"
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Partial Entrance.txtpb b/data/maps/control_center/rooms/Partial Entrance.txtpb
index 77b68fa..80c854b 100644
--- a/data/maps/control_center/rooms/Partial Entrance.txtpb
+++ b/data/maps/control_center/rooms/Partial Entrance.txtpb

@@ -9,4 +9,8 @@ panels {
 ports {
  name: "PARTIAL"
  path: "Components/Warps/worldport4"
+  destination { x: 21 y: 0 z: -41 }
+  rotation: 270
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Perceptive Entrance.txtpb b/data/maps/control_center/rooms/Perceptive Entrance.txtpb
index 6eec265..be264e1 100644
--- a/data/maps/control_center/rooms/Perceptive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Perceptive Entrance.txtpb

@@ -17,4 +17,8 @@ panels {
 ports {
  name: "PERCEPTIVE"
  path: "Components/Warps/worldport12"
+  destination { x: -23 y: 0 z: -11 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Repetitive Entrance.txtpb b/data/maps/control_center/rooms/Repetitive Entrance.txtpb
index 08b8fa4..e2b581b 100644
--- a/data/maps/control_center/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Repetitive Entrance.txtpb

@@ -2,4 +2,8 @@ name: "Repetitive Entrance"
 ports {
  name: "REPETITIVE"
  path: "Components/Warps/worldport14"
+  destination { x: -16 y: 0 z: -17.5 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Tenacious Entrance.txtpb b/data/maps/control_center/rooms/Tenacious Entrance.txtpb
index 0527d50..16819ad 100644
--- a/data/maps/control_center/rooms/Tenacious Entrance.txtpb
+++ b/data/maps/control_center/rooms/Tenacious Entrance.txtpb

@@ -9,4 +9,8 @@ panels {
 ports {
  name: "TENACIOUS"
  path: "Components/Warps/worldport13"
+  destination { x: 56 y: 0 z: -38 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Unkempt Entrance.txtpb b/data/maps/control_center/rooms/Unkempt Entrance.txtpb
index b6fc074..619891a 100644
--- a/data/maps/control_center/rooms/Unkempt Entrance.txtpb
+++ b/data/maps/control_center/rooms/Unkempt Entrance.txtpb

@@ -9,4 +9,8 @@ panels {
 ports {
  name: "UNKEMPT"
  path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/daedalus/rooms/Composite Room S.txtpb b/data/maps/daedalus/rooms/Composite Room S.txtpb
index 3773034..d7a79a4 100644
--- a/data/maps/daedalus/rooms/Composite Room S.txtpb
+++ b/data/maps/daedalus/rooms/Composite Room S.txtpb

@@ -195,4 +195,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/Worldports/worldport16"
+  destination { x: -84 y: 0 z: 81 }
+  rotation: 270
 }
diff --git a/data/maps/daedalus/rooms/Entry Shortcut.txtpb b/data/maps/daedalus/rooms/Entry Shortcut.txtpb
index 63202ba..f737cd1 100644
--- a/data/maps/daedalus/rooms/Entry Shortcut.txtpb
+++ b/data/maps/daedalus/rooms/Entry Shortcut.txtpb

@@ -11,4 +11,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/Worldports/worldport4"
+  destination { x: -21 y: 0 z: -4 }
+  rotation: 90
 }
diff --git a/data/maps/daedalus/rooms/Hedges Tower.txtpb b/data/maps/daedalus/rooms/Hedges Tower.txtpb
index 3031c1d..e720bc9 100644
--- a/data/maps/daedalus/rooms/Hedges Tower.txtpb
+++ b/data/maps/daedalus/rooms/Hedges Tower.txtpb

@@ -3,4 +3,5 @@ panel_display_name: "Hedges"
 ports {
  name: "TENACIOUS"
  path: "Components/Warps/Worldports/worldport13"
+  no_shuffle: true
 }
diff --git a/data/maps/daedalus/rooms/Moat.txtpb b/data/maps/daedalus/rooms/Moat.txtpb
index cbb5d16..345f4f0 100644
--- a/data/maps/daedalus/rooms/Moat.txtpb
+++ b/data/maps/daedalus/rooms/Moat.txtpb

@@ -7,4 +7,6 @@ paintings {
 ports {
  name: "HIVE"
  path: "Components/Warps/Worldports/worldport9"
+  destination { x: 64 y: 1 z: 24.5 }
+  rotation: 0
 }
diff --git a/data/maps/daedalus/rooms/Outside Hedges.txtpb b/data/maps/daedalus/rooms/Outside Hedges.txtpb
index 9f32e26..17c93a0 100644
--- a/data/maps/daedalus/rooms/Outside Hedges.txtpb
+++ b/data/maps/daedalus/rooms/Outside Hedges.txtpb

@@ -77,4 +77,6 @@ paintings {
 ports {
  name: "REVITALIZED"
  path: "Components/Warps/Worldports/worldport7"
+  destination { x: 45 y: 0 z: 94 }
+  rotation: 270
 }
diff --git a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb
index 5284133..d3592d4 100644
--- a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb
+++ b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb

@@ -3,4 +3,6 @@ panel_display_name: "South Area"
 ports {
  name: "GREAT"
  path: "Components/Warps/Worldports/worldport17"
+  destination { x: -24 y: 0 z: 61 }
+  rotation: 270
 }
diff --git a/data/maps/daedalus/rooms/Quiet Entrance.txtpb b/data/maps/daedalus/rooms/Quiet Entrance.txtpb
index 08fbcc7..c33b07d 100644
--- a/data/maps/daedalus/rooms/Quiet Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Quiet Entrance.txtpb

@@ -17,4 +17,6 @@ paintings {
 ports {
  name: "QUIET"
  path: "Components/Warps/Worldports/worldport5"
+  destination { x: -32 y: 0 z: -40 }
+  rotation: 90
 }
diff --git a/data/maps/daedalus/rooms/Rain Side.txtpb b/data/maps/daedalus/rooms/Rain Side.txtpb
index 6906aef..cfaf40d 100644
--- a/data/maps/daedalus/rooms/Rain Side.txtpb
+++ b/data/maps/daedalus/rooms/Rain Side.txtpb

@@ -11,4 +11,6 @@ panels {
 ports {
  name: "BEARER"
  path: "Components/Warps/Worldports/worldport11"
+  destination { x: 93.5 y: 0 z: 27 }
+  rotation: 90
 }
diff --git a/data/maps/daedalus/rooms/Starting Room.txtpb b/data/maps/daedalus/rooms/Starting Room.txtpb
index 62fc96a..88e8e79 100644
--- a/data/maps/daedalus/rooms/Starting Room.txtpb
+++ b/data/maps/daedalus/rooms/Starting Room.txtpb

@@ -10,4 +10,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/Worldports/worldport"
+  destination { x: 0 y: 0 z: 11 }
+  rotation: 0
 }
diff --git a/data/maps/daedalus/rooms/Sweet Foyer.txtpb b/data/maps/daedalus/rooms/Sweet Foyer.txtpb
index 03c8262..8620985 100644
--- a/data/maps/daedalus/rooms/Sweet Foyer.txtpb
+++ b/data/maps/daedalus/rooms/Sweet Foyer.txtpb

@@ -52,8 +52,12 @@ paintings {
 ports {
  name: "SWEET1"
  path: "Components/Warps/Worldports/worldport14"
+  destination { x: -27 y: 0 z: 76.5 }
+  rotation: 270
 }
 ports {
  name: "SWEET2"
  path: "Components/Warps/Worldports/worldport15"
+  destination { x: -36 y: 0 z: 76.5 }
+  rotation: 90
 }
diff --git a/data/maps/daedalus/rooms/Tree Entrance.txtpb b/data/maps/daedalus/rooms/Tree Entrance.txtpb
index 2b98178..9466ada 100644
--- a/data/maps/daedalus/rooms/Tree Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Tree Entrance.txtpb

@@ -49,4 +49,6 @@ panels {
 ports {
  name: "TREE"
  path: "Components/Warps/Worldports/worldport12"
+  destination { x: 41 y: 0 z: 50.5 }
+  rotation: 0
 }
diff --git a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb
index c0cb0df..c5ae4ab 100644
--- a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb

@@ -3,4 +3,6 @@ panel_display_name: "O2 Room"
 ports {
  name: "UNKEMPT"
  path: "Components/Warps/Worldports/worldport6"
+  destination { x: -61 y: 0 z: 95 }
+  rotation: 270
 }
diff --git a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb
index a172313..8139a6c 100644
--- a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb
+++ b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb

@@ -1,12 +1,8 @@
 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"
  path: "Components/Warps/Worldports/worldport10"
+  destination { x: -46 y: 0 z: 23 }
+  rotation: 90
 }
diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb
index ae9b3f1..0e04d7d 100644
--- a/data/maps/daedalus/rooms/Wonderland.txtpb
+++ b/data/maps/daedalus/rooms/Wonderland.txtpb

@@ -38,4 +38,6 @@ panels {
 ports {
  name: "WONDROUS"
  path: "Components/Warps/Worldports/worldport3"
+  destination { x: -104 y: 0 z: -69 }
+  rotation: 180
 }
diff --git a/data/maps/daedalus/rooms/Yellow Color Door.txtpb b/data/maps/daedalus/rooms/Yellow Color Door.txtpb
index e44658c..0ffec87 100644
--- a/data/maps/daedalus/rooms/Yellow Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Color Door.txtpb

@@ -31,4 +31,6 @@ paintings {
 ports {
  name: "FOURROOMS"
  path: "Components/Warps/Worldports/worldport8"
+  destination { x: 92.5 y: 0 z: -62 }
+  rotation: 90
 }
diff --git a/data/maps/four_rooms/rooms/Examples Room.txtpb b/data/maps/four_rooms/rooms/Examples Room.txtpb
index dc82971..513bb61 100644
--- a/data/maps/four_rooms/rooms/Examples Room.txtpb
+++ b/data/maps/four_rooms/rooms/Examples Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -40.5 }
+  rotation: 180
 }
diff --git a/data/maps/four_rooms/rooms/Intensify Room.txtpb b/data/maps/four_rooms/rooms/Intensify Room.txtpb
index 2cbb214..dfdb6dc 100644
--- a/data/maps/four_rooms/rooms/Intensify Room.txtpb
+++ b/data/maps/four_rooms/rooms/Intensify Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "IMPRESSIVE"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
diff --git a/data/maps/four_rooms/rooms/Synonyms Room.txtpb b/data/maps/four_rooms/rooms/Synonyms Room.txtpb
index 4dd5b5d..3d2ddcc 100644
--- a/data/maps/four_rooms/rooms/Synonyms Room.txtpb
+++ b/data/maps/four_rooms/rooms/Synonyms Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport3"
-  orientation: "south"
+  destination { x: 20 y: 0 z: 6.5 }
+  rotation: 0
 }
diff --git a/data/maps/four_rooms/rooms/Time Room.txtpb b/data/maps/four_rooms/rooms/Time Room.txtpb
index d684685..0786d04 100644
--- a/data/maps/four_rooms/rooms/Time Room.txtpb
+++ b/data/maps/four_rooms/rooms/Time Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "OWL"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -40.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb
index b1860de..0be8a7c 100644
--- a/data/maps/the_bearer/rooms/Back Area.txtpb
+++ b/data/maps/the_bearer/rooms/Back Area.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 10 y: 0 z: -84.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_bearer/rooms/Entry.txtpb b/data/maps/the_bearer/rooms/Entry.txtpb
index 4300c1f..e770924 100644
--- a/data/maps/the_bearer/rooms/Entry.txtpb
+++ b/data/maps/the_bearer/rooms/Entry.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "UNYIELDING"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 4 z: 15 }
+  rotation: 90
 }
diff --git a/data/maps/the_bearer/rooms/Tree Entrance.txtpb b/data/maps/the_bearer/rooms/Tree Entrance.txtpb
index 97a07da..d3172dc 100644
--- a/data/maps/the_bearer/rooms/Tree Entrance.txtpb
+++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Tree Entrance"
 ports {
  name: "TREE"
  path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: -19 y: 0 z: -83.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_between/rooms/Control Center Side.txtpb b/data/maps/the_between/rooms/Control Center Side.txtpb
index a6a126a..0576305 100644
--- a/data/maps/the_between/rooms/Control Center Side.txtpb
+++ b/data/maps/the_between/rooms/Control Center Side.txtpb

@@ -14,10 +14,12 @@ paintings {
 ports {
  name: "CC"
  path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: 36 y: 0 z: 1 }
+  rotation: 180
 }
 ports {
  name: "LIVELY"
  path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 24 y: 0 z: 6.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_between/rooms/Main Area.txtpb b/data/maps/the_between/rooms/Main Area.txtpb
index a0fc596..ed6072b 100644
--- a/data/maps/the_between/rooms/Main Area.txtpb
+++ b/data/maps/the_between/rooms/Main Area.txtpb

@@ -198,5 +198,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: -1 y: 0 z: 20 }
+  rotation: 90
 }
diff --git a/data/maps/the_between/rooms/Plaza Entrance.txtpb b/data/maps/the_between/rooms/Plaza Entrance.txtpb
index e4d7b19..5c87619 100644
--- a/data/maps/the_between/rooms/Plaza Entrance.txtpb
+++ b/data/maps/the_between/rooms/Plaza Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Plaza Entrance"
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 1 }
+  rotation: 180
 }
diff --git a/data/maps/the_butterfly/rooms/Main Area.txtpb b/data/maps/the_butterfly/rooms/Main Area.txtpb
index 8b441e4..c5349bc 100644
--- a/data/maps/the_butterfly/rooms/Main Area.txtpb
+++ b/data/maps/the_butterfly/rooms/Main Area.txtpb

@@ -128,5 +128,6 @@ panels {
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport"
-  orientation: "southwest" # uhhhh this is new
+  destination { x: -19 y: 0 z: 19 }
+  rotation: 315
 }
diff --git a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb
index 97ddb0f..268caa6 100644
--- a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb
+++ b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb

@@ -24,10 +24,12 @@ panels {
 ports {
  name: "STURDY"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -75 }
+  rotation: 270
 }
 ports {
  name: "DARKROOM"
  path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -17 y: 0 z: -51 }
+  rotation: 270
 }
diff --git a/data/maps/the_colorful/rooms/White Room.txtpb b/data/maps/the_colorful/rooms/White Room.txtpb
index c2cf33f..da28fdc 100644
--- a/data/maps/the_colorful/rooms/White Room.txtpb
+++ b/data/maps/the_colorful/rooms/White Room.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: 3.5 y: 0 z: 19 }
+  rotation: 270
 }
diff --git a/data/maps/the_congruent/rooms/Main Area.txtpb b/data/maps/the_congruent/rooms/Main Area.txtpb
index e91f419..1066da2 100644
--- a/data/maps/the_congruent/rooms/Main Area.txtpb
+++ b/data/maps/the_congruent/rooms/Main Area.txtpb

@@ -86,7 +86,8 @@ panels {
 ports {
  name: "DARKROOM"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 7.5 }
+  rotation: 180
 }
 paintings {
  name: "P"
diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb
index 1b7ad05..43bca70 100644
--- a/data/maps/the_darkroom/connections.txtpb
+++ b/data/maps/the_darkroom/connections.txtpb

@@ -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"
    }
  }
diff --git a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
index 7ea1286..c8f5dd7 100644
--- a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
+++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Second Room"
 ports {
  name: "CONGRUENT"
  path: "Components/Warps/worldport7"
-  orientation: "east"
+  destination { x: 51.5 y: 0 z: 29 }
+  rotation: 90
 }
diff --git a/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb
index 308efb1..eba02f5 100644
--- a/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb
+++ b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
  name: "COLORFUL"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -12 }
+  rotation: 180
 }
diff --git a/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
index 9d25108..7b258cf 100644
--- a/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
+++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
  name: "DOUBLESIDED"
  path: "Components/Warps/worldport6"
-  orientation: "east"
+  destination { x: 15 y: 0 z: 23 }
+  rotation: 90
 }
diff --git a/data/maps/the_darkroom/rooms/First Room Exit.txtpb b/data/maps/the_darkroom/rooms/First Room Exit.txtpb
new file mode 100644
index 0000000..852d562
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/First Room Exit.txtpb

@@ -0,0 +1,8 @@
+name: "First Room Exit"
+panel_display_name: "First Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -15 }
+  rotation: 180
+}
diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb
index c635757..5e8167c 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -34,11 +34,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: -10 y: 0 z: 10 }
-}
+  rotation: 0
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport2"
-  orientation: "north"
-  required_door { name: "Second Room Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/Second Room Exit.txtpb b/data/maps/the_darkroom/rooms/Second Room Exit.txtpb
new file mode 100644
index 0000000..9f197ae
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Second Room Exit.txtpb

@@ -0,0 +1,8 @@
+name: "Second Room Exit"
+panel_display_name: "Second Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport4"
+  destination { x: 48 y: 0 z: -15 }
+  rotation: 180
+}
diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb
index a3964ea..fed0669 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -39,11 +39,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport3"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 10 }
-}
+  rotation: 0
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport4"
-  orientation: "north"
-  required_door { name: "Third Room Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/Third Room.txtpb b/data/maps/the_darkroom/rooms/Third Room.txtpb
index fc80fa7..5e5fc62 100644
--- a/data/maps/the_darkroom/rooms/Third Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Third Room.txtpb

@@ -66,5 +66,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }
diff --git a/data/maps/the_digital/rooms/Gallery Maze.txtpb b/data/maps/the_digital/rooms/Gallery Maze.txtpb
index bfdfa41..32ed611 100644
--- a/data/maps/the_digital/rooms/Gallery Maze.txtpb
+++ b/data/maps/the_digital/rooms/Gallery Maze.txtpb

@@ -2,5 +2,6 @@ name: "Gallery Maze"
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport4"
-  orientation: "east"
+  destination { x: -58 y: 0 z: -76 }
+  rotation: 90
 }
diff --git a/data/maps/the_digital/rooms/Main Area.txtpb b/data/maps/the_digital/rooms/Main Area.txtpb
index 99bcdcc..3a52778 100644
--- a/data/maps/the_digital/rooms/Main Area.txtpb
+++ b/data/maps/the_digital/rooms/Main Area.txtpb

@@ -28,15 +28,18 @@ panels {
 ports {
  name: "ENTRY1"
  path: "Components/Worldports/worldport3"
-  orientation: "west"
+  destination { x: -33 y: 0 z: 28 }
+  rotation: 270
 }
 ports {
  name: "ENTRY2"
  path: "Components/Worldports/worldport"
-  orientation: "south"
+  destination { x: -30 y: 0 z: 51 }
+  rotation: 0
 }
 ports {
  name: "ENTRY3"
  path: "Components/Worldports/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 51 }
+  rotation: 0
 }
diff --git a/data/maps/the_digital/rooms/Tree Area.txtpb b/data/maps/the_digital/rooms/Tree Area.txtpb
index 56301d5..dd51887 100644
--- a/data/maps/the_digital/rooms/Tree Area.txtpb
+++ b/data/maps/the_digital/rooms/Tree Area.txtpb

@@ -9,6 +9,6 @@ panels {
 ports {
  name: "TREE"
  path: "Components/Worldports/worldport4"
-  orientation: "east"
+  destination { x: -16 y: 0 z: -31 }
-  # This is double sided.
+  rotation: 90
 }
diff --git a/data/maps/the_digital/rooms/Unyielding Entrance.txtpb b/data/maps/the_digital/rooms/Unyielding Entrance.txtpb
index 0370928..575f1d8 100644
--- a/data/maps/the_digital/rooms/Unyielding Entrance.txtpb
+++ b/data/maps/the_digital/rooms/Unyielding Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Unyielding Entrance"
 ports {
  name: "UNYIELDING"
  path: "Components/Warps/worldport5"
-  orientation: "east"
+  destination { x: 14 y: 0 z: 5 }
+  rotation: 90
 }
diff --git a/data/maps/the_double_sided/rooms/Start.txtpb b/data/maps/the_double_sided/rooms/Start.txtpb
index b0bfbcd..f7b6c37 100644
--- a/data/maps/the_double_sided/rooms/Start.txtpb
+++ b/data/maps/the_double_sided/rooms/Start.txtpb

@@ -16,5 +16,6 @@ panels {
 ports {
  name: "DARKROOM"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 8 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index ca0207e..5fe279c 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -160,6 +160,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
diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
index b9a8098..9d9f362 100644
--- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "COMPOSITE"
  path: "Components/Warps/worldport12"
-  orientation: "east"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
index db9b78a..4967857 100644
--- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb
index dd8b5f4..fe474b3 100644
--- a/data/maps/the_entry/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "DIGITAL"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb
index b5d75aa..68c7006 100644
--- a/data/maps/the_entry/rooms/Entry Exit.txtpb
+++ b/data/maps/the_entry/rooms/Entry Exit.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb
index da17163..f56ce59 100644
--- a/data/maps/the_entry/rooms/Eye Room.txtpb
+++ b/data/maps/the_entry/rooms/Eye Room.txtpb

@@ -32,5 +32,6 @@ paintings {
 ports {
  name: "LIONIZED"
  path: "Components/Warps/worldport10"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
index 689d23e..42e3173 100644
--- a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -2,6 +2,7 @@ name: "Four Rooms Entrance"
 ports {
  name: "FOUR"
  path: "Components/Warps/worldport9"
-  orientation: "south"
+  destination { x: -41 y: 6 z: -17.5 }
+  rotation: 0
  gravity: Y_PLUS
 }
diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb
index 987a3ca..231dff9 100644
--- a/data/maps/the_entry/rooms/Gallery Return.txtpb
+++ b/data/maps/the_entry/rooms/Gallery Return.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb
index adbe545..4fb715e 100644
--- a/data/maps/the_entry/rooms/Least Blue Last.txtpb
+++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb

@@ -73,7 +73,8 @@ panels {
 ports {
  name: "DARKROOM"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
  name: "PAINS"
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
index f0176a0..7c50e39 100644
--- a/data/maps/the_entry/rooms/Liberated Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Liberated Entrance"
 ports {
  name: "BLUE"
  path: "worldport8"
-  orientation: "west"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb
index e94f775..603fbdc 100644
--- a/data/maps/the_entry/rooms/Lime Room.txtpb
+++ b/data/maps/the_entry/rooms/Lime Room.txtpb

@@ -19,9 +19,3 @@ panels {
  answer: "white"
  symbols: EXAMPLE
 }
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
index 4ec402f..c15e242 100644
--- a/data/maps/the_entry/rooms/Literate Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Literate Entrance"
 ports {
  name: "BROWN"
  path: "worldport9"
-  orientation: "east"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb
index 4776d11..bd49b55 100644
--- a/data/maps/the_entry/rooms/Parthenon Return.txtpb
+++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "PARTHENON"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: -5.5 y: 0 z: 18 }
-}
-\ No newline at end of file
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 520d513..0cb4661 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "HOLE"
  path: "worldport4"
-  orientation: "down"
+  destination { x: 74 y: 0 z: -43 }
-}
-\ No newline at end of file
+  rotation: 0
+}
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 04ddcf3..40937a7 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

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

@@ -0,0 +1,8 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index 67aa6de..ad407c3 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "SHOP"
  path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
index ce35e5b..9149c03 100644
--- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
+++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Colored Doors Area"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport11"
-  orientation: "west"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb
index 3f61c26..215e223 100644
--- a/data/maps/the_entry/rooms/X Area.txtpb
+++ b/data/maps/the_entry/rooms/X Area.txtpb

@@ -7,5 +7,6 @@ letters {
 ports {
  name: "CC"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }
diff --git a/data/maps/the_extravagant/rooms/Engine Room.txtpb b/data/maps/the_extravagant/rooms/Engine Room.txtpb
index 3dcc437..42ecc54 100644
--- a/data/maps/the_extravagant/rooms/Engine Room.txtpb
+++ b/data/maps/the_extravagant/rooms/Engine Room.txtpb

@@ -24,5 +24,6 @@ ports {
  name: "GALLERY"
  path: "Components/Warps/worldport2"
  gravity: Z_PLUS
-  # TODO: orientation is not well defined with Z-axis gravity
+  # TODO: entrance shuffling for non Y axis gravity
+  no_shuffle: true
 }
diff --git a/data/maps/the_gallery/rooms/Main Area.txtpb b/data/maps/the_gallery/rooms/Main Area.txtpb
index bc1606d..d2f1812 100644
--- a/data/maps/the_gallery/rooms/Main Area.txtpb
+++ b/data/maps/the_gallery/rooms/Main Area.txtpb

@@ -163,5 +163,6 @@ paintings {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 16 }
+  rotation: 270
 }
diff --git a/data/maps/the_great/rooms/Back Area.txtpb b/data/maps/the_great/rooms/Back Area.txtpb
index c1b8ab3..fdf72e7 100644
--- a/data/maps/the_great/rooms/Back Area.txtpb
+++ b/data/maps/the_great/rooms/Back Area.txtpb

@@ -125,22 +125,26 @@ paintings {
 ports {
  name: "UNKEMPT"
  path: "Meshes/Blocks/Warps/worldport5"
-  orientation: "north"
+  destination { x: 72 y: 0 z: 10.5 }
+  rotation: 180
 }
 ports {
  name: "THREEDOORS"
  path: "Meshes/Blocks/Warps/worldport16"
-  orientation: "south"
+  destination { x: 77 y: 0 z: 33.5 }
+  rotation: 0
 }
 ports {
  name: "TOWER"
  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"
  path: "Meshes/Blocks/Warps/worldport17"
-  orientation: "north"
+  destination { x: 26 y: 0 z: 58 }
+  rotation: 180
 }
diff --git a/data/maps/the_great/rooms/Colorful Entrance.txtpb b/data/maps/the_great/rooms/Colorful Entrance.txtpb
index cb7eb25..aa2e8d4 100644
--- a/data/maps/the_great/rooms/Colorful Entrance.txtpb
+++ b/data/maps/the_great/rooms/Colorful Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Pillar Room"
 ports {
  name: "COLORFUL"
  path: "Meshes/Blocks/Warps/worldport13"
-  orientation: "west"
+  destination { x: -37.5 y: 0 z: 74 }
+  rotation: 270
 }
diff --git a/data/maps/the_great/rooms/Daedalus Entrance.txtpb b/data/maps/the_great/rooms/Daedalus Entrance.txtpb
index 003a8a3..a6976c2 100644
--- a/data/maps/the_great/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_great/rooms/Daedalus Entrance.txtpb

@@ -10,7 +10,8 @@ panels {
 ports {
  name: "DAEDALUS"
  path: "Meshes/Blocks/Warps/worldport8"
-  orientation: "south"
+  destination { x: 98 y: 2 z: 27.5 }
+  rotation: 0
  required_door { name: "Daedalus Entrance" }
  # The reverse warp bypasses the door, so there needs to be two oneway connections.
 }
diff --git a/data/maps/the_great/rooms/Hive Entrance.txtpb b/data/maps/the_great/rooms/Hive Entrance.txtpb
index cd6ba68..aa91e2e 100644
--- a/data/maps/the_great/rooms/Hive Entrance.txtpb
+++ b/data/maps/the_great/rooms/Hive Entrance.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "HIVE"
  path: "Meshes/Blocks/Warps/worldport19"
-  orientation: "east"
+  destination { x: -91.5 y: 0 z: 37 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Jubilant Entrance.txtpb b/data/maps/the_great/rooms/Jubilant Entrance.txtpb
index 0700a6b..a7ca665 100644
--- a/data/maps/the_great/rooms/Jubilant Entrance.txtpb
+++ b/data/maps/the_great/rooms/Jubilant Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "West Side"
 ports {
  name: "JUBILANT"
  path: "Meshes/Blocks/Warps/worldport12"
-  orientation: "east"
+  destination { x: -62 y: 0 z: -19 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb
index 82ec48c..61cf83d 100644
--- a/data/maps/the_great/rooms/Main Area.txtpb
+++ b/data/maps/the_great/rooms/Main Area.txtpb

@@ -123,26 +123,31 @@ panels {
 ports {
  name: "ENTRY"
  path: "Meshes/Blocks/Warps/worldport"
-  orientation: "south"
+  destination { x: 33 y: 0 z: 15 }
+  rotation: 0
 }
 ports {
  name: "KEEN"
  path: "Meshes/Blocks/Warps/worldport6"
-  orientation: "north"
+  destination { x: 33 y: 0 z: -21 }
+  rotation: 180
 }
 ports {
  name: "ORB"
  path: "Meshes/Blocks/Warps/worldport3"
-  orientation: "north"
+  destination { x: 62 y: 0 z: -13 }
+  rotation: 180
 }
 ports {
  name: "LINEAR"
  path: "Meshes/Blocks/Warps/worldport15"
-  orientation: "south"
+  destination { x: 33 y: 0 z: -42.5 }
+  rotation: 0
 }
 ports {
  name: "DIGITAL"
  path: "Meshes/Blocks/Warps/worldport4"
-  orientation: "down"
+  destination { x: -6.5 y: 0 z: 7.5 }
+  rotation: 0
  required_door { name: "Digital Entrance" }
 }
diff --git a/data/maps/the_great/rooms/North Landscape.txtpb b/data/maps/the_great/rooms/North Landscape.txtpb
index fb11c42..65e1f2a 100644
--- a/data/maps/the_great/rooms/North Landscape.txtpb
+++ b/data/maps/the_great/rooms/North Landscape.txtpb

@@ -57,7 +57,7 @@ keyholders {
 ports {
  name: "INVISIBLE"
  path: "Meshes/Blocks/Warps/worldport20"
-  orientation: "north"
+  destination { x: 33 y: 0 z: -66.5 }
-  # Note that this can be easily entered from the other side.
+  rotation: 0
  required_door { name: "Invisible Entrance" }
 }
diff --git a/data/maps/the_great/rooms/Purple Room.txtpb b/data/maps/the_great/rooms/Purple Room.txtpb
index e505ca0..de78437 100644
--- a/data/maps/the_great/rooms/Purple Room.txtpb
+++ b/data/maps/the_great/rooms/Purple Room.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Main Area"
 ports {
  name: "DAEDALUS"
  path: "Meshes/Blocks/Warps/worldport18"
-  orientation: "north"
+  destination { x: 158 y: 0 z: 14 }
+  rotation: 180
 }
diff --git a/data/maps/the_great/rooms/Salmon Room.txtpb b/data/maps/the_great/rooms/Salmon Room.txtpb
index ecdef75..93bf86f 100644
--- a/data/maps/the_great/rooms/Salmon Room.txtpb
+++ b/data/maps/the_great/rooms/Salmon Room.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Main Area"
 ports {
  name: "BETWEEN"
  path: "Meshes/Blocks/Warps/worldport11"
-  orientation: "east"
+  destination { x: 83 y: 0 z: -21 }
+  rotation: 90
 }
diff --git a/data/maps/the_great/rooms/Talented Entrance.txtpb b/data/maps/the_great/rooms/Talented Entrance.txtpb
index 7329853..0546f82 100644
--- a/data/maps/the_great/rooms/Talented Entrance.txtpb
+++ b/data/maps/the_great/rooms/Talented Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Question Room"
 ports {
  name: "TALENTED"
  path: "Meshes/Blocks/Warps/worldport14"
-  orientation: "south"
+  destination { x: 109 y: -6 z: -26.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_great/rooms/West Side.txtpb b/data/maps/the_great/rooms/West Side.txtpb
index 8279e16..78a36ef 100644
--- a/data/maps/the_great/rooms/West Side.txtpb
+++ b/data/maps/the_great/rooms/West Side.txtpb

@@ -64,17 +64,20 @@ paintings {
 ports {
  name: "IMPRESSIVE"
  path: "Meshes/Blocks/Warps/worldport2"
-  orientation: "south"
+  destination { x: -34 y: 0 z: 22.5 }
+  rotation: 0
 }
 ports {
  name: "CC"
  path: "Meshes/Blocks/Warps/worldport9"
-  orientation: "north"
+  destination { x: -59 y: 0 z: -50.5 }
+  rotation: 180
 }
 ports {
  name: "PARTIAL"
  path: "Meshes/Blocks/Warps/worldport7"
-  orientation: "east"
+  destination { x: -62 y: 0 z: 11 }
+  rotation: 90
  # ER with this is weird; make sure to place on the surface
  required_door { name: "Partial Entrance" }
 }
diff --git a/data/maps/the_hinterlands/rooms/Main Area.txtpb b/data/maps/the_hinterlands/rooms/Main Area.txtpb
index 8daac05..d678560 100644
--- a/data/maps/the_hinterlands/rooms/Main Area.txtpb
+++ b/data/maps/the_hinterlands/rooms/Main Area.txtpb

@@ -3,10 +3,12 @@ name: "Main Area"
 ports {
  name: "RIGHT"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 30 y: 0 z: 19 }
+  rotation: 90
 }
 ports {
  name: "LEFT"
  path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 30 y: 0 z: -76 }
+  rotation: 90
 }
diff --git a/data/maps/the_hive/rooms/Main Area.txtpb b/data/maps/the_hive/rooms/Main Area.txtpb
index 013390a..1012b91 100644
--- a/data/maps/the_hive/rooms/Main Area.txtpb
+++ b/data/maps/the_hive/rooms/Main Area.txtpb

@@ -273,20 +273,24 @@ keyholders {
 ports {
  name: "DAED1"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -1.5 y: 0 z: 24 }
+  rotation: 270
 }
 ports {
  name: "DAED2"
  path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: -26.5 y: 0 z: -22 }
+  rotation: 270
 }
 ports {
  name: "DAED3"
  path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -44.5 y: 0 z: -13 }
+  rotation: 90
 }
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport4"
-  orientation: "west"
+  destination { x: -29.5 y: 0 z: -62 }
+  rotation: 270
 }
diff --git a/data/maps/the_impressive/rooms/Green Eye.txtpb b/data/maps/the_impressive/rooms/Green Eye.txtpb
index b4a115b..aed6462 100644
--- a/data/maps/the_impressive/rooms/Green Eye.txtpb
+++ b/data/maps/the_impressive/rooms/Green Eye.txtpb

@@ -23,5 +23,6 @@ panels {
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -33 y: 0 z: 1 }
+  rotation: 90
 }
diff --git a/data/maps/the_impressive/rooms/Lobby.txtpb b/data/maps/the_impressive/rooms/Lobby.txtpb
index 3c565fe..f61691c 100644
--- a/data/maps/the_impressive/rooms/Lobby.txtpb
+++ b/data/maps/the_impressive/rooms/Lobby.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 11.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_impressive/rooms/Side Area.txtpb b/data/maps/the_impressive/rooms/Side Area.txtpb
index 1dfb12b..a0c54cc 100644
--- a/data/maps/the_impressive/rooms/Side Area.txtpb
+++ b/data/maps/the_impressive/rooms/Side Area.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "FOURROOMS"
  path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -27 y: 0 z: 25.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_invisible/rooms/Entrance.txtpb b/data/maps/the_invisible/rooms/Entrance.txtpb
index bfc7223..d898b9f 100644
--- a/data/maps/the_invisible/rooms/Entrance.txtpb
+++ b/data/maps/the_invisible/rooms/Entrance.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 0 y: 0 z: -57 }
+  rotation: 180
 }
diff --git a/data/maps/the_invisible/rooms/Maze.txtpb b/data/maps/the_invisible/rooms/Maze.txtpb
index 895817a..fd80bcb 100644
--- a/data/maps/the_invisible/rooms/Maze.txtpb
+++ b/data/maps/the_invisible/rooms/Maze.txtpb

@@ -6,5 +6,7 @@ masteries {
 ports {
  name: "ENTRY"
  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
 }
diff --git a/data/maps/the_jubilant/rooms/Main Area.txtpb b/data/maps/the_jubilant/rooms/Main Area.txtpb
index 3b91f6d..5993a35 100644
--- a/data/maps/the_jubilant/rooms/Main Area.txtpb
+++ b/data/maps/the_jubilant/rooms/Main Area.txtpb

@@ -98,5 +98,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3 y: 0 z: 9 }
+  rotation: 270
 }
diff --git a/data/maps/the_keen/rooms/Main Area.txtpb b/data/maps/the_keen/rooms/Main Area.txtpb
index eacd131..a4d5ac9 100644
--- a/data/maps/the_keen/rooms/Main Area.txtpb
+++ b/data/maps/the_keen/rooms/Main Area.txtpb

@@ -70,5 +70,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_liberated/rooms/Puzzle Room.txtpb b/data/maps/the_liberated/rooms/Puzzle Room.txtpb
index 0223b44..72db46f 100644
--- a/data/maps/the_liberated/rooms/Puzzle Room.txtpb
+++ b/data/maps/the_liberated/rooms/Puzzle Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_linear/rooms/Room.txtpb b/data/maps/the_linear/rooms/Room.txtpb
index c47ce0c..20237be 100644
--- a/data/maps/the_linear/rooms/Room.txtpb
+++ b/data/maps/the_linear/rooms/Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_lionized/rooms/Puzzle Room.txtpb b/data/maps/the_lionized/rooms/Puzzle Room.txtpb
index 22b72ac..e96d441 100644
--- a/data/maps/the_lionized/rooms/Puzzle Room.txtpb
+++ b/data/maps/the_lionized/rooms/Puzzle Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_literate/rooms/Puzzle Room.txtpb b/data/maps/the_literate/rooms/Puzzle Room.txtpb
index 3927702..a3eab21 100644
--- a/data/maps/the_literate/rooms/Puzzle Room.txtpb
+++ b/data/maps/the_literate/rooms/Puzzle Room.txtpb

@@ -58,5 +58,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 7.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_lively/rooms/Puzzle Room.txtpb b/data/maps/the_lively/rooms/Puzzle Room.txtpb
index b33a122..d6becee 100644
--- a/data/maps/the_lively/rooms/Puzzle Room.txtpb
+++ b/data/maps/the_lively/rooms/Puzzle Room.txtpb

@@ -58,4 +58,6 @@ panels {
 ports {
  name: "BETWEEN"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 6.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_nuanced/rooms/Main Room.txtpb b/data/maps/the_nuanced/rooms/Main Room.txtpb
index da89bd8..d16fcb6 100644
--- a/data/maps/the_nuanced/rooms/Main Room.txtpb
+++ b/data/maps/the_nuanced/rooms/Main Room.txtpb

@@ -107,7 +107,8 @@ panels {
 ports {
  name: "UNYIELDING"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
 keyholders {
  name: "S"
diff --git a/data/maps/the_orb/rooms/B Room.txtpb b/data/maps/the_orb/rooms/B Room.txtpb
index 0324647..cdb533b 100644
--- a/data/maps/the_orb/rooms/B Room.txtpb
+++ b/data/maps/the_orb/rooms/B Room.txtpb

@@ -14,7 +14,8 @@ paintings {
 ports {
  name: "MID"
  path: "Components/Warps/worldport4"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 0
  # 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
@@ -23,5 +24,6 @@ ports {
 ports {
  name: "FINAL"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 87 }
+  rotation: 0
 }
diff --git a/data/maps/the_orb/rooms/Main Area.txtpb b/data/maps/the_orb/rooms/Main Area.txtpb
index 4fcac29..2fc17d7 100644
--- a/data/maps/the_orb/rooms/Main Area.txtpb
+++ b/data/maps/the_orb/rooms/Main Area.txtpb

@@ -86,5 +86,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 39 }
+  rotation: 0
 }
diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb
index cf5ea1f..e5c2633 100644
--- a/data/maps/the_owl/rooms/Connected Area.txtpb
+++ b/data/maps/the_owl/rooms/Connected Area.txtpb

@@ -150,6 +150,7 @@ paintings {
 ports {
  name: "FOURROOMS"
  path: "Components/Warps/worldport2"
-  orientation: "east"
+  destination { x: 71.5 y: 0 z: -9 }
+  rotation: 90
  # Note that this is behind teal walls.
 }
diff --git a/data/maps/the_owl/rooms/Magenta Hallway.txtpb b/data/maps/the_owl/rooms/Magenta Hallway.txtpb
index ccbdc1c..29e140a 100644
--- a/data/maps/the_owl/rooms/Magenta Hallway.txtpb
+++ b/data/maps/the_owl/rooms/Magenta Hallway.txtpb

@@ -2,5 +2,6 @@ name: "Magenta Hallway"
 ports {
  name: "STURDY"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: 17 y: 0 z: -46 }
+  rotation: 270
 }
diff --git a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
index 604a1cc..2f6b98d 100644
--- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
+++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb

@@ -9,7 +9,8 @@ panels {
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
  # TODO: Note that this port is accessible from the other side in the Z1
  # room. Hmm.
 }
diff --git a/data/maps/the_parthenon/rooms/Main Area.txtpb b/data/maps/the_parthenon/rooms/Main Area.txtpb
index 85188d1..e94089e 100644
--- a/data/maps/the_parthenon/rooms/Main Area.txtpb
+++ b/data/maps/the_parthenon/rooms/Main Area.txtpb

@@ -56,15 +56,18 @@ panels {
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: 0 y: 0 z: -21 }
+  rotation: 0
 }
 ports {
  name: "REVITALIZED"
  path: "Components/Warps/worldport3"
-  orientation: "north"
+  destination { x: -24 y: 0 z: -39 }
+  rotation: 180
 }
diff --git a/data/maps/the_partial/rooms/Control Center Entrance.txtpb b/data/maps/the_partial/rooms/Control Center Entrance.txtpb
index e685822..125ea51 100644
--- a/data/maps/the_partial/rooms/Control Center Entrance.txtpb
+++ b/data/maps/the_partial/rooms/Control Center Entrance.txtpb

@@ -9,5 +9,8 @@ panels {
 ports {
  name: "CC"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 8 }
+  rotation: 180
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_partial/rooms/Obverse Side.txtpb b/data/maps/the_partial/rooms/Obverse Side.txtpb
index c0ce04b..77f0e4d 100644
--- a/data/maps/the_partial/rooms/Obverse Side.txtpb
+++ b/data/maps/the_partial/rooms/Obverse Side.txtpb

@@ -100,7 +100,8 @@ panels {
 ports {
  name: "GREAT"
  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.
diff --git a/data/maps/the_perceptive/rooms/Main Area.txtpb b/data/maps/the_perceptive/rooms/Main Area.txtpb
index 449bd4d..5f80ce1 100644
--- a/data/maps/the_perceptive/rooms/Main Area.txtpb
+++ b/data/maps/the_perceptive/rooms/Main Area.txtpb

@@ -2,5 +2,8 @@ name: "Main Area"
 ports {
  name: "CC"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 13 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_plaza/rooms/Main Area.txtpb b/data/maps/the_plaza/rooms/Main Area.txtpb
index 521b974..20e6900 100644
--- a/data/maps/the_plaza/rooms/Main Area.txtpb
+++ b/data/maps/the_plaza/rooms/Main Area.txtpb

@@ -37,15 +37,18 @@ panels {
 ports {
  name: "UNYIELDING"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: 1 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
  name: "IMPRESSIVE"
  path: "Components/Warps/worldport2"
-  orientation: "west"
+  destination { x: 11 y: 0 z: 10 }
+  rotation: 270
 }
 ports {
  name: "BETWEEN"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -9 y: 0 z: 10 }
+  rotation: 270
 }
diff --git a/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb b/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb
index 3857d5f..107c7f3 100644
--- a/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "REPETITIVE"
  path: "Components/Warps/worldport5"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 16 }
+  rotation: 180
 }
diff --git a/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb b/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb
index 3c60ca8..48474b9 100644
--- a/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb
+++ b/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "SIRENIC"
  path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -51 y: 0 z: -43 }
+  rotation: 270
 }
diff --git a/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb b/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb
index ce5982c..cb9ef4f 100644
--- a/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb
+++ b/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "SYMBOLIC"
  path: "Components/Warps/worldport4"
-  orientation: "south"
+  destination { x: 28 y: 0 z: 4 }
+  rotation: 0
 }
diff --git a/data/maps/the_quiet/rooms/Main Area.txtpb b/data/maps/the_quiet/rooms/Main Area.txtpb
index 180e0bc..8ac4255 100644
--- a/data/maps/the_quiet/rooms/Main Area.txtpb
+++ b/data/maps/the_quiet/rooms/Main Area.txtpb

@@ -98,5 +98,6 @@ panels {
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 0 z: 8 }
+  rotation: 90
 }
diff --git a/data/maps/the_repetitive/rooms/Entry Connector.txtpb b/data/maps/the_repetitive/rooms/Entry Connector.txtpb
index b6795c2..3fa883e 100644
--- a/data/maps/the_repetitive/rooms/Entry Connector.txtpb
+++ b/data/maps/the_repetitive/rooms/Entry Connector.txtpb

@@ -2,5 +2,9 @@ name: "Entry Connector"
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -11 y: 0 z: 13 }
+  rotation: 0
+  # TODO: this is part of what makes the keyholder dependent connection form CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
diff --git a/data/maps/the_repetitive/rooms/Main Room.txtpb b/data/maps/the_repetitive/rooms/Main Room.txtpb
index 8a2feb0..50b9d34 100644
--- a/data/maps/the_repetitive/rooms/Main Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Main Room.txtpb

@@ -139,5 +139,8 @@ paintings {
 ports {
  name: "CC"
  path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -5.5 y: 0 z: 56 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb
index 1ed66b4..d3698e7 100644
--- a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb
+++ b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb

@@ -2,5 +2,6 @@ name: "Plaza Connector"
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport"
-  orientation: "north"
+  destination { x: 15 y: 0 z: 13 }
+  rotation: 180
 }
diff --git a/data/maps/the_revitalized/rooms/Bye Room.txtpb b/data/maps/the_revitalized/rooms/Bye Room.txtpb
index 6cefe70..0b8eab5 100644
--- a/data/maps/the_revitalized/rooms/Bye Room.txtpb
+++ b/data/maps/the_revitalized/rooms/Bye Room.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "PARTHENON"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 30 y: 0 z: 16 }
+  rotation: 0
 }
diff --git a/data/maps/the_shop/rooms/Main Area.txtpb b/data/maps/the_shop/rooms/Main Area.txtpb
index db93fe1..c933345 100644
--- a/data/maps/the_shop/rooms/Main Area.txtpb
+++ b/data/maps/the_shop/rooms/Main Area.txtpb

@@ -156,6 +156,8 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
+  destination { x: 4 y: 0 z: 12 }
+  rotation: 90
 }
 keyholders {
  name: "N"
diff --git a/data/maps/the_sirenic/rooms/Start.txtpb b/data/maps/the_sirenic/rooms/Start.txtpb
index 9014e6d..197dccf 100644
--- a/data/maps/the_sirenic/rooms/Start.txtpb
+++ b/data/maps/the_sirenic/rooms/Start.txtpb

@@ -16,5 +16,6 @@ panels {
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 0 y: 0 z: 26 }
+  rotation: 0
 }
diff --git a/data/maps/the_stormy/rooms/Center.txtpb b/data/maps/the_stormy/rooms/Center.txtpb
index f0e3e39..8c2840f 100644
--- a/data/maps/the_stormy/rooms/Center.txtpb
+++ b/data/maps/the_stormy/rooms/Center.txtpb

@@ -32,5 +32,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -8.5 y: 0 z: 6 }
+  rotation: 270
 }
diff --git a/data/maps/the_sturdy/rooms/Main Area.txtpb b/data/maps/the_sturdy/rooms/Main Area.txtpb
index c437ceb..b7c6125 100644
--- a/data/maps/the_sturdy/rooms/Main Area.txtpb
+++ b/data/maps/the_sturdy/rooms/Main Area.txtpb

@@ -106,8 +106,12 @@ panels {
 ports {
  name: "OWL"
  path: "Components/Warps/worldport"
+  destination { x: 17 y: 0 z: 41 }
+  rotation: 90
 }
 ports {
  name: "COLORFUL"
  path: "Components/Warps/worldport2"
+  destination { x: 17 y: 0 z: -33 }
+  rotation: 90
 }
diff --git a/data/maps/the_sun_temple/rooms/Entrance.txtpb b/data/maps/the_sun_temple/rooms/Entrance.txtpb
index f9da822..352ab60 100644
--- a/data/maps/the_sun_temple/rooms/Entrance.txtpb
+++ b/data/maps/the_sun_temple/rooms/Entrance.txtpb

@@ -10,4 +10,6 @@ panels {
 ports {
  name: "UNKEMPT"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 13 }
+  rotation: 0
 }
diff --git a/data/maps/the_sweet/rooms/Main Area.txtpb b/data/maps/the_sweet/rooms/Main Area.txtpb
index d4e6fda..a488199 100644
--- a/data/maps/the_sweet/rooms/Main Area.txtpb
+++ b/data/maps/the_sweet/rooms/Main Area.txtpb

@@ -201,8 +201,12 @@ panels {
 ports {
  name: "EXIT1"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -11.5 }
+  rotation: 180
 }
 ports {
  name: "EXIT2"
  path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -17.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_symbolic/rooms/White Room.txtpb b/data/maps/the_symbolic/rooms/White Room.txtpb
index 808588e..5877885 100644
--- a/data/maps/the_symbolic/rooms/White Room.txtpb
+++ b/data/maps/the_symbolic/rooms/White Room.txtpb

@@ -8,4 +8,6 @@ panels {
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 2.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_talented/rooms/Main Area.txtpb b/data/maps/the_talented/rooms/Main Area.txtpb
index f99be48..9877fa6 100644
--- a/data/maps/the_talented/rooms/Main Area.txtpb
+++ b/data/maps/the_talented/rooms/Main Area.txtpb

@@ -112,4 +112,6 @@ keyholders {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
diff --git a/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb b/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb
index 45a0d12..0d0af54 100644
--- a/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb
+++ b/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb

@@ -9,4 +9,8 @@ panels {
 ports {
  name: "CC"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 10 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_three_doors/rooms/Dead End Room.txtpb b/data/maps/the_three_doors/rooms/Dead End Room.txtpb
index c752368..8074fbe 100644
--- a/data/maps/the_three_doors/rooms/Dead End Room.txtpb
+++ b/data/maps/the_three_doors/rooms/Dead End Room.txtpb

@@ -30,8 +30,12 @@ panels {
 ports {
  name: "BEGIN"
  path: "Components/Warps/worldport6"
+  destination { x: -38 y: 0 z: 41.5 }
+  rotation: 0
 }
 ports {
  name: "BEGIN2"
  path: "Components/Warps/worldport5"
+  destination { x: -38 y: 0 z: 27.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_three_doors/rooms/First Second Room.txtpb b/data/maps/the_three_doors/rooms/First Second Room.txtpb
index 1bee8c7..c2d9397 100644
--- a/data/maps/the_three_doors/rooms/First Second Room.txtpb
+++ b/data/maps/the_three_doors/rooms/First Second Room.txtpb

@@ -30,8 +30,12 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
+  destination { x: -16 y: 0 z: 0.5 }
+  rotation: 180
 }
 ports {
  name: "TTD"
  path: "Components/Warps/worldport2"
+  destination { x: -16 y: 0 z: 14.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_three_doors/rooms/Loose Strings Room.txtpb b/data/maps/the_three_doors/rooms/Loose Strings Room.txtpb
index 9d4430f..9cb7f65 100644
--- a/data/maps/the_three_doors/rooms/Loose Strings Room.txtpb
+++ b/data/maps/the_three_doors/rooms/Loose Strings Room.txtpb

@@ -16,4 +16,6 @@ panels {
 ports {
  name: "BEGIN"
  path: "Components/Warps/worldport7"
+  destination { x: -16 y: 0 z: 41.5 }
+  rotation: 0
 }
diff --git a/data/maps/the_three_doors/rooms/One Luck Room.txtpb b/data/maps/the_three_doors/rooms/One Luck Room.txtpb
index 816b4e3..742a8d3 100644
--- a/data/maps/the_three_doors/rooms/One Luck Room.txtpb
+++ b/data/maps/the_three_doors/rooms/One Luck Room.txtpb

@@ -16,4 +16,6 @@ panels {
 ports {
  name: "BEGIN"
  path: "Components/Warps/worldport8"
+  destination { x: -16 y: 0 z: 27.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_three_doors/rooms/Silver Portal Room.txtpb b/data/maps/the_three_doors/rooms/Silver Portal Room.txtpb
index aeab9da..0d62429 100644
--- a/data/maps/the_three_doors/rooms/Silver Portal Room.txtpb
+++ b/data/maps/the_three_doors/rooms/Silver Portal Room.txtpb

@@ -28,8 +28,12 @@ panels {
 ports {
  name: "BEGIN"
  path: "Components/Warps/worldport3"
+  destination { x: -38 y: 0 z: 14.5 }
+  rotation: 0
 }
 ports {
  name: "NEXT"
  path: "Components/Warps/worldport4"
+  destination { x: -38 y: 0 z: 0.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_tower/rooms/First Floor.txtpb b/data/maps/the_tower/rooms/First Floor.txtpb
index 33398a3..6b960d8 100644
--- a/data/maps/the_tower/rooms/First Floor.txtpb
+++ b/data/maps/the_tower/rooms/First Floor.txtpb

@@ -98,4 +98,6 @@ panels {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
+  destination { x: -0 y: 0 z: 13 }
+  rotation: 0
 }
diff --git a/data/maps/the_tree/rooms/Bearer Entrance.txtpb b/data/maps/the_tree/rooms/Bearer Entrance.txtpb
index 797e5d0..e81027b 100644
--- a/data/maps/the_tree/rooms/Bearer Entrance.txtpb
+++ b/data/maps/the_tree/rooms/Bearer Entrance.txtpb

@@ -2,4 +2,6 @@ name: "Bearer Entrance"
 ports {
  name: "BEARER"
  path: "Components/Warps/worldport"
+  destination { x: -15.5 y: 0 z: 20 }
+  rotation: 270
 }
diff --git a/data/maps/the_tree/rooms/Main Area.txtpb b/data/maps/the_tree/rooms/Main Area.txtpb
index b232d1e..efa8e7d 100644
--- a/data/maps/the_tree/rooms/Main Area.txtpb
+++ b/data/maps/the_tree/rooms/Main Area.txtpb

@@ -212,18 +212,28 @@ panels {
 ports {
  name: "UNKEMPT"
  path: "Components/Warps/worldport4"
+  destination { x: -21 y: 0 z: 7 }
+  rotation: 0
+  # enterable from either side
 }
 ports {
  name: "DIGITAL"
  path: "Components/Warps/worldport5"
+  destination { x: -21 y: 0 z: -7 }
+  rotation: 180
+  # enterable from either side
 }
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport2"
+  destination { x: 21 y: 0 z: -4 }
+  rotation: 180
 }
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport3"
+  destination { x: -15.5 y: 0 z: -19 }
+  rotation: 90
 }
 paintings {
  name: "SEA"
diff --git a/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb b/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb
index e8fa13a..d2c6ef9 100644
--- a/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb
+++ b/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb

@@ -9,4 +9,8 @@ panels {
 ports {
  name: "CC"
  path: "Components/Warps/worldport2"
+  destination { x: -4.5 y: 0 z: 7 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb b/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb
index 851c863..a8048f0 100644
--- a/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb

@@ -2,4 +2,6 @@ name: "Daedalus Entrance"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport4"
+  destination { x: 33 y: 0 z: -10 }
+  rotation: 90
 }
diff --git a/data/maps/the_unkempt/rooms/Main Area.txtpb b/data/maps/the_unkempt/rooms/Main Area.txtpb
index b5d29c4..822af8d 100644
--- a/data/maps/the_unkempt/rooms/Main Area.txtpb
+++ b/data/maps/the_unkempt/rooms/Main Area.txtpb

@@ -217,13 +217,19 @@ keyholders {
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport"
+  destination { x: -3 y: 0 z: 11 }
+  rotation: 270
 }
 ports {
  name: "TREE"
  path: "Components/Warps/worldport5"
+  destination { x: -34 y: 0 z: 7 }
+  rotation: 270
 }
 ports {
  name: "SUNTEMPLE"
  path: "Components/Warps/worldport3"
+  destination { x: -42 y: 0 z: -2 }
+  rotation: 270
  required_door { name: "Sun Temple Entrance" }
 }
diff --git a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb
index 4c1440f..0f6e372 100644
--- a/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Bearer Entrance.txtpb

@@ -2,4 +2,6 @@ name: "Bearer Entrance"
 ports {
  name: "BEARER"
  path: "Components/Warps/worldport4"
+  destination { x: 23 y: 0 z: -29 }
+  rotation: 90
 }
diff --git a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb
index 74665a2..fa7def2 100644
--- a/data/maps/the_unyielding/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Digital Entrance.txtpb

@@ -9,4 +9,6 @@ panels {
 ports {
  name: "DIGITAL"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 0 }
+  rotation: 0
 }
diff --git a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb
index f011b32..a2603c4 100644
--- a/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Nuanced Entrance.txtpb

@@ -2,4 +2,6 @@ name: "Nuanced Entrance"
 ports {
  name: "NUANCED"
  path: "Components/Warps/worldport3"
+  destination { x: -23 y: 0 z: -29 }
+  rotation: 270
 }
diff --git a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb
index 0bc60a7..c6f1075 100644
--- a/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb
+++ b/data/maps/the_unyielding/rooms/Plaza Entrance.txtpb

@@ -16,4 +16,6 @@ panels {
 ports {
  name: "PLAZA"
  path: "Components/Warps/worldport5"
+  destination { x: 35 y: 0 z: 44 }
+  rotation: 270
 }
diff --git a/data/maps/the_wondrous/rooms/Entry.txtpb b/data/maps/the_wondrous/rooms/Entry.txtpb
index e15f75c..401e9aa 100644
--- a/data/maps/the_wondrous/rooms/Entry.txtpb
+++ b/data/maps/the_wondrous/rooms/Entry.txtpb

@@ -8,4 +8,6 @@ panels {
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport"
+  destination { x: 18 y: 0 z: 41 }
+  rotation: 180
 }
diff --git a/data/maps/the_words/rooms/Main Area.txtpb b/data/maps/the_words/rooms/Main Area.txtpb
index 503408c..09ef049 100644
--- a/data/maps/the_words/rooms/Main Area.txtpb
+++ b/data/maps/the_words/rooms/Main Area.txtpb

@@ -58,4 +58,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9.5 }
+  rotation: 0
 }