diff --git a/apps/apps.yaml b/apps/apps.yaml
index 46ef9bf..a0a58d7 100644
--- a/apps/apps.yaml
+++ b/apps/apps.yaml
@@ -19,7 +19,7 @@ scene_detect:
   module: scene_detect
   class: MotionCanceller
   scene: in_bed
-  app: bedroom
+  app: bedroom_motion
 
 leaving:
   module: leaving
diff --git a/apps/room_control b/apps/room_control
index f436476..c9cc841 160000
--- a/apps/room_control
+++ b/apps/room_control
@@ -1 +1 @@
-Subproject commit f4364764a1c50fb0187ccb16a9ba018999a67178
+Subproject commit c9cc841d58ca45dac8557576913249ed807fef2c
diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index 5540cfc..e4b71db 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -35,6 +35,7 @@ bathroom_button:
   module: button
   class: ButtonController
   app: bathroom
+  ref_entity: light.bathroom
   button: Bathroom Button
 
 bathroom_motion:
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index 41bd9f7..efff443 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -70,13 +70,14 @@ bedroom:
         light.overhead:
           state: on
           color_name: blueviolet
-          brightness_pct: 30
+          brightness_pct: 100
   sleep: input_boolean.sleeping
 
 bedroom_buttons:
   module: button
   class: ButtonController
   app: bedroom
+  ref_entity: light.bedroom
   button:
     - Bedroom Button 1
     - Bedroom Button 2
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index 7eaadee..ffd5479 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -40,6 +40,7 @@ kitchen_button:
   module: button
   class: ButtonController
   app: kitchen
+  ref_entity: light.kitchen
   button: Kitchen Button
 
 kitchen_motion:
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index 143b32c..df9a4a2 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -76,6 +76,7 @@ living_room_button:
   class: ButtonController
   app: living_room
   button: Living Room Button
+  ref_entity: light.living_room
 
 living_room_motion:
   module: motion