diff --git a/automations.yaml b/automations.yaml
index 345c74e..e9b4a7e 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -2632,100 +2632,100 @@
 - id: '1696356974829'
   alias: Scheduled Reset
   description: Reset all context entities for the next day at the appropriate times
-  trigger:
-  - platform: time
-    at: 00:00:00
+  triggers:
+  - at: 00:00:00
     id: midnight
-  - platform: time
-    at: input_datetime.audible_notification_on
+    trigger: time
+  - at: input_datetime.audible_notification_on
     id: audible-on
-  - platform: time
-    at: input_datetime.kallen_school_day_end
+    trigger: time
+  - at: input_datetime.kallen_school_day_end
     id: school-end
-  - platform: state
-    entity_id: sensor.twitch_ironnerd24
+    trigger: time
+  - entity_id: sensor.twitch_ironnerd24
     from: streaming
     to: offline
     id: stream-offline
-  - platform: time
-    at: 04:00:00
+    trigger: state
+  - at: 04:00:00
     id: 4am
-  - platform: time
-    at: '16:00:00'
-    id: 4pm
-  - platform: time
-    at: 06:00:00
+    trigger: time
+  - at: '12:00:00'
+    id: noon
+    trigger: time
+  - at: 06:00:00
     id: 6am
-  condition: []
-  action:
+    trigger: time
+  conditions: []
+  actions:
   - choose:
     - conditions:
       - condition: trigger
         id: midnight
       sequence:
-      - service: script.scheduling_reset
-        data: {}
-      - service: script.kallen_school_reset_late
-        data: {}
-      - service: automation.turn_on
-        target:
+      - data: {}
+        action: script.scheduling_reset
+      - data: {}
+        action: script.kallen_school_reset_late
+      - target:
           entity_id:
           - automation.scheduled_alarm_rearm
           - automation.scheduled_alarm_disarm
         data: {}
-      - service: input_boolean.turn_off
-        target:
+        action: automation.turn_on
+      - target:
           entity_id:
           - input_boolean.skip_disarm
           - input_boolean.skip_rearm
         data: {}
-      - service: counter.reset
-        target:
+        action: input_boolean.turn_off
+      - target:
           entity_id:
           - counter.back_door_opened_today
           - counter.front_door_opened_today
           - counter.basement_studio_door_opened_today
           - counter.basement_led_strip_resets
         data: {}
+        action: counter.reset
     - conditions:
       - condition: trigger
         id:
         - audible-on
       sequence:
-      - service: script.reset_annc_switches
-        data: {}
+      - data: {}
+        action: script.reset_annc_switches
     - conditions:
       - condition: trigger
         id: school-end
       sequence:
-      - service: script.kallen_school_reset
-        data: {}
+      - data: {}
+        action: script.kallen_school_reset
     - conditions:
       - condition: trigger
         id: stream-offline
       sequence:
-      - service: input_boolean.turn_off
-        target:
+      - target:
           entity_id: input_boolean.tony_streaming_today
         data: {}
+        action: input_boolean.turn_off
     - conditions:
       - condition: trigger
         id: 4am
       sequence:
-      - service: input_boolean.turn_off
-        target:
+      - target:
           entity_id:
           - input_boolean.kallen_morning_meds_taken
           - input_boolean.kallen_night_meds_taken
           - input_boolean.tina_morning_meds_taken
           - input_boolean.emma_scheduling_evening_ran
         data: {}
-      - service: counter.reset
-        target:
+        action: input_boolean.turn_off
+      - target:
           entity_id:
           - counter.tony_morning_meds_reminder_count
           - counter.tony_afternoon_meds_reminder_count
         data: {}
+        action: counter.reset
     - conditions:
       - condition: trigger
         id: 6am
@@ -2735,19 +2735,20 @@
           entity_id: sensor.twitch_ironnerd24
           state: offline
         then:
-        - service: input_boolean.turn_off
-          target:
+        - target:
             entity_id: input_boolean.tony_streaming_today
           data: {}
+          action: input_boolean.turn_off
     - conditions:
       - condition: trigger
-        id: 4pm
+        id:
+        - noon
       sequence:
-      - service: input_boolean.turn_off
-        target:
+      - target:
           entity_id:
           - input_boolean.tina_night_meds_taken
         data: {}
+        action: input_boolean.turn_off
   mode: restart
 - id: '1696361494561'
   alias: Turn On Audible Notifications