diff --git a/apps/bathroom.yaml b/apps/bathroom.yaml
new file mode 100644
index 0000000..00421f1
--- /dev/null
+++ b/apps/bathroom.yaml
@@ -0,0 +1,51 @@
+bathroom:
+  module: controller
+  class: ControllerRoomLights
+  entities:
+    - light.bathroom
+
+bathroom_motion:
+  module: controller
+  class: ControllerMotion
+  room: bathroom
+  off_duration: 00:03:00
+  entities:
+    - binary_sensor.motion_bathroom
+
+bathroom_button:
+  module: controller
+  class: ControllerButton
+  room: bathroom
+  buttons:
+    - kitchen
+
+bathroom_daylight:
+  module: controller
+  class: ControllerDaylight
+  room: bathroom
+  entities:
+    - light.bathroom
+  latitude: 30.150380
+  longitude: -97.4487
+  periods:
+    - time: '04:00:00am'
+      brightness: 40
+      color_temp: 350
+
+    - elevation: 0
+      direction: rising
+      brightness: 150
+      color_temp: 200
+
+    - time: noon
+      brightness: 255
+      color_temp: 300
+
+    - elevation: 0
+      direction: setting
+      brightness: 125
+      color_temp: 325
+
+    - time: '10:30:00pm'
+      brightness: 40
+      color_temp: 350
\ No newline at end of file
diff --git a/apps/bedroom.yaml b/apps/bedroom.yaml
new file mode 100644
index 0000000..0eb6d78
--- /dev/null
+++ b/apps/bedroom.yaml
@@ -0,0 +1,54 @@
+bedroom:
+  module: controller
+  class: ControllerRoomLights
+  sleep: input_boolean.sleeping
+  entities:
+    - light.bedroom
+    - light.overhead
+
+bedroom_motion:
+  module: controller
+  class: ControllerMotion
+  room: bedroom
+  off_duration: 00:05:00
+  entities:
+    - binary_sensor.motion_bedroom
+
+bedroom_button:
+  module: controller
+  class: ControllerButton
+  room: bedroom
+  buttons:
+    - bedroom
+    - bedroom2
+
+bedroom_daylight:
+  module: controller
+  class: ControllerDaylight
+  room: bedroom
+  entities:
+    - light.bedroom
+  latitude: 30.150380
+  longitude: -97.4487
+  periods:
+    - time: '04:00:00am'
+      brightness: 75
+      color_temp: 200
+
+    - elevation: 0
+      direction: rising
+      brightness: 150
+      color_temp: 200
+
+    - time: noon
+      brightness: 255
+      color_temp: 300
+
+    - elevation: 0
+      direction: setting
+      brightness: 125
+      color_temp: 325
+
+    - time: '10:30:00pm'
+      brightness: 75
+      color_temp: 350
\ No newline at end of file
diff --git a/apps/kitchen.yaml b/apps/kitchen.yaml
index 3f1de93..7ea6bee 100644
--- a/apps/kitchen.yaml
+++ b/apps/kitchen.yaml
@@ -22,29 +22,21 @@ kitchen_button:
 kitchen_daylight:
   module: controller
   class: ControllerDaylight
+  room: kitchen
   entities:
     - light.kitchen
   latitude: 30.150380
   longitude: -97.4487
   periods:
-    - time: '04:00:00am'
-      brightness: 75
+    - time: sunrise
+      brightness: 10
       color_temp: 200
-
-    - elevation: 0
-      direction: rising
-      brightness: 150
-      color_temp: 200
-
     - time: noon
-      brightness: 255
+      brightness: 30
       color_temp: 300
-
-    - elevation: 0
-      direction: setting
-      brightness: 125
-      color_temp: 325
-
-    - time: '10:30:00pm'
-      brightness: 75
-      color_temp: 350
\ No newline at end of file
+    - time: sunset
+      brightness: 40
+      color_temp: 450
+    - time: '10:00:00pm'
+      brightness: 10
+      color_temp: 650
\ No newline at end of file
diff --git a/apps/living_room.yaml b/apps/living_room.yaml
index a883eb1..39b9eb0 100644
--- a/apps/living_room.yaml
+++ b/apps/living_room.yaml
@@ -25,6 +25,7 @@ living_room_button:
 living_room_daylight:
   module: controller
   class: ControllerDaylight
+  room: living_room
   entities:
     - light.living_room
   latitude: 30.150380
@@ -32,7 +33,7 @@ living_room_daylight:
   periods:
     - time: '04:00:00am'
       brightness: 75
-      color_temp: 200
+      color_temp: 375
 
     - elevation: 0
       direction: rising
@@ -60,16 +61,20 @@ living_room_daylight:
 
     - time: '10:30:00pm'
       brightness: 75
-      color_temp: 400
+      color_temp: 375
 
 couch_corner_daylight:
   module: controller
   class: ControllerDaylight
+  room: living_room
   entities:
     - light.couch_corner
   latitude: 30.150380
   longitude: -97.4487
   periods:
+    - time: '04:00:00am'
+      brightness: 10
+      color_temp: 500
     - time: sunrise
       brightness: 20
       color_temp: 200
@@ -79,6 +84,10 @@ couch_corner_daylight:
     - time: sunset
       brightness: 20
       color_temp: 400
+    - time: '10:30:00pm'
+      brightness: 10
+      color_temp: 500
+
 
   # scene:
   #   - time: sunrise
diff --git a/apps/rooms.yaml b/apps/rooms.yaml
index 49f365a..bb45ac9 100755
--- a/apps/rooms.yaml
+++ b/apps/rooms.yaml
@@ -1,38 +1,38 @@
-bathroom:
-  module: basic_motion
-  class: MotionLight
-  entity: light.bathroom
-  sensor: binary_sensor.motion_bathroom
-  off_duration: '00:05:00'
-  button: button1
-  delay: '00:20:00'
-  scene:
-    - time: '05:00:00'
-      scene:
-        light.bathroom:
-          brightness_pct: 40
-          color_temp: 250
-    - time: '12:00:00'
-      scene:
-        light.bathroom:
-          brightness_pct: 70
-          color_temp: 300
-    - time: sunset
-      scene:
-        light.bathroom:
-          brightness_pct: 50
-          color_temp: 350
-    - time: '23:00:00'
-      scene:
-        light.bathroom:
-          brightness_pct: 20
-          color_temp: 350
-  sleep: input_boolean.sleeping
-  sleep_scene:
-    off_duration: '00:02:00'
-    light.bathroom:
-      brightness_pct: 10
-      color_temp: 250
+# bathroom:
+#   module: basic_motion
+#   class: MotionLight
+#   entity: light.bathroom
+#   sensor: binary_sensor.motion_bathroom
+#   off_duration: '00:05:00'
+#   button: button1
+#   delay: '00:20:00'
+#   scene:
+#     - time: '05:00:00'
+#       scene:
+#         light.bathroom:
+#           brightness_pct: 40
+#           color_temp: 250
+#     - time: '12:00:00'
+#       scene:
+#         light.bathroom:
+#           brightness_pct: 70
+#           color_temp: 300
+#     - time: sunset
+#       scene:
+#         light.bathroom:
+#           brightness_pct: 50
+#           color_temp: 350
+#     - time: '23:00:00'
+#       scene:
+#         light.bathroom:
+#           brightness_pct: 20
+#           color_temp: 350
+#   sleep: input_boolean.sleeping
+#   sleep_scene:
+#     off_duration: '00:02:00'
+#     light.bathroom:
+#       brightness_pct: 10
+#       color_temp: 250
 
 closet:
   module: basic_motion
@@ -62,55 +62,55 @@ closet:
           brightness_pct: 40
           color_temp: 400
 
-bedroom:
-  module: basic_motion
-  class: MotionLight
-  entity: light.bedroom
-  sensor: binary_sensor.motion_bedroom
-  off_duration: '00:05:00'
-  button:
-    - bedroom_switch
-    - bedroom_switch_2
-  scene:
-    - time: 'sunrise - 03:00:00'
-      scene:
-        light.bedroom:
-          state: on
-          color_temp: 550
-          brightness_pct: 20
-        light.overhead:
-          state: off
-    - time: '06:00:00'
-      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:
-          state: on
-          color_temp: 325
-          brightness_pct: 30
-        light.overhead:
-          state: on
-          color_temp: 325
-          brightness_pct: 70
-    - time: 'sunset'
-      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
+# bedroom:
+#   module: basic_motion
+#   class: MotionLight
+#   entity: light.bedroom
+#   sensor: binary_sensor.motion_bedroom
+#   off_duration: '00:05:00'
+#   button:
+#     - bedroom
+#     - bedroom2
+#   scene:
+#     - time: 'sunrise - 03:00:00'
+#       scene:
+#         light.bedroom:
+#           state: on
+#           color_temp: 550
+#           brightness_pct: 20
+#         light.overhead:
+#           state: off
+#     - time: '06:00:00'
+#       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:
+#           state: on
+#           color_temp: 325
+#           brightness_pct: 30
+#         light.overhead:
+#           state: on
+#           color_temp: 325
+#           brightness_pct: 70
+#     - time: 'sunset'
+#       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:
 #   module: basic_motion
diff --git a/apps/sleep.yaml b/apps/sleep.yaml
index c3821bd..df2aab6 100755
--- a/apps/sleep.yaml
+++ b/apps/sleep.yaml
@@ -13,4 +13,4 @@ sleep:
     - light.patio
     - light.closet
     - light.kitchen
-    - light.corner_light
+    - light.couch_corner