diff --git a/apps/rooms.yaml b/apps/rooms.yaml
index 19e89ad..a0ef7dd 100755
--- a/apps/rooms.yaml
+++ b/apps/rooms.yaml
@@ -28,11 +28,12 @@ bathroom:
           brightness_pct: 20
           color_temp: 350
   sleep: input_boolean.sleeping
-  sleep_scene:
+  sleep_state:
     off_duration: '00:02:00'
-    light.bathroom:
-      brightness_pct: 10
-      color_temp: 250
+    scene:
+      light.bathroom:
+        brightness_pct: 10
+        color_temp: 250
 
 closet:
   module: basic_motion
@@ -127,7 +128,7 @@ living_room:
           state: on
           color_temp: 200
           brightness_pct: 30
-        light.corner_light:
+        light.couch_corner:
           state: on
           color_temp: 200
           brightness_pct: 7
@@ -137,7 +138,7 @@ living_room:
           state: on
           color_temp: 250
           brightness_pct: 50
-        light.corner_light:
+        light.couch_corner:
           state: on
           color_temp: 250
           brightness_pct: 25
@@ -147,28 +148,41 @@ living_room:
           state: on
           color_temp: 300
           brightness_pct: 100
-        light.corner_light:
+        light.couch_corner:
           state: on
           color_temp: 450
           brightness_pct: 50
-    - time: 'sunset'
-      off_duration: '01:00:00'
+    - time: sunset
+      off_duration: 01:00:00
       scene:
         light.living_room:
           state: on
           color_temp: 350
           brightness_pct: 70
-        light.corner_light:
+        light.couch_corner:
           state: on
           color_temp: 650
           brightness_pct: 10
+    - elevation: -20
+      direction: setting
+      off_duration: 00:30:00
+      scene:
+        light.living_room:
+          state: on
+          color_temp: 350
+          brightness_pct: 50
+        light.couch_corner:
+          state: on
+          color_temp: 650
+          brightness_pct: 5
   sleep: input_boolean.sleeping
-  sleep_scene:
+  sleep_state:
     off_duration: '00:02:00'
-    light.living_room:
-      state: 'on'
-      color_name: 'red'
-      brightness_pct: 50
+    scene:
+      light.living_room:
+        state: 'on'
+        color_name: 'red'
+        brightness_pct: 50
 
 kitchen:
   module: basic_motion
@@ -176,7 +190,7 @@ kitchen:
   entity: light.kitchen
   sensor: binary_sensor.motion_kitchen
   off_duration: '00:10:00'
-  button: kitchen_switch
+  button: kitchen
   scene:
     - time: sunrise
       scene:
@@ -204,11 +218,11 @@ kitchen:
           color_temp: 650
           brightness_pct: 10
   sleep: input_boolean.sleeping
-  sleep_scene:
-    light.kitchen:
-      state: on
-      brightness_pct: 1
-
+  sleep_state:
+    scene:
+      light.kitchen:
+        state: on
+        brightness_pct: 1
 
 # patio:
 #   module: patio