diff --git a/apps/room_control b/apps/room_control
index 4d36c11..ff033c1 160000
--- a/apps/room_control
+++ b/apps/room_control
@@ -1 +1 @@
-Subproject commit 4d36c11bfb316f2f43611ff85589ef9baa85efcd
+Subproject commit ff033c174d0b72681a96a24d52132b75516ac427
diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index 8a1d988..b6814b0 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -4,7 +4,6 @@ bathroom:
   entity: light.bathroom
   sensor: binary_sensor.bathroom_motion_occupancy
   off_duration: '00:05:00'
-  button: Bathroom Button
   delay: '00:20:00'
   states:
     - time: '05:00:00'
@@ -32,5 +31,11 @@ bathroom:
     off_duration: '00:02:00'
     scene:
       light.bathroom:
-        brightness_pct: 10
-        color_temp: 250
\ No newline at end of file
+        brightness: 1
+        color_temp: 250
+
+bathroom_button:
+  module: button
+  class: ButtonController
+  app: bathroom
+  button: Bathroom Button
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index f62e361..94f41d2 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -4,9 +4,6 @@ bedroom:
   entity: light.bedroom
   sensor: binary_sensor.bedroom_motion_occupancy
   off_duration: '00:05:00'
-  button:
-    - Bedroom Button 1
-    - Bedroom Button 2
   states:
     - time: 'sunrise - 03:00:00'
       scene:
@@ -62,4 +59,12 @@ bedroom:
           state: on
           color_temp: 350
           brightness_pct: 10
-  sleep: input_boolean.sleeping
\ No newline at end of file
+  sleep: input_boolean.sleeping
+
+bedroom_buttons:
+  module: button
+  class: ButtonController
+  app: bedroom
+  button:
+    - Bedroom Button 1
+    - Bedroom Button 2
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index a868ec3..bbbad4c 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -4,7 +4,7 @@ kitchen:
   entity: light.kitchen
   sensor: binary_sensor.kitchen_motion_occupancy
   off_duration: '00:10:00'
-  button: Kitchen Button
+
   ha_button: input_button.activate_kitchen
   states:
     - time: sunrise
@@ -38,3 +38,9 @@ kitchen:
       light.kitchen:
         state: on
         brightness_pct: 1
+
+kitchen_button:
+  module: button
+  class: ButtonController
+  app: kitchen
+  button: Kitchen Button
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index b15625f..9a37449 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -73,3 +73,9 @@ front_door:
   class: DoorControl
   app: living_room
   door: binary_sensor.front_contact
+
+living_room_button:
+  module: button
+  class: ButtonController
+  app: living_room
+  button: Living Room Button
\ No newline at end of file