diff --git a/apps/global/sleep.yaml b/apps/global/sleep.yaml
index b3699ae..1bb2b53 100644
--- a/apps/global/sleep.yaml
+++ b/apps/global/sleep.yaml
@@ -4,13 +4,15 @@ sleep_sensors:
   priority: 5 # default priority app is 50, since most of them require sensors created by virtual sensors, it's important that virtual_sensors start first
 
   sensors:    
-    binary_sensor.is_bedroom_sleeping: input_boolean.bedroom_sleeping
-    binary_sensor.is_living_room_sleeping: input_boolean.living_room_sleeping
-    binary_sensor.is_desk_sleeping: input_boolean.desk_sleeping
-    binary_sensor.is_guestroom_sleeping: input_boolean.guestroom_sleeping
+    binary_sensor.is_bedroom_sleeping: input_boolean.bedroom_sleeping or input_boolean.nap_switch
+    binary_sensor.is_living_room_sleeping: input_boolean.living_room_sleeping and input_boolean.living_room_occupied_tonight
+    binary_sensor.is_desk_sleeping: input_boolean.desk_sleeping and input_boolean.desk_occupied_tonight
+    binary_sensor.is_guestroom_sleeping: input_boolean.guestroom_sleeping and input_boolean.guestroom_occupied_tonight
 
-    binary_sensor.is_everybody_sleeping:       
-      - (binary_sensor.is_bedroom_sleeping or not input_boolean.bedroom_occupied_tonight) and (binary_sensor.is_living_room_sleeping or not input_boolean.living_room_occupied_tonight) and (binary_sensor.is_desk_sleeping or not input_boolean.desk_occupied_tonight) and (binary_sensor.is_guestroom_sleeping or not input_boolean.guestroom_occupied_tonight)
+    binary_sensor.is_everybody_sleeping:
+      trigger_conditions:        
+        - (binary_sensor.is_bedroom_sleeping or not input_boolean.bedroom_occupied_tonight) and (binary_sensor.is_living_room_sleeping or not input_boolean.living_room_occupied_tonight) and (binary_sensor.is_desk_sleeping or not input_boolean.desk_occupied_tonight) and (binary_sensor.is_guestroom_sleeping or not input_boolean.guestroom_occupied_tonight)
+      disable_conditions: input_boolean.nap_switch
     binary_sensor.is_anybody_sleeping: 
       - binary_sensor.is_bedroom_sleeping and input_boolean.bedroom_occupied_tonight
       - binary_sensor.is_living_room_sleeping and input_boolean.living_room_occupied_tonight