diff --git a/apps/rooms.yaml b/apps/rooms.yaml
index 9983cd1..bc04614 100755
--- a/apps/rooms.yaml
+++ b/apps/rooms.yaml
@@ -2,7 +2,7 @@ bathroom:
   module: basic_motion
   class: MotionLight
   entity: light.bathroom
-  sensor: binary_sensor.aqarap1_motion
+  sensor: binary_sensor.motion_bathroom
   off_duration: '00:05:00'
   button: button1
   delay: '00:20:00'
@@ -81,7 +81,15 @@ bedroom:
         light.overhead:
           state: off
     - time: '06:00:00'
-      scene: scene.wakeup
+      scene:
+        light.bedroom:
+          state: on
+          color_temp: 550
+          brightness_pct: 20
+        light.overhead:
+          state: on
+          color_temp: 250
+          brightness_pct: 15
     - time: '12:00:00'
       scene:
         light.bedroom:
@@ -93,7 +101,15 @@ bedroom:
           color_temp: 325
           brightness_pct: 70
     - time: 'sunset'
-      scene: scene.bedtime
+      scene:
+        light.bedroom:
+          state: on
+          color_temp: 325
+          brightness_pct: 50
+        light.overhead:
+          state: on
+          color_temp: 350
+          brightness_pct: 10
   sleep: input_boolean.sleeping
 
 living_room:
@@ -102,7 +118,7 @@ living_room:
   entity: light.living_room
   sensor: binary_sensor.motion_living_room
   off_duration: '00:30:00'
-  button: living_room_switch
+  button: living_room
   door: binary_sensor.front_door
   scene:
     - time: sunrise