diff --git a/config/lovelace/home_dashboard/09_system.yaml b/config/lovelace/home_dashboard/09_system.yaml
index 09213be..c40964c 100644
--- a/config/lovelace/home_dashboard/09_system.yaml
+++ b/config/lovelace/home_dashboard/09_system.yaml
@@ -9,6 +9,7 @@ cards:
     entities:
       - automation.youtube_download_latest_pds
       - automation.tv_join_beam_to_sonos_group_when_off
+      - automation.randi_notify_cart_is_available
 
       - type: custom:fold-entity-row
         head:
diff --git a/config/packages/modules/media/music.yaml b/config/packages/modules/media/music.yaml
index 116b81b..2ba7b07 100644
--- a/config/packages/modules/media/music.yaml
+++ b/config/packages/modules/media/music.yaml
@@ -7,7 +7,7 @@ script:
   music_play:
     alias: Music · Play
     sequence:
-      - service: script.music_join_sonoses
+      - service: script.sonos_join_bedroom
       - service: media_player.volume_set
         entity_id: group.all_sonos
         data_template:
@@ -21,6 +21,7 @@ script:
           entity_id: media_player.master_bedroom
           source: "{{ playlist | default('Evening Chill') }}"
 
+
 automation:
   - alias: Music · Play/Pause on Magic Cube Knock
     trigger:
diff --git a/config/packages/modules/media/sonos.yaml b/config/packages/modules/media/sonos.yaml
index e920b0e..909f112 100644
--- a/config/packages/modules/media/sonos.yaml
+++ b/config/packages/modules/media/sonos.yaml
@@ -27,13 +27,34 @@ binary_sensor:
           {% endif %}
 
 script:
-  music_join_sonoses:
-    alias: Music · Join Sonoses
+  sonos_join_bedroom:
+    alias: Sonos · Join to Bedroom
     sequence:
       - service: sonos.join
         entity_id: group.all_sonos
-        data_template:
+        data:
           master: media_player.master_bedroom
+  sonos_join_tv:
+    alias: Sonos · Join to TV
+    sequence:
+      - service: sonos.join
+        entity_id: group.all_sonos
+        data:
+          master: media_player.living_room
+  sonos_bathroom_up:
+    alias: Sonos · Bathroom up
+    sequence:
+      - service: media_player.volume_set
+        entity_id: media_player.bathroom
+        data:
+          volume_level: 0.5
+  sonos_bathrom_down:
+    alias: Sonos · Bathroom down
+    sequence:
+      - service: media_player.volume_set
+        entity_id: media_player.bathroom
+        data:
+          volume_level: 0.2
 
 homeassistant:
   customize:
diff --git a/config/packages/modules/media/youtube.yaml b/config/packages/modules/media/youtube.yaml
index dce7fb6..6a56eb4 100644
--- a/config/packages/modules/media/youtube.yaml
+++ b/config/packages/modules/media/youtube.yaml
@@ -23,7 +23,7 @@ script:
   youtube_play_file:
     alias:  Youtube · Play file
     sequence:
-      - service: script.music_join_sonoses
+      - service: script.sonos_join_bedroom
       - service: media_player.play_media
         data_template:
           entity_id: media_player.master_bedroom
@@ -61,7 +61,7 @@ script:
           url: "{{ states('input_text.youtube_download_url') }}"
           name: "{{ states('input_text.youtube_download_name') }}"
 
-      - service: script.music_join_sonoses
+      - service: script.sonos_join_bedroom
       - service: media_player.play_media
         data_template:
           entity_id: media_player.master_bedroom
diff --git a/config/packages/routines/coming_home.yaml b/config/packages/routines/coming_home.yaml
index b27058d..7375e96 100644
--- a/config/packages/routines/coming_home.yaml
+++ b/config/packages/routines/coming_home.yaml
@@ -18,7 +18,7 @@ script:
       # TODO: Only if it's dark in the living room
       - service: light.turn_on
         entity_id: light.living_room_all_lights
-      - service: script.music_join_sonoses
+      - service: script.sonos_join_bedroom
 
       # Check if welcome home is enabled, proceed with welcome routine.
       - condition: state
diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml
index 9b79923..4168340 100644
--- a/config/packages/routines/waking_up.yaml
+++ b/config/packages/routines/waking_up.yaml
@@ -25,7 +25,7 @@ script:
         data:
           message: "Here's some music to start the day!"
       - delay: 00:00:02
-      - service: script.music_join_sonoses
+      - service: script.sonos_join_bedroom
       - service: script.music_play
 
   routine_morning_briefing: