Include Guest Bedroom in house mode

config/packages/routines/bedtime.yaml

@@ -1,7 +1,13 @@
 script:
-  routine_bedtime:
-    alias: Routine · Bedtime
+  routine_bedroom_bedtime:
+    alias: Routine · Bedroom · Bedtime
     sequence:
+      - service: sonos.unjoin
+        entity_id:
+          - media_player.living_room
+          - media_player.kitchen
+          - media_player.bathroom
+
       - service: script.say_discretely
         data:
           message: "Entering bed time."
@@ -15,41 +21,14 @@ script:
           option: "sleep"
 
       - service: light.turn_on
-        entity_id: light.bedside
-      - service: script.bed_led_on
+        entity_id:
+          - light.bedside
+          - light.bed_led
 
       - service: light.turn_off
         entity_id: light.master_bedroom_main
-      - service: sonos.unjoin
-        entity_id:
-          - media_player.living_room
-          - media_player.kitchen
-          - media_player.bathroom
+
       - service: media_player.volume_set
         entity_id: media_player.master_bedroom
         data:
           volume_level: 0.15
-
-      # Turn off everything else
-      - service: media_player.media_stop
-        entity_id:
-          - media_player.living_room
-          - media_player.kitchen
-          - media_player.bathroom
-      - service: homeassistant.turn_off
-        entity_id:
-          - media_player.nvidia_shield
-          - media_player.living_room_tv
-          - light.master_bedroom_main
-          - light.living_room_ceiling
-          - light.kitchen_main
-          - light.kitchen_secondary
-          - light.hallway_main
-          - light.hallway_entrance
-          - switch.titanium
-      - service: light.turn_on
-        entity_id:
-          - light.browser_kitchen
-          - light.browser_hallway
-        data:
-          brightness_pct: 1

config/packages/routines/coming_home.yaml

@@ -22,9 +22,9 @@ script:
           - light.browser_hallway
           - light.living_room_ambient
           - light.bedside
+          - light.bed_led
         data:
           brightness_pct: 100
-      - service: script.bed_led_on
 
       # Cameras
       - service: switch.turn_on

config/packages/routines/good_night.yaml

@@ -11,7 +11,8 @@ script:
           message: "Entering night mode. Good night!"
 
       # Prepare Bed LED brightness to be turned on during night time
-      - service: script.bed_led_on
+      - service: light.turn_on
+        entity_id: light.bed_led
         data:
           brightness_pct: 40
 
@@ -31,6 +32,7 @@ script:
           - light.kitchen_secondary
           - light.hallway_main
           - light.hallway_entrance
+          - light.light_lohas_6
           - media_player.nvidia_shield
           - media_player.living_room_tv
           - switch.titanium

config/packages/routines/leaving_home.yaml

@@ -18,6 +18,7 @@ script:
 
       - service: media_player.media_stop
         entity_id: group.all_sonos
+      - service: script.dashboards_light_down
       - service: input_select.select_option
         entity_id: input_select.hallway_dashboard_mode
         data:

config/packages/routines/waking_up.yaml

@@ -2,19 +2,6 @@ script:
   routine_waking_up:
     alias: Routine · Waking up
     sequence:
-      - service: fan.turn_off
-        entity_id: fan.philips_airpurifier
-
-      - service: media_player.media_stop
-        entity_id: media_player.master_bedroom
-
-      - delay: 00:00:01
-
-      - service: script.routine_morning_briefing
-      - wait_template: "{{ is_state('input_boolean.sarah_talking', 'off') }}"
-        timeout: 00:02:00
-      - delay: 00:00:01
-
       - service: light.turn_on
         entity_id: light.hallway
         data:
@@ -23,21 +10,43 @@ script:
       - service: light.turn_on
         entity_id:
           - light.living_room_ambient
-          - light.bed_led
-          - light.bedside
 
       - service: script.open_living_room_cover
       - service: script.shield_screensaver
 
-      - condition: state
-        entity_id: input_boolean.guest_mode
-        state: "off"
+      # Only when no guests are present
+      - condition: and
+        conditions:
+          - condition: state
+            entity_id: input_boolean.guest_mode
+            state: "off"
+          - condition: state
+            entity_id: input_boolean.guest_bedroom
+            state: "off"
       - service: script.say
         data:
           message: "Here's some music to start the day!"
       - delay: 00:00:02
       - service: script.music_play
 
+
+  routine_bedroom_morning:
+    alias: Routine · Bedroom · Morning
+    sequence:
+      - service: fan.turn_off
+        entity_id: fan.philips_airpurifier
+      - service: media_player.media_stop
+        entity_id: media_player.master_bedroom
+      - delay: 00:00:01
+      - service: light.turn_on
+        entity_id:
+          - light.bed_led
+          - light.bedside
+      - service: script.routine_morning_briefing
+      - wait_template: "{{ is_state('input_boolean.sarah_talking', 'off') }}"
+        timeout: 00:02:00
+      - delay: 00:00:01
+
   routine_morning_briefing:
     alias: Routine · Morning Briefing
     sequence: