diff --git a/apps/room_control b/apps/room_control
index 643fd90..570fc40 160000
--- a/apps/room_control
+++ b/apps/room_control
@@ -1 +1 @@
-Subproject commit 643fd90ff08e36652c95fc208b779b9d0a8dc031
+Subproject commit 570fc4094677e9c766a37f319c7d70d95044ca55
diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index edd76fc..5540cfc 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -1,10 +1,7 @@
 bathroom:
   module: room_control
   class: RoomController
-  entity: light.bathroom
-  sensor: binary_sensor.bathroom_motion_occupancy
   off_duration: '00:05:00'
-  delay: '00:20:00'
   states:
     - time: '05:00:00'
       scene:
@@ -45,4 +42,4 @@ bathroom_motion:
   class: Motion 
   app: bathroom
   sensor: binary_sensor.bathroom_motion_occupancy
-  entity: light.bathroom
\ No newline at end of file
+  ref_entity: light.bathroom
\ No newline at end of file
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index fb9d04b..5a2b826 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -1,7 +1,6 @@
 bedroom:
   module: room_control
   class: RoomController
-  entity: light.bedroom
   off_duration: '00:05:00'
   states:
     - time: 'sunrise - 03:00:00'
@@ -74,4 +73,4 @@ bedroom_motion:
   app: bedroom
   sensor: binary_sensor.bedroom_motion_occupancy
   off_duration: '00:05:00'
-  entity: light.bedroom
+  ref_entity: light.bedroom
diff --git a/apps/rooms/closet.yaml b/apps/rooms/closet.yaml
index 5e4ce87..5011890 100644
--- a/apps/rooms/closet.yaml
+++ b/apps/rooms/closet.yaml
@@ -1,8 +1,6 @@
 closet:
   module: room_control
   class: RoomController
-  entity: light.closet
-  sensor: binary_sensor.closet_motion_occupancy
   off_duration: '00:02:00'
   states:
     - time: 'sunrise - 03:00:00'
@@ -31,4 +29,4 @@ closet_motion:
   class: Motion 
   app: closet
   sensor: binary_sensor.closet_motion_occupancy
-  entity: light.closet
+  ref_entity: light.closet
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index 9958d5c..7eaadee 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -1,10 +1,7 @@
 kitchen:
   module: room_control
   class: RoomController
-  entity: light.kitchen
-  sensor: binary_sensor.kitchen_motion_occupancy
   off_duration: '00:10:00'
-
   ha_button: input_button.activate_kitchen
   states:
     - time: sunrise
@@ -50,4 +47,4 @@ kitchen_motion:
   class: Motion 
   app: kitchen
   sensor: binary_sensor.kitchen_motion_occupancy
-  entity: light.kitchen
\ No newline at end of file
+  ref_entity: light.kitchen
\ No newline at end of file
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index 03e1504..143b32c 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -1,10 +1,7 @@
 living_room:
   module: room_control
   class: RoomController
-  sensor: binary_sensor.living_room_motion_occupancy
   off_duration: 00:30:00
-  entity: light.living_room
-  button: Living Room Button
   states:
     - time: sunrise
       scene:
@@ -85,4 +82,4 @@ living_room_motion:
   class: Motion 
   app: living_room
   sensor: binary_sensor.living_room_motion_occupancy
-  entity: light.living_room
+  ref_entity: light.living_room