diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index 9347823..c78eb85 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -60,6 +60,9 @@ good_night:
         entity_id:
           - climate.office_thermostat
           - climate.dining_thermostat
+    - service: switch.turn_off
+      entity_id:
+        - switch.xmas_lights_on_off
     - service: light.turn_off
       entity_id:
         - light.couch_lights
@@ -96,7 +99,9 @@ good_morning:
         option: Day
       entity_id: input_select.home_mode
     - service: switch.turn_on
-      entity_id: switch.computer_outlet
+      entity_id:
+        - switch.computer_outlet
+        - switch.xmas_lights_on_off
     - service: switch.turn_off
       entity_id: switch.mute_doorbell
     - service: switch.turn_on
@@ -176,6 +181,9 @@ leave_home:
           - climate.office_thermostat
           - climate.dining_thermostat
           - climate.bedroom_thermostat
+    - service: switch.turn_off
+      entity_id:
+        - switch.xmas_lights_on_off
     - service: light.turn_off
       entity_id:
         - light.couch_lights
@@ -209,6 +217,7 @@ arrive_home:
     - service: switch.turn_on
       entity_id:
         - switch.computer_outlet
+        - switch.xmas_lights_on_off
     - service: switch.turn_off
       entity_id:
         - switch.kitchen_state