39 files changed, 49 insertions, 74 deletions
diff --git a/data/maps/the_bearer/connections.txtpb b/data/maps/the_bearer/connections.txtpb
index 8f38791..ba14d83 100644
--- a/data/maps/the_bearer/connections.txtpb
+++ b/data/maps/the_bearer/connections.txtpb

@@ -34,6 +34,11 @@ connections {
  door { name: "Planet Orange -> Red" }
 }
 connections {
+  from_room: "Red Planet"
+  to_room: "Red Town"
+  door { name: "Red Planet -> Town" }
+}
+connections {
  from_room: "Yellow Planet"
  to_room: "Green Planet"
  door { name: "Planet Yellow -> Green" }
@@ -258,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" }
+}
diff --git a/data/maps/the_bearer/doors.txtpb b/data/maps/the_bearer/doors.txtpb
index 1faddef..f1f5a57 100644
--- a/data/maps/the_bearer/doors.txtpb
+++ b/data/maps/the_bearer/doors.txtpb

@@ -211,7 +211,7 @@ doors {
 }
 doors {
  name: "Q2 Door"
-  type: STANDARD
+  type: EVENT
  receivers: "Components/Doors/entry_3"
  panels { room: "Entry" name: "SQUISH" }
  panels { room: "Entry" name: "MANE" }
@@ -237,7 +237,6 @@ doors {
  panels { room: "Red Vegetable" name: "CARD" }
  panels { room: "Yellow Planet" name: "ZEUS" }
  panels { room: "Yellow Vegetable" name: "CAKE" }
-  location_room: "Entry"
 }
 doors {
  name: "Control Center Brown Door"
@@ -249,5 +248,5 @@ doors {
  name: "Butterfly Entrance"
  type: ITEM_ONLY
  receivers: "Components/Doors/brown_2"
-  switches: "double_letters"
+  double_letters: true
 }
diff --git a/data/maps/the_bearer/metadata.txtpb b/data/maps/the_bearer/metadata.txtpb
new file mode 100644
index 0000000..584c71e
--- /dev/null
+++ b/data/maps/the_bearer/metadata.txtpb

@@ -0,0 +1 @@
+display_name: "The Bearer"
diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb
index 5f0ec79..b1860de 100644
--- a/data/maps/the_bearer/rooms/Back Area.txtpb
+++ b/data/maps/the_bearer/rooms/Back Area.txtpb

@@ -1,17 +1,10 @@
 name: "Back Area"
-display_name: "Back Area"
 panels {
  name: "COLOR"
  path: "Panels/Entry/panel_3"
  clue: "color"
  answer: "brown"
-  symbols: "example"
+  symbols: EXAMPLE
-}
-ports {
-  name: "TREE"
-  path: "Components/Warps/worldport3"
-  orientation: "north"
-  required_door { name: "Control Center Brown Door" }
 }
 ports {
  name: "DAEDALUS"
diff --git a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb
index 0b60207..33c278c 100644
--- a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb

@@ -1,9 +1,8 @@
 name: "Blue Animal (View)"
-display_name: "Main Area"
 panels {
  name: "HALF"
  path: "Panels/Blue/panel_2"
  clue: "half"
  answer: "whale"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Blue Animal.txtpb b/data/maps/the_bearer/rooms/Blue Animal.txtpb
index 49ac048..e503c93 100644
--- a/data/maps/the_bearer/rooms/Blue Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Animal.txtpb

@@ -1,2 +1 @@
 name: "Blue Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb
index 335fe0b..e745718 100644
--- a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb

@@ -1,9 +1,8 @@
 name: "Blue Planet (View)"
-display_name: "Main Area"
 panels {
  name: "TUNE"
  path: "Panels/Blue/panel_4"
  clue: "tune"
  answer: "neptune"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Blue Planet.txtpb b/data/maps/the_bearer/rooms/Blue Planet.txtpb
index b291c35..b044590 100644
--- a/data/maps/the_bearer/rooms/Blue Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Planet.txtpb

@@ -1,2 +1 @@
 name: "Blue Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Town (View).txtpb b/data/maps/the_bearer/rooms/Blue Town (View).txtpb
index 69d9e89..f57fc9b 100644
--- a/data/maps/the_bearer/rooms/Blue Town (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Town (View).txtpb

@@ -1,9 +1,8 @@
 name: "Blue Town (View)"
-display_name: "Main Area"
 panels {
  name: "LICE"
  path: "Panels/Blue/panel_3"
  clue: "lice"
  answer: "police"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Blue Town.txtpb b/data/maps/the_bearer/rooms/Blue Town.txtpb
index b24af76..5ceed12 100644
--- a/data/maps/the_bearer/rooms/Blue Town.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Town.txtpb

@@ -1,2 +1 @@
 name: "Blue Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb
index 04beaea..cf1ffd3 100644
--- a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb

@@ -1,9 +1,8 @@
 name: "Blue Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "THORN"
  path: "Panels/Blue/panel_1"
  clue: "thorn"
  answer: "corn"
-  symbols: "zero"
+  symbols: ZERO
 }
diff --git a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb
index 9034471..64ce77d 100644
--- a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Blue Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Butterfly Room.txtpb b/data/maps/the_bearer/rooms/Butterfly Room.txtpb
index b1b2be3..a702737 100644
--- a/data/maps/the_bearer/rooms/Butterfly Room.txtpb
+++ b/data/maps/the_bearer/rooms/Butterfly Room.txtpb

@@ -1,18 +1,17 @@
 name: "Butterfly Room"
-display_name: "Back Area"
 panels {
  name: "VIBRANT"
  path: "Panels/Entry/panel_4"
  clue: "vibrant"
  answer: "colorful"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
  name: "DARKNESS"
  path: "Panels/Entry/panel_5"
  clue: "darkness"
  answer: "light"
-  symbols: "sun"
+  symbols: SUN
 }
 paintings {
  name: "BUTTERFLY"
diff --git a/data/maps/the_bearer/rooms/Entry.txtpb b/data/maps/the_bearer/rooms/Entry.txtpb
index 8c83a38..4300c1f 100644
--- a/data/maps/the_bearer/rooms/Entry.txtpb
+++ b/data/maps/the_bearer/rooms/Entry.txtpb

@@ -1,60 +1,59 @@
 name: "Entry"
-display_name: "Main Area"
 panels {
  name: "VIEW"
  path: "Panels/Entry/panel_1"
  clue: "view"
  answer: "look"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
  name: "HOVER"
  path: "Panels/Entry/panel_2"
  clue: "hover"
  answer: "over"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
  name: "SQUISH"
  path: "Panels/Yellow/panel_1"
  clue: "squish"
  answer: "squash"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
  name: "MANE"
  path: "Panels/Yellow/panel_2"
  clue: "mane"
  answer: "lion"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
  name: "SCHOOL"
  path: "Panels/Yellow/panel_3"
  clue: "school"
  answer: "bus"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
  name: "FLYTRAP"
  path: "Panels/Yellow/panel_4"
  clue: "flytrap"
  answer: "venus"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
  name: "TOAD"
  path: "Panels/Green/panel_2"
  clue: "toad"
  answer: "frog"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
  name: "CYCLING"
  path: "Panels/Green/panel_3"
  clue: "cycling"
  answer: "recycling"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 ports {
  name: "UNYIELDING"
diff --git a/data/maps/the_bearer/rooms/Green Animal.txtpb b/data/maps/the_bearer/rooms/Green Animal.txtpb
index 61522cc..147f825 100644
--- a/data/maps/the_bearer/rooms/Green Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Green Animal.txtpb

@@ -1,2 +1 @@
 name: "Green Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Planet (View).txtpb b/data/maps/the_bearer/rooms/Green Planet (View).txtpb
index 42de587..4d9f449 100644
--- a/data/maps/the_bearer/rooms/Green Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Green Planet (View).txtpb

@@ -1,9 +1,8 @@
 name: "Green Planet (View)"
-display_name: "Main Area"
 panels {
  name: "SOIL"
  path: "Panels/Green/panel_4"
  clue: "soil"
  answer: "earth"
-  symbols: "sun"
+  symbols: SUN
 }
diff --git a/data/maps/the_bearer/rooms/Green Planet.txtpb b/data/maps/the_bearer/rooms/Green Planet.txtpb
index b97b731..efe000a 100644
--- a/data/maps/the_bearer/rooms/Green Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Green Planet.txtpb

@@ -1,2 +1 @@
 name: "Green Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Town.txtpb b/data/maps/the_bearer/rooms/Green Town.txtpb
index 184ded3..fd80201 100644
--- a/data/maps/the_bearer/rooms/Green Town.txtpb
+++ b/data/maps/the_bearer/rooms/Green Town.txtpb

@@ -1,2 +1 @@
 name: "Green Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb
index 867b5f5..98fbbe8 100644
--- a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb

@@ -1,9 +1,8 @@
 name: "Green Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "SPIN"
  path: "Panels/Green/panel_1"
  clue: "spin"
  answer: "spinach"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Green Vegetable.txtpb b/data/maps/the_bearer/rooms/Green Vegetable.txtpb
index ccb817a..051a6d3 100644
--- a/data/maps/the_bearer/rooms/Green Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Green Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Green Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Orange Planet.txtpb b/data/maps/the_bearer/rooms/Orange Planet.txtpb
index d7dff1a..15fae66 100644
--- a/data/maps/the_bearer/rooms/Orange Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Orange Planet.txtpb

@@ -1,9 +1,8 @@
 name: "Orange Planet"
-display_name: "Main Area"
 panels {
  name: "MAR"
  path: "Panels/Red/panel_4"
  clue: "mar"
  answer: "mars"
-  symbols: "planet"
+  symbols: PLANET
 }
diff --git a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb
index 9ade2f1..e4d59e6 100644
--- a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb

@@ -1,9 +1,8 @@
 name: "Orange Vegetable"
-display_name: "Main Area"
 panels {
  name: "POTATO"
  path: "Panels/Red/panel_1"
  clue: "potato"
  answer: "tomato"
-  symbols: "zero"
+  symbols: ZERO
 }
diff --git a/data/maps/the_bearer/rooms/Overlook.txtpb b/data/maps/the_bearer/rooms/Overlook.txtpb
index 384802c..9eadf8f 100644
--- a/data/maps/the_bearer/rooms/Overlook.txtpb
+++ b/data/maps/the_bearer/rooms/Overlook.txtpb

@@ -1,2 +1 @@
 name: "Overlook"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb
index 5e44b2b..04ae0f8 100644
--- a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb

@@ -1,9 +1,8 @@
 name: "Purple Animal (View)"
-display_name: "Main Area"
 panels {
  name: "SUNBASS"
  path: "Panels/Purple/panel_2"
  clue: "sunbass"
  answer: "starfish"
-  symbols: "example"
+  symbols: EXAMPLE
 }
diff --git a/data/maps/the_bearer/rooms/Purple Animal.txtpb b/data/maps/the_bearer/rooms/Purple Animal.txtpb
index 9ddb70e..1c3a52c 100644
--- a/data/maps/the_bearer/rooms/Purple Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Animal.txtpb

@@ -1,2 +1 @@
 name: "Purple Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb
index 959d5b5..bacfae6 100644
--- a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb

@@ -1,9 +1,8 @@
 name: "Purple Planet (View)"
-display_name: "Main Area"
 panels {
  name: "DOG"
  path: "Panels/Purple/panel_4"
  clue: "dog"
  answer: "pluto"
-  symbols: "example"
+  symbols: EXAMPLE
 }
diff --git a/data/maps/the_bearer/rooms/Purple Planet.txtpb b/data/maps/the_bearer/rooms/Purple Planet.txtpb
index 37f7ddc..03021d5 100644
--- a/data/maps/the_bearer/rooms/Purple Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Planet.txtpb

@@ -1,2 +1 @@
 name: "Purple Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Town (View).txtpb b/data/maps/the_bearer/rooms/Purple Town (View).txtpb
index 1988321..855e3ea 100644
--- a/data/maps/the_bearer/rooms/Purple Town (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Town (View).txtpb

@@ -1,9 +1,8 @@
 name: "Purple Town (View)"
-display_name: "Main Area"
 panels {
  name: "GRACEFUL"
  path: "Panels/Purple/panel_3"
  clue: "graceful"
  answer: "race"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Purple Town.txtpb b/data/maps/the_bearer/rooms/Purple Town.txtpb
index 768f378..b077178 100644
--- a/data/maps/the_bearer/rooms/Purple Town.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Town.txtpb

@@ -1,2 +1 @@
 name: "Purple Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb
index 796d774..1a6ab04 100644
--- a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb

@@ -1,9 +1,8 @@
 name: "Purple Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "AUBERGINE"
  path: "Panels/Purple/panel_1"
  clue: "aubergine"
  answer: "eggplant"
-  symbols: "sun"
+  symbols: SUN
 }
diff --git a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb
index ef5dd7e..380b909 100644
--- a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Purple Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Q2 Room.txtpb b/data/maps/the_bearer/rooms/Q2 Room.txtpb
index ab5032a..5cdea80 100644
--- a/data/maps/the_bearer/rooms/Q2 Room.txtpb
+++ b/data/maps/the_bearer/rooms/Q2 Room.txtpb

@@ -1,5 +1,4 @@
 name: "Q2 Room"
-display_name: "Back Area"
 letters {
  key: "q"
  level2: true
diff --git a/data/maps/the_bearer/rooms/Red Animal.txtpb b/data/maps/the_bearer/rooms/Red Animal.txtpb
index 0091c05..d5ae244 100644
--- a/data/maps/the_bearer/rooms/Red Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Red Animal.txtpb

@@ -1,10 +1,9 @@
 name: "Red Animal"
-display_name: "Main Area"
 panels {
  name: "FOOLSHARK"
  path: "Panels/Orange/panel_2"
  clue: "foolshark"
  answer: "clownfish"
-  symbols: "sun"
+  symbols: SUN
-  symbols: "example"
+  symbols: EXAMPLE
 }
diff --git a/data/maps/the_bearer/rooms/Red Planet.txtpb b/data/maps/the_bearer/rooms/Red Planet.txtpb
index 8ed2595..dd3f2ec 100644
--- a/data/maps/the_bearer/rooms/Red Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Red Planet.txtpb

@@ -1,9 +1,8 @@
 name: "Red Planet"
-display_name: "Main Area"
 panels {
  name: "FUEL"
  path: "Panels/Red/panel_3"
  clue: "fuel"
  answer: "fire"
-  symbols: "cross"
+  symbols: CROSS
 }
diff --git a/data/maps/the_bearer/rooms/Red Town.txtpb b/data/maps/the_bearer/rooms/Red Town.txtpb
index 03d57bc..ed608cc 100644
--- a/data/maps/the_bearer/rooms/Red Town.txtpb
+++ b/data/maps/the_bearer/rooms/Red Town.txtpb

@@ -1,9 +1,8 @@
 name: "Red Town"
-display_name: "Main Area"
 panels {
  name: "DESTRUCTION"
  path: "Panels/Orange/panel_3"
  clue: "destruction"
  answer: "construction"
-  symbols: "sun"
+  symbols: SUN
 }
diff --git a/data/maps/the_bearer/rooms/Red Vegetable.txtpb b/data/maps/the_bearer/rooms/Red Vegetable.txtpb
index 3de8b77..fb694db 100644
--- a/data/maps/the_bearer/rooms/Red Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Red Vegetable.txtpb

@@ -1,9 +1,8 @@
 name: "Red Vegetable"
-display_name: "Main Area"
 panels {
  name: "CARD"
  path: "Panels/Red/panel_2"
  clue: "card"
  answer: "cardinal"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
diff --git a/data/maps/the_bearer/rooms/Tree Entrance.txtpb b/data/maps/the_bearer/rooms/Tree Entrance.txtpb
new file mode 100644
index 0000000..97a07da
--- /dev/null
+++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Tree Entrance"
+ports {
+  name: "TREE"
+  path: "Components/Warps/worldport3"
+  orientation: "north"
+}
diff --git a/data/maps/the_bearer/rooms/Yellow Planet.txtpb b/data/maps/the_bearer/rooms/Yellow Planet.txtpb
index 02a3884..7f8a86b 100644
--- a/data/maps/the_bearer/rooms/Yellow Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Yellow Planet.txtpb

@@ -1,9 +1,8 @@
 name: "Yellow Planet"
-display_name: "Main Area"
 panels {
  name: "ZEUS"
  path: "Panels/Orange/panel_4"
  clue: "zeus"
  answer: "jupiter"
-  symbols: "sun"
+  symbols: SUN
 }
diff --git a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb
index f67688f..f37faa5 100644
--- a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb

@@ -1,9 +1,8 @@
 name: "Yellow Vegetable"
-display_name: "Main Area"
 panels {
  name: "CAKE"
  path: "Panels/Orange/panel_1"
  clue: "cake"
  answer: "carrot"
-  symbols: "example"
+  symbols: EXAMPLE
 }