diff --git a/packages/lighting_and_scenes.yaml b/packages/lighting_and_scenes.yaml
index 06e7099..31b1424 100644
--- a/packages/lighting_and_scenes.yaml
+++ b/packages/lighting_and_scenes.yaml
@@ -84,6 +84,20 @@ input_number:
     step: 1
     unit_of_measurement: minutes
     icon: mdi:timer
+  emma_bedroom_lights_off_delay:
+    name: Emma Bedroom Lights Off Delay
+    min: 0
+    max: 30
+    step: 1
+    unit_of_measurement: minutes
+    icon: mdi:timer
+  stairwell_lights_off_delay:
+    name: Stairwell Lights Off Delay
+    min: 0
+    max: 30
+    step: 1
+    unit_of_measurement: minutes
+    icon: mdi:timer
   wakeup_lights_fade_day:
     name: Wakeup Lights Fade Day
     min: 0
@@ -105,6 +119,34 @@ input_number:
     step: 5
     unit_of_measurement: lx
     icon: mdi:sun-wireless
+  upstairs_bathroom_lux_threshold:
+    name: Upstairs Bathroom Lux Threshold
+    min: 0
+    max: 100
+    step: 5
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
+  emma_bedroom_lux_threshold:
+    name: Emma Bedroom Lux Threshold
+    min: 0
+    max: 100
+    step: 5
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
+  stairwell_lux_threshold:
+    name: Stairwell Lux Threshold
+    min: 0
+    max: 100
+    step: 5
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
+  living_room_lux_threshold:
+    name: Living Room Lux Threshold
+    min: 0
+    max: 100
+    step: 5
+    unit_of_measurement: lx
+    icon: mdi:sun-wireless
 
   # Settings for adaptive adjustments
   daytime_colortemp_front_porch:
diff --git a/packages/presence.yaml b/packages/presence.yaml
index 651846a..9bfd804 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -208,7 +208,9 @@ template:
       device_class: occupancy
       state: >
         {{ is_state('light.emma_bedroom_light','on') or
-            is_state('input_boolean.emma_sleeping','on') }}
+            is_state('input_boolean.emma_sleeping','on') or
+            is_state('binary_sensor.emma_bedroom_motion','on') or
+            is_state('timer.emma_bedroom_motion','active') }}
       delay_off: "00:00:15"
     - name: "Living Room Occupied"
       unique_id: 25623e3d-d74f-471e-8c2d-abce16646282
@@ -222,6 +224,12 @@ template:
       state: >
         {{ is_state('binary_sensor.downstairs_bathroom_motion','on') or is_state('timer.downstairs_bathroom_lights_timer','active') }}
       delay_off: "00:00:15"
+    - name: "Stairwell Occupied"
+      unique_id: ab80b307-820e-4f82-86f2-c08f97245107
+      device_class: occupancy
+      state: >
+        {{ is_state('binary_sensor.stairwell_bottom_motion','on') or
+            is_state('timer.stairwell_motion_timer','active') }}
   - sensor:
     - unique_id: people_at_home
       name: People at Home