diff --git a/automations.yaml b/automations.yaml
index b2189ea..6d43e38 100755
--- a/automations.yaml
+++ b/automations.yaml
@@ -10,7 +10,7 @@
 - id: washer_complete
   alias: Washer Complete
   trigger:
-  - below: '1'
+  - below: 3
     entity_id: sensor.washer
     platform: numeric_state
   condition:
@@ -25,7 +25,7 @@
   alias: Washer Emptied
   trigger:
   - platform: state
-    entity_id: binary_sensor.washer_door
+    entity_id: binary_sensor.washer_door_contact
     from: 'off'
     to: 'on'
   action:
@@ -47,7 +47,7 @@
   alias: Turn Off Disney
   trigger:
   - platform: state
-    entity_id: media_player.hass_speaker
+    entity_id: media_player.guest_tv
     from: playing
     to: idle
   action:
@@ -131,7 +131,7 @@
   - service: scene.turn_on
     entity_id: scene.diminished_kitchen_lighting
   - service: switch.turn_off
-    entity_id: switch.rainbow_light_4
+    entity_id: switch.rainbow_light_3
 - id: good_morning_workday
   alias: Good Morning Workday
   initial_state: true
@@ -148,7 +148,7 @@
   - service: scene.turn_on
     entity_id: scene.normal_kitchen_lighting
   - service: switch.turn_off
-    entity_id: switch.rainbow_light_4
+    entity_id: switch.rainbow_light_3
   - service: scene.turn_on
     entity_id: scene.jeff_light_on
   - service: script.twitter_notify
@@ -169,7 +169,9 @@
     state: 'off'
   action:
   - service: switch.turn_on
-    entity_id: switch.rainbow_light_4
+    entity_id: switch.rainbow_light_3
+  - service: light.turn_on
+    entity_id: light.table_lamp_2
 - id: jeff_lights_out
   alias: Jeff lights out
   initial_state: true
@@ -263,13 +265,14 @@
   action:
   - service: scene.turn_on
     entity_id: scene.night_time_livingroom_lighting
-  - service: light.turn_off
-    data:
-      entity_id: light.loft_lamp
+  - service: switch.turn_off
+    entity_id: switch.upstairs_fan
+  - service: switch.turn_off
+    entity_id: switch.upstairs
   - service: switch.turn_off
     entity_id: switch.incense
   - service: switch.turn_off
-    entity_id: switch.artemis
+    entity_id: switch.artemis_2
   - service: light.turn_off
     data:
       entity_id: light.kitchen_cabinet_lights
@@ -455,6 +458,21 @@
   action:
   - service: script.family_is_away
 
+- id: set_coffee_time
+  alias: set soffee time
+  trigger:
+    - platform: time
+      at: '00:02:15'
+  action:
+    - service: input_datetime.set_datetime
+      entity_id: input_datetime.coffee_time
+      data_template:
+        time: > 
+          {% if states.binary_sensor.workday_sensor.state == 'on' %}
+            05:15
+          {% else %}
+            07:15
+          {% endif %}
 
 
 
diff --git a/packages/disney.yaml b/packages/disney.yaml
index 0d1e5fd..a6655a8 100755
--- a/packages/disney.yaml
+++ b/packages/disney.yaml
@@ -57,7 +57,7 @@ automation:
       to: 'off'
     action:
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
     - service: script.turn_on
       entity_id: script.kill_this_ride
   - id: illuminations_on
@@ -113,7 +113,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: happy_ever_after_on
     alias: Happy Ever After On
     initial_state: true
@@ -135,7 +135,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: haunted_mansion_on
     alias: Haunted Mansion On
     initial_state: true
@@ -156,7 +156,7 @@ automation:
     action:
     - service: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: spaceship_earth_on
     alias: Spaceship Earth On
     initial_state: true
@@ -178,7 +178,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: boo_to_you_show_on
     alias: Boo To You Show On
     initial_state: true
@@ -200,7 +200,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: boo_to_you_on
     alias: Boo To You On
     initial_state: true
@@ -222,7 +222,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
   - id: holiday_wisher_on
     alias: Holiday Wishes On
     initial_state: true
@@ -244,7 +244,7 @@ automation:
     - service: script.turn_on
       entity_id: script.kill_this_ride
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
 
 script:
   kill_hurry_back:
@@ -301,8 +301,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.haunted_mansion_preshow_full
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/haunted_mansion_preshow_full.mp3
         media_content_type: "music"
@@ -354,7 +358,7 @@ script:
   kill_this_ride:
     sequence:
     - service: media_player.media_stop
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
     - service: shell_command.alarm_off
     - service: script.turn_off
       data:
@@ -404,8 +408,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.dance_it
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/move_it_shake_dance_audio.mp3
         media_content_type: "music"
@@ -418,8 +426,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.spaceship_earth_ride
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: media/audio/spaceship_earth_ride.mp3
         media_content_type: "music"
@@ -468,8 +480,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.welcome_show_crowd
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/welcome_show_crowd.mp3
         media_content_type: "music"
@@ -493,7 +509,7 @@ script:
       state: Home
     #- service: shell_command.holiday_wishes
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/wishes_5_min.mp3
         media_content_type: "music"
@@ -507,7 +523,7 @@ script:
       state: Home
     #- service: shell_command.boo_to_you
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/boo_to_you_audio.mp3
         media_content_type: "music"
@@ -521,7 +537,7 @@ script:
       state: Home
     #- service: shell_command.happily_ever_after
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/Happily_Ever_After_Audio.mp3
         media_content_type: "music"
@@ -535,7 +551,7 @@ script:
       state: Home
     #- service: shell_command.boo_to_you
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/boo_to_you_audio.mp3
         media_content_type: "music"
@@ -548,8 +564,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.tiki_room_audio
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .9
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/tiki_room_audio.mp3
         media_content_type: "music"
@@ -562,8 +582,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.happily_ever_after
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/Happily_Ever_After_Audio.mp3
         media_content_type: "music"
@@ -611,8 +635,12 @@ script:
       entity_id: sensor.family_status
       state: Home
     #- service: shell_command.illuminations_audio
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .7
     - service: media_player.play_media
-      entity_id: media_player.hass_speaker
+      entity_id: media_player.guest_tv
       data:
         media_content_id: /media/audio/illuminations.mp3
         media_content_type: "music"
diff --git a/packages/notify.yaml b/packages/notify.yaml
index c7b4f14..d55f6d1 100755
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -173,7 +173,7 @@ script:
         state: 'off'
       - service: tts.google_translate_say
         data_template:
-          entity_id: media_player.hass_speaker
+          entity_id: media_player.guest_tv
           message: >
             {{ message }}
 
@@ -181,7 +181,7 @@ script:
     sequence:
     - service: tts.amazon_polly_say
       data_template:
-        entity_id: media_player.hass_speaker
+        entity_id: media_player.guest_tv
         message: >-
           <speak>
             {{ message }}
@@ -207,11 +207,11 @@ script:
         entity_id: input_boolean.vacation_mode
         state: 'off'
       - condition: state
-        entity_id: media_player.hass_speaker
+        entity_id: media_player.guest_tv
         state: 'idle'
       - service: tts.google_translate_say
         data_template:
-          entity_id: media_player.hass_speaker
+          entity_id: media_player.guest_tv
           message: >
             {{message }}
 
@@ -230,19 +230,26 @@ script:
     - condition: state
       entity_id: input_boolean.vacation_mode
       state: 'off'
+    - service: media_player.turn_on
+      entity_id: media_player.guest_tv
     - wait_template: >-
-        {{ not is_state('media_player.hass_speaker', 'playing') }}
+        {{ not is_state('media_player.guest_tv', 'playing') }}
+    - service: media_player.volume_set
+      data_template:
+        entity_id: media_player.guest_tv
+        volume_level: .65
     - service: tts.amazon_polly_say
       data_template:
         entity_id: >
           {% if states.input_boolean.audible_notifications.state == 'on' %}
-          media_player.hass_speaker
+          media_player.guest_tv, media_player.googlehome0715, media_player.googlehomehub3492
           {% else %}
-          media_player.googlehome0715, media_player.googlehomehub3492
+          media_player.googlehome0715, media_player.googlehomehub3492, media_player.upstairs_speaker
           {% endif %}
         message: >-
           <speak>
             {{ message }}
+            <break time="1.0s" />
           </speak>
         cache: true
   
@@ -317,8 +324,9 @@ script:
       
           
           {% macro morning_greeting() %}
-              {{ [ "Anchorage House. Rise and Shine. ",
-                "everyone. ",
+              {{ [ "Time to Rise and Shine. ",
+                "Let's do this thing.",
+                "Anchorage House."
                 "The early bird gets the worm. And look over there. A worm. Wait, is that a snake? umm,,,I don't like snakes. Someone might want to take care,, ok,,, moving on.",
                 "The early bird gets the worm.",
                 "from the bridge.",
@@ -335,8 +343,8 @@ script:
 
           {% macro evening_greeting() %}
             {{ [ "I thought you might like to know. ",
-                "Here is the nightly report.",
-                "Before I call it a day I wanted to let you know,",
+                "The day is almost over.",
+                "Before things start to quiet down,",
                 "Anchorage House."
               ] | random }}
           {% endmacro %}
@@ -391,7 +399,6 @@ script:
             {% endif %}
             {% if states.calendar.birthdays.state == "on" %}
               Today is {{ states.calendar.birthdays.attributes.message }} birthday!
-              # Add some snark
             {% endif %}
           {% endmacro %}
 
@@ -495,18 +502,12 @@ script:
               {% if states.calendar.skylar_school.attributes.description == "early-release" %}
                 And guess what? It is early release!
               {% endif %}
-              # {% if is_state("sensor.weekday", "fri") %} 
-              #   Plus, it is fun Friday! 
-              # {% endif %} 
             {% endif %}
           {% endmacro %}
 
           {% macro skylar_events() %}
             {% if is_state("calendar.skylar_events", "on") %}
               Skylar, You have {{ states.calendar.skylar_events.attributes.message }} today as well!
-              # {% if is_state("sensor.weekday", "fri") %} 
-              #   Plus, it is fun Friday! 
-              # {% endif %} 
             {% endif %}
           {% endmacro %}
 
@@ -517,14 +518,34 @@ script:
               It is going to be cold today so I suggest wearing long pants and a light jacket.
             {% elif is_state("sensor.clothing_forecast", "Chilly") %}
               It is going to be chilly today so I suggest wearing at least long pants.
-            # {% elif is_state("sensor.clothing_forecast", "Nice") %}
-            #   It is going to be nice today so I suggest wearing shorts.
-            # {% elif is_state("sensor.clothing_forecast", "Toasty") %}
-            #   It is going to be a bit warm today so I suggest wearing shorts. 
-            # {% elif is_state("sensor.clothing_forecast", "Hot") %}
-            #   It is going to be hot today so I suggest wearing shorts.
+            {% elif is_state("sensor.clothing_forecast", "Nice") %}
+              It is going to be           
+              {{ [ "nice outside",
+                "pretty nice outside "
+                "a good day to be outside ",
+                "rather enjoyable outside ",
+              ] | random }} 
+              today so I suggest wearing shorts.
+            {% elif is_state("sensor.clothing_forecast", "Toasty") %}
+              It is going to be a 
+              {{ [ "bit warm ",
+                "rather warm outside ",
+                "almost too hot outside ",
+                "a little warm ",
+              ] | random }} 
+              today so I suggest wearing shorts. 
+            {% elif is_state("sensor.clothing_forecast", "Hot") %}
+              It is going to be 
+              {{ [ "hot",
+                "hotter than the sun "
+                "hotter than hot, but in a lot of bad ways ",
+                "hotter than the sun outside ",
+                "super hot ",
+                "hotter than the inside of a volcano "
+              ] | random }} 
+              today so I suggest wearing shorts.
             {% else %}
-              It is going to {{ states.sensor.clothing_forecast.state }} today so I suggest wearing shorts.
+              It is going to be {{ states.sensor.clothing_forecast.state }} today so I suggest wearing shorts.
             {% endif %} 
           {% endmacro %}
           
diff --git a/packages/security.yaml b/packages/security.yaml
index 1de60ec..d8daaa3 100755
--- a/packages/security.yaml
+++ b/packages/security.yaml
@@ -143,10 +143,10 @@ automation:
     trigger:
     - platform: state
       entity_id:
-      - binary_sensor.front_door
-      - binary_sensor.laundry_room_door
-      - binary_sensor.attic_door
-      - binary_sensor.back_door
+      - binary_sensor.front_door_contact_2
+      - binary_sensor.laundry_room_door_contact_2
+      - binary_sensor.attic_door_contact_2
+      - binary_sensor.back_door_contact_2
       from: 'off'
       to: 'on'
       for: '00:01:00'
@@ -192,11 +192,11 @@ automation:
     trigger:
     - platform: state
       entity_id:
-      - binary_sensor.front_door
-      - binary_sensor.laundry_room_door
-      - binary_sensor.back_door
-      - binary_sensor.side_door
-      - binary_sensor.garage_door
+      - binary_sensor.front_door_contact_2
+      - binary_sensor.laundry_room_door_contact_2
+      - binary_sensor.back_door_contact_2
+      - binary_sensor.side_door_contact_2
+      - binary_sensor.garage_door_contact_2
       from: 'off'
     condition:
     - condition: state
@@ -347,10 +347,10 @@ script:
   #     entity_id: input_boolean.audible_notifications
   #     state: 'on'
   #   - condition: state
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.guest_tv
   #     state: 'idle'
   #   - service: tts.google_say
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.guest_tv
   #     data_template:
   #       message: "Sentry mode activated"
 
@@ -360,10 +360,10 @@ script:
   #     entity_id: input_boolean.audible_notifications
   #     state: 'on'
   #   - condition: state
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.guest_tv
   #     state: 'idle'
   #   - service: tts.google_say
-  #     entity_id: media_player.hass_speaker
+  #     entity_id: media_player.guest_tv
   #     data_template:
   #       message: "Sentry mode deactivated"