diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index e730e5e..9347823 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -7,24 +7,6 @@ good_night:
       data:
         option: Night
       entity_id: input_select.home_mode
-    - service: light.turn_off
-      entity_id:
-        - light.couch_lights
-        - light.tv_lights
-        - light.office
-        - light.kitchen_lights
-        - light.bedroom_lights
-        - light.bed_lamps
-        - light.bed_lightstrip
-        - light.kitchen_sink_lighstrip
-        - light.bathroom_lights
-        - light.shower_lights
-        - light.bathroom_mirror_lights
-        - light.bathroom_color_zha_group_0x0007
-        - light.hallway_light
-        - light.hallway_lightstrip
-        - light.balcony
-        - light.table_lamp_lights
     - choose:
         - conditions:
             - condition: state
@@ -52,7 +34,6 @@ good_night:
               data: { }
               target:
                 entity_id: lock.front_door_lock_doorlock
-
     - choose:
         - conditions:
             - condition: numeric_state
@@ -79,6 +60,24 @@ good_night:
         entity_id:
           - climate.office_thermostat
           - climate.dining_thermostat
+    - service: light.turn_off
+      entity_id:
+        - light.couch_lights
+        - light.tv_lights
+        - light.office
+        - light.kitchen_lights
+        - light.bedroom_lights
+        - light.bed_lamps
+        - light.bed_lightstrip
+        - light.kitchen_sink_lighstrip
+        - light.bathroom_lights
+        - light.shower_lights
+        - light.bathroom_mirror_lights
+        - light.bathroom_color_zha_group_0x0007
+        - light.hallway_light
+        - light.hallway_lightstrip
+        - light.balcony
+        - light.table_lamp_lights
   mode: single
   icon: mdi:weather-night
 
@@ -128,24 +127,6 @@ leave_home:
       data:
         option: Away
       entity_id: input_select.home_mode
-    - service: light.turn_off
-      entity_id:
-        - light.couch_lights
-        - light.tv_lights
-        - light.office
-        - light.kitchen_lights
-        - light.bedroom_lights
-        - light.bed_lamps
-        - light.bed_lightstrip
-        - light.kitchen_sink_lighstrip
-        - light.bathroom_lights
-        - light.shower_lights
-        - light.bathroom_mirror_lights
-        - light.bathroom_color_zha_group_0x0007
-        - light.hallway_light
-        - light.hallway_lightstrip
-        - light.balcony
-        - light.table_lamp_lights
     - choose:
         - conditions:
             - condition: state
@@ -158,8 +139,6 @@ leave_home:
     - service: switch.turn_on
       entity_id:
         - switch.kitchen_camera_outlet_on_off
-        - switch.kitchen_state
-        - switch.hallway_state
     - service: switch.turn_off
       entity_id:
         - switch.printer_switch
@@ -197,6 +176,24 @@ leave_home:
           - climate.office_thermostat
           - climate.dining_thermostat
           - climate.bedroom_thermostat
+    - service: light.turn_off
+      entity_id:
+        - light.couch_lights
+        - light.tv_lights
+        - light.office
+        - light.kitchen_lights
+        - light.bedroom_lights
+        - light.bed_lamps
+        - light.bed_lightstrip
+        - light.kitchen_sink_lighstrip
+        - light.bathroom_lights
+        - light.shower_lights
+        - light.bathroom_mirror_lights
+        - light.bathroom_color_zha_group_0x0007
+        - light.hallway_light
+        - light.hallway_lightstrip
+        - light.balcony
+        - light.table_lamp_lights
   mode: single
   icon: mdi:home-export-outline