diff --git a/config/input_datetime.yaml b/config/input_datetime.yaml
index 3bf9e74..53b0cc7 100755
--- a/config/input_datetime.yaml
+++ b/config/input_datetime.yaml
@@ -30,6 +30,10 @@ christmas_show:
   name: Christmas Show
   has_date: false
   has_time: true
+christmas_preshow:
+  name: Christmas Preshow
+  has_date: false
+  has_time: true
 halloween_show:
   name: Halloween Show
   has_date: false
diff --git a/config/packages/disney.yaml b/config/packages/disney.yaml
index db8666a..6b9a872 100755
--- a/config/packages/disney.yaml
+++ b/config/packages/disney.yaml
@@ -147,6 +147,87 @@ automation:
     - service: media_player.media_stop
       entity_id: media_player.theater
   
+  - id: wishes_show_on
+    alias: Wishes Show On
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: input_boolean.holiday_wishes
+      to: 'on'
+    action:
+    - service: script.turn_on
+      entity_id: script.holiday_wishes
+  - id: wishes_show_off
+    alias: Wishes Show Off
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: input_boolean.holiday_wishes
+      to: 'off'
+    action:
+    - service: script.turn_on
+      entity_id: script.kill_this_ride
+    - service: media_player.media_stop
+      entity_id: media_player.theater
+    - service: script.turn_off
+      entity_id: script.holiday_wishes
+    - service: script.turn_off 
+      entity_id: script.wishes_lights_on
+    - service: script.turn_off
+      entity_id: script.wishes_lights_all
+  
+  - id: wishes_preshow_trigger
+    alias: Wishes Preshow Trigger 
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: input_boolean.holiday_wishes
+      to: 'on'
+    action:
+    - service: scene.turn_on
+      entity_id: scene.wishes_preshow
+  
+  - id: wishes_show_trigger
+    alias: Wishes show Trigger 
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: media_player.theater
+      to: 'playing'
+    condition:
+    - condition: state 
+      entity_id: input_boolean.holiday_wishes
+      state: 'on'
+    action:
+    - service: script.turn_on 
+      entity_id: script.wishes_lights_on
+    - service: script.turn_on
+      entity_id: script.wishes_lights_all
+
+  - id: springs_xmas_on
+    alias: Springs Xmas On
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: input_boolean.disney_springs_xmas
+      to: 'on'
+    action:
+    - service: script.turn_on
+      entity_id: script.holiday_wishes
+  - id: springs_xmas_off
+    alias: Springs Xmas Off
+    initial_state: true
+    trigger:
+    - platform: state
+      entity_id: input_boolean.disney_springs_xmas
+      to: 'off'
+    action:
+    - service: script.turn_on
+      entity_id: script.kill_this_ride
+    - service: media_player.media_stop
+      entity_id: media_player.theater
+    - service: script.turn_off
+      entity_id: script.disney_springs_xmas
 
   # #######################################
   # # Turn on / off Haunted Mansion show 
@@ -505,7 +586,17 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    - service: shell_command.mk_audio
+    - service: media_player.turn_on
+      entity_id: media_player.theater
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.theater
+        volume_level: .5
+    - service: media_player.play_media
+      entity_id: media_player.theater
+      data:
+        media_content_id: http://192.168.7.40/audio/magic_kingdom.mp3
+        media_content_type: "music"
   
   kill_this_ride:
     sequence:
@@ -534,12 +625,6 @@ script:
     - service: input_boolean.turn_off
       entity_id: input_boolean.illuminations
     - service: script.chromecast_media_stop
-    - service: script.turn_off
-      data:
-        entity_id: script.holiday_wishes
-    - service: script.turn_off
-      data:
-        entity_id: script.holiday_wishes_start
     - service: script.turn_off
       entity_id: script.illuminations_preshow
     - service: script.turn_off
@@ -558,8 +643,6 @@ script:
       entity_id: script.welcome_show_audio
     - service: script.turn_off
       entity_id: script.move_it_shake_it
-    - service: script.turn_off
-      entity_id: script.holiday_wishes_start
     - service: script.turn_off
       entity_id: script.holiday_wishes
     - service: script.turn_off
@@ -648,20 +731,17 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    # - service: shell_command.disney_springs_xmas
-    # - service: switch.turn_on 
-    #   entity_id: switch.ha_speaker 
     - service: media_player.turn_on
       entity_id: media_player.theater
     - service: media_player.volume_set
       data_template:
         entity_id: media_player.theater
         volume_level: >
-          .5
+          .3
     - service: media_player.play_media
       entity_id: media_player.theater
       data:
-        media_content_id: http://192.168.7.40/audio/Disney_Springs_Xmas_Loop.mp3.mp3
+        media_content_id: http://192.168.7.40/audio/Disney_Springs_Xmas_Loop.mp3
         media_content_type: "music"
   sleepy_hollow_readalong:
     sequence:
@@ -700,7 +780,17 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    - service: shell_command.welcome_to_mk
+    - service: media_player.turn_on
+      entity_id: media_player.theater
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.theater
+        volume_level: .5
+    - service: media_player.play_media
+      entity_id: media_player.theater
+      data:
+        media_content_id: http://192.168.7.40/audio/welcome_show.mp3
+        media_content_type: "music"
   monorail_waiting:
     sequence:
     - condition: state
@@ -748,6 +838,7 @@ script:
       data:
         media_content_id: http://192.168.7.40/audio/welcome_show_crowd.mp3
         media_content_type: "music"
+  
   holiday_wishes_preshow:
     sequence:
     - condition: state
@@ -756,10 +847,14 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    - service: shell_command.holiday_wishes_preshow
-    - delay: '00:04:00' 
-    - service: input_boolean.turn_on
-      entity_id: input_boolean.holiday_wishes
+    - service: media_player.turn_on
+      entity_id: media_player.theater
+    - service: media_player.play_media
+      entity_id: media_player.theater
+      data:
+        media_content_id: http://192.168.7.40/audio/wishes_5_min.mp3
+        media_content_type: "music"
+  
   holiday_wishes:
     sequence:
     - condition: state
@@ -768,14 +863,36 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    # - service: shell_command.holiday_wishes
     - service: media_player.turn_on
       entity_id: media_player.theater
     - service: media_player.play_media
       entity_id: media_player.theater
       data:
-        media_content_id: http://192.168.7.40/audio/wishes_5_min.mp3
+        media_content_id: http://192.168.7.40/audio/holidaywishes.mp3
         media_content_type: "music"
+  
+  wishes_lights_on:
+    sequence:
+    - delay:
+        seconds: 10
+    - service: scene.turn_on
+      entity_id: scene.wishes_show
+
+  wishes_lights_all:
+    sequence:
+    - delay:
+        seconds: 110
+    - service: scene.turn_on
+      entity_id: scene.table_lamp_blue
+    - delay:
+        seconds: 2
+    - service: scene.turn_on
+      entity_id: scene.front_lamp_green
+    - delay:
+        seconds: 2
+    - service: scene.turn_on
+      entity_id: scene.tower_lamp_red
+
   boo_to_you_show:
     sequence:
     - condition: state
@@ -800,9 +917,12 @@ script:
     - condition: state
       entity_id: sensor.family_status
       state: Home
-    # - service: shell_command.happily_ever_after
     - service: media_player.turn_on
       entity_id: media_player.theater
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.theater
+        volume_level: .5
     - service: media_player.play_media
       entity_id: media_player.theater
       data:
diff --git a/config/packages/holidays.yaml b/config/packages/holidays.yaml
index 94a6fde..1541888 100755
--- a/config/packages/holidays.yaml
+++ b/config/packages/holidays.yaml
@@ -138,6 +138,45 @@ automation:
     - service: script.turn_on
       entity_id: input_boolean.haunted_sounds
 
+  - id: wishes_five_min
+    alias: Wishes Five Minute
+    initial_state: true
+    trigger:
+    - platform: template
+      value_template: "{{ states('sensor.time') == (state_attr('input_datetime.christmas_preshow', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
+    condition:
+    - condition: state
+      entity_id: calendar.holidays_in_united_states
+      state: "on"
+    - condition: template
+      value_template: >
+        {%- set event=states.calendar.holidays_in_united_states.attributes.message %}
+        {%- if event == 'Christmas Eve' %}
+          true
+        {%- endif -%}
+    action:
+    - service: script.holiday_wishes_preshow
+
+  - id: wishes_show_start
+    alias: Wishes Show Start
+    initial_state: true
+    trigger:
+    - platform: template
+      value_template: "{{ states('sensor.time') == (state_attr('input_datetime.christmas_show', 'timestamp') | int | timestamp_custom('%H:%M', False)) }}"
+    condition:
+    - condition: state
+      entity_id: calendar.holidays_in_united_states
+      state: "on"
+    - condition: template
+      value_template: >
+        {%- set event=states.calendar.holidays_in_united_states.attributes.message %}
+        {%- if event == 'Christmas Eve' %}
+          true
+        {%- endif -%}
+    action:
+    - service: script.turn_on
+      entity_id: input_boolean.holiday_wishes
+
 script:
 
   haunted_sounds:
diff --git a/config/scenes.yaml b/config/scenes.yaml
index f966498..dbcff46 100755
--- a/config/scenes.yaml
+++ b/config/scenes.yaml
@@ -55,7 +55,7 @@
 
 - name: dimished livingroom lighting
   entities:
-    light.0xb0ce18140003608a_light_2:
+    light.0xb0ce18140003608a_light:
       state: on
       brightness: 40
       color_temp: 369
@@ -97,13 +97,13 @@
     switch.fireplace_lights:
       state: off
 
-# light.0xb0ce18140003608a_light_2 = Tower Lamp
+# light.0xb0ce18140003608a_light = Tower Lamp
 # light.0xb0ce181400051072_light_2 = Front Door Lamp
 # light0xb0ce181400051b4c_light_2 = Table Lampo
 
 - name: night time livingroom lighting
   entities:
-    light.0xb0ce18140003608a_light_2:
+    light.0xb0ce18140003608a_light:
       state: on
       brightness: 10
       color_temp: 369
@@ -142,6 +142,8 @@
       state: off
     switch.fireplace_lights:
       state: off
+    light.0xb0ce18140003608a_light:
+      state: off
     light.0xe20db9fffe004207_light:
       state: off
     light.0xe20db9fffe003637_light:
@@ -189,6 +191,55 @@
     switch.fireplace_lights:
       state: off
 
+- name: wishes preshow
+  entities:
+    switch.ge_14291_in_wall_smart_switch_switch_2:
+      state: off
+    group.rgb_lr:
+      state: off
+    switch.fireplace_lights:
+      state: off
+    switch.rail_lights:
+      state: on
+    switch.christmas_tree:
+      state: off
+
+- name: wishes show
+  entities:
+    switch.christmas_tree:
+      state: on
+    light.0xb0ce181400051b4c_light_2:
+      state: on
+      brightness: 20
+    light.0xb0ce18140003608a_light:
+      state: on
+      brightness: 20
+    light.0xb0ce181400051072_light_2:
+      state: on
+      brightness: 20
+
+- name: table lamp blue
+  entities:
+    light.0xb0ce181400051b4c_light_2:
+      state: on
+      brightness_pct: 100
+      rgb_color: [65,105,255]
+
+- name: tower lamp red
+  entities:
+    light.0xb0ce18140003608a_light:
+      state: on
+      brightness_pct: 100
+      rgb_color: [255,40,0]
+    
+- name: front lamp green
+  entities:
+    light.0xb0ce181400051072_light_2:
+      state: on
+      brightness_pct: 100
+      rgb_color: [0,128,0]
+    
+
 - name: jeff light on
   entities:
     light.0xe20db9fffe004207_light:
@@ -248,18 +299,14 @@
     light.0xe20db9fffe003637_light:
       state: off
 
-# - name: santa protocol
-#   entities:
-#     switch.christmas_tree:
-#       state: on
-#     switch.upstairs_christmas_tree:
-#       state: on
-#     light.tower_lamp:
-#       state: on
-#       brightness: 10
-#     light.front_lamp:
-#       state: on
-#       brightness: 10
+- name: santa protocol
+  entities:
+    switch.christmas_tree:
+      state: on
+    switch.rail_lights:
+      state: on
+    
+    
 
 
 #########################################
@@ -288,3 +335,5 @@
       state: on
       brightness_pct: 100
       rgb_color: [255,40,0]
+
+