diff --git a/automations/01_home_and_lighting.yaml b/automations/01_home_and_lighting.yaml
index 3577aa6..74d0d5c 100644
--- a/automations/01_home_and_lighting.yaml
+++ b/automations/01_home_and_lighting.yaml
@@ -1,96 +1,126 @@
 # Home and lighting automations.
 
 - id: '1760000000001'
-  alias: Fireplace mantle outlet schedule
-  description: Turn the fireplace mantle outlet off overnight.
+  alias: Fireplace mantle outlet morning schedule
+  description: Turn the fireplace mantle outlet on each morning.
+  triggers:
+  - trigger: time
+    at: '06:00:00'
+  conditions: []
+  actions:
+  - action: switch.turn_on
+    target:
+      entity_id: switch.fireplace
+  mode: single
+
+# Evening living-room motion automations disabled.
+#
+# - id: '1738951431044'
+#   alias: Turn off living room lights
+#   description: ''
+#   triggers:
+#   - entity_id:
+#     - binary_sensor.hsjq_motion
+#     to: 'off'
+#     for:
+#       hours: 0
+#       minutes: 15
+#       seconds: 0
+#     trigger: state
+#   conditions:
+#   - condition: time
+#     after: 09:00:00
+#     before: 06:00:00
+#     weekday:
+#     - sun
+#     - mon
+#     - tue
+#     - wed
+#     - thu
+#     - fri
+#     - sat
+#   actions:
+#   - target:
+#       entity_id: media_player.hisense_g204x_cd41
+#     action: media_player.turn_off
+#     data: {}
+#     enabled: false
+#   - action: light.turn_off
+#     data: {}
+#     target:
+#       entity_id:
+#       - light.living_room_light_2
+#   mode: single
+#
+# - id: '1739826648241'
+#   alias: Turn on Living room lights motion sense
+#   description: ''
+#   triggers:
+#   - trigger: state
+#     entity_id:
+#     - binary_sensor.hsjq_motion
+#     to: 'on'
+#   conditions:
+#   - condition: and
+#     conditions:
+#     - condition: sun
+#       after: sunset
+#     - condition: time
+#       before: '22:30:00'
+#   actions:
+#   - action: light.turn_on
+#     metadata: {}
+#     data:
+#       color_temp_kelvin: 3701
+#       brightness_pct: 78
+#     target:
+#       device_id:
+#       - d76728b35b6f17a89be03ef00645812e
+#       entity_id: light.living_room_light_2
+#   mode: single
+
+- id: '1788748800000'
+  alias: Living room nightly shutoff
+  description: Turn off all living-room lights and the fireplace at bedtime.
   triggers:
   - trigger: time
     at: '22:00:00'
-    id: 'off'
+    id: weeknight
   - trigger: time
-    at: '06:00:00'
-    id: 'on'
-  conditions: []
-  actions:
-  - choose:
-    - conditions:
-      - condition: trigger
-        id: 'off'
-      sequence:
-      - action: switch.turn_off
-        target:
-          entity_id: switch.fireplace
-    - conditions:
-      - condition: trigger
-        id: 'on'
-      sequence:
-      - action: switch.turn_on
-        target:
-          entity_id: switch.fireplace
-  mode: single
-
-- id: '1738951431044'
-  alias: Turn off living room lights
-  description: ''
-  triggers:
-  - entity_id:
-    - binary_sensor.hsjq_motion
-    to: 'off'
-    for:
-      hours: 0
-      minutes: 15
-      seconds: 0
-    trigger: state
+    at: '00:00:00'
+    id: weekend_night
   conditions:
-  - condition: time
-    after: 09:00:00
-    before: 06:00:00
-    weekday:
-    - sun
-    - mon
-    - tue
-    - wed
-    - thu
-    - fri
-    - sat
+  - condition: or
+    conditions:
+    - condition: and
+      conditions:
+      - condition: trigger
+        id: weeknight
+      - condition: time
+        weekday:
+        - sun
+        - mon
+        - tue
+        - wed
+        - thu
+    - condition: and
+      conditions:
+      - condition: trigger
+        id: weekend_night
+      - condition: time
+        weekday:
+        - sat
+        - sun
   actions:
-  - target:
-      entity_id: media_player.hisense_g204x_cd41
-    action: media_player.turn_off
-    data: {}
-    enabled: false
   - action: light.turn_off
-    data: {}
     target:
       entity_id:
       - light.living_room_light_2
-  mode: single
-
-- id: '1739826648241'
-  alias: Turn on Living room lights motion sense
-  description: ''
-  triggers:
-  - trigger: state
-    entity_id:
-    - binary_sensor.hsjq_motion
-    to: 'on'
-  conditions:
-  - condition: and
-    conditions:
-    - condition: sun
-      after: sunset
-    - condition: time
-      before: '22:30:00'
-  actions:
-  - action: light.turn_on
-    metadata: {}
-    data:
-      color_temp_kelvin: 3701
-      brightness_pct: 78
+      - light.living_room_lamp_1
+      - light.small_living_room_lamp
+  - action: switch.turn_off
     target:
-      device_id:
-      - d76728b35b6f17a89be03ef00645812e
-      entity_id: light.living_room_light_2
+      entity_id: switch.fireplace
   mode: single
 
 - id: '1739835025769'