diff --git a/apps/room_control b/apps/room_control
index ff033c1..643fd90 160000
--- a/apps/room_control
+++ b/apps/room_control
@@ -1 +1 @@
-Subproject commit ff033c174d0b72681a96a24d52132b75516ac427
+Subproject commit 643fd90ff08e36652c95fc208b779b9d0a8dc031
diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index b6814b0..edd76fc 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -39,3 +39,10 @@ bathroom_button:
   class: ButtonController
   app: bathroom
   button: Bathroom Button
+
+bathroom_motion:
+  module: motion
+  class: Motion 
+  app: bathroom
+  sensor: binary_sensor.bathroom_motion_occupancy
+  entity: light.bathroom
\ No newline at end of file
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index 94f41d2..fb9d04b 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -2,7 +2,6 @@ bedroom:
   module: room_control
   class: RoomController
   entity: light.bedroom
-  sensor: binary_sensor.bedroom_motion_occupancy
   off_duration: '00:05:00'
   states:
     - time: 'sunrise - 03:00:00'
@@ -68,3 +67,11 @@ bedroom_buttons:
   button:
     - Bedroom Button 1
     - Bedroom Button 2
+
+bedroom_motion:
+  module: motion
+  class: Motion 
+  app: bedroom
+  sensor: binary_sensor.bedroom_motion_occupancy
+  off_duration: '00:05:00'
+  entity: light.bedroom
diff --git a/apps/rooms/closet.yaml b/apps/rooms/closet.yaml
index f7925ab..5e4ce87 100644
--- a/apps/rooms/closet.yaml
+++ b/apps/rooms/closet.yaml
@@ -24,4 +24,11 @@ closet:
       scene:
         light.closet:
           brightness_pct: 40
-          color_temp: 400
\ No newline at end of file
+          color_temp: 400
+
+closet_motion:
+  module: motion
+  class: Motion 
+  app: closet
+  sensor: binary_sensor.closet_motion_occupancy
+  entity: light.closet
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index bbbad4c..9958d5c 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -44,3 +44,10 @@ kitchen_button:
   class: ButtonController
   app: kitchen
   button: Kitchen Button
+
+kitchen_motion:
+  module: motion
+  class: Motion 
+  app: kitchen
+  sensor: binary_sensor.kitchen_motion_occupancy
+  entity: light.kitchen
\ No newline at end of file
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index 9a37449..03e1504 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -78,4 +78,11 @@ living_room_button:
   module: button
   class: ButtonController
   app: living_room
-  button: Living Room Button
\ No newline at end of file
+  button: Living Room Button
+
+living_room_motion:
+  module: motion
+  class: Motion 
+  app: living_room
+  sensor: binary_sensor.living_room_motion_occupancy
+  entity: light.living_room