diff --git a/packages/emmalynn.yaml b/packages/emmalynn.yaml
index 60a14be..765dd54 100644
--- a/packages/emmalynn.yaml
+++ b/packages/emmalynn.yaml
@@ -329,64 +329,76 @@ script:
 # Lighting
       - variables:
           brightness: "{{ state_attr('switch.adaptive_lighting_emma_bedroom','brightness_pct') }}"
-      - choose:
-        - conditions:
-          - condition: state
-            entity_id: binary_sensor.early_night_mode
-            state: 'on'
-          sequence:
-          - service: switch.turn_off
-            target:
-              entity_id: switch.adaptive_lighting_emma_bedroom
-          - delay:
-              seconds: 1
-          - service: light.turn_on
-            target:
-              entity_id: light.emma_bedroom_light
-            data:
-              brightness_pct: "{{ brightness }}"
-              transition: >
-                {% from 'time.jinja' import timer_duration %}
-                {{ timer_duration('input_number.wakeup_lights_fade_night') }}
-          - service: light.turn_on
-            target:
-              entity_id: light.hallway_overhead
-          - service: input_select.select_option
-            target:
-              entity_id:
-                - input_select.upstairs_hallway_scenes
-                - input_select.master_bedroom_scenes
-            data:
-              option: Adaptive
-        - conditions:
-          - condition: state
-            entity_id: binary_sensor.early_night_mode
-            state: 'off'
-          sequence:
-          - service: switch.turn_off
-            target:
-              entity_id: switch.adaptive_lighting_emma_bedroom
-          - delay:
-              seconds: 1
-          - service: light.turn_on
-            target:
-              entity_id: light.emma_bedroom_light
-            data:
-              brightness_pct: "{{ brightness }}"
-              transition: >
-                {% from 'time.jinja' import timer_duration %}
-                {{ timer_duration('input_number.wakeup_lights_fade_day') }}
-# Climate/White Noise
       - if:
         - condition: state
           entity_id: binary_sensor.early_night_mode
-          state: 'off'
+          state: 'on'
         then:
-        - delay:
-            minutes: 5
-        else:
-        - delay:
-            minutes: "{{ states('input_number.wakeup_lights_fade_night') }}"
+        - service: light.turn_on
+          target:
+            entity_id: light.hallway_overhead
+        - service: input_select.select_option
+          target:
+            entity_id:
+              - input_select.upstairs_hallway_scenes
+              - input_select.master_bedroom_scenes
+          data:
+            option: Adaptive
+      - service: switch.turn_off
+        target:
+          entity_id: switch.adaptive_lighting_emma_bedroom
+      - delay:
+          seconds: 1
+      - service: light.turn_on
+        target:
+          entity_id: light.emma_bedroom_light
+        data:
+          brightness_pct: "{{ brightness }}"
+          transition: >
+            {% from 'time.jinja' import timer_duration %}
+            {% if is_state('binary_sensor.early_night_mode','on') %}
+              {{ timer_duration('input_number.wakeup_lights_fade_night') }}
+            {% else %}
+              {{ timer_duration('input_number.wakeup_lights_fade_day') }}
+            {% endif %}
+      - wait_for_trigger:
+        - platform: state
+          entity_id: light.emma_bedroom_light
+          to: 'off'
+          id: lights-off
+        - platform: state
+          entity_id: input_select.emma_bedroom_scenes
+          to: 'Adaptive'
+          id: adaptive
+        timeout:
+          minutes: >
+            {% if is_state('binary_sensor.early_night_mode','on') %}
+              {{ states('input_number.wakeup_lights_fade_night') }}
+            {% else %}
+              5
+            {% endif %}
+      - choose:
+        - conditions: "{{ wait.trigger == none }}"
+          sequence:
+          - service: input_select.select_option
+            target:
+              entity_id: input_select.emma_bedroom_scenes
+            data:
+              option: Adaptive
+        - conditions: "{{ wait.trigger.id == 'lights-off' }}"
+          sequence:
+          - service: switch.turn_on
+            target:
+              entity_id: switch.adaptive_lighting_emma_bedroom
+          - service: switch.turn_off
+            target:
+              entity_id: switch.adaptive_lighting_sleep_mode_emma_bedroom
+          - service: input_text.set_value
+            target:
+              entity_id: input_text.emma_bedroom_selected_scene
+            data:
+              value: Adaptive
+# Climate/White Noise
       - service: input_boolean.turn_off
         target:
           entity_id: input_boolean.white_noise_emma_bedroom
@@ -398,11 +410,6 @@ script:
         - service: script.turn_on
           target:
             entity_id: script.emma_aircon_shutoff
-      - service: input_select.select_option
-        target:
-          entity_id: input_select.emma_bedroom_scenes
-        data:
-          option: Adaptive
 
   emma_aircon_shutoff:
     alias: 'Emma Air Conditioner Shutoff'
diff --git a/packages/master_bedroom.yaml b/packages/master_bedroom.yaml
index 46f57c6..e1525ec 100644
--- a/packages/master_bedroom.yaml
+++ b/packages/master_bedroom.yaml
@@ -90,74 +90,63 @@ script:
     - service: switch.turn_off
       target:
         entity_id: switch.master_bedroom_echo_dot_do_not_disturb_switch
-    - service: media_player.volume_set
+    - service: script.turn_on
       target:
-        entity_id: media_player.master_bedroom_echo_dot
+        entity_id: script.volume_reset
+    - service: switch.turn_off
+      target:
+        entity_id: switch.adaptive_lighting_master_bedroom
+    - delay:
+        seconds: 1
+    - service: light.turn_on
+      target:
+        entity_id: light.master_bedroom_lights
       data:
-        volume_level: >
-          {% if is_state('input_boolean.give_me_darkness','on') %}
-            {{ states('input_number.master_bedroom_echo_dot_night_volume') }}
+        brightness_pct: "{{ brightness }}"
+        transition: >
+          {% from 'time.jinja' import timer_duration %}
+          {% if is_state('binary_sensor.early_night_mode','on') %}
+            {{ timer_duration('input_number.wakeup_lights_fade_night') }}
           {% else %}
-            {{ states('input_number.master_bedroom_echo_dot_day_volume') }}
+            {{ timer_duration('input_number.wakeup_lights_fade_day') }}
           {% endif %}
-    - if:
-      - condition: template
-        value_template: >
-          {% set weather = states('weather.iron_nerd_weather_station') %}
-          {{ weather in ['cloudy','partlycloudy','rainy','snowy','hail','lightning','lightning-rainy','pouring','snowy-rainy'] }}
-      then:
-      - choose:
-        - conditions:
-          - condition: state
-            entity_id: binary_sensor.early_night_mode
-            state: 'on'
-          sequence:
-          - service: switch.turn_off
-            target:
-              entity_id: switch.adaptive_lighting_master_bedroom
-          - delay:
-              seconds: 1
-          - service: light.turn_on
-            target:
-              entity_id: light.master_bedroom_lights
-            data:
-              brightness_pct: "{{ brightness }}"
-              transition: >
-                {% from 'time.jinja' import timer_duration %}
-                {{ timer_duration('input_number.wakeup_lights_fade_night') }}
-          - delay:
-              minutes: "{{ states('input_number.wakeup_lights_fade_night') }}"
-          - service: input_select.select_option
-            target:
-              entity_id: input_select.master_bedroom_scenes
-            data:
-              option: Adaptive
-        - conditions:
-          - condition: state
-            entity_id: binary_sensor.early_night_mode
-            state: 'off'
-          sequence:
-          - service: switch.turn_off
-            target:
-              entity_id: switch.adaptive_lighting_master_bedroom
-          - delay:
-              seconds: 1
-          - service: light.turn_on
-            target:
-              entity_id: light.master_bedroom_lights
-            data:
-              brightness_pct: "{{ brightness }}"
-              transition: >
-                {% from 'time.jinja' import timer_duration %}
-                {{ timer_duration('input_number.wakeup_lights_fade_day') }}
-          - delay:
-              minutes: "{{ states('input_number.wakeup_lights_fade_day') }}"
-          - service: input_select.select_option
-            target:
-              entity_id: input_select.master_bedroom_scenes
-            data:
-              option: Adaptive
-    - service: script.volume_reset
+    - wait_for_trigger:
+      - platform: state
+        entity_id: light.master_bedroom_lights
+        to: 'off'
+        id: lights-off
+      - platform: state
+        entity_id: input_select.master_bedroom_scenes
+        to: 'Adaptive'
+        id: adaptive
+      timeout:
+        minutes: >
+          {% if is_state('binary_sensor.early_night_mode','on') %}
+            {{ states('input_number.wakeup_lights_fade_night') }}
+          {% else %}
+            {{ states('input_number.wakeup_lights_fade_day') }}
+          {% endif %}
+    - choose:
+      - conditions: "{{ wait.trigger == none }}"
+        sequence:
+        - service: input_select.select_option
+          target:
+            entity_id: input_select.master_bedroom_scenes
+          data:
+            option: Adaptive
+      - conditions: "{{ wait.trigger.id == 'lights-off' }}"
+        sequence:
+        - service: switch.turn_on
+          target:
+            entity_id: switch.adaptive_lighting_master_bedroom
+        - service: switch.turn_off
+          target:
+            entity_id: switch.adaptive_lighting_sleep_mode_master_bedroom
+        - service: input_text.set_value
+          target:
+            entity_id: input_text.master_bedroom_selected_scene
+          data:
+            value: Adaptive
 
   master_bedroom_sleep:
     alias: 'Master Bedroom Sleep'