6 files changed, 42 insertions, 30 deletions
diff --git a/data/maps/the_nuanced/connections.txtpb b/data/maps/the_nuanced/connections.txtpb
index 6c4b0f6..a530472 100644
--- a/data/maps/the_nuanced/connections.txtpb
+++ b/data/maps/the_nuanced/connections.txtpb

@@ -1,7 +1,7 @@
 connections {
  from_room: "Main Room"
  to_room: "Back Room"
-  door { name: "Main Room Puzzles" }
+  door { name: "Main Room Door" }
 }
 connections {
  from_room: "Back Room"
diff --git a/data/maps/the_nuanced/doors.txtpb b/data/maps/the_nuanced/doors.txtpb
index 0c66799..300524b 100644
--- a/data/maps/the_nuanced/doors.txtpb
+++ b/data/maps/the_nuanced/doors.txtpb

@@ -1,5 +1,5 @@
 doors {
-  name: "Left Room Puzzles"
+  name: "Blue Side Puzzles"
  type: LOCATION_ONLY
  panels { room: "Main Room" name: "HOARSE" }
  panels { room: "Main Room" name: "NAY" }
@@ -11,7 +11,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Right Room Puzzles"
+  name: "Green Side Puzzles"
  type: LOCATION_ONLY
  panels { room: "Main Room" name: "HOSE" }
  panels { room: "Main Room" name: "NIGH" }
@@ -23,7 +23,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Main Room Puzzles"
+  name: "Main Room Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_1"
  panels { room: "Main Room" name: "HOARSE" }
@@ -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"
+}
diff --git a/data/maps/the_nuanced/metadata.txtpb b/data/maps/the_nuanced/metadata.txtpb
new file mode 100644
index 0000000..4ac9b13
--- /dev/null
+++ b/data/maps/the_nuanced/metadata.txtpb

@@ -0,0 +1,5 @@
+display_name: "The Nuanced"
+worldport_entrance {
+  room: "Main Room"
+  name: "UNYIELDING"
+}
diff --git a/data/maps/the_nuanced/rooms/Back Room.txtpb b/data/maps/the_nuanced/rooms/Back Room.txtpb
index 5ff9342..b61e18b 100644
--- a/data/maps/the_nuanced/rooms/Back Room.txtpb
+++ b/data/maps/the_nuanced/rooms/Back Room.txtpb

@@ -1,51 +1,50 @@
 name: "Back Room"
-display_name: "Nuanced"
 panels {
  name: "COURSE"
  path: "Panels/Rhymes/panel_1"
  clue: "course"
  answer: "horse"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "WEIGH (1)"
  path: "Panels/Rhymes/panel_2"
  clue: "weigh"
  answer: "neigh"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "WEIGH (2)"
  path: "Panels/Rhymes/panel_3"
  clue: "weigh"
  answer: "hay"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "BUYER"
  path: "Panels/Rhymes/panel_4"
  clue: "buyer"
  answer: "hire"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "GNASH"
  path: "Panels/Rhymes/panel_5"
  clue: "gnash"
  answer: "cash"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "LIMB"
  path: "Panels/Rhymes/panel_6"
  clue: "limb"
  answer: "him"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "SPARE"
  path: "Panels/Rhymes/panel_7"
  clue: "spare"
  answer: "flare"
-  symbols: "zero"
+  symbols: ZERO
 }
diff --git a/data/maps/the_nuanced/rooms/Main Room.txtpb b/data/maps/the_nuanced/rooms/Main Room.txtpb
index d24a62d..ce4310e 100644
--- a/data/maps/the_nuanced/rooms/Main Room.txtpb
+++ b/data/maps/the_nuanced/rooms/Main Room.txtpb

@@ -1,116 +1,118 @@
 name: "Main Room"
-display_name: "Nuanced"
 panels {
  name: "HOARSE"
  path: "Panels/Eyes/panel_1"
  clue: "hoarse"
  answer: "horse"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "NAY"
  path: "Panels/Eyes/panel_2"
  clue: "nay"
  answer: "neigh"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "HEY"
  path: "Panels/Eyes/panel_3"
  clue: "hey"
  answer: "hay"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "HIGHER"
  path: "Panels/Eyes/panel_4"
  clue: "higher"
  answer: "hire"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "CACHE"
  path: "Panels/Eyes/panel_5"
  clue: "cache"
  answer: "cash"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "HYMN"
  path: "Panels/Eyes/panel_6"
  clue: "hymn"
  answer: "him"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "FLAIR"
  path: "Panels/Eyes/panel_7"
  clue: "flair"
  answer: "flare"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
  name: "HOSE"
  path: "Panels/Letters/panel_1"
  clue: "hose"
  answer: "horse"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "NIGH"
  path: "Panels/Letters/panel_2"
  clue: "nigh"
  answer: "neigh"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "HA"
  path: "Panels/Letters/panel_3"
  clue: "ha"
  answer: "hay"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "IRE"
  path: "Panels/Letters/panel_4"
  clue: "ire"
  answer: "hire"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "ASH"
  path: "Panels/Letters/panel_5"
  clue: "ash"
  answer: "cash"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "HI"
  path: "Panels/Letters/panel_6"
  clue: "hi"
  answer: "him"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "FARE"
  path: "Panels/Letters/panel_7"
  clue: "fare"
  answer: "flare"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "TORE"
  path: "Panels/Extras/hint"
  clue: "tore"
  answer: "stores"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 ports {
  name: "UNYIELDING"
+  display_name: "Entrance"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 21 }
+  rotation: 270
 }
 keyholders {
  name: "S"
  path: "Components/KeyHolders/keyHolderS"
+  key: "s"
 }
diff --git a/data/maps/the_nuanced/rooms/N2 Room.txtpb b/data/maps/the_nuanced/rooms/N2 Room.txtpb
index 492d4a3..eb9f67c 100644
--- a/data/maps/the_nuanced/rooms/N2 Room.txtpb
+++ b/data/maps/the_nuanced/rooms/N2 Room.txtpb

@@ -1,5 +1,4 @@
 name: "N2 Room"
-display_name: "Nuanced"
 letters {
  key: "n"
  level2: true