diff --git a/automations.yaml b/automations.yaml
index fc24143..a3e56fd 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -888,14 +888,22 @@
           entity_id: light.living_room_lights
         alias: Brightness Down Small
       off_short_action:
-      - if:
-        - condition: state
-          entity_id: binary_sensor.early_night_mode
-          state: 'on'
-        then:
-        - service: script.evening_on_first_floor
-          data: {}
-        else:
+      - choose:
+        - conditions:
+          - condition: state
+            entity_id: binary_sensor.early_night_mode
+            state: 'on'
+          sequence:
+          - service: script.evening_on_first_floor
+            data: {}
+        - conditions:
+          - condition: state
+            entity_id: input_boolean.goodnight
+            state: 'on'
+          sequence:
+          - service: script.goodnight_on_first_floor
+            data: {}
+        default:
         - service: light.turn_off
           data: {}
           target:
@@ -1025,18 +1033,41 @@
         target:
           entity_id: input_boolean.emma_sleeping
       off_short_action:
-      - if:
-        - condition: state
-          entity_id: binary_sensor.early_night_mode
-          state: 'on'
-        then:
-        - service: script.evening_on_second_floor
-          data: {}
-        else:
+      - choose:
+        - conditions:
+          - condition: state
+            entity_id: binary_sensor.early_night_mode
+            state: 'on'
+          sequence:
+          - service: script.evening_on_second_floor
+            data: {}
+        - conditions:
+          - condition: state
+            entity_id: input_boolean.goodnight
+            state: 'on'
+          sequence:
+          - service: script.goodnight_on_second_floor
+            data: {}
+        default:
         - service: light.turn_off
           data: {}
           target:
-            entity_id: light.second_floor_lights
+            area_id:
+            - emma_bedroom
+            - kallen_bedroom
+            - master_bedroom
+            - master_bedroom_closet
+            - upstairs_hallway
+        - if:
+          - condition: template
+            value_template: '{{ is_state(''timer.upstairs_bathroom_motion_timer'',''idle'')
+              and is_state(''binary_sensor.upstairs_bathroom_motion'',''off'') and
+              is_state(''light.upstairs_bathroom_lights'',''on'') }}'
+          then:
+          - service: light.turn_off
+            data: {}
+            target:
+              entity_id: light.upstairs_bathroom_lights
 - id: '1682561310614'
   alias: Kallen Bedroom Switch Handler
   description: ''
diff --git a/packages/lighting_and_scenes.yaml b/packages/lighting_and_scenes.yaml
index 3631eb4..766ffb6 100644
--- a/packages/lighting_and_scenes.yaml
+++ b/packages/lighting_and_scenes.yaml
@@ -1715,6 +1715,93 @@ script:
               data:
                 value: Adaptive
 
+  goodnight_in_basement:
+    alias: 'Goodnight in Basement'
+    sequence:
+    - service: light.turn_off
+      target:
+        area_id:
+        - basement_studio
+        - furnace_room
+    - service: fan.turn_off
+      target:
+        entity_id: fan.basement_fan
+
+  goodnight_on_first_floor:
+    alias: 'Goodnight on First Floor'
+    sequence:
+    - if:
+      - condition: state
+        entity_id: input_boolean.guest_mode
+        state: 'on'
+      then:
+      - service: light.turn_off
+        target:
+          area_id:
+          - dining_room
+          - downstairs_bathroom
+          - living_room
+          - tina_desk
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.mud_room_scenes
+        data:
+          option: Nightlight
+      else:
+      - service: light.turn_off
+        target:
+          area_id:
+          - dining_room
+          - downstairs_bathroom
+          - living_room
+          - mud_room
+          - tina_desk
+
+  goodnight_on_second_floor:
+    alias: 'Goodnight on Second Floor'
+    sequence:
+    - service: light.turn_off
+      target:
+        area_id:
+        - emma_bedroom
+        - kallen_bedroom
+        - master_bedroom
+        - master_bedroom_closet
+    - if:
+      - condition: state
+        entity_id: input_boolean.guest_mode
+        state: 'on'
+      then:
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.upstairs_hallway_scenes
+        data:
+          option: Nightlight
+      else:
+      - service: light.turn_off
+        target:
+          entity_id: light.hallway_overhead
+    - if:
+      - condition: state
+        entity_id: input_boolean.kallen_overnight
+        state: 'on'
+      then:
+      - service: light.turn_off
+        target:
+          area_id: upstairs_bathroom
+      else:
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.upstairs_bathroom_scenes
+        data:
+          option: Single Nightlight
+    - service: light.turn_on
+      target:
+        entity_id: light.stairwell_led_strip
+      data:
+        color_temp_kelvin: 2000
+        brightness: 50
+
   morning_scene:
     alias: 'Morning Scene'
     sequence: