diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
index f6b0216..3ebf850 100644
--- a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
+++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml
@@ -27,49 +27,13 @@ action:
           target:
             entity_id: media_player.master_bedroom_clock
           data:
-            media_content_id: media-source://dlna_dms/dream_media/:22$@12740
+            media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
             media_content_type: audio/mpeg
-          metadata:
-            title: Thunderstorm
-            thumbnail: >-
-              http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12740.jpg
-            media_class: music
-            children_media_class: null
-            navigateIds:
-              - {}
-              - media_content_type: app
-                media_content_id: media-source://dlna_dms
-              - media_content_type: object.container
-                media_content_id: media-source://dlna_dms/dream_media/:21
-              - media_content_type: object.container.storageFolder
-                media_content_id: media-source://dlna_dms/dream_media/:22
-              - media_content_type: object.container.storageFolder
-                media_content_id: media-source://dlna_dms/dream_media/:22$16644
-              - media_content_type: object.container.storageFolder
-                media_content_id: media-source://dlna_dms/dream_media/:22$16648
     default:
       - service: media_player.play_media
         target:
           entity_id: media_player.master_bedroom_clock
         data:
-          media_content_id: media-source://dlna_dms/dream_media/:22$@12740
+          media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
           media_content_type: audio/mpeg
-        metadata:
-          title: Thunderstorm
-          thumbnail: >-
-            http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12740.jpg
-          media_class: music
-          children_media_class: null
-          navigateIds:
-            - {}
-            - media_content_type: app
-              media_content_id: media-source://dlna_dms
-            - media_content_type: object.container
-              media_content_id: media-source://dlna_dms/dream_media/:21
-            - media_content_type: object.container.storageFolder
-              media_content_id: media-source://dlna_dms/dream_media/:22
-            - media_content_type: object.container.storageFolder
-              media_content_id: media-source://dlna_dms/dream_media/:22$16644
-            - media_content_type: object.container.storageFolder
-              media_content_id: media-source://dlna_dms/dream_media/:22$16648
 
diff --git a/automations/rooms/nursery/nursery_white_noise_on.yaml b/automations/rooms/nursery/nursery_white_noise_on.yaml
index 7056db0..1d21074 100644
--- a/automations/rooms/nursery/nursery_white_noise_on.yaml
+++ b/automations/rooms/nursery/nursery_white_noise_on.yaml
@@ -35,24 +35,7 @@ action:
     target:
       entity_id: media_player.nursery_hub
     data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12740
+      media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
       media_content_type: audio/mpeg
-    metadata:
-      title: Thunderstorm
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12740.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
+
 
diff --git a/automations/things/media_testing_debug.yaml b/automations/things/media_testing_debug.yaml
deleted file mode 100644
index 296aa60..0000000
--- a/automations/things/media_testing_debug.yaml
+++ /dev/null
@@ -1,883 +0,0 @@
-alias: Media Testing Debug
-id: automation_media_testing_debug
-description: ""
-trigger:
-  - platform: zone
-    entity_id: device_tracker.bridget_s_fire_wifi
-    zone: zone.plainwell
-    event: enter
-condition: []
-action:
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12723
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_emmett_bridget_ebin
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12723.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12726
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_emmett_bridget
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12726.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12716
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_emmett_ebin
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12716.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12728
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_emmett
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12728.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12725
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_bridget_ebin
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12725.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12718
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_bridget
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12718.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12717
-      media_content_type: audio/mpeg
-    metadata:
-      title: goodnight_ebin
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12717.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12729
-      media_content_type: audio/mpeg
-    metadata:
-      title: taking_afternoon_meds
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12729.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12727
-      media_content_type: audio/mpeg
-    metadata:
-      title: taking_morning_meds
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12727.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12715
-      media_content_type: audio/mpeg
-    metadata:
-      title: coffee_ready
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12701.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12724
-      media_content_type: audio/mpeg
-    metadata:
-      title: dishwasher_done
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12724.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12720
-      media_content_type: audio/mpeg
-    metadata:
-      title: dryer_done
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12720.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12721
-      media_content_type: audio/mpeg
-    metadata:
-      title: washing_machine_done
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12721.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12722
-      media_content_type: audio/mpeg
-    metadata:
-      title: meds_not_needed
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12722.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16647
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12711
-      media_content_type: audio/mpeg
-    metadata:
-      title: alarm clock beeps
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12711.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16646
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.front_room_hub
-    data:
-      media_content_id: media-source://camera/camera.frigate_cam08
-      media_content_type: image/jpeg
-    metadata:
-      title: Frigate Cam08
-      thumbnail: /api/camera_proxy/camera.frigate_cam08
-      media_class: video
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://camera
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12744
-      media_content_type: audio/mpeg
-    metadata:
-      title: Babbling Brook
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12744.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12745
-      media_content_type: audio/mpeg
-    metadata:
-      title: Female Baby Shusher
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12745.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12736
-      media_content_type: audio/mpeg
-    metadata:
-      title: Male Baby Shusher
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12736.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12741
-      media_content_type: audio/mpeg
-    metadata:
-      title: Country Nights
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12741.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12743
-      media_content_type: audio/mpeg
-    metadata:
-      title: Fireplace
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12743.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12731
-      media_content_type: audio/mpeg
-    metadata:
-      title: Forest
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12731.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12734
-      media_content_type: audio/mpeg
-    metadata:
-      title: Female Lullaby
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12734.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12739
-      media_content_type: audio/mpeg
-    metadata:
-      title: Male Lullaby
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12739.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12747
-      media_content_type: audio/mpeg
-    metadata:
-      title: Ocean
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12747.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12746
-      media_content_type: audio/mpeg
-    metadata:
-      title: Oscillating Fan
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12746.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12735
-      media_content_type: audio/mpeg
-    metadata:
-      title: Pink Noise
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12735.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12737
-      media_content_type: audio/mpeg
-    metadata:
-      title: Rain
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12737.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12738
-      media_content_type: audio/mpeg
-    metadata:
-      title: River
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12738.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12748
-      media_content_type: audio/mpeg
-    metadata:
-      title: Female Rock-a-bye Baby
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12748.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12733
-      media_content_type: audio/mpeg
-    metadata:
-      title: Male Rock-a-bye Baby
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12733.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12740
-      media_content_type: audio/mpeg
-    metadata:
-      title: Thunderstorm
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12740.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12742
-      media_content_type: audio/mpeg
-    metadata:
-      title: Female Twinkle Twinkle
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12742.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12732
-      media_content_type: audio/mpeg
-    metadata:
-      title: Male Twinkle Twinkle
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12732.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12730
-      media_content_type: audio/mpeg
-    metadata:
-      title: White Noise
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12730.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16644
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16648
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.front_room_hub
-    data:
-      media_content_id: cams-yml/nursery-camera
-      media_content_type: lovelace
-    metadata:
-      title: Nursery Camera
-      thumbnail: https://brands.home-assistant.io/_/lovelace/logo.png
-      media_class: app
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: lovelace
-          media_content_id: ""
-        - media_content_type: lovelace
-          media_content_id: cams-yml
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.computer_area_hub
-    data:
-      media_content_id: media-source://dlna_dms/dream_media/:22$@12719
-      media_content_type: audio/mpeg
-    metadata:
-      title: almost_bedtime
-      thumbnail: >-
-        http://192.168.1.10:50002/transcoder/jpegtnscaler.cgi/folderart/12719.jpg
-      media_class: music
-      children_media_class: null
-      navigateIds:
-        - {}
-        - media_content_type: app
-          media_content_id: media-source://dlna_dms
-        - media_content_type: object.container
-          media_content_id: media-source://dlna_dms/dream_media/:21
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16996
-        - media_content_type: object.container.storageFolder
-          media_content_id: media-source://dlna_dms/dream_media/:22$16999
-mode: single
diff --git a/components/packages/ambientsounds.yaml b/components/packages/ambientsounds.yaml
index f9feadb..c48777d 100644
--- a/components/packages/ambientsounds.yaml
+++ b/components/packages/ambientsounds.yaml
@@ -1,6 +1,6 @@
 --- ###### CUSTOMIZE ----------------------------------------
 
-# RESOURCES:
+# RESOURCES:a
 # Credit to /u/dsgraham on Reddit - https://www.reddit.com/r/homeassistant/comments/9n0llr/google_ambient_sound_urls/
 # Script adapted from Bob_NL on Home Assistant Forums - https://community.home-assistant.io/t/chromecast-radio-with-station-and-player-selection/12732
 # Google webpage: https://support.google.com/googlehome/answer/7364558?hl=en
@@ -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://dlna_dms/dream_media/:22$@12744
-            {% elif is_state("input_select.ambient_sound", "Female Baby Shusher") %} media-source://dlna_dms/dream_media/:22$@12745
-            {% elif is_state("input_select.ambient_sound", "Male Baby Shusher") %} media-source://dlna_dms/dream_media/:22$@12736
-            {% elif is_state("input_select.ambient_sound", "Country Night") %} media-source://dlna_dms/dream_media/:22$@12741
-            {% elif is_state("input_select.ambient_sound", "Fireplace") %} media-source://dlna_dms/dream_media/:22$@12743
-            {% elif is_state("input_select.ambient_sound", "Forest") %} media-source://dlna_dms/dream_media/:22$@12731
-            {% elif is_state("input_select.ambient_sound", "Female Lullaby") %} media-source://dlna_dms/dream_media/:22$@12734
-            {% elif is_state("input_select.ambient_sound", "Male Lullaby") %} media-source://dlna_dms/dream_media/:22$@12739
-            {% elif is_state("input_select.ambient_sound", "Ocean") %} media-source://dlna_dms/dream_media/:22$@12747
-            {% elif is_state("input_select.ambient_sound", "Oscillating Fan") %} media-source://dlna_dms/dream_media/:22$@12746
-            {% elif is_state("input_select.ambient_sound", "Pink Noise") %} media-source://dlna_dms/dream_media/:22$@12735
-            {% elif is_state("input_select.ambient_sound", "Rain") %} media-source://dlna_dms/dream_media/:22$@12737
-            {% elif is_state("input_select.ambient_sound", "River") %} media-source://dlna_dms/dream_media/:22$@12738
-            {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://dlna_dms/dream_media/:22$@12748
-            {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://dlna_dms/dream_media/:22$@12733
-            {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://dlna_dms/dream_media/:22$@12740
-            {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://dlna_dms/dream_media/:22$@12742
-            {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://dlna_dms/dream_media/:22$@12730
-            {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://dlna_dms/dream_media/:22$@12740
+            {% 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://dlna_dms/dream_media/:22$@12744',
-                'media-source://dlna_dms/dream_media/:22$@12746',
-                'media-source://dlna_dms/dream_media/:22$@12731',
-                'media-source://dlna_dms/dream_media/:22$@12747',
-                'media-source://dlna_dms/dream_media/:22$@12738',
-                'media-source://dlna_dms/dream_media/:22$@12740'] %}
+              {% 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://dlna_dms/dream_media/:22$@12734',
-                'media-source://dlna_dms/dream_media/:22$@12748',
-                'media-source://dlna_dms/dream_media/:22$@12742'] %}
+              {% 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"