diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index 241c107..dbf4c34 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -1,5 +1,7 @@
 good_night:
   alias: Good Night
+  mode: single
+  icon: mdi:weather-night
   sequence:
     - service: input_boolean.turn_off
       target:
@@ -10,7 +12,7 @@ good_night:
       data:
         option: Night
       entity_id: input_select.home_mode
-    - service: script.bedroom_lights_on
+    - service: script.bedroom_lights_off
     - service: script.cctv_on
     - service: alarm_control_panel.alarm_arm_home
       entity_id: alarm_control_panel.home_alarm
@@ -69,6 +71,10 @@ good_night:
           - climate.dining_thermostat
     - service: light.turn_off
       entity_id:
+        # Xmas lights
+        - light.twinkly_1
+        - light.twinkly_2
+        - light.wled_star
         - light.couch_lights
         - light.tv_lights
         - light.office
@@ -86,8 +92,6 @@ good_night:
         - light.table_lamp_lights
         - light.lego_bookcase_light
         - light.notification_cube_light
-  mode: single
-  icon: mdi:weather-night
 
 before_wakeup:
   alias: Before wakeup
@@ -102,6 +106,8 @@ before_wakeup:
 
 good_morning:
   alias: Good Morning
+  mode: single
+  icon: mdi:weather-sunny
   sequence:
     - service: input_boolean.turn_on
       target:
@@ -124,6 +130,12 @@ good_morning:
     - service: switch.turn_on
       entity_id:
         - switch.computer_outlet
+    - service: light.turn_on
+      entity_id:
+        # Xmas lights
+        - light.twinkly_1
+        - light.twinkly_2
+        - light.wled_star
     - service: script.humidifier_on
     - service: switch.turn_off
       entity_id: switch.mute_doorbell
@@ -159,11 +171,11 @@ good_morning:
           sequence:
             - service: light.turn_on
               entity_id: light.3d_printer_light
-  mode: single
-  icon: mdi:weather-sunny
 
 leave_home:
   alias: Leave Home
+  mode: single
+  icon: mdi:home-export-outline
   sequence:
     - service: script.cctv_on
     - service: alarm_control_panel.alarm_arm_away
@@ -238,11 +250,15 @@ leave_home:
         - light.table_lamp_lights
         - light.lego_bookcase_light
         - light.notification_cube_light
-  mode: single
-  icon: mdi:home-export-outline
+        # Xmas lights
+        - light.twinkly_1
+        - light.twinkly_2
+        - light.wled_star
 
 arrive_home:
   alias: Arrive Home
+  mode: single
+  icon: mdi:home-import-outline
   sequence:
     - service: script.cctv_off
     - service: alarm_control_panel.alarm_disarm
@@ -251,6 +267,12 @@ arrive_home:
       data:
         option: Day
       entity_id: input_select.home_mode
+    - service: light.turn_on
+      entity_id:
+        # Xmas lights
+        - light.twinkly_1
+        - light.twinkly_2
+        - light.wled_star
     - service: switch.turn_on
       entity_id:
         - switch.computer_outlet
@@ -278,5 +300,3 @@ arrive_home:
     - service: light.turn_on
       entity_id:
         - light.lego_bookcase_light
-  mode: single
-  icon: mdi:home-import-outline
\ No newline at end of file