diff --git a/.gitignore b/.gitignore
index a5bc1bd..a254933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ backup_config.yaml
 .cloud/
 .automatic/
 .tts.token*
+*.tts.token
 customize.yaml
 image/
 open-zwave/
diff --git a/automations/people/Bridget/bridget_location_update.yaml b/automations/people/Bridget/bridget_location_update.yaml
index 1e207e5..e133b12 100644
--- a/automations/people/Bridget/bridget_location_update.yaml
+++ b/automations/people/Bridget/bridget_location_update.yaml
@@ -8,6 +8,7 @@ trigger:
   # Bridget moved
   - platform: state
     entity_id:
+      - input_select.weaver_kids
       - input_select.bridget_status_dropdown
       - input_boolean.bridget_home
       # Clint moved
@@ -23,5 +24,5 @@ condition:
     value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
 action:
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.bridget_travel_sensor
\ No newline at end of file
diff --git a/automations/people/Emmett/emmett_location_update.yaml b/automations/people/Emmett/emmett_location_update.yaml
index 56201d1..21d900e 100644
--- a/automations/people/Emmett/emmett_location_update.yaml
+++ b/automations/people/Emmett/emmett_location_update.yaml
@@ -2,10 +2,11 @@ alias: Emmett Location Update
 id: automation_emmett_location_update
 mode: restart
 
-trigger:
+triggers:
   # Emmett moved
-  - platform: state
+  - trigger: state
     entity_id:
+      - input_select.weaver_kids
       - input_select.emmett_status_dropdown
       - input_boolean.emmett_home
       # Clint moved
@@ -20,6 +21,6 @@ condition:
   - condition: template
     value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
-action:
-  - service: script.turn_on
+actions:
+  - action: script.turn_on
     entity_id: script.emmett_travel_sensor
diff --git a/automations/people/almost_bedtime.yaml b/automations/people/almost_bedtime.yaml
index 8770b6c..de226da 100644
--- a/automations/people/almost_bedtime.yaml
+++ b/automations/people/almost_bedtime.yaml
@@ -37,13 +37,13 @@ action:
                 - media_player.bathroom_mini
                 - media_player.kitchen
                 - media_player.great_room
-              media_content_id: media-source://media_source/local/Sounds/tts/almost_bedtime.mp3
+              media_content_id: media-source://media_source/local/sounds/tts/almost_bedtime.mp3
               volume: 0.7
     default:
       - service: script.make_clever_announcement
         data:
           entity_id: media_player.announcements
-          media_content_id: media-source://media_source/local/Sounds/tts/almost_bedtime.mp3
+          media_content_id: media-source://media_source/local/sounds/tts/almost_bedtime.mp3
           volume: 0.7
 
   # Because of how we're calling the script, the automation won't continue until the script is done, so we don't need a delay here
diff --git a/automations/people/almost_bedtime_tts.yaml b/automations/people/almost_bedtime_tts.yaml
index 0eef405..9edaac1 100644
--- a/automations/people/almost_bedtime_tts.yaml
+++ b/automations/people/almost_bedtime_tts.yaml
@@ -20,7 +20,7 @@ condition:
       entity_id: input_boolean.ebin_home
       state: 'on'
 action:
-  - service: media_player.volume_set
+  - action: media_player.volume_set
     data_template:
       entity_id:
         - media_player.bathroom_mini
@@ -31,9 +31,11 @@ action:
         - media_player.master_bedroom_clock
       volume_level: 0.7
   - delay: '00:00:03'
-  - service: tts.google_translate_say
-    entity_id: media_player.all_speakers
-    data_template:
+  - action: tts.speak
+    target:
+      entity_id: tts.google_translate_en_com
+    data:
+      media_player_entity_id: media_player.all_speakers
       message: Alright kids. Its almost bedtime. You've got 5 minutes.
   - delay: '00:00:10'
   - service: media_player.turn_off
diff --git a/automations/people/bedtime_something_open.yaml b/automations/people/bedtime_something_open.yaml
index 58b621b..2243f3d 100644
--- a/automations/people/bedtime_something_open.yaml
+++ b/automations/people/bedtime_something_open.yaml
@@ -28,9 +28,11 @@ action:
     data_template:
       volume_level: 0.30
       entity_id: media_player.master_bedroom_clock
-  - service: tts.google_translate_say
-    data_template:
-      entity_id: media_player.master_bedroom_clock
+  - action: tts.speak
+    target:
+      entity_id: tts.google_translate_en_com
+    data:
+      media_player_entity_id: media_player.master_bedroom_clock
       message: >-
         The following are open:
         {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
diff --git a/automations/people/goodnight_kids.yaml b/automations/people/goodnight_kids.yaml
index 211bc08..d1e7a02 100644
--- a/automations/people/goodnight_kids.yaml
+++ b/automations/people/goodnight_kids.yaml
@@ -40,23 +40,23 @@ action:
                 {% if is_state('input_boolean.emmett_home', 'on') %}
                   {% if is_state('input_boolean.bridget_home', 'on') %}
                     {% if is_state('input_boolean.ebin_home', 'on') %}
-                      media-source://media_source/local/Sounds/tts/goodnight_emmett_bridget_ebin.mp3
+                      media-source://media_source/local/sounds/tts/goodnight_emmett_bridget_ebin.mp3
                     {% else %}
-                      media-source://media_source/local/Sounds/tts/goodnight_emmett_bridget.mp3
+                      media-source://media_source/local/sounds/tts/goodnight_emmett_bridget.mp3
                     {% endif %}
                   {% elif is_state('input_boolean.ebin_home','on') %}
-                    media-source://media_source/local/Sounds/tts/goodnight_emmett_ebin.mp3
+                    media-source://media_source/local/sounds/tts/goodnight_emmett_ebin.mp3
                   {% else %}
-                    media-source://media_source/local/Sounds/tts/goodnight_emmett.mp3
+                    media-source://media_source/local/sounds/tts/goodnight_emmett.mp3
                   {% endif %}
                 {% elif is_state('input_boolean.bridget_home', 'on') %}
                   {% if is_state('input_boolean.ebin_home', 'on') %}
-                    media-source://media_source/local/Sounds/tts/goodnight_bridget_ebin.mp3
+                    media-source://media_source/local/sounds/tts/goodnight_bridget_ebin.mp3
                   {% else %}
-                    media-source://media_source/local/Sounds/tts/goodnight_bridget.mp3
+                    media-source://media_source/local/sounds/tts/goodnight_bridget.mp3
                   {% endif %}
                 {% elif is_state('input_boolean.ebin_home', 'on') %}
-                  media-source://media_source/local/Sounds/tts/goodnight_ebin.mp3
+                  media-source://media_source/local/sounds/tts/goodnight_ebin.mp3
                 {% endif %}
               volume: 0.7
     default:
@@ -67,23 +67,23 @@ action:
             {% if is_state('input_boolean.emmett_home', 'on') %}
               {% if is_state('input_boolean.bridget_home', 'on') %}
                 {% if is_state('input_boolean.ebin_home', 'on') %}
-                  media-source://media_source/local/Sounds/tts/goodnight_emmett_bridget_ebin.mp3
+                  media-source://media_source/local/sounds/tts/goodnight_emmett_bridget_ebin.mp3
                 {% else %}
-                  media-source://media_source/local/Sounds/tts/goodnight_emmett_bridget.mp3
+                  media-source://media_source/local/sounds/tts/goodnight_emmett_bridget.mp3
                 {% endif %}
               {% elif is_state('input_boolean.ebin_home','on') %}
-                media-source://media_source/local/Sounds/tts/goodnight_emmett_ebin.mp3
+                media-source://media_source/local/sounds/tts/goodnight_emmett_ebin.mp3
               {% else %}
-                media-source://media_source/local/Sounds/tts/goodnight_emmett.mp3
+                media-source://media_source/local/sounds/tts/goodnight_emmett.mp3
               {% endif %}
             {% elif is_state('input_boolean.bridget_home', 'on') %}
               {% if is_state('input_boolean.ebin_home', 'on') %}
-                media-source://media_source/local/Sounds/tts/goodnight_bridget_ebin.mp3
+                media-source://media_source/local/sounds/tts/goodnight_bridget_ebin.mp3
               {% else %}
-                media-source://media_source/local/Sounds/tts/goodnight_bridget.mp3
+                media-source://media_source/local/sounds/tts/goodnight_bridget.mp3
               {% endif %}
             {% elif is_state('input_boolean.ebin_home', 'on') %}
-              media-source://media_source/local/Sounds/tts/goodnight_ebin.mp3
+              media-source://media_source/local/sounds/tts/goodnight_ebin.mp3
             {% endif %}
           volume: 0.7
 
diff --git a/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml b/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml
index 3be6ee0..bb0019c 100644
--- a/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml
+++ b/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml
@@ -8,9 +8,11 @@ trigger:
     for: "00:00:10"
 
 action:
-  - service: tts.google_translate_say
-    entity_id: media_player.front_room_hub, media_player.bathroom_mini, media_player.kitchen, media_player.master_bedroom_clock
+  - action: tts.speak
+    target:
+      entity_id: tts.google_translate_en_com
     data:
+      media_player_entity_id: media_player.front_room_hub, media_player.bathroom_mini, media_player.kitchen, media_player.master_bedroom_clock
       message: Attention! A water leak has been detected on the furnace room floor!
 
   - service: notify.mobile_app_pixel_7
diff --git a/automations/rooms/nursery/nursery_out_of_bed.yaml b/automations/rooms/nursery/nursery_out_of_bed.yaml
index c1d3d0b..e321477 100644
--- a/automations/rooms/nursery/nursery_out_of_bed.yaml
+++ b/automations/rooms/nursery/nursery_out_of_bed.yaml
@@ -5,20 +5,17 @@ mode: single
 max_exceeded: silent
 
 trigger:
-  - platform: template
-    value_template: "{% if is_state('binary_sensor.nursery_door_person_occupancy','on') and is_state('binary_sensor.nursery_door','off')%}true{%endif%}"
-
-  - platform: state
+  - trigger: state
     entity_id: binary_sensor.black_bed_occupied
     from: "on"
     to: "off"
     for: "00:00:05"
-  - platform: state
+  - trigger: state
     entity_id: input_boolean.white_bed_occupied
     from: "on"
     to: "off"
     for: "00:00:05"
-  - platform: state
+  - trigger: state
     entity_id: binary_sensor.nursery_door
     from: "off"
     to: "on"
@@ -95,7 +92,7 @@ action:
             entity_id: binary_sensor.garage_occupied
             state: "on"
         sequence:
-          - service: script.blink_garage_lights
+          - action: script.blink_garage_lights
 
   - choose:
       - conditions:
@@ -103,7 +100,7 @@ action:
             entity_id: binary_sensor.computer_area_occupied
             state: "on"
         sequence:
-          - service: webrtc.dash_cast
+          - action: webrtc.dash_cast
             data:
               entity_id: media_player.computer_area_hub
               url: rtsp_cam08_sub
@@ -117,7 +114,7 @@ action:
             entity_id: binary_sensor.front_room_occupied
             state: "on"
         sequence:
-          - service: webrtc.dash_cast
+          - action: webrtc.dash_cast
             data:
               entity_id: media_player.front_room_hub
               url: rtsp_cam08_sub
@@ -127,7 +124,7 @@ action:
 
   - delay: "00:10:00"
 
-  - service: media_player.turn_off
+  - action: media_player.turn_off
     entity_id: media_player.front_room_hub, media_player.computer_area_hub
 
   # - alias: "Flash some lights"
diff --git a/automations/rooms/nursery/nursery_white_noise_on.yaml b/automations/rooms/nursery/nursery_white_noise_on.yaml
index b2e6700..fe44521 100644
--- a/automations/rooms/nursery/nursery_white_noise_on.yaml
+++ b/automations/rooms/nursery/nursery_white_noise_on.yaml
@@ -8,21 +8,20 @@ trigger:
 
 action:
   - choose:
-    - conditions:
-        - condition: state
-          entity_id: media_player.ma_nursery_hub
-          state: "playing"
-      sequence:
-        - service: media_player.media_stop
-          target:
+      - conditions:
+          - condition: state
             entity_id: media_player.ma_nursery_hub
+            state: "playing"
+        sequence:
+          - service: media_player.media_stop
+            target:
+              entity_id: media_player.ma_nursery_hub
 
   #- service: input_select.select_option
   #  data:
   #    entity_id: input_select.nursery_mode
   #    option: 'Off'
 
-
   # The kids can turn on their own sounds. Just stop the music
   # - service: media_player.volume_set
   #   data:
@@ -34,7 +33,5 @@ action:
   #   target:
   #     entity_id: media_player.nursery_hub
   #   data:
-  #     media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm/thunderstorm.mp3
+  #     media_content_id: media-source://media_source/local/sounds/relaxing/thunderstorm/thunderstorm.mp3
   #     media_content_type: audio/mpeg
-
-
diff --git a/automations/things/keurig_done.yaml b/automations/things/keurig_done.yaml
index 14ded60..1c43b6e 100644
--- a/automations/things/keurig_done.yaml
+++ b/automations/things/keurig_done.yaml
@@ -54,5 +54,4 @@ action:
           - alias: "Announce that the coffee is ready"
             service: script.make_clever_announcement
             data:
-              media_content_id: media-source://media_source/local/Sounds/tts/coffee_ready.mp3
-
+              media_content_id: media-source://media_source/local/sounds/tts/coffee_ready.mp3
diff --git a/automations/things/kitchen_fridge_door.yaml b/automations/things/kitchen_fridge_door.yaml
index 0abdcc8..8e4f80c 100644
--- a/automations/things/kitchen_fridge_door.yaml
+++ b/automations/things/kitchen_fridge_door.yaml
@@ -46,7 +46,7 @@ action:
               sequence:
                 - service: script.make_clever_announcement
                   data:
-                    media_content_id: media-source://media_source/local/Sounds/tts/kitchen_fridge_open_too_long.mp3
+                    media_content_id: media-source://media_source/local/sounds/tts/kitchen_fridge_open_too_long.mp3
 
         - choose:
             - conditions:
diff --git a/components/packages/ambientsounds.yaml b/components/packages/ambientsounds.yaml
index c48777d..5477729 100644
--- a/components/packages/ambientsounds.yaml
+++ b/components/packages/ambientsounds.yaml
@@ -119,37 +119,37 @@ script:
             {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers
             {% endif %}
           media_content_id: >
-            {% if is_state("input_select.ambient_sound", "Babbling Brook") %} media-source://media_source/local/Sounds/relaxing/babbling_brook.mp3
-            {% elif is_state("input_select.ambient_sound", "Female Baby Shusher") %} media-source://media_source/local/Sounds/relaxing/baby_shusher_hol.mp3
-            {% elif is_state("input_select.ambient_sound", "Male Baby Shusher") %} media-source://media_source/local/Sounds/relaxing/baby_shusher_jmp.mp3
-            {% elif is_state("input_select.ambient_sound", "Country Night") %} media-source://media_source/local/Sounds/relaxing/country_night.mp3
-            {% elif is_state("input_select.ambient_sound", "Fireplace") %} media-source://media_source/local/Sounds/relaxing/fireplace.mp3
-            {% elif is_state("input_select.ambient_sound", "Forest") %} media-source://media_source/local/Sounds/relaxing/forest.mp3
-            {% elif is_state("input_select.ambient_sound", "Female Lullaby") %} media-source://media_source/local/Sounds/relaxing/luh_lullaby_hol.mp3
-            {% elif is_state("input_select.ambient_sound", "Male Lullaby") %} media-source://media_source/local/Sounds/relaxing/luh_lullaby_jmp.mp3
-            {% elif is_state("input_select.ambient_sound", "Ocean") %} media-source://media_source/local/Sounds/relaxing/ocean.mp3
-            {% elif is_state("input_select.ambient_sound", "Oscillating Fan") %} media-source://media_source/local/Sounds/relaxing/oscillating_fan.mp3
-            {% elif is_state("input_select.ambient_sound", "Pink Noise") %} media-source://media_source/local/Sounds/relaxing/pink_noise.mp3
-            {% elif is_state("input_select.ambient_sound", "Rain") %} media-source://media_source/local/Sounds/relaxing/rain.mp3
-            {% elif is_state("input_select.ambient_sound", "River") %} media-source://media_source/local/Sounds/relaxing/river.mp3
-            {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://media_source/local/Sounds/relaxing/rock_a_bye_baby_hol.mp3
-            {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://media_source/local/Sounds/relaxing/rock_a_bye_baby_jmp.mp3
-            {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
-            {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://media_source/local/Sounds/relaxing/twinkle_twinkle_hol.mp3
-            {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://media_source/local/Sounds/relaxing/twinkle_twinkle_jmp.mp3
-            {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://media_source/local/Sounds/relaxing/white_noise.mp3
+            {% if is_state("input_select.ambient_sound", "Babbling Brook") %} media-source://media_source/local/sounds/relaxing/babbling_brook.mp3
+            {% elif is_state("input_select.ambient_sound", "Female Baby Shusher") %} media-source://media_source/local/sounds/relaxing/baby_shusher_hol.mp3
+            {% elif is_state("input_select.ambient_sound", "Male Baby Shusher") %} media-source://media_source/local/sounds/relaxing/baby_shusher_jmp.mp3
+            {% elif is_state("input_select.ambient_sound", "Country Night") %} media-source://media_source/local/sounds/relaxing/country_night.mp3
+            {% elif is_state("input_select.ambient_sound", "Fireplace") %} media-source://media_source/local/sounds/relaxing/fireplace.mp3
+            {% elif is_state("input_select.ambient_sound", "Forest") %} media-source://media_source/local/sounds/relaxing/forest.mp3
+            {% elif is_state("input_select.ambient_sound", "Female Lullaby") %} media-source://media_source/local/sounds/relaxing/luh_lullaby_hol.mp3
+            {% elif is_state("input_select.ambient_sound", "Male Lullaby") %} media-source://media_source/local/sounds/relaxing/luh_lullaby_jmp.mp3
+            {% elif is_state("input_select.ambient_sound", "Ocean") %} media-source://media_source/local/sounds/relaxing/ocean.mp3
+            {% elif is_state("input_select.ambient_sound", "Oscillating Fan") %} media-source://media_source/local/sounds/relaxing/oscillating_fan.mp3
+            {% elif is_state("input_select.ambient_sound", "Pink Noise") %} media-source://media_source/local/sounds/relaxing/pink_noise.mp3
+            {% elif is_state("input_select.ambient_sound", "Rain") %} media-source://media_source/local/sounds/relaxing/rain.mp3
+            {% elif is_state("input_select.ambient_sound", "River") %} media-source://media_source/local/sounds/relaxing/river.mp3
+            {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://media_source/local/sounds/relaxing/rock_a_bye_baby_hol.mp3
+            {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://media_source/local/sounds/relaxing/rock_a_bye_baby_jmp.mp3
+            {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/local/sounds/relaxing/thunderstorm.mp3
+            {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://media_source/local/sounds/relaxing/twinkle_twinkle_hol.mp3
+            {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://media_source/local/sounds/relaxing/twinkle_twinkle_jmp.mp3
+            {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://media_source/local/sounds/relaxing/white_noise.mp3
             {% elif is_state("input_select.ambient_sound", "Random White Noise") %}
-              {% set noises = ['media-source://media_source/local/Sounds/relaxing/babbling_brook.mp3',
-                'media-source://media_source/local/Sounds/relaxing/country_night.mp3',
-                'media-source://media_source/local/Sounds/relaxing/oscillating_fan.mp3',
-                'media-source://media_source/local/Sounds/relaxing/rain.mp3',
-                'media-source://media_source/local/Sounds/relaxing/river.mp3',
-                'media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3'] %}
+              {% set noises = ['media-source://media_source/local/sounds/relaxing/babbling_brook.mp3',
+                'media-source://media_source/local/sounds/relaxing/country_night.mp3',
+                'media-source://media_source/local/sounds/relaxing/oscillating_fan.mp3',
+                'media-source://media_source/local/sounds/relaxing/rain.mp3',
+                'media-source://media_source/local/sounds/relaxing/river.mp3',
+                'media-source://media_source/local/sounds/relaxing/thunderstorm.mp3'] %}
               {{ noises|random }}
             {% elif is_state("input_select.ambient_sound", "Random Kids Noise") %}
-              {% set noises = ['media-source://media_source/local/Sounds/relaxing/baby_shusher_hol.mp3',
-                'media-source://media_source/local/Sounds/relaxing/luh_lullaby_hol.mp3',
-                'media-source://media_source/local/Sounds/relaxing/twinkle_twinkle_hol.mp3'] %}
+              {% set noises = ['media-source://media_source/local/sounds/relaxing/baby_shusher_hol.mp3',
+                'media-source://media_source/local/sounds/relaxing/luh_lullaby_hol.mp3',
+                'media-source://media_source/local/sounds/relaxing/twinkle_twinkle_hol.mp3'] %}
               {{ noises|random }}
             {% endif %}
           media_content_type: "audio/mp4"
diff --git a/components/packages/clever_announcements.yaml b/components/packages/clever_announcements.yaml
index e651ce6..664acc3 100644
--- a/components/packages/clever_announcements.yaml
+++ b/components/packages/clever_announcements.yaml
@@ -15,7 +15,7 @@ script:
 
       media_content_id:
         description: "Media Content ID to announce"
-        example: media-source://media_source/local/Sounds/tts/welcome_to_daddys_house.mp3
+        example: media-source://media_source/local/sounds/tts/welcome_to_daddys_house.mp3
         selector:
           text:
 
@@ -42,7 +42,7 @@ script:
       # If YTube Music Player is not in use, play the announcement over the media_player.announcements speaker group
       media_player: '{{ iif(entity_id is defined, entity_id, iif(is_state("media_player.ytube_music_player","playing") or is_state("media_player.ytube_music_player","idle") or is_state("media_player.ytube_music_player","paused"),state_attr("media_player.ytube_music_player","remote_player_id"),"media_player.announcements")) }}'
       remote_player: '{{ state_attr("media_player.ytube_music_player","remote_player_id") }}'
-      content_id: '{{ iif(media_content_id is defined,media_content_id,"media-source://media_source/local/Sounds/tts/welcome_to_daddys_house.mp3") }}'
+      content_id: '{{ iif(media_content_id is defined,media_content_id,"media-source://media_source/local/sounds/tts/welcome_to_daddys_house.mp3") }}'
       content_type: '{{ iif(media_content_type is defined,media_content_type,"audio/mpeg") }}'
       volume: "{{ iif(volume is defined,volume,0.6) }}"
       original_volume: '{{ iif(is_state("media_player.ytube_music_player","off"),0.0,state_attr(state_attr("media_player.ytube_music_player","remote_player_id"), "volume_level")) }}'
diff --git a/configuration.yaml b/configuration.yaml
index 0fa1b4b..78f5b27 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -20,7 +20,7 @@ homeassistant:
     tts: /config/www/audio/tts
     #local: /media/
     #mnt: /mnt
-    #audio: /config/www/audio/    
+    #audio: /config/www/audio/
     #snapshots: /config/snapshots/
 
   allowlist_external_dirs:
@@ -29,7 +29,7 @@ homeassistant:
     - /config/tmp/snapshots/
     - /config/custom_logs/
     #- /config/www/audio/
-    #- /config/image/    
+    #- /config/image/
 
   customize: !include_dir_merge_named customizations/entities
   packages: !include_dir_named components/packages
diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml
index 78d4640..e1c610a 100644
--- a/lovelace/cameras/view-camera-08.yaml
+++ b/lovelace/cameras/view-camera-08.yaml
@@ -97,16 +97,6 @@ card:
             top: 95%
             left: 92%
 
-        - type: conditional
-          conditions:
-            - entity: binary_sensor.black_bed_person_occupancy
-              state: "on"
-          elements:
-            - type: state-icon
-              entity: binary_sensor.black_bed_person_occupancy
-              style:
-                top: 30%
-                left: 23%
         - type: conditional
           conditions:
             - entity: binary_sensor.black_bed_occupied
@@ -117,16 +107,7 @@ card:
               style:
                 top: 30%
                 left: 18%
-        - type: conditional
-          conditions:
-            - entity: binary_sensor.white_bed_person_occupancy
-              state: "on"
-          elements:
-            - type: state-icon
-              entity: binary_sensor.white_bed_person_occupancy
-              style:
-                top: 65%
-                left: 85%
+
         - type: conditional
           conditions:
             - entity: input_boolean.white_bed_occupied
diff --git a/lovelace/details/view-people.yaml b/lovelace/details/view-people.yaml
index 3e1a030..0402375 100644
--- a/lovelace/details/view-people.yaml
+++ b/lovelace/details/view-people.yaml
@@ -153,20 +153,6 @@ cards:
     card:
       type: horizontal-stack
       cards:
-        - type: entity-filter
-          entities:
-            - binary_sensor.master_bed_person_occupancy
-          show_empty: false
-          state_filter:
-            - 'on'
-          card:
-            type: picture-glance
-            title: Master Bed
-            camera_view: auto
-            entities: []
-            image_entity: image.frigate_cam06_person
-            entity: binary_sensor.master_bed_person_occupancy
-
         - type: entity-filter
           entities:
             - binary_sensor.master_bedroom_person_occupancy
@@ -190,20 +176,6 @@ cards:
     card:
       type: horizontal-stack
       cards:
-        - type: entity-filter
-          entities:
-            - binary_sensor.master_bed_person_occupancy
-          show_empty: false
-          state_filter:
-            - 'on'
-          card:
-            type: picture-glance
-            title: Master Bed
-            camera_view: auto
-            entities: []
-            image_entity: image.frigate_cam07_person
-            entity: binary_sensor.master_bed_person_occupancy
-
         - type: entity-filter
           entities:
             - binary_sensor.master_bedroom_person_occupancy
@@ -227,34 +199,6 @@ cards:
     card:
       type: horizontal-stack
       cards:
-        - type: entity-filter
-          entities:
-            - binary_sensor.black_bed_person_occupancy
-          show_empty: false
-          state_filter:
-            - 'on'
-          card:
-            type: picture-glance
-            title: Black Bed
-            camera_view: auto
-            entities: []
-            image_entity: image.frigate_cam08_person
-            entity: binary_sensor.black_bed_person_occupancy
-
-        - type: entity-filter
-          entities:
-            - binary_sensor.white_bed_person_occupancy
-          show_empty: false
-          state_filter:
-            - 'on'
-          card:
-            type: picture-glance
-            title: White Bed
-            camera_view: auto
-            entities: []
-            image_entity: image.frigate_cam08_person
-            entity: binary_sensor.white_bed_person_occupancy
-
         - type: entity-filter
           entities:
             - binary_sensor.nursery_person_occupancy
diff --git a/lovelace/details/view-watchman.yaml b/lovelace/details/view-watchman.yaml
index 66f1202..1a65571 100644
--- a/lovelace/details/view-watchman.yaml
+++ b/lovelace/details/view-watchman.yaml
@@ -1,40 +1,65 @@
 title: Watchman
 path: watchman
-icon: mdi:sunglasses
+icon: mdi:eye-check
+type: sections
+max_columns: 4
 visible:
   - user: 24a4bd075e7f41a497dd0390a1dd4a9f
-cards:
-  - type: vertical-stack
+sections:
+  - type: grid
     cards:
-      - type: custom:mushroom-chips-card
-        chips:
-          - type: back
-      - type: button
-        entity: sensor.watchman_last_updated
-        name: Update
-        show_name: true
-        show_icon: true
-        tap_action:
-          action: call-service
-          service: watchman.report
-          service_data:
-            parse_config: true
-          target: {}
-
-
-  - type: markdown
-    content: >-
-      <h2> <ha-icon icon='mdi:shield-half-full'></ha-icon> Watchman Report<h2>
-      <h3>Missing Entities: {{ states.sensor.watchman_missing_entities.state }}</h3>
-      {%- for item in state_attr("sensor.watchman_missing_entities","entities") %}
-      <hr> <table><tr> <td> <ha-icon icon='mdi: {%- if item.state=="missing"-%}cloud-alert' {%- elif item.state=="unavail"
-      -%}cloud-off-outline' {%- else-%}cloud-question' {%- endif -%} ></ha-icon> {{
-      item.id }} [{{item.state}}] <a title="{{item.occurrences}}">
-      {{item.occurrences.split('/')[-1].split(':')[0]}}</a> </td></tr></table>
-      {%- endfor %}
-      <h3> Missing Services: {{ states.sensor.watchman_missing_services.state }}</h3>
-      {%- for item in state_attr("sensor.watchman_missing_services", "entities") %}
-      <hr><table><tr><td><ha-icon icon='mdi:cloud-alert'></ha-icon> {{ item.id }} <a
-      title="{{item.occurrences}}">{{item.occurrences.split('/')[-1].split(':')[0]}}
-      </a></td></tr></table>
-      {%- endfor %}
\ No newline at end of file
+      - type: markdown
+        content: >-
+          <h2>Missing Entities: {{ states.sensor.watchman_missing_entities.state }}</h2>
+          {%- for item in state_attr("sensor.watchman_missing_entities","entities") %}
+          <hr> <table><tr> <td> <ha-icon icon='mdi: {%- if item.state=="missing"-%}cloud-alert' {%- elif item.state=="unavail"
+          -%}cloud-off-outline' {%- else-%}cloud-question' {%- endif -%} ></ha-icon> {{
+          item.id }} [{{item.state}}] <a title="{{item.occurrences}}">
+          {{item.occurrences.split('/')[-1].split(':')[0]}}</a> </td></tr></table>
+          {%- endfor %}
+  - type: grid
+    cards:
+      - type: markdown
+        content: >-
+          <h2> Missing Services: {{ states.sensor.watchman_missing_services.state }}</h2>
+          {%- for item in state_attr("sensor.watchman_missing_services","entities") %}
+          <hr><table><tr><td><ha-icon icon='mdi:cloud-alert'></ha-icon> {{item.id }}
+          <a title="{{item.occurrences}}">{{item.occurrences.split('/')[-1].split(':')[0]}}
+          </a></td></tr></table>
+          {%- endfor %}
+header:
+  card:
+    type: markdown
+    content: |
+      # Watchman Report
+    text_only: true
+badges:
+  - type: entity
+    show_name: true
+    show_state: true
+    show_icon: true
+    entity: sensor.watchman_last_updated
+    name: Last Updated
+    tap_action:
+      action: perform-action
+      perform_action: watchman.report
+      target: {}
+      data:
+        parse_config: false
+        create_file: true
+  - type: entity
+    show_name: true
+    show_state: true
+    show_icon: true
+    entity: sensor.watchman_missing_entities
+    name: Missing Entities
+    tap_action:
+      action: none
+  - type: entity
+    show_name: true
+    show_state: true
+    show_icon: true
+    entity: sensor.watchman_missing_services
+    name: Missing Services
+    tap_action:
+      action: none
diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml
index b186d2c..b1026cb 100644
--- a/lovelace/view-overview.yaml
+++ b/lovelace/view-overview.yaml
@@ -908,13 +908,13 @@ badges:
           navigation_path: /ai-yml/ai-cam04
         hold_action:
           action: more-info
-      - entity: binary_sensor.back_yard_person_occupancy
-        name: Yard
-        tap_action:
-          action: navigate
-          navigation_path: /ai-yml/ai-cam14
-        hold_action:
-          action: more-info
+      # - entity: binary_sensor.back_yard_person_occupancy
+      #   name: Yard
+      #   tap_action:
+      #     action: navigate
+      #     navigation_path: /ai-yml/ai-cam14
+      #   hold_action:
+      #     action: more-info
       - entity: binary_sensor.front_yard_person_occupancy
         name: Front
         tap_action:
diff --git a/scripts/house_alert.yaml b/scripts/house_alert.yaml
index a8e0d2e..d44a4b2 100644
--- a/scripts/house_alert.yaml
+++ b/scripts/house_alert.yaml
@@ -18,9 +18,11 @@ sequence:
     timeout: '00:00:06'
     continue_on_timeout: 'true'
   # Send an audio alert
-  - service: tts.google_translate_say
-    data_template:
-      entity_id: media_player.master_bedroom_clock
+  - action: tts.speak
+    target:
+      entity_id: tts.google_translate_en_com
+    data:
+      media_player_entity_id: media_player.master_bedroom_clock
       message: >-
         The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
   - delay: '00:00:02'
diff --git a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml
index ee91a67..4c992e1 100644
--- a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml
+++ b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml
@@ -25,7 +25,7 @@ sequence:
 
         - action: media_player.play_media
           data:
-            media_content_id: media-source://media_source/local/Sounds/alarms/Alarm_Clock.mp3
+            media_content_id: media-source://media_source/local/sounds/alarms/Alarm_Clock.mp3
             media_content_type: music
           target:
             entity_id: media_player.master_bedroom_clock
@@ -36,9 +36,11 @@ sequence:
             seconds: 12
             milliseconds: 0
 
-        - action: tts.google_translate_say
+        - action: tts.speak
+          target:
+            entity_id: tts.google_translate_en_com
           data:
-            entity_id: media_player.master_bedroom_clock
+            media_player_entity_id: media_player.master_bedroom_clock
             message: "{{ response.text }}"
 
         # - action: tts.speak
diff --git a/scripts/people/bridget/bridget_travel_sensor.yaml b/scripts/people/bridget/bridget_travel_sensor.yaml
index f988951..a071095 100644
--- a/scripts/people/bridget/bridget_travel_sensor.yaml
+++ b/scripts/people/bridget/bridget_travel_sensor.yaml
@@ -13,8 +13,8 @@ sequence:
           {% else %}
             {{ states("input_select.bridget_status_dropdown") }}
           {% endif %}
-        {% elif is_state('binary_sensor.have_custody', 'off') %}
-          Off week
+        {% elif is_state('binary_sensor.have_custody', 'off') or is_state('input_select.weaver_kids', 'Away') %}
+          With Sarah
         {% elif is_state('input_boolean.clint_work_from_home', 'on') %}
           At Childcare
         {% else %}
diff --git a/scripts/people/clint/take_meds.yaml b/scripts/people/clint/take_meds.yaml
index 2292e6c..faa7a95 100644
--- a/scripts/people/clint/take_meds.yaml
+++ b/scripts/people/clint/take_meds.yaml
@@ -17,7 +17,7 @@ sequence:
               entity_id:
                 - media_player.bathroom_mini
             data:
-              media_content_id: media-source://media_source/local/Sounds/tts/taking_morning_meds.mp3
+              media_content_id: media-source://media_source/local/sounds/tts/taking_morning_meds.mp3
               media_content_type: "audio/mpeg"
       - conditions:
           - alias: "Afternoon meds needed"
@@ -34,7 +34,7 @@ sequence:
               entity_id:
                 - media_player.bathroom_mini
             data:
-              media_content_id: media-source://media_source/local/Sounds/tts/taking_afternoon_meds.mp3
+              media_content_id: media-source://media_source/local/sounds/tts/taking_afternoon_meds.mp3
               media_content_type: "audio/mpeg"
     default:
       - service: media_player.play_media
@@ -42,5 +42,5 @@ sequence:
           entity_id:
             - media_player.bathroom_mini
         data:
-          media_content_id: media-source://media_source/local/Sounds/tts/meds_not_needed.mp3
+          media_content_id: media-source://media_source/local/sounds/tts/meds_not_needed.mp3
           media_content_type: "audio/mpeg"
diff --git a/scripts/people/emmett/emmett_travel_sensor.yaml b/scripts/people/emmett/emmett_travel_sensor.yaml
index 2527dbd..93356f1 100644
--- a/scripts/people/emmett/emmett_travel_sensor.yaml
+++ b/scripts/people/emmett/emmett_travel_sensor.yaml
@@ -5,18 +5,18 @@ sequence:
     data_template:
       entity_id: input_text.person_emmett
       value: >-
-        {% if is_state('input_boolean.emmett_home', 'on') %}
-          {% if is_state('input_boolean.emmett_is_awake','off') %}
+        {% if is_state('input_boolean.bridget_home', 'on') %}
+          {% if is_state('input_boolean.bridget_is_awake','off') %}
             Sleeping
-          {% elif is_state('input_boolean.emmett_in_bed','on') %}
+          {% elif is_state('input_boolean.bridget_in_bed','on') %}
             In bed
           {% else %}
-            {{ states("input_select.emmett_status_dropdown") }}
+            {{ states("input_select.bridget_status_dropdown") }}
           {% endif %}
-        {% elif is_state('binary_sensor.have_custody', 'off') %}
-          Off week
+        {% elif is_state('binary_sensor.have_custody', 'off') or is_state('input_select.weaver_kids', 'Away') %}
+          With Sarah
         {% elif is_state('input_boolean.clint_work_from_home', 'on') %}
           At Childcare
         {% else %}
           Somewhere
-        {% endif %}
+        {% endif %}
\ No newline at end of file