3 files changed, 43 insertions, 45 deletions
diff --git a/data/maps/the_hive/rooms/Main Area.txtpb b/data/maps/the_hive/rooms/Main Area.txtpb
index bd2e088..013390a 100644
--- a/data/maps/the_hive/rooms/Main Area.txtpb
+++ b/data/maps/the_hive/rooms/Main Area.txtpb

@@ -1,274 +1,274 @@
 name: "Main Area"
-display_name: "Hive"
 panels {
  name: "ASP"
  path: "Panels/Room 1/panel_1"
  clue: "asp"
  answer: "wasp"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "HORN"
  path: "Panels/Room 1/panel_2"
  clue: "horn"
  answer: "hornet"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "NET"
  path: "Panels/Room 1/panel_3"
  clue: "net"
  answer: "hornet"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "WAS"
  path: "Panels/Room 1/panel_4"
  clue: "was"
  answer: "wasp"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "HONE"
  path: "Panels/Room 2/panel_1"
  clue: "hone"
  answer: "honeybee"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "MOO"
  path: "Panels/Room 2/panel_2"
  clue: "moo"
  answer: "mosquito"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "QUIT"
  path: "Panels/Room 2/panel_3"
  clue: "quit"
  answer: "mosquito"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "EYE"
  path: "Panels/Room 2/panel_4"
  clue: "eye"
  answer: "honeybee"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "YELL"
  path: "Panels/Room 3/panel_1"
  clue: "yell"
  answer: "yellow"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "AT"
  path: "Panels/Room 3/panel_2"
  clue: "at"
  answer: "jacket"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "LOW (1)"
  path: "Panels/Room 3/panel_3"
  clue: "low"
  answer: "yellow"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "JACK"
  path: "Panels/Room 3/panel_4"
  clue: "jack"
  answer: "jacket"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "LOW (2)"
  path: "Panels/Room 4/panel_1"
  clue: "low"
  answer: "flower"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "OWE"
  path: "Panels/Room 4/panel_2"
  clue: "owe"
  answer: "flower"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "DEN"
  path: "Panels/Room 4/panel_3"
  clue: "den"
  answer: "garden"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "AD"
  path: "Panels/Room 4/panel_4"
  clue: "ad"
  answer: "garden"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "SITE"
  path: "Panels/Room 5/panel_1"
  clue: "site"
  answer: "parasite"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "ATE"
  path: "Panels/Room 5/panel_2"
  clue: "ate"
  answer: "creature"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "CURE"
  path: "Panels/Room 5/panel_3"
  clue: "cure"
  answer: "creature"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "PAR"
  path: "Panels/Room 5/panel_4"
  clue: "par"
  answer: "parasite"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "EEL"
  path: "Panels/Room 6/panel_1"
  clue: "eel"
  answer: "beetle"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "SIR"
  path: "Panels/Room 6/panel_2"
  clue: "sir"
  answer: "spider"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "PER"
  path: "Panels/Room 6/panel_3"
  clue: "per"
  answer: "spider"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "BEE"
  path: "Panels/Room 6/panel_4"
  clue: "bee"
  answer: "beetle"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "STEM"
  path: "Panels/Room 7/panel_1"
  clue: "stem"
  answer: "flower"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "PETAL"
  path: "Panels/Room 7/panel_2"
  clue: "petal"
  answer: "flower"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "SOIL"
  path: "Panels/Room 7/panel_3"
  clue: "soil"
  answer: "garden"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "PLANTS"
  path: "Panels/Room 7/panel_4"
  clue: "plants"
  answer: "garden"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "COWARDLY"
  path: "Panels/Room 9/panel_1"
  clue: "cowardly"
  answer: "yellow"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "COAT"
  path: "Panels/Room 9/panel_2"
  clue: "coat"
  answer: "jacket"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "FLAXEN"
  path: "Panels/Room 9/panel_3"
  clue: "flaxen"
  answer: "yellow"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "CASE"
  path: "Panels/Room 9/panel_4"
  clue: "case"
  answer: "jacket"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "LEGS"
  path: "Panels/Room 10/panel_1"
  clue: "legs"
  answer: "spider"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "EYES"
  path: "Panels/Room 10/panel_2"
  clue: "eyes"
  answer: "spider"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "WINGS"
  path: "Panels/Room 10/panel_3"
  clue: "wings"
  answer: "beetle"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "ANTENNA"
  path: "Panels/Room 10/panel_4"
  clue: "antenna"
  answer: "beetle"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "COFFEE"
  path: "Panels/Others/panel_1"
  clue: "coffee"
  answer: "tea"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
  name: "BEEF"
  path: "Panels/Others/panel_2"
  clue: "beef"
  answer: "ham"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 keyholders {
  name: "B"
  path: "Components/KeyHolders/keyHolderB"
+  key: "b"
 }
 ports {
  name: "DAED1"
diff --git a/data/maps/the_hive/rooms/Mastery Room.txtpb b/data/maps/the_hive/rooms/Mastery Room.txtpb
index 1884cfd..5e3326c 100644
--- a/data/maps/the_hive/rooms/Mastery Room.txtpb
+++ b/data/maps/the_hive/rooms/Mastery Room.txtpb

@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Hive"
 masteries {
  name: "MASTERY"
  path: "Components/Collectables/smiley"
diff --git a/data/maps/the_hive/rooms/Room 8.txtpb b/data/maps/the_hive/rooms/Room 8.txtpb
index 6ba5d1d..c96440c 100644
--- a/data/maps/the_hive/rooms/Room 8.txtpb
+++ b/data/maps/the_hive/rooms/Room 8.txtpb

@@ -1,30 +1,29 @@
 name: "Room 8"
-display_name: "Hive"
 panels {
  name: "BUMBLE"
  path: "Panels/Room 8/panel_1"
  clue: "bumble"
  answer: "bee"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "CARPENTER"
  path: "Panels/Room 8/panel_2"
  clue: "carpenter"
  answer: "bee"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "CLOVER"
  path: "Panels/Room 8/panel_3"
  clue: "clover"
  answer: "honey"
-  symbols: "question"
+  symbols: QUESTION
 }
 panels {
  name: "WILDFLOWER"
  path: "Panels/Room 8/panel_4"
  clue: "wildflower"
  answer: "honey"
-  symbols: "question"
+  symbols: QUESTION
 }