blue_room to boys_room

README.md

@@ -36,7 +36,7 @@ ran {% if defined(trigger)%}because {{ trigger.entity_id }} changed{% endif %}{%
 ```
 This is how to actuall do it!
 ```yaml
-  - service: notify.logfile
+  - action: notify.logfile
     data_template:
       message: >
         {{ states("sensor.date_time_iso") }} Computer Area Motion On ran

automations/alerts/something_open_hvac_on.yaml

@@ -8,7 +8,7 @@ triggers:
   to: "on"
 
 action:
-  - service: notify.mobile_app_pixel_7
+  - action: notify.mobile_app_pixel_7
     data:
       message: >-
         The following are open: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_hvac_affecting_openings', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}"

automations/cameras/camera6_presets.yaml

@@ -17,37 +17,36 @@ action:
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Static'
+            state: "Static"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_1
+          - action: shell_command.master_bedroom_left_preset_1
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Door'
+            state: "Door"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_3
+          - action: shell_command.master_bedroom_left_preset_3
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Bed'
+            state: "Bed"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_3
+          - action: shell_command.master_bedroom_left_preset_3
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Window'
+            state: "Window"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_2
+          - action: shell_command.master_bedroom_left_preset_2
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Floor'
+            state: "Floor"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_4
+          - action: shell_command.master_bedroom_left_preset_4
       - conditions:
           - condition: state
             entity_id: input_select.camera_06
-        state: 'Privacy'
+            state: "Privacy"
         sequence:
-      - service: shell_command.master_bedroom_left_preset_5
-
+          - action: shell_command.master_bedroom_left_preset_5

automations/cameras/camera7_presets.yaml

@@ -17,36 +17,36 @@ action:
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Static'
+            state: "Static"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_2
+          - action: shell_command.master_bedroom_right_preset_2
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Door'
+            state: "Door"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_1
+          - action: shell_command.master_bedroom_right_preset_1
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Bed'
+            state: "Bed"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_3
+          - action: shell_command.master_bedroom_right_preset_3
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Window'
+            state: "Window"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_2
+          - action: shell_command.master_bedroom_right_preset_2
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Floor'
+            state: "Floor"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_4
+          - action: shell_command.master_bedroom_right_preset_4
       - conditions:
           - condition: state
             entity_id: input_select.camera_07
-        state: 'Privacy'
+            state: "Privacy"
         sequence:
-      - service: shell_command.master_bedroom_right_preset_5
+          - action: shell_command.master_bedroom_right_preset_5

automations/cameras/frigate_recordings.yaml

@@ -27,9 +27,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.debug_recordings
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -49,9 +49,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_recordings
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -65,9 +65,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_recordings
-          state: 'off'
+            state: "off"
         sequence:
-        - service: switch.turn_off
+          - action: switch.turn_off
             data: {}
             target:
               entity_id:
@@ -79,14 +79,13 @@ action:
                 - switch.frigate_cam12_recordings
                 - switch.frigate_cam13_recordings
 
-
   - choose:
       - conditions:
           - condition: state
             entity_id: input_boolean.outdoor_recordings
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -97,9 +96,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.outdoor_recordings
-          state: 'off'
+            state: "off"
         sequence:
-        - service: switch.turn_off
+          - action: switch.turn_off
             data: {}
             target:
               entity_id:

automations/cameras/frigate_snapshots.yaml

@@ -27,9 +27,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.debug_snapshots
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -49,9 +49,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_snapshots
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -65,9 +65,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.indoor_snapshots
-          state: 'off'
+            state: "off"
         sequence:
-        - service: switch.turn_off
+          - action: switch.turn_off
             data: {}
             target:
               entity_id:
@@ -79,14 +79,13 @@ action:
                 - switch.frigate_cam12_snapshots
                 - switch.frigate_cam13_snapshots
 
-
   - choose:
       - conditions:
           - condition: state
             entity_id: input_boolean.outdoor_snapshots
-          state: 'on'
+            state: "on"
         sequence:
-        - service: switch.turn_on
+          - action: switch.turn_on
             data: {}
             target:
               entity_id:
@@ -97,9 +96,9 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.outdoor_snapshots
-          state: 'off'
+            state: "off"
         sequence:
-        - service: switch.turn_off
+          - action: switch.turn_off
             data: {}
             target:
               entity_id:

automations/climate/hvac_fan_off.yaml

@@ -1,6 +1,7 @@
 alias: HVAC Fan Off
 id: automation_hvac_fan_off
-description: "Purposefully disabled because it just re-circulates the upstairs air"
+description:
+  "Purposefully disabled because it just re-circulates the upstairs air"
   # This shouldn't be used because it just re-circulates the air in the house.
   # Since there aren't any returns in the basement, the upstairs air recirculates itself
   # which accomplishes nothing
@@ -10,25 +11,25 @@ trigger:
   # Has the fan been running for ten minutes?
   - platform: state
     entity_id: switch.thermostat_fan_mode
-    to: 'on'
-    for: '00:10:00'
+    to: "on"
+    for: "00:10:00"
   # Did the system turn on?
   - platform: state
     entity_id: sensor.hvac_action
-    from: 'idle'
+    from: "idle"
   # Check the conditions every 5 minutes
   - platform: time_pattern
-    minutes: '/5'
+    minutes: "/5"
 
   - platform: state
     entity_id: input_boolean.allow_fan
-    to: 'off'
+    to: "off"
 
 condition:
   # Is the fan currently on?
   - condition: state
     entity_id: switch.thermostat_fan_mode
-    state:  'on'
+    state: "on"
 
   - condition: or
     conditions:
@@ -40,7 +41,7 @@ condition:
             above: 68
           - condition: state
             entity_id: binary_sensor.warmer_outside
-          state: 'on'
+            state: "on"
         # Is it getting too cool outside?
       - condition: and
         conditions:
@@ -49,21 +50,20 @@ condition:
             below: 65
           - condition: state
             entity_id: binary_sensor.cooler_outside
-          state: 'on'
+            state: "on"
         # Did the system turn on?
       - condition: not
         conditions:
           - condition: state
             entity_id: sensor.hvac_action
-          state:  'idle'
+            state: "idle"
 action:
-  - service: logbook.log
+  - action: logbook.log
     data_template:
       name: HVAC Fan Off
       entity_id: automation.hvac_fan_off
       message: >
         Turned off HVAC fan
 
-
-  - service: homeassistant.turn_off
+  - action: homeassistant.turn_off
     entity_id: switch.thermostat_fan_mode

automations/frigate/frigate_person_back_yard.yaml

@@ -50,13 +50,13 @@ action:
               attachment:
                 url: /api/frigate/notifications/{{id}}/thumbnail.jpg
 
-          - service: persistent_notification.create
+          - action: persistent_notification.create
             data:
               title: A {{ label }} was detected on the {{ camera_name }} camera.
               message: 'A {{ label }} was detected on the {{ camera_name }} camera. ![image](https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg)'
               notification_id: "{{ id }}"
     default:
-      - service: notify.{{ group_target }}
+      - action: notify.{{ group_target }}
         data:
           message: A {{ label }} was detected on the {{ camera_name }} camera.
           data:
@@ -109,7 +109,7 @@ action:
                         title: Silence Notifications
                         destructive: true
           default:
-            - service: notify.{{ group_target }}
+            - action: notify.{{ group_target }}
               data:
                 message: A {{ label }} was detected on the {{ camera_name }} camera.
                 data:

automations/frigate/frigate_person_from_street.yaml

@@ -59,13 +59,13 @@ action:
               attachment:
                 url: /api/frigate/notifications/{{id}}/thumbnail.jpg
 
-          - service: persistent_notification.create
+          - action: persistent_notification.create
             data:
               title: A {{ label }} was detected on the {{ camera_name }} camera.
               message: 'A {{ label }} was detected on the {{ camera_name }} camera. ![image](https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg)'
               notification_id: "{{ id }}"
     default:
-      - service: notify.{{ group_target }}
+      - action: notify.{{ group_target }}
         data:
           message: A {{ label }} was detected on the {{ camera_name }} camera.
           data:
@@ -118,7 +118,7 @@ action:
                         title: Silence Notifications
                         destructive: true
           default:
-            - service: notify.{{ group_target }}
+            - action: notify.{{ group_target }}
               data:
                 message: A {{ label }} was detected on the {{ camera_name }} camera.
                 data:
@@ -156,4 +156,3 @@ action:
     continue_on_timeout: false
   - delay:
       minutes: 30
-

automations/frigate/frigate_person_front_porch.yaml

@@ -56,13 +56,13 @@ action:
               attachment:
                 url: /api/frigate/notifications/{{id}}/thumbnail.jpg
 
-          - service: persistent_notification.create
+          - action: persistent_notification.create
             data:
               title: A {{ label }} was detected on the {{ camera_name }} camera.
               message: 'A {{ label }} was detected on the {{ camera_name }} camera. ![image](https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg)'
               notification_id: "{{ id }}"
     default:
-      - service: notify.{{ group_target }}
+      - action: notify.{{ group_target }}
         data:
           message: A {{ label }} was detected on the {{ camera_name }} camera.
           data:
@@ -115,7 +115,7 @@ action:
                         title: Silence Notifications
                         destructive: true
           default:
-            - service: notify.{{ group_target }}
+            - action: notify.{{ group_target }}
               data:
                 message: A {{ label }} was detected on the {{ camera_name }} camera.
                 data:
@@ -153,4 +153,3 @@ action:
     continue_on_timeout: false
   - delay:
       minutes: 30
-

automations/frigate/frigate_vehicle_notification.yaml

@@ -63,13 +63,13 @@ action:
               attachment:
                 url: /api/frigate/notifications/{{id}}/thumbnail.jpg
 
-          - service: persistent_notification.create
+          - action: persistent_notification.create
             data:
               title: A {{ label }} was detected on the {{ camera_name }} camera.
               message: 'A {{ label }} was detected on the {{ camera_name }} camera. ![image](https://automation.clintweaver.com/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/thumbnail.jpg)'
               notification_id: "{{ id }}"
     default:
-      - service: notify.{{ group_target }}
+      - action: notify.{{ group_target }}
         data:
           message: A {{ label }} was detected on the {{ camera_name }} camera.
           data:
@@ -122,7 +122,7 @@ action:
                         title: Silence Notifications
                         destructive: true
           default:
-            - service: notify.{{ group_target }}
+            - action: notify.{{ group_target }}
               data:
                 message: A {{ label }} was detected on the {{ camera_name }} camera.
                 data:

automations/house/all_away_media_off.yaml

@@ -1,42 +1,42 @@
-alias: 'All away media off'
+alias: "All away media off"
 id: automation_all_away_media_off
-initial_state: 'on'
+initial_state: "on"
 mode: single
 max_exceeded: silent
 
 trigger:
   - platform: state
     entity_id: input_boolean.home_occupied
-    to: 'off'
-    for: '00:05:00'
+    to: "off"
+    for: "00:05:00"
 condition:
   condition: or
   conditions:
     - condition: state
       entity_id: media_player.kitchen
-    state: 'playing'
+      state: "playing"
     - condition: state
       entity_id: media_player.great_room
-    state: 'playing'
+      state: "playing"
     - condition: state
       entity_id: media_player.front_room_tv
-    state: 'playing'
+      state: "playing"
     - condition: state
       entity_id: media_player.front_room_hub
-    state: 'playing'
+      state: "playing"
     - condition: state
       entity_id: media_player.master_bedroom_clock
-    state: 'playing'
+      state: "playing"
     - condition: state
-    entity_id: media_player.nursery_hub
-    state: 'playing'
+      entity_id: media_player.girls_room_hub
+      state: "playing"
     - condition: state
       entity_id: media_player.bathroom_mini
-    state: 'playing'
+      state: "playing"
     - condition: state
       entity_id: media_player.downstairs_roku
-    state: 'playing'
+      state: "playing"
 action:
-  service: media_player.turn_off
+  action: media_player.turn_off
   data:
     entity_id: all

automations/house/guest_mode_off_nobody_home.yaml

@@ -1,4 +1,4 @@
-alias: 'Guest mode off nobody home'
+alias: "Guest mode off nobody home"
 id: automation_guest_mode_off_nobody_home
 mode: single
 max_exceeded: silent
@@ -6,23 +6,23 @@ max_exceeded: silent
 trigger:
   - platform: state
     entity_id: input_boolean.guest_mode
-    to: 'off'
+    to: "off"
 condition:
   condition: and
   conditions:
     # We're all away
     - condition: state
       entity_id: input_boolean.clint_home
-      state: 'off'
+      state: "off"
     - condition: state
       entity_id: input_boolean.kristy_home
-      state: 'off'
+      state: "off"
     - condition: or
       conditions:
         # Either the phone or tablet are away, or the family room isn't occupied
         - condition: state
           entity_id: input_boolean.clint_home
-        state: 'off'
+          state: "off"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.home_occupied

automations/house/home_not_occupied.yaml

@@ -1,4 +1,4 @@
-alias: 'Home not occupied'
+alias: "Home not occupied"
 id: automation_home_not_occupied
 mode: single
 max_exceeded: silent
@@ -14,36 +14,36 @@ trigger:
       - input_boolean.tess_home
       - input_boolean.ebin_home
       - input_boolean.guest_mode
-    to: 'off'
+    to: "off"
 condition:
   - condition: state
     entity_id: input_boolean.home_occupied
-    state: 'on'
+    state: "on"
   # We're all away
   - condition: numeric_state
     entity_id: group.person_household
     below: 1
     value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_household', 'entity_id'))|list)|groupby('state'))['on']|count }}"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     target:
       entity_id: input_boolean.home_occupied
 
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     target:
       entity_id:
         - input_boolean.indoor_snapshots
         - input_boolean.outdoor_snapshots
 
-  - service: automation.turn_on
+  - action: automation.turn_on
     data:
       entity_id: automation.garage_open_nobody_home
   - choose:
       - conditions:
           - condition: state
             entity_id: binary_sensor.patio_door_contact
-        state: 'off'
+            state: "off"
         sequence:
-        - service: lock.lock
+          - action: lock.lock
             target:
               entity_id: lock.patio_door

automations/house/home_occupied.yaml

@@ -1,4 +1,4 @@
-alias: 'Home occupied'
+alias: "Home occupied"
 id: automation_home_occupied
 mode: single
 max_exceeded: silent
@@ -14,29 +14,29 @@ trigger:
       - input_boolean.tess_home
       - input_boolean.ebin_home
       - input_boolean.guest_mode
-    to: 'on'
+    to: "on"
   - platform: state
     entity_id: cover.garage_door
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 condition:
   - condition: state
     entity_id: input_boolean.home_occupied
-    state: 'off'
+    state: "off"
   # One person is home
   - condition: numeric_state
     entity_id: group.person_household
     above: 0
     value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_household', 'entity_id'))|list)|groupby('state'))['on']|count }}"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     target:
       entity_id: input_boolean.home_occupied
 
-  # - service: input_boolean.turn_off
+  # - action: input_boolean.turn_off
   #   target:
   #     entity_id: input_boolean.indoor_snapshots
 
-  - service: automation.turn_off
+  - action: automation.turn_off
     data:
       entity_id: automation.garage_open_nobody_home

automations/house/house_mode_change.yaml

@@ -10,7 +10,6 @@ trigger:
       - input_boolean.bedtime
       - sensor.people_count
 
-
   - platform: homeassistant
     event: start
 
@@ -19,28 +18,28 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.home_occupied
-        state: 'off'
+            state: "off"
         sequence:
-        - service: input_select.select_option
+          - action: input_select.select_option
             data:
               entity_id: input_select.house
-            option: 'Away'
+              option: "Away"
 
       - conditions:
           - condition: state
             entity_id: input_boolean.home_occupied
-        state: 'on'
+            state: "on"
 
           - condition: state
             entity_id: sensor.people_count
-        state: '1'
+            state: "1"
         sequence:
-        - service: input_select.select_option
+          - action: input_select.select_option
             data:
               entity_id: input_select.house
-            option: 'Bachelor'
+              option: "Bachelor"
 
-        - service: homeassistant.turn_on
+          - action: homeassistant.turn_on
             entity_id:
               - input_boolean.lighting_automations
               - input_boolean.brightness_automations
@@ -48,7 +47,7 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.home_occupied
-        state: 'on'
+            state: "on"
           - condition: numeric_state
             entity_id: sensor.people_count
             above: 1
@@ -57,17 +56,17 @@ action:
             conditions:
               - condition: state
                 entity_id: input_boolean.emmett_home
-            state: 'on'
+                state: "on"
               - condition: state
                 entity_id: input_boolean.bridget_home
-            state: 'on'
+                state: "on"
 
         sequence:
-        - service: input_select.select_option
+          - action: input_select.select_option
             data:
               entity_id: input_select.house
-            option: 'Dad'
-        - service: homeassistant.turn_on
+              option: "Dad"
+          - action: homeassistant.turn_on
             entity_id:
               - input_boolean.lighting_automations
               - input_boolean.brightness_automations
@@ -75,30 +74,29 @@ action:
       - conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Guest'
+            state: "Guest"
         sequence:
-        - service: homeassistant.turn_off
+          - action: homeassistant.turn_off
             entity_id:
               - input_boolean.lighting_automations
 
-
       - conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Manual'
+            state: "Manual"
         sequence:
-        - service: homeassistant.turn_off
+          - action: homeassistant.turn_off
             entity_id:
               - input_boolean.lighting_automations
               - input_boolean.brightness_automations
 
     default:
-      - service: input_select.select_option
+      - action: input_select.select_option
         data:
           entity_id: input_select.house
-          option: 'Auto'
+          option: "Auto"
 
-      - service: homeassistant.turn_on
+      - action: homeassistant.turn_on
         entity_id:
           - input_boolean.lighting_automations
           - input_boolean.brightness_automations

automations/house/leaving_home.yaml

@@ -9,7 +9,7 @@ trigger:
     to: "off"
     for: "00:05:00"
 action:
-  - service: homeassistant.turn_off
+  - action: homeassistant.turn_off
     entity_id:
       - group.my_lights
       - group.my_fans

automations/house/update_automatic_light_profile.yaml

@@ -1,4 +1,4 @@
-alias: 'Update Automatic Light Profile'
+alias: "Update Automatic Light Profile"
 id: automation_update_automatic_light_profile
 trigger:
   - platform: state
@@ -27,16 +27,16 @@ action:
       - conditions:
           - condition: state
             entity_id: binary_sensor.have_custody
-      state: 'off'
+            state: "off"
         sequence:
           - choose:
               # Set to Energize during Early Morning (04:00 - 06:00)
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Morning'
+                    state: "Early Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_morning_mode')}}"
@@ -44,9 +44,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Morning'
+                    state: "Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.morning_mode')}}"
@@ -54,9 +54,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Morning'
+                    state: "Late Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_morning_mode')}}"
@@ -64,9 +64,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Afternoon'
+                    state: "Early Afternoon"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_afternoon_mode')}}"
@@ -74,9 +74,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Afternoon'
+                    state: "Late Afternoon"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_afternoon_mode')}}"
@@ -84,9 +84,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Evening'
+                    state: "Early Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_evening_mode')}}"
@@ -94,9 +94,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Evening'
+                    state: "Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.evening_mode')}}"
@@ -104,9 +104,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Evening'
+                    state: "Late Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_evening_mode')}}"
@@ -114,9 +114,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Night'
+                    state: "Night"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.night_mode')}}"
@@ -124,16 +124,16 @@ action:
       - conditions:
           - condition: state
             entity_id: binary_sensor.have_custody
-      state: 'on'
+            state: "on"
         sequence:
           - choose:
               # Set to Energize during Early Morning (04:00 - 06:00)
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Morning'
+                    state: "Early Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_morning_kids_mode')}}"
@@ -141,9 +141,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Morning'
+                    state: "Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.morning_kids_mode')}}"
@@ -151,9 +151,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Morning'
+                    state: "Late Morning"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_morning_kids_mode')}}"
@@ -161,9 +161,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Afternoon'
+                    state: "Early Afternoon"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_afternoon_kids_mode')}}"
@@ -171,9 +171,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Afternoon'
+                    state: "Late Afternoon"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_afternoon_kids_mode')}}"
@@ -181,9 +181,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Early Evening'
+                    state: "Early Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.early_evening_kids_mode')}}"
@@ -191,9 +191,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Evening'
+                    state: "Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.evening_kids_mode')}}"
@@ -201,9 +201,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Late Evening'
+                    state: "Late Evening"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.late_evening_kids_mode')}}"
@@ -211,9 +211,9 @@ action:
               - conditions:
                   - condition: state
                     entity_id: input_select.time_of_day
-              state: 'Night'
+                    state: "Night"
                 sequence:
-            - service: input_select.select_option
+                  - action: input_select.select_option
                     data:
                       entity_id: input_select.automatic_light_profile
                       option: "{{states('input_select.night_kids_mode')}}"

automations/house/update_light_off_delay.yaml

@@ -16,49 +16,49 @@ action:
         conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Away'
+            state: "Away"
         sequence:
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_seconds
             data:
               value: 30
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_minutes
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_minutes
             data:
               value: 5
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_minutes
             data:
               value: 30
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_hours
             data:
@@ -68,49 +68,49 @@ action:
         conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Bachelor'
+            state: "Bachelor"
         sequence:
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_minutes
             data:
               value: 1
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_minutes
             data:
               value: 10
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_minutes
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_hours
             data:
@@ -120,49 +120,49 @@ action:
         conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Manual'
+            state: "Manual"
         sequence:
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_minutes
             data:
               value: 10
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_minutes
             data:
               value: 30
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_minutes
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_hours
             data:
@@ -172,96 +172,96 @@ action:
         conditions:
           - condition: state
             entity_id: input_select.house
-        state: 'Manual'
+            state: "Manual"
         sequence:
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_minutes
             data:
               value: 20
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.short_light_off_delay_hours
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_minutes
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.normal_light_off_delay_hours
             data:
               value: 1
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_seconds
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_minutes
             data:
               value: 0
-        - service: input_number.set_value
+          - action: input_number.set_value
             target:
               entity_id: input_number.long_light_off_delay_hours
             data:
               value: 2
 
     default:
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.short_light_off_delay_seconds
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.short_light_off_delay_minutes
         data:
           value: 10
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.short_light_off_delay_hours
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.normal_light_off_delay_seconds
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.normal_light_off_delay_minutes
         data:
           value: 30
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.normal_light_off_delay_hours
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.long_light_off_delay_seconds
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.long_light_off_delay_minutes
         data:
           value: 0
-      - service: input_number.set_value
+      - action: input_number.set_value
         target:
           entity_id: input_number.long_light_off_delay_hours
         data:

automations/people/Bridget/bridget_in_bed.yaml

@@ -5,7 +5,7 @@ mode: restart
 
 trigger:
   - trigger: state
-    entity_id: binary_sensor.black_bed_occupied
+    entity_id: binary_sensor.bridgets_bed
     to: "on"
     for: "00:10:00"
   - trigger: state
@@ -22,7 +22,7 @@ condition:
     state: "on"
   - condition: state
     entity_id:
-      - binary_sensor.black_bed_occupied
+      - binary_sensor.bridgets_bed
     state: "on"
     for: "00:05:00"
   - condition: state

automations/people/Clint/Clint_WFH.yaml

@@ -14,14 +14,14 @@ action:
       - conditions:
           - condition: state
             entity_id: binary_sensor.clint_work_from_home
-        state: 'on'
+            state: "on"
         sequence:
-      - service: homeassistant.turn_on
+          - action: homeassistant.turn_on
             entity_id: input_boolean.clint_work_from_home
       - conditions:
           - condition: state
             entity_id: binary_sensor.clint_work_from_home
-        state: 'off'
+            state: "off"
         sequence:
-      - service: homeassistant.turn_off
+          - action: homeassistant.turn_off
             entity_id: input_boolean.clint_work_from_home

automations/people/Clint/Clint_asleep.yaml

@@ -2,11 +2,11 @@ alias: Clint Asleep
 id: automation_clint_asleep
 #description:
 
-initial_state: 'on'
+initial_state: "on"
 trigger:
   - platform: state
     entity_id: input_boolean.clint_in_bed
-    to: 'on'
+    to: "on"
     for:
       minutes: 15
 condition:
@@ -14,14 +14,13 @@ condition:
     conditions:
       - condition: state
         entity_id: input_boolean.clint_is_awake
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: input_boolean.clint_home
-      state: 'on'
+        state: "on"
       - condition: time
-      after: '21:00:00'
-      before: '04:00:00'
+        after: "21:00:00"
+        before: "04:00:00"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.clint_is_awake
-

automations/people/Clint/Clint_at_work.yaml

@@ -4,11 +4,11 @@ id: automation_clint_at_work
 trigger:
   platform: state
   entity_id: device_tracker.pixel_7
-  to: 'WMU'
+  to: "WMU"
 action:
-  - service: automation.turn_on
+  - action: automation.turn_on
     entity_id: automation.clint_home_after_work
-  - service: input_text.set_value
+  - action: input_text.set_value
     data:
       entity_id: input_text.person_clint
       value: at work

automations/people/Clint/Clint_awake.yaml

@@ -6,11 +6,11 @@ mode: restart
 trigger:
   - platform: state
     entity_id: input_boolean.clint_in_bed
-    to: 'off'
-    for: '00:00:30'
+    to: "off"
+    for: "00:00:30"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.clint_is_awake
 
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.clint_travel_sensor

automations/people/Clint/Clint_away.yaml

@@ -9,21 +9,20 @@ trigger:
       - device_tracker.pixel_7
       - person.clint
       - group.person_clint
-    from: 'home'
+    from: "home"
 
   - platform: homeassistant
     event: start
 
 condition:
-
   - condition: not
     conditions:
       - condition: state
         entity_id: person.clint
-      state: 'home'
+        state: "home"
       - condition: state
         entity_id: device_tracker.pixel_7
-      state: 'home'
+        state: "home"
 
 action:
   - choose:
@@ -32,9 +31,9 @@ action:
             conditions:
               - condition: state
                 entity_id: person.clint
-        state: 'home'
+                state: "home"
         sequence:
-    - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.clint_home
 
-- delay: '00:00:30'
+  - delay: "00:00:30"

automations/people/Clint/Clint_home.yaml

@@ -10,7 +10,7 @@ trigger:
       - person.clint
       - group.person_clint
       - device_tracker.pixel_7_wifi
-    to: 'home'
+    to: "home"
 
   - platform: state
     id: car_home
@@ -18,9 +18,8 @@ trigger:
       - binary_sensor.gray_suv_east_side
       - binary_sensor.gray_suv_west_side
       - group.traverse
-    from: 'off'
-    to: 'on'
-
+    from: "off"
+    to: "on"
 
   - platform: homeassistant
     event: start
@@ -36,26 +35,24 @@ action:
                 value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_clint', 'entity_id'))|list)|groupby('state'))['home']|count }}"
               - condition: state
                 entity_id: sensor.pixel_7_wifi_connection
-        state: 'DreamWeaver'
+                state: "DreamWeaver"
               - condition: state
                 entity_id: sensor.pixel_7_wifi_connection
-        state: 'DreamIoT-2G'
+                state: "DreamIoT-2G"
               - condition: state
                 entity_id: sensor.pixel_7_wifi_connection
-        state: 'pozfam'
+                state: "pozfam"
               - condition: state
                 entity_id: sensor.pixel_7_wifi_connection
-        state: 'pozfam-2.4G'
+                state: "pozfam-2.4G"
               - condition: trigger
                 id: "car_home"
         sequence:
-    - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.clint_travelling
-    - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.clint_home
-    - service: automation.turn_on
+          - action: automation.turn_on
             entity_id: automation.clint_at_work
 
-- delay: '00:00:30'
-
-
+  - delay: "00:00:30"

automations/people/Clint/Clint_home_after_work.yaml

@@ -1,11 +1,11 @@
-initial_state: 'off'
-alias: 'clint home after work'
+initial_state: "off"
+alias: "clint home after work"
 id: automation_home_after_work
 #description:
 trigger:
   platform: state
   entity_id: device_tracker.pixel_7
-  to: 'home'
+  to: "home"
   for:
     minutes: 10
 condition:
@@ -13,11 +13,11 @@ condition:
   conditions:
     - condition: state
       entity_id: input_boolean.notify_clint_work
-      state: 'on'
+      state: "on"
     - condition: or
       conditions:
         - condition: time
-        after: '15:00:00'
+          after: "15:00:00"
           weekday:
             - mon
             - tue
@@ -25,5 +25,5 @@ condition:
             - thu
             - fri
 action:
-  - service: homeassistant.turn_off
+  - action: homeassistant.turn_off
     entity_id: automation.clint_home_after_work

automations/people/Clint/Clint_in_bed.yaml

@@ -6,22 +6,22 @@ trigger:
   # Bed in master bedroom is occupied
   - platform: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either
-    to: 'on'
+    to: "on"
   # Radio playing
   - platform: state
     entity_id: media_player.master_bedroom_clock
-    to: 'playing'
+    to: "playing"
   - platform: state
     entity_id: media_player.master_bedroom_clock
-    to: 'idle'
+    to: "idle"
   # Light on
   - platform: state
     entity_id: light.master_bedroom_hue
-    to: 'on'
+    to: "on"
   # Front room unoccupied for at least 5 minutes
   - platform: state
     entity_id: input_boolean.front_room_occupied
-    to: 'off'
+    to: "off"
     for:
       minutes: 5
   # Something gets plugged in
@@ -33,7 +33,7 @@ trigger:
     to: "wireless"
   - platform: state
     entity_id: input_boolean.clint_tablet_charging
-    to: 'on'
+    to: "on"
 condition:
   - alias: "An adult is home and not in bed"
     condition: or
@@ -43,29 +43,28 @@ condition:
         conditions:
           - condition: state
             entity_id: input_boolean.clint_in_bed
-        state: 'off'
+            state: "off"
           - condition: state
             entity_id: input_boolean.clint_home
-        state: 'on'
+            state: "on"
       - alias: "Kristy is home and not in bed"
         condition: and
         conditions:
           - condition: state
             entity_id: input_boolean.kristy_in_bed
-        state: 'off'
+            state: "off"
           - condition: state
             entity_id: input_boolean.kristy_home
-        state: 'on'
+            state: "on"
   - alias: "Its between 8:30PM and 5AM"
     condition: time
-    after: '20:30:00'
-    before: '05:00:00'
+    after: "20:30:00"
+    before: "05:00:00"
 
   - alias: "The bed is occupied"
     condition: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.clint_in_bed
-

automations/people/Clint/Clint_location_update.yaml

@@ -1,5 +1,5 @@
-initial_state: 'on'
-alias: 'Clint Location Update'
+initial_state: "on"
+alias: "Clint Location Update"
 id: automation_clint_location_update
 mode: restart
 #description:
@@ -14,8 +14,8 @@ trigger:
 
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
 action:
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.clint_travel_sensor

automations/people/Clint/Clint_travelling.yaml

@@ -1,16 +1,16 @@
 alias: Clint Travelling
 id: automation_clint_travelling
-initial_state: 'on'
+initial_state: "on"
 #description:
 trigger:
   - platform: homeassistant
     event: start
   - platform: time
-    at: '21:00:00'
+    at: "21:00:00"
 condition:
   - condition: state
     entity_id: input_boolean.clint_home
-  state: 'off'
+    state: "off"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.clint_travelling

automations/people/Clint/Clint_up.yaml

@@ -1,45 +1,44 @@
-alias: 'Clint Up'
+alias: "Clint Up"
 id: automation_clint_up
-initial_state: 'on'
+initial_state: "on"
 #description:
 trigger:
   - platform: state
     entity_id: media_player.great_room
-    to: 'playing'
+    to: "playing"
   - platform: state
     entity_id: media_player.great_room
-    to: 'idle'
+    to: "idle"
   - platform: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_right
-    to: 'off'
-    for: '00:05:00'
+    to: "off"
+    for: "00:05:00"
   - platform: state
     entity_id:
       - binary_sensor.master_bedroom_door_contact
       - binary_sensor.master_suite_door_contact
-    to: 'on'
+    to: "on"
   - platform: state
     entity_id: binary_sensor.pixel_7_is_charging
-    from: 'on'
-    to: 'off'
-    for: '00:10:00'
+    from: "on"
+    to: "off"
+    for: "00:10:00"
 condition:
   - condition: and
     conditions:
       - condition: state
         entity_id: input_boolean.clint_home
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: input_boolean.clint_in_bed
-      state: 'on'
+        state: "on"
       - condition: time
-      after: '04:00:00'
-      before: '22:00:00'
+        after: "04:00:00"
+        before: "22:00:00"
       - condition: state
         entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_right
-      state: 'off'
-      for: '00:01:00'
+        state: "off"
+        for: "00:01:00"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.clint_in_bed
-

automations/people/Clint/Clint_wakeup.yaml

@@ -6,33 +6,33 @@ mode: restart
 trigger:
   - platform: state
     entity_id: binary_sensor.morning
-    to: 'on'
+    to: "on"
   - platform: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_right
-    to: 'on'
+    to: "on"
 
 condition:
   - condition: state
     entity_id: input_boolean.clint_home
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_right
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: binary_sensor.morning
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: binary_sensor.is_workday
-    state: 'on'
+    state: "on"
 
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       entity_id: input_select.master_bedroom_mode
-      option: 'Auto'
+      option: "Auto"
 
-  - service: homeassistant.turn_on
+  - action: homeassistant.turn_on
     data:
       entity_id: light.master_bedroom_hue
 
-  - delay: '00:30:00'
+  - delay: "00:30:00"

automations/people/Clint/clint_changing_zones.yaml

@@ -1,20 +1,20 @@
-initial_state: 'on'
-alias: 'Clint changing zones'
+initial_state: "on"
+alias: "Clint changing zones"
 id: automation_clint_changing_zones
 #description:
 trigger:
   # Been away for a few minutes
   - platform: state
     entity_id: device_tracker.pixel_7
-    to: 'not_home'
-    for: '00:05:00'
+    to: "not_home"
+    for: "00:05:00"
   # Arrived in a zone
   - platform: state
     entity_id: device_tracker.pixel_7
-    from: 'not_home'
+    from: "not_home"
 condition:
   # Been at least 5 minutes
   - condition: template
     value_template: "{{ ( as_timestamp(now()) - as_timestamp(state_attr('script.clint_traveltime','last_triggered'))|float)|float > 300 }}"
 action:
-  - service: script.clint_traveltime
+  - action: script.clint_traveltime

automations/people/Clint/clint_status_at_startup.yaml

@@ -9,39 +9,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.clint_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '23:30:00'
-        before: '00:00:00'
+            after: "23:30:00"
+            before: "00:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.clint_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.clint_is_awake
       - conditions:
           - condition: time
-        after: '00:00:00'
-        before: '06:00:00'
+            after: "00:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.clint_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.clint_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.clint_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.clint_is_awake

automations/people/Clint/set_clint_next_alarm.yaml

@@ -5,14 +5,14 @@ id: automation_set_clint_next_alarm
 trigger:
   - platform: state
     entity_id: binary_sensor.is_workday
-    to: 'off'
+    to: "off"
 
   - platform: state
     entity_id: binary_sensor.is_workday
-    to: 'on'
+    to: "on"
 
   - platform: time
-    at: '01:00:00'
+    at: "01:00:00"
 
   - platform: homeassistant
     event: start
@@ -22,9 +22,9 @@ action:
       - conditions:
           - condition: state
             entity_id: binary_sensor.is_workday
-        state: 'off'
+            state: "off"
         sequence:
-        - service: input_datetime.set_datetime
+          - action: input_datetime.set_datetime
             target:
               entity_id: input_datetime.clint_next_alarm
             data:
@@ -33,9 +33,9 @@ action:
       - conditions:
           - condition: state
             entity_id: binary_sensor.is_workday
-        state: 'on'
+            state: "on"
         sequence:
-        - service: input_datetime.set_datetime
+          - action: input_datetime.set_datetime
             target:
               entity_id: input_datetime.clint_next_alarm
             data:

automations/people/Clint/wake_clint.yaml

@@ -1,4 +1,4 @@
-alias: 'Wake Clint'
+alias: "Wake Clint"
 
 id: automation_wake_clint
 initial_state: on
@@ -9,7 +9,7 @@ trigger:
     entity_id: input_datetime.clint_next_alarm
     offset: "-300"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     data:
       entity_id: input_boolean.master_bedroom_asleep
 
@@ -19,7 +19,7 @@ action:
       seconds: 0
       milliseconds: 0
 
-  - service: media_player.volume_set
+  - action: media_player.volume_set
     data:
       entity_id: media_player.master_bedroom_clock
       volume_level: 0.50
@@ -28,18 +28,18 @@ action:
       - conditions:
           - condition: state
             entity_id: input_select.master_bedroom_mode
-            state: 'off'
+            state: "off"
         sequence:
-          - service: input_select.select_option
+          - action: input_select.select_option
             data:
               option: Energize
             target:
               entity_id: input_select.master_bedroom_mode
 
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       option: Energize
     target:
       entity_id: input_select.master_bedroom_mode
 
-  - service: script.wake_up_the_master_bedroom
+  - action: script.wake_up_the_master_bedroom

automations/people/Ebin/ebin_away.yaml

@@ -1,4 +1,4 @@
-alias: 'Ebin Away'
+alias: "Ebin Away"
 id: automation_ebin_away
 mode: restart
 
@@ -12,7 +12,7 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.ebin_home
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.ebin_home

automations/people/Ebin/ebin_home.yaml

@@ -1,4 +1,4 @@
-alias: 'Ebin Home'
+alias: "Ebin Home"
 id: automation_ebin_home
 mode: restart
 
@@ -14,12 +14,12 @@ condition:
     conditions:
       - condition: state
         entity_id: binary_sensor.have_custody
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: person.kristy
-      state: 'home'
+        state: "home"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.ebin_travelling
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.ebin_home

automations/people/Ebin/ebin_in_bed.yaml

@@ -37,5 +37,5 @@ condition:
           minutes: 5
 
 action:
-  - service: homeassistant.turn_on
+  - action: homeassistant.turn_on
     entity_id: input_boolean.ebin_in_bed

automations/people/Ebin/ebin_location_update.yaml

@@ -1,4 +1,4 @@
-alias: 'Ebin Location Update'
+alias: "Ebin Location Update"
 id: automation_ebin_location_update
 mode: restart
 
@@ -10,8 +10,8 @@ trigger:
       - input_boolean.ebin_home
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
 action:
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.ebin_travel_sensor

automations/people/Ebin/ebin_status_at_startup.yaml

@@ -8,39 +8,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.ebin_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '20:00:00'
-        before: '21:00:00'
+            after: "20:00:00"
+            before: "21:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.ebin_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.ebin_is_awake
       - conditions:
           - condition: time
-        after: '21:00:00'
-        before: '06:00:00'
+            after: "21:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.ebin_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.ebin_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.ebin_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.ebin_is_awake

automations/people/Emmett/emmett_asleep.yaml

@@ -6,8 +6,8 @@ trigger:
   - platform: state
     id: in_bed
     entity_id: input_boolean.emmett_in_bed
-    to: 'on'
-    for: '00:20:00'
+    to: "on"
+    for: "00:20:00"
   - platform: homeassistant
     event: start
 
@@ -16,13 +16,13 @@ condition:
     entity_id:
       - input_boolean.emmett_home
       - input_boolean.kids_bedtime
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: input_boolean.emmett_is_awake
-    state: 'on'
+    state: "on"
   - condition: trigger
     id: "in_bed"
 
 action:
-  - service: homeassistant.turn_off
+  - action: homeassistant.turn_off
     entity_id: input_boolean.emmett_is_awake

automations/people/Emmett/emmett_away.yaml

@@ -1,20 +1,20 @@
-alias: 'Emmett Away'
+alias: "Emmett Away"
 id: automation_emmett_away
 mode: restart
 
 trigger:
   - platform: state
     entity_id: binary_sensor.emmett_home
-    to: 'off'
+    to: "off"
   - platform: time_pattern
     minutes: "/5"
 condition:
   - condition: state
     entity_id: input_boolean.emmett_home
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: binary_sensor.emmett_home
-    state: 'off'
+    state: "off"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.emmett_home

automations/people/Emmett/emmett_home.yaml

@@ -1,22 +1,22 @@
-alias: 'Emmett Home'
+alias: "Emmett Home"
 id: automation_emmett_home
 mode: restart
 
 trigger:
   - platform: state
     entity_id: binary_sensor.emmett_home
-    to: 'on'
+    to: "on"
   - platform: time_pattern
     minutes: "/5"
 condition:
   - condition: state
     entity_id: input_boolean.emmett_home
-    state: 'off'
+    state: "off"
   - condition: state
     entity_id: binary_sensor.emmett_home
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.emmett_travelling
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.emmett_home

automations/people/Emmett/emmett_in_bed.yaml

@@ -5,11 +5,11 @@ mode: restart
 trigger:
   - platform: state
     entity_id: binary_sensor.white_bed_occupied
-    to: 'on'
-    for: '00:10:00'
+    to: "on"
+    for: "00:10:00"
   - platform: state
     entity_id: input_boolean.kids_bedtime
-    to: 'on'
+    to: "on"
   - platform: homeassistant
     event: start
 
@@ -18,15 +18,15 @@ condition:
     entity_id:
       - input_boolean.emmett_home
       - input_boolean.kids_bedtime
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id:
       - binary_sensor.white_bed_occupied
-    state: 'on'
-    for: '00:10:00'
+    state: "on"
+    for: "00:10:00"
   - condition: state
     entity_id: input_boolean.emmett_in_bed
-    state: 'off'
+    state: "off"
   #- condition: state
   #  entity_id: binary_sensor.black_bed_occupied
   #  state: 'on'
@@ -34,5 +34,5 @@ condition:
   #    minutes: 5
 
 action:
-  - service: homeassistant.turn_on
+  - action: homeassistant.turn_on
     entity_id: input_boolean.emmett_in_bed

automations/people/Emmett/emmett_status_at_startup.yaml

@@ -8,39 +8,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.emmett_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '20:00:00'
-        before: '21:00:00'
+            after: "20:00:00"
+            before: "21:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.emmett_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.emmett_is_awake
       - conditions:
           - condition: time
-        after: '21:00:00'
-        before: '06:00:00'
+            after: "21:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.emmett_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.emmett_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.emmett_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.emmett_is_awake

automations/people/Guest/guest_location_update.yaml

@@ -1,4 +1,4 @@
-alias: 'Guest Location Update'
+alias: "Guest Location Update"
 id: automation_guest_location_update
 mode: restart
 
@@ -13,8 +13,8 @@ trigger:
       - input_boolean.guest_in_bed
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
 action:
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.guest_travel_sensor

automations/people/Guest/guest_status_at_startup.yaml

@@ -8,39 +8,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.guest_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '23:30:00'
-        before: '00:00:00'
+            after: "23:30:00"
+            before: "00:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.guest_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.guest_is_awake
       - conditions:
           - condition: time
-        after: '00:00:00'
-        before: '06:00:00'
+            after: "00:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.guest_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.guest_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.guest_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.guest_is_awake

automations/people/Kristy/kristy_asleep.yaml

@@ -1,11 +1,11 @@
 alias: Kristy Asleep
 id: automation_kristy_asleep
 
-initial_state: 'on'
+initial_state: "on"
 trigger:
   - platform: state
     entity_id: input_boolean.kristy_in_bed
-    to: 'on'
+    to: "on"
     for:
       minutes: 15
 condition:
@@ -13,14 +13,13 @@ condition:
     conditions:
       - condition: state
         entity_id: input_boolean.kristy_is_awake
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: input_boolean.kristy_home
-      state: 'on'
+        state: "on"
       - condition: time
-      after: '20:30:00'
-      before: '04:00:00'
+        after: "20:30:00"
+        before: "04:00:00"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.kristy_is_awake
-

automations/people/Kristy/kristy_awake.yaml

@@ -5,11 +5,11 @@ mode: restart
 trigger:
   - platform: state
     entity_id: input_boolean.kristy_in_bed
-    to: 'off'
-    for: '00:05:00'
+    to: "off"
+    for: "00:05:00"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.kristy_is_awake
 
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.kristy_travel_sensor

automations/people/Kristy/kristy_away.yaml

@@ -1,4 +1,4 @@
-alias: 'Kristy Away'
+alias: "Kristy Away"
 id: automation_kristy_away
 mode: restart
 
@@ -6,32 +6,30 @@ trigger:
   - platform: state
     entity_id:
       - device_tracker.kristy_s_phone
-    from: 'home'
+    from: "home"
 
   - platform: homeassistant
     event: start
 
 condition:
-
   - condition: state
     entity_id: device_tracker.kristy_s_phone
-    state: 'not_home'
+    state: "not_home"
 
 action:
   - choose:
       - conditions:
           - condition: state
             entity_id: device_tracker.kristy_s_phone
-      state: 'not_home'
+            state: "not_home"
         sequence:
-    - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.kristy_home
 
-    - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.allow_announcements
 
-    - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.out_of_bed_alert
 
-- delay: '00:00:30'
-
+  - delay: "00:00:30"

automations/people/Kristy/kristy_home.yaml

@@ -1,4 +1,4 @@
-alias: 'Kristy Home'
+alias: "Kristy Home"
 id: automation_kristy_home
 mode: restart
 
@@ -10,32 +10,32 @@ trigger:
     entity_id:
       - group.person_kristy
       - device_tracker.nmap_tracker_d6_28_7a_58_b8_da
-    to: 'home'
+    to: "home"
 
   - platform: event
     event_type: automation_reloaded
 
 condition:
-  - alias: 'They were previously considered away'
+  - alias: "They were previously considered away"
     condition: state
     entity_id: input_boolean.kristy_home
-    state: 'off'
+    state: "off"
 
-  - alias: 'At least one tracker is home'
+  - alias: "At least one tracker is home"
     condition: numeric_state
     entity_id: group.person_kristy
     above: 0
     value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_kristy', 'entity_id'))|list)|groupby('state'))['home']|count }}"
 
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.kristy_travelling
 
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.kristy_home
 
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.allow_announcements
 
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.out_of_bed_alert

automations/people/Kristy/kristy_in_bed.yaml

@@ -5,35 +5,34 @@ trigger:
   # Bed in master bedroom is occupied
   - platform: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_left
-    to: 'on'
+    to: "on"
   # Radio playing
   - platform: state
     entity_id: media_player.master_bedroom_clock
-    to: 'playing'
+    to: "playing"
   - platform: state
     entity_id: media_player.master_bedroom_clock
-    to: 'idle'
+    to: "idle"
   # Light on
   - platform: state
     entity_id: light.master_bedroom_hue
-    to: 'on'
+    to: "on"
 condition:
   - condition: state
     entity_id: input_boolean.kristy_in_bed
-    state: 'off'
+    state: "off"
   - condition: state
     entity_id: input_boolean.kristy_home
-    state: 'on'
+    state: "on"
   - alias: "Its between 8:30PM and 5AM"
     condition: time
-    after: '20:30:00'
-    before: '05:00:00'
+    after: "20:30:00"
+    before: "05:00:00"
 
   - alias: "The bed is occupied"
     condition: state
     entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_left
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.kristy_in_bed
-

automations/people/Kristy/kristy_location_update.yaml

@@ -1,4 +1,4 @@
-alias: 'Kristy Location Update'
+alias: "Kristy Location Update"
 id: automation_kristy_location_update
 mode: restart
 
@@ -11,8 +11,8 @@ trigger:
 
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
 
 action:
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.kristy_travel_sensor

automations/people/Kristy/kristy_status_at_startup.yaml

@@ -9,41 +9,41 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.kristy_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '23:30:00'
-        before: '00:00:00'
+            after: "23:30:00"
+            before: "00:00:00"
 
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.kristy_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.kristy_is_awake
 
       - conditions:
           - condition: time
-        after: '00:00:00'
-        before: '06:00:00'
+            after: "00:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.kristy_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.kristy_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.kristy_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.kristy_is_awake

automations/people/Marshall/marshall_away.yaml

@@ -1,17 +1,17 @@
-alias: 'Marshall Away'
+alias: "Marshall Away"
 id: automation_marshall_away
 mode: restart
 
 trigger:
   - platform: state
     entity_id: device_tracker.nmap_tracker_fe_cf_82_b2_22_e0
-    to: 'not_home'
+    to: "not_home"
 
 condition:
   - condition: state
     entity_id: input_boolean.marshall_home
-    state: 'on'
+    state: "on"
 
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.marshall_home

automations/people/Marshall/marshall_home.yaml

@@ -1,4 +1,4 @@
-alias: 'Marshall Home'
+alias: "Marshall Home"
 id: automation_marshall_home
 mode: restart
 
@@ -10,25 +10,25 @@ trigger:
     entity_id:
       - group.person_marshall
       - device_tracker.nmap_tracker_fe_cf_82_b2_22_e0
-    to: 'home'
+    to: "home"
 
   - platform: event
     event_type: automation_reloaded
 
 condition:
-  - alias: 'They were previously considered away'
+  - alias: "They were previously considered away"
     condition: state
     entity_id: input_boolean.marshall_home
-    state: 'off'
+    state: "off"
 
-  - alias: 'At least one tracker is home'
+  - alias: "At least one tracker is home"
     condition: numeric_state
     entity_id: group.person_marshall
     above: 0
     value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_marshall', 'entity_id'))|list)|groupby('state'))['home']|count }}"
 
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.marshall_travelling
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.marshall_home

automations/people/Marshall/marshall_location_update.yaml

@@ -1,4 +1,4 @@
-alias: 'Marshall Location Update'
+alias: "Marshall Location Update"
 id: automation_marshall_location_update
 mode: restart
 
@@ -10,11 +10,10 @@ trigger:
       - input_boolean.marshall_home
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
   - condition: state
     entity_id: script.marshall_travel_sensor
-    state: 'off'
+    state: "off"
 action:
-
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.marshall_travel_sensor

automations/people/Marshall/marshall_status_at_startup.yaml

@@ -8,39 +8,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.marshall_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '22:00:00'
-        before: '23:00:00'
+            after: "22:00:00"
+            before: "23:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.marshall_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.marshall_is_awake
       - conditions:
           - condition: time
-        after: '23:00:00'
-        before: '06:00:00'
+            after: "23:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.marshall_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.marshall_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.marshall_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.marshall_is_awake

automations/people/Tess/tess_away.yaml

@@ -1,4 +1,4 @@
-alias: 'Tess Away'
+alias: "Tess Away"
 id: automation_tess_away
 mode: restart
 
@@ -6,15 +6,15 @@ trigger:
   - platform: state
     entity_id:
       - person.kristy
-    to: 'not_home'
+    to: "not_home"
   - platform: state
     entity_id:
       - person.tess
-    to: 'not_home'
+    to: "not_home"
 condition:
   - condition: state
     entity_id: input_boolean.tess_home
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.tess_home

automations/people/Tess/tess_home.yaml

@@ -1,4 +1,4 @@
-alias: 'Tess Home'
+alias: "Tess Home"
 id: automation_tess_home
 mode: restart
 
@@ -7,18 +7,18 @@ trigger:
     event_type: automation_reloaded
 
 condition:
-  - alias: 'They were previously considered away'
+  - alias: "They were previously considered away"
     condition: state
     entity_id: input_boolean.tess_home
-    state: 'off'
+    state: "off"
 
-  - alias: 'At least one tracker is home'
+  - alias: "At least one tracker is home"
     condition: numeric_state
     entity_id: group.person_tess
     above: 0
     value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_tess', 'entity_id'))|list)|groupby('state'))['home']|count }}"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.tess_travelling
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.tess_home

automations/people/Tess/tess_location_update.yaml

@@ -1,4 +1,4 @@
-alias: 'Tess Location Update'
+alias: "Tess Location Update"
 id: automation_tess_location_update
 mode: restart
 
@@ -10,11 +10,10 @@ trigger:
       - input_boolean.tess_home
 condition:
   - condition: template
-    value_template: '{{ trigger.from_state.state != trigger.to_state.state }}'
+    value_template: "{{ trigger.from_state.state != trigger.to_state.state }}"
   - condition: state
     entity_id: script.tess_travel_sensor
-    state: 'off'
+    state: "off"
 action:
-
-  - service: script.turn_on
+  - action: script.turn_on
     entity_id: script.tess_travel_sensor

automations/people/Tess/tess_status_at_startup.yaml

@@ -8,39 +8,39 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.tess_home
-    state: 'on'
+    state: "on"
 
 action:
   - choose:
       - conditions:
           - condition: time
-        after: '22:00:00'
-        before: '23:00:00'
+            after: "22:00:00"
+            before: "23:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.tess_in_bed
 
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.tess_is_awake
       - conditions:
           - condition: time
-        after: '23:00:00'
-        before: '06:00:00'
+            after: "23:00:00"
+            before: "06:00:00"
         sequence:
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id:
               - input_boolean.tess_in_bed
 
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id:
               - input_boolean.tess_is_awake
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         entity_id:
           - input_boolean.tess_in_bed
 
-      - service: input_boolean.turn_on
+      - action: input_boolean.turn_on
         entity_id:
           - input_boolean.tess_is_awake

automations/people/adults_asleep.yaml

@@ -10,7 +10,7 @@ trigger:
       - input_boolean.clint_is_awake
       - input_boolean.kristy_is_awake
       - input_boolean.guest_is_awake
-    to: 'off'
+    to: "off"
 
 action:
   - choose:
@@ -21,34 +21,34 @@ action:
                 conditions:
                   - condition: state
                     entity_id: input_boolean.clint_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.clint_home
-                state: 'on'
+                    state: "on"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.kristy_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.kristy_home
-                state: 'on'
+                    state: "on"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.guest_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.guest_home
-                state: 'on'
+                    state: "on"
         sequence:
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             data:
               entity_id:
                 - input_boolean.asleep
                 - input_boolean.teens_asleep
                 - input_boolean.kids_asleep
-          - service: input_select.select_option
+          - action: input_select.select_option
             target:
               entity_id: input_select.master_bedroom_mode
             data:
@@ -57,13 +57,13 @@ action:
               - conditions:
                   - condition: state
                     entity_id: binary_sensor.patio_door_contact
-                state: 'off'
+                    state: "off"
                 sequence:
-                - service: lock.lock
+                  - action: lock.lock
                     target:
                       entity_id: lock.patio_door
 
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         data:
           entity_id: input_boolean.asleep

automations/people/adults_awake.yaml

@@ -20,17 +20,17 @@ trigger:
   - platform: state
     id: late_morning
     entity_id: binary_sensor.late_morning
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 
   - platform: homeassistant
     event: start
 
 condition:
   - condition: time
-    after: '04:30:00'
+    after: "04:30:00"
   - condition: time
-    before: '10:00:00'
+    before: "10:00:00"
   - condition: or
     conditions:
       - condition: trigger
@@ -39,57 +39,56 @@ condition:
         id: wake_clint
       - condition: state
         entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either
-        state: 'off'
-        for: '00:10:00'
+        state: "off"
+        for: "00:10:00"
       - condition: and
         conditions:
           - condition: or
             conditions:
               - condition: state
                 entity_id: input_boolean.kristy_home
-            state: 'off'
+                state: "off"
               - condition: and
                 conditions:
                   - condition: or
                     conditions:
                       - condition: state
                         entity_id: input_boolean.kristy_is_awake
-                state: 'on'
+                        state: "on"
                       - condition: state
                         entity_id: input_boolean.kristy_in_bed
-                state: 'off'
+                        state: "off"
                   - condition: state
                     entity_id: input_boolean.kristy_home
-              state: 'on'
+                    state: "on"
           - condition: or
             conditions:
               - condition: state
                 entity_id: input_boolean.clint_home
-            state: 'off'
+                state: "off"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.clint_home
-              state: 'on'
+                    state: "on"
                   - condition: or
                     conditions:
                       - condition: state
                         entity_id: input_boolean.clint_is_awake
-                state: 'on'
+                        state: "on"
                       - condition: state
                         entity_id: input_boolean.clint_in_bed
-                state: 'off'
+                        state: "off"
 
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id:
       - input_boolean.bedtime
       - input_boolean.asleep
       - input_boolean.master_bedroom_asleep
 
-  - service: input_select.select_option
+  - action: input_select.select_option
     target:
       entity_id: input_select.master_bedroom_mode
     data:
       option: Auto
-

automations/people/adults_away.yaml

@@ -8,20 +8,20 @@ trigger:
       - input_boolean.clint_home
       - input_boolean.kristy_home
       - input_boolean.guest_home
-    to: 'off'
+    to: "off"
 condition:
   # All away
   - condition: and
     conditions:
       - condition: state
         entity_id: input_boolean.clint_home
-        state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.kristy_home
-        state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.guest_home
-        state: 'off'
+        state: "off"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.adults_away

automations/people/adults_away_something_open.yaml

@@ -10,13 +10,13 @@ trigger:
 condition:
   - condition: state
     entity_id: binary_sensor.something_open
-    state: 'on'
+    state: "on"
   - condition: state
     entity_id: input_boolean.home_occupied
     state: "off"
 action:
   # Notify the last person to leave
-  - service: notify.mobile_app_pixel_7
+  - action: notify.mobile_app_pixel_7
     data:
       message: >-
         {% if as_timestamp(states.input_boolean.kristy_home.last_updated) > as_timestamp(states.input_boolean.clint_home.last_updated) %}

automations/people/adults_returned.yaml

@@ -1,4 +1,4 @@
-alias: 'Adults returned'
+alias: "Adults returned"
 id: automation_adults_returned
 mode: restart
 
@@ -8,11 +8,11 @@ trigger:
       - input_boolean.clint_home
       - input_boolean.kristy_home
       - input_boolean.guest_home
-    to: 'on'
+    to: "on"
 condition:
   - condition: state
     entity_id: input_boolean.adults_away
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.adults_away

automations/people/all_away.yaml

@@ -1,4 +1,4 @@
-alias: 'All away'
+alias: "All away"
 id: automation_all_away
 mode: restart
 
@@ -17,41 +17,41 @@ trigger:
       - input_boolean.computer_area_occupied
       - input_boolean.kitchen_occupied
       - input_boolean.great_room_occupied
-    to: 'off'
+    to: "off"
 condition:
   # Adults are away
   - condition: and
     conditions:
       - condition: state
         entity_id: input_boolean.clint_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.kristy_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.guest_home
-      state: 'off'
+        state: "off"
         # Kids are away
       - condition: state
         entity_id: input_boolean.emmett_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.bridget_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.marshall_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.tess_home
-      state: 'off'
+        state: "off"
       - condition: state
         entity_id: input_boolean.ebin_home
-      state: 'off'
+        state: "off"
       # And not in guest mode
       - condition: state
         entity_id: input_boolean.guest_mode
-      state: 'off'
+        state: "off"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.all_away
-  - delay: '00:00:30'
+  - delay: "00:00:30"

automations/people/all_returned.yaml

@@ -1,4 +1,4 @@
-alias: 'All returned'
+alias: "All returned"
 id: automation_all_returned
 mode: restart
 
@@ -7,7 +7,7 @@ trigger:
     entity_id:
       - input_boolean.clint_home
       - input_boolean.kristy_home
-    to: 'on'
+    to: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.all_away

automations/people/almost_bedtime.yaml

@@ -22,7 +22,7 @@ condition:
         entity_id: input_boolean.ebin_home
         state: "on"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     target:
       entity_id: input_boolean.kids_bedtime
 
@@ -31,7 +31,7 @@ action:
           - condition: template
             value_template: "{{states('media_player.announcements') == 'unknown' or states('media_player.announcements') == 'unavailable' }}"
         sequence:
-          - service: script.make_clever_announcement
+          - action: script.make_clever_announcement
             data:
               entity_id:
                 - media_player.bathroom_mini
@@ -40,7 +40,7 @@ action:
               media_content_id: media-source://media_source/tts/almost_bedtime.mp3
               volume: 0.7
     default:
-      - service: script.make_clever_announcement
+      - action: script.make_clever_announcement
         data:
           entity_id: media_player.announcements
           media_content_id: media-source://media_source/tts/almost_bedtime.mp3
@@ -54,7 +54,7 @@ action:
           - condition: template
             value_template: "{{states('switch.nursery_bed_lights') == 'off' }}"
         sequence:
-          - service: input_select.select_option
+          - action: input_select.select_option
             target:
               entity_id: input_select.nursery_wled
             data:

automations/people/almost_bedtime_tts.yaml

@@ -1,4 +1,4 @@
-alias: 'Almost Bedtime TTS'
+alias: "Almost Bedtime TTS"
 id: automation_almost_bedtime_tts
 initial_state: off
 trigger:
@@ -9,18 +9,18 @@ trigger:
 condition:
   - condition: state
     entity_id: input_boolean.announce_bedtime
-    state: 'on'
+    state: "on"
   - condition: or
     conditions:
       - condition: state
         entity_id: input_boolean.emmett_home
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: input_boolean.bridget_home
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: input_boolean.ebin_home
-      state: 'on'
+        state: "on"
 action:
   - action: media_player.volume_set
     data_template:
@@ -29,20 +29,20 @@ action:
         - media_player.bathroom_mini
         - media_player.front_room_hub
         - media_player.kitchen
-        - media_player.nursery_hub
+        - media_player.girls_room_hub
         - media_player.master_bedroom_clock
       volume_level: 0.7
-  - delay: '00:00:03'
+  - delay: "00:00:03"
   - action: tts.speak
     target:
       entity_id: tts.google_translate_en_com
     data:
       media_player_entity_id: media_player.all_speakers
       message: Alright kids. Its almost bedtime. You've got 5 minutes.
-  - delay: '00:00:10'
-  - service: media_player.turn_off
+  - delay: "00:00:10"
+  - action: media_player.turn_off
     entity_id: media_player.all_speakers
-  - service: input_select.select_option
+  - action: input_select.select_option
     entity_id: input_select.automatic_light_profile
     data:
       option: Dimmed

automations/people/bedtime.yaml

@@ -1,5 +1,5 @@
-initial_state: 'on'
-alias: 'Bedtime'
+initial_state: "on"
+alias: "Bedtime"
 id: automation_bedtime
 trigger:
   # - platform: homeassistant
@@ -9,7 +9,7 @@ trigger:
     entity_id:
       - input_boolean.kristy_in_bed
       - input_boolean.clint_in_bed
-    to: 'on'
+    to: "on"
 condition:
   - condition: and
     conditions:
@@ -17,35 +17,35 @@ condition:
         conditions:
           - condition: state
             entity_id: input_boolean.kristy_home
-        state: 'off'
+            state: "off"
           - condition: and
             conditions:
               - condition: state
                 entity_id: input_boolean.kristy_in_bed
-          state: 'on'
+                state: "on"
               - condition: state
                 entity_id: input_boolean.kristy_home
-          state: 'on'
+                state: "on"
       - condition: or
         conditions:
           - condition: state
             entity_id: input_boolean.clint_home
-        state: 'off'
+            state: "off"
           - condition: and
             conditions:
               - condition: state
                 entity_id: input_boolean.clint_in_bed
-          state: 'on'
+                state: "on"
               - condition: state
                 entity_id: input_boolean.clint_home
-          state: 'on'
+                state: "on"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id:
       - input_boolean.bedtime
       - input_boolean.teens_bedtime
       - input_boolean.kids_bedtime
-  - service: input_select.select_option
+  - action: input_select.select_option
     target:
       entity_id: input_select.automatic_light_profile
     data:

automations/people/bedtime_something_open.yaml

@@ -1,30 +1,30 @@
-alias: 'Bedtime something open'
+alias: "Bedtime something open"
 id: automation_bedtime_something_open
 mode: restart
 
 trigger:
   - platform: state
     entity_id: input_boolean.clint_is_awake
-    to: 'off'
+    to: "off"
 condition:
   condition: and
   conditions:
     # We're both in bed
     - condition: state
       entity_id: input_boolean.clint_is_awake
-      state: 'off'
+      state: "off"
     - condition: state
       entity_id: binary_sensor.something_open
-      state: 'on'
+      state: "on"
     - condition: state
       entity_id: binary_sensor.impending_rain
-      state: 'on'
+      state: "on"
 
 action:
-  - service: media_player.turn_on
+  - action: media_player.turn_on
     data_template:
       entity_id: media_player.master_bedroom_clock
-  - service: media_player.volume_set
+  - action: media_player.volume_set
     data_template:
       volume_level: 0.30
       entity_id: media_player.master_bedroom_clock
@@ -36,7 +36,7 @@ action:
       message: >-
         The following are open:
         {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}
-  - delay: '00:01:00'
-  - service: media_player.turn_off
+  - delay: "00:01:00"
+  - action: media_player.turn_off
     data:
       entity_id: media_player.master_bedroom_clock

automations/people/continue_nursery_noise.yaml

@@ -2,52 +2,52 @@ alias: Continue Nursery Noise
 id: automation_continue_nursery_noise
 trigger:
   - platform: state
-    entity_id: media_player.nursery_hub
+    entity_id: media_player.girls_room_hub
     from: "playing"
 condition:
   - condition: state
     entity_id: input_boolean.nursery_asleep
-    state:  'on'
+    state: "on"
   - condition: or
     conditions:
       - condition: and
         conditions:
           - condition: state
             entity_id: input_boolean.emmett_in_bed
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.emmett_home
-          state: 'on'
+            state: "on"
       - condition: and
         conditions:
           - condition: state
             entity_id: input_boolean.bridget_in_bed
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.bridget_home
-          state: 'on'
+            state: "on"
       - condition: and
         conditions:
           - condition: state
             entity_id: input_boolean.ebin_in_bed
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.ebin_home
-          state: 'on'
+            state: "on"
       - condition: state
         entity_id: input_select.nursery_mode
-        state: 'Night on'
+        state: "Night on"
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       entity_id: input_select.google_home
-      option: 'Nursery'
-  - service: input_select.select_option
+      option: "Nursery"
+  - action: input_select.select_option
     data:
       entity_id: input_select.ambient_sound
-      option: 'Random White Noise'
-  - service: input_number.set_value
+      option: "Random White Noise"
+  - action: input_number.set_value
     data:
       entity_id: input_number.volume_ambientsounds
-      value: '0.35'
-  - service: script.ambientsounds
+      value: "0.35"
+  - action: script.ambientsounds

automations/people/goodnight_kids.yaml

@@ -22,7 +22,7 @@ condition:
         entity_id: input_boolean.ebin_home
         state: "on"
 action:
-  - service: homeassistant.turn_on
+  - action: homeassistant.turn_on
     entity_id: input_boolean.kids_bedtime
 
   - choose:
@@ -30,7 +30,7 @@ action:
           - condition: template
             value_template: "{{states('media_player.announcements') == 'unknown' or states('media_player.announcements') == 'unavailable' }}"
         sequence:
-          - service: script.make_clever_announcement
+          - action: script.make_clever_announcement
             data:
               entity_id:
                 - media_player.bathroom_mini
@@ -60,7 +60,7 @@ action:
                 {% endif %}
               volume: 0.7
     default:
-      - service: script.make_clever_announcement
+      - action: script.make_clever_announcement
         data:
           entity_id: media_player.announcements
           media_content_id: >-
@@ -93,29 +93,29 @@ action:
   - choose:
       - conditions: "{{is_state_attr('media_player.front_room_tv','source','YouTube')}}"
         sequence:
-          - service: homeassistant.turn_off
+          - action: homeassistant.turn_off
             entity_id: media_player.front_room_tv
 
   - choose:
       - conditions: "{{is_state_attr('media_player.downstairs_roku','source','YouTube')}}"
         sequence:
-          - service: media_player.select_source
+          - action: media_player.select_source
             data:
               source: Home
             target:
               entity_id: media_player.downstairs_roku
 
-          # - service: homeassistant.turn_off
+          # - action: homeassistant.turn_off
           #   entity_id: switch.shelly_projector
 
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       entity_id: input_select.automatic_light_profile
       option: Dimmed
 
   - delay: "00:00:01"
 
-  # - service: media_player.play_media
+  # - action: media_player.play_media
   #   target:
   #     entity_id: media_player.front_room_hub
   #   data:
@@ -136,13 +136,13 @@ action:
   - choose:
       - conditions: "{{is_state('input_boolean.ebin_home','on')}}"
         sequence:
-          - service: input_select.select_option
+          - action: input_select.select_option
             target:
               entity_id: input_select.nursery_wled
             data:
               option: "Off"
 
-          - service: input_select.select_option
+          - action: input_select.select_option
             target:
               entity_id: input_select.nursery_mode
             data:
@@ -153,25 +153,25 @@ action:
   - choose:
       - conditions: "{{is_state('input_boolean.bridget_home','on')}}"
         sequence:
-          - service: input_button.press
+          - action: input_button.press
             data: {}
             target:
               entity_id: input_button.nursery_bedtime
 
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       option: Running Rainbow
     target:
       entity_id: input_select.nursery_wled
 
-  # - service: automation.trigger
+  # - action: automation.trigger
   #   target:
   #     entity_id: automation.nursery_wled_changed
 
   # - choose:
   #     - conditions: "{{is_state('input_boolean.bridget_home','on')}}"
   #       sequence:
-  #         - service: input_boolean.turn_on
+  #         - action: input_boolean.turn_on
   #           data: {}
   #           target:
   #             entity_id: input_boolean.nursery_asleep
@@ -181,7 +181,7 @@ action:
   # - choose:
   #     - conditions: "{{is_state('media_player.ytube_music_player','on')}}"
   #       sequence:
-  #         - service: media_player.turn_off
+  #         - action: media_player.turn_off
   #           target:
   #             entity_id: media_player.ytube_music_player
 
@@ -190,13 +190,13 @@ action:
   - choose:
       - conditions: "{{is_state('input_boolean.emmett_home','on')}}"
         sequence:
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             data: {}
             target:
-              entity_id: input_boolean.blue_room_asleep
+              entity_id: input_boolean.boys_room_asleep
 
-          - service: input_select.select_option
+          - action: input_select.select_option
             target:
-              entity_id: input_select.blue_room_mode
+              entity_id: input_select.boys_room_mode
             data:
               option: "Nightlight"

automations/people/kids_asleep.yaml

@@ -10,11 +10,11 @@ trigger:
       - input_boolean.emmett_is_awake
       - input_boolean.bridget_is_awake
       - input_boolean.ebin_is_awake
-    to: 'off'
+    to: "off"
 
   - platform: state
     entity_id: input_boolean.kids_away
-    to: 'on'
+    to: "on"
 
 action:
   - choose:
@@ -25,33 +25,32 @@ action:
                 conditions:
                   - condition: state
                     entity_id: input_boolean.emmett_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.emmett_home
-                state: 'on'
+                    state: "on"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.bridget_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.bridget_home
-                state: 'on'
+                    state: "on"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.ebin_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.ebin_home
-                state: 'on'
+                    state: "on"
         sequence:
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             data:
               entity_id: input_boolean.kids_asleep
 
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         data:
           entity_id: input_boolean.kids_asleep
-

automations/people/kids_awake.yaml

@@ -15,8 +15,8 @@ trigger:
 
   - platform: state
     entity_id:
-      - binary_sensor.black_bed_occupied
-      - binary_sensor.white_bed_occupied
+      - binary_sensor.emmetts_bed
+      - binary_sensor.bridgets_bed
     to: "off"
     for: "00:05:00"
 
@@ -46,10 +46,10 @@ condition:
               - condition: or
                 conditions:
                   - condition: state
-                    entity_id: binary_sensor.black_bed_occupied
+                    entity_id: binary_sensor.emmetts_bed
                     state: "off"
                   - condition: state
-                    entity_id: binary_sensor.black_bed_occupied
+                    entity_id: binary_sensor.emmetts_bed
                     state: "unavailable"
       - condition: or
         conditions:
@@ -67,10 +67,10 @@ condition:
               - condition: or
                 conditions:
                   - condition: state
-                    entity_id: binary_sensor.white_bed_occupied
+                    entity_id: binary_sensor.bridgets_bed
                     state: "off"
                   - condition: state
-                    entity_id: binary_sensor.white_bed_occupied
+                    entity_id: binary_sensor.bridgets_bed
                     state: "unavailable"
       - condition: or
         conditions:
@@ -88,21 +88,21 @@ condition:
               - condition: or
                 conditions:
                   - condition: state
-                    entity_id: binary_sensor.black_bed_occupied
+                    entity_id: binary_sensor.emmetts_bed
                     state: "off"
                   - condition: state
-                    entity_id: binary_sensor.black_bed_occupied
+                    entity_id: binary_sensor.emmetts_bed
                     state: "unavailable"
               - condition: or
                 conditions:
                   - condition: state
-                    entity_id: binary_sensor.white_bed_occupied
+                    entity_id: binary_sensor.bridgets_bed
                     state: "off"
                   - condition: state
-                    entity_id: binary_sensor.white_bed_occupied
+                    entity_id: binary_sensor.bridgets_bed
                     state: "unavailable"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id:
       - input_boolean.kids_bedtime
       - input_boolean.kids_asleep
@@ -118,15 +118,15 @@ action:
           - condition: or
             conditions:
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
+                entity_id: binary_sensor.emmetts_bed
                 state: "off"
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
+                entity_id: binary_sensor.emmetts_bed
                 state: "unavailable"
         sequence:
-          - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.emmett_in_bed
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.emmett_is_awake
 
   - choose:
@@ -140,15 +140,15 @@ action:
           - condition: or
             conditions:
               - condition: state
-                entity_id: binary_sensor.white_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "off"
               - condition: state
-                entity_id: binary_sensor.white_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "unavailable"
         sequence:
-          - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.bridget_in_bed
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.bridget_is_awake
 
   - choose:
@@ -162,42 +162,34 @@ action:
           - condition: or
             conditions:
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
+                entity_id: binary_sensor.emmetts_bed
                 state: "off"
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
+                entity_id: binary_sensor.emmetts_bed
                 state: "unavailable"
           - condition: or
             conditions:
               - condition: state
-                entity_id: binary_sensor.white_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "off"
               - condition: state
-                entity_id: binary_sensor.white_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "unavailable"
         sequence:
-          - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.ebin_in_bed
-          - service: input_boolean.turn_on
-            entity_id: input_boolean.bridget_is_awake
+          - action: input_boolean.turn_on
+            entity_id: input_boolean.ebin_is_awake
 
   - choose:
       - conditions:
           - condition: or
             conditions:
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "off"
               - condition: state
-                entity_id: binary_sensor.black_bed_occupied
-                state: "unavailable"
-          - condition: or
-            conditions:
-              - condition: state
-                entity_id: binary_sensor.white_bed_occupied
-                state: "off"
-              - condition: state
-                entity_id: binary_sensor.white_bed_occupied
+                entity_id: binary_sensor.bridgets_bed
                 state: "unavailable"
           - condition: not
             conditions:
@@ -208,7 +200,31 @@ action:
                 entity_id: input_select.house
                 state: "Away"
         sequence:
-          - service: input_select.select_option
+          - action: input_select.select_option
             data:
               entity_id: input_select.nursery_mode
               option: Auto
+
+  - choose:
+      - conditions:
+          - condition: or
+            conditions:
+              - condition: state
+                entity_id: binary_sensor.emmetts_bed
+                state: "off"
+              - condition: state
+                entity_id: binary_sensor.emmetts_bed
+                state: "unavailable"
+          - condition: not
+            conditions:
+              - condition: state
+                entity_id: input_select.boys_room_mode
+                state: "Manual"
+              - condition: state
+                entity_id: input_select.house
+                state: "Away"
+        sequence:
+          - action: input_select.select_option
+            data:
+              entity_id: input_select.boys_room_mode
+              option: Auto

automations/people/kids_away.yaml

@@ -8,10 +8,10 @@ trigger:
       - input_boolean.emmett_home
       - input_boolean.bridget_home
       - input_boolean.ebin_home
-    to: 'off'
+    to: "off"
   - platform: state
     entity_id: binary_sensor.kids_at_home
-    to: 'off'
+    to: "off"
 condition:
   - condition: state
     entity_id:
@@ -19,8 +19,8 @@ condition:
       - input_boolean.bridget_home
       - input_boolean.ebin_home
       - binary_sensor.kids_at_home
-    state: 'off'
+    state: "off"
 
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.kids_away

automations/people/kids_away_videos_on.yaml

@@ -4,90 +4,90 @@ id: automation_kids_away_videos_on
 trigger:
   - platform: state
     entity_id: input_boolean.kids_away
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 
 condition:
   - condition: or
     conditions:
       - condition: state
         entity_id: media_player.front_room_tv
-      state: 'on'
+        state: "on"
       - condition: state
         entity_id: media_player.front_room_tv
-      state: 'playing'
+        state: "playing"
   - condition: or
     conditions:
       - condition: state
         entity_id: media_player.front_room_tv
         attribute: source
-      state: 'PBS Kids'
+        state: "PBS Kids"
       - condition: state
         entity_id: media_player.front_room_tv
         attribute: source
-      state: 'YouTube'
+        state: "YouTube"
       - condition: state
         entity_id: media_player.front_room_hub
         attribute: source
-      state: 'PBS Kids'
+        state: "PBS Kids"
       - condition: state
         entity_id: media_player.front_room_hub
         attribute: source
-      state: 'YouTube'
+        state: "YouTube"
       - condition: state
         entity_id: media_player.master_bedroom_clock
         attribute: source
-      state: 'PBS Kids'
+        state: "PBS Kids"
       - condition: state
         entity_id: media_player.master_bedroom_clock
         attribute: source
-      state: 'YouTube'
+        state: "YouTube"
 
 action:
   - choose:
       - conditions:
           - condition: state
             entity_id: media_player.front_room_tv
-      state: 'playing'
+            state: "playing"
           - condition: or
             conditions:
               - condition: state
                 entity_id: media_player.front_room_tv
                 attribute: source
-        state: 'YouTube'
+                state: "YouTube"
               - condition: state
                 entity_id: media_player.front_room_tv
                 attribute: source
-        state: 'PBS Kids'
+                state: "PBS Kids"
         sequence:
-    - service: media_player.select_source
+          - action: media_player.select_source
             data:
               entity_id: media_player.front_room_tv
               source: Home
-    - service: media_player.turn_off
+          - action: media_player.turn_off
             data:
               entity_id: media_player.front_room_tv
   - choose:
       - conditions:
           - condition: state
             entity_id: media_player.front_room_hub
-      state: 'playing'
+            state: "playing"
           - condition: or
             conditions:
               - condition: state
                 entity_id: media_player.front_room_hub
                 attribute: source
-        state: 'YouTube'
+                state: "YouTube"
               - condition: state
                 entity_id: media_player.front_room_hub
                 attribute: source
-        state: 'PBS Kids'
+                state: "PBS Kids"
         sequence:
-    - service: media_player.select_source
+          - action: media_player.select_source
             data:
               entity_id: media_player.front_room_hub
               source: Home
-    - service: media_player.turn_off
+          - action: media_player.turn_off
             data:
               entity_id: media_player.front_room_hub
 
@@ -95,22 +95,22 @@ action:
       - conditions:
           - condition: state
             entity_id: media_player.master_bedroom_clock
-      state: 'playing'
+            state: "playing"
           - condition: or
             conditions:
               - condition: state
                 entity_id: media_player.master_bedroom_clock
                 attribute: source
-        state: 'YouTube'
+                state: "YouTube"
               - condition: state
                 entity_id: media_player.master_bedroom_clock
                 attribute: source
-        state: 'PBS Kids'
+                state: "PBS Kids"
         sequence:
-    - service: media_player.select_source
+          - action: media_player.select_source
             data:
               entity_id: media_player.master_bedroom_clock
               source: Home
-    - service: media_player.turn_off
+          - action: media_player.turn_off
             data:
               entity_id: media_player.master_bedroom_clock

automations/people/kids_returned.yaml

@@ -8,11 +8,11 @@ trigger:
       - input_boolean.emmett_home
       - input_boolean.bridget_home
       - input_boolean.ebin_home
-    to: 'on'
+    to: "on"
 condition:
   - condition: state
     entity_id: input_boolean.kids_away
-    state: 'on'
+    state: "on"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.kids_away

automations/people/nearly_home.yaml

@@ -1,17 +1,17 @@
-alias: 'Nearly Home'
+alias: "Nearly Home"
 id: automation_nearly_home
-initial_state: 'on'
+initial_state: "on"
 trigger:
   - platform: state
     entity_id:
       - binary_sensor.garage_door
       - binary_sensor.front_door_contact
-    to: 'on'
+    to: "on"
 condition:
   - condition: state
     entity_id: input_boolean.home_occupied
-    state: 'off'
-    for: '00:10:00'
+    state: "off"
+    for: "00:10:00"
   - condition: numeric_state
     entity_id: sensor.deck_light_level
     below: 25
@@ -19,7 +19,7 @@ condition:
     entity_id: sensor.sun_elevation
     below: 15
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data:
       entity_id: input_select.entryway_mode
-      option: 'Auto'
+      option: "Auto"

automations/people/people_count_changed.yaml

@@ -13,15 +13,15 @@ action:
       - conditions:
           - condition: state
             entity_id: person.clint
-        state: 'home'
+            state: "home"
           - condition: numeric_state
             entity_id: sensor.people_count
             above: 0
             below: 2
         sequence:
-        - service: homeassistant.turn_on
+          - action: homeassistant.turn_on
             entity_id: input_boolean.clint_home_alone
 
     default:
-      - service: homeassistant.turn_off
+      - action: homeassistant.turn_off
         entity_id: input_boolean.clint_home_alone

automations/people/person_arrived.yaml

@@ -16,7 +16,7 @@ trigger:
     from: "off"
     to: "on"
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data_template:
       entity_id: >
         {% if trigger.entity_id == 'input_boolean.clint_home' %}
@@ -87,16 +87,15 @@ action:
           {% endif %}
         {% endif %}
 
-  - service: logbook.log
+  - action: logbook.log
     data_template:
       name: Person Arrived
       entity_id: automation.person_arrived
       message: >
         Person Arrived ran
 
-
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.all_away
 
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.home_occupied

automations/people/person_asleep.yaml

@@ -15,7 +15,7 @@ trigger:
       - input_boolean.tess_in_bed
       - input_boolean.ebin_in_bed
       - input_boolean.guest_in_bed
-    to: 'On'
+    to: "On"
     for:
       minutes: 5
   - platform: state
@@ -28,23 +28,23 @@ trigger:
       - input_boolean.tess_is_awake
       - input_boolean.ebin_is_awake
       - input_boolean.guest_is_awake
-    to: 'off'
+    to: "off"
 action:
   - choose:
       - conditions:
           - condition: state
             entity_id: input_boolean.clint_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.clint_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.clint_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.clint_is_awake
 
@@ -52,17 +52,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.emmett_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.emmett_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.emmett_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.emmett_is_awake
 
@@ -70,17 +70,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.bridget_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.bridget_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.bridget_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.bridget_is_awake
 
@@ -88,17 +88,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.kristy_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.kristy_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.kristy_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.kristy_is_awake
 
@@ -106,17 +106,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.marshall_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.marshall_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.marshall_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.marshall_is_awake
 
@@ -124,17 +124,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.tess_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.tess_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.tess_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.tess_is_awake
 
@@ -142,17 +142,17 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.ebin_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.ebin_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.ebin_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.ebin_is_awake
 
@@ -160,16 +160,16 @@ action:
       - conditions:
           - condition: state
             entity_id: input_boolean.guest_home
-          state: 'on'
+            state: "on"
           - condition: state
             entity_id: input_boolean.guest_in_bed
-          state: 'on'
+            state: "on"
             for:
               minutes: 5
           - condition: state
             entity_id: input_boolean.guest_is_awake
-          state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             data:
               entity_id: input_boolean.guest_is_awake

automations/people/person_away.yaml

@@ -13,11 +13,11 @@ trigger:
       - input_select.tess_status_dropdown
       - input_select.ebin_status_dropdown
       - input_select.guest_status_dropdown
-    to: 'Just Left'
+    to: "Just Left"
     for:
       minutes: 5
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data_template:
       entity_id: >
         {% if trigger.entity_id == 'input_select.clint_status_dropdown' %}
@@ -39,7 +39,7 @@ action:
         {% endif %}
       option: Away
 
-  - service: logbook.log
+  - action: logbook.log
     data_template:
       name: Person Away
       entity_id: automation.person_away

automations/people/person_extended_away.yaml

@@ -5,46 +5,46 @@ mode: queued
 trigger:
   - platform: state
     entity_id: input_select.clint_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.emmett_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.bridget_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.kristy_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.marshall_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.tess_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.ebin_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
   - platform: state
     entity_id: input_select.guest_status_dropdown
-    to: 'Away'
+    to: "Away"
     for:
       hours: 24
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data_template:
       entity_id: >
         {{ trigger.entity_id }}

automations/people/person_home.yaml

@@ -12,7 +12,7 @@ trigger:
       - input_select.marshall_status_dropdown
       - input_select.tess_status_dropdown
       - input_select.ebin_status_dropdown
-    to: 'Just Arrived'
+    to: "Just Arrived"
     for:
       minutes: 5
   - platform: state
@@ -25,10 +25,10 @@ trigger:
       - input_select.tess_status_dropdown
       - input_select.ebin_status_dropdown
       - input_select.guest_status_dropdown
-    from: 'Just Left'
-    to: 'Just Arrived'
+    from: "Just Left"
+    to: "Just Arrived"
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data_template:
       entity_id: >
         {{ trigger.entity_id }}

automations/people/person_left.yaml

@@ -16,7 +16,7 @@ trigger:
     from: "on"
     to: "off"
 action:
-  - service: input_select.select_option
+  - action: input_select.select_option
     data_template:
       entity_id: >
         {% if trigger.entity_id == 'input_boolean.clint_home' %}
@@ -38,10 +38,9 @@ action:
         {% endif %}
       option: Just Left
 
-  - service: logbook.log
+  - action: logbook.log
     data_template:
       name: Person Left
       entity_id: automation.person_left
       message: >
         Person Left ran
-

automations/people/returned_home.yaml

@@ -5,16 +5,16 @@ mode: queued
 trigger:
   - platform: state
     entity_id: binary_sensor.front_door_contact
-    to: 'on'
+    to: "on"
   - platform: state
     entity_id: binary_sensor.garage_door
-    to: 'on'
+    to: "on"
   # - platform: state
   #   entity_id: binary_sensor.outer_garage_door
   #   to: 'on'
   - platform: state
     entity_id: binary_sensor.outer_garage_door_contact
-    to: 'on'
+    to: "on"
   # People just got home
   - platform: state
     entity_id:
@@ -26,7 +26,7 @@ trigger:
       - input_select.tess_status_dropdown
       - input_select.ebin_status_dropdown
       - input_select.guest_status_dropdown
-    to: 'Just Arrived'
+    to: "Just Arrived"
   # Should also include some travel time magic here
   # Basically, travel time < 15 for 10 minutes, travelling towards home
 condition:
@@ -35,7 +35,7 @@ condition:
     # Lighting automations are enabled
     - condition: state
       entity_id: input_boolean.lighting_automations
-      state: 'on'
+      state: "on"
     # It's getting dark
     - condition: numeric_state
       entity_id: sensor.bar_light_level
@@ -46,16 +46,16 @@ condition:
         # Front door is open, somebody is nearly home or just arrived
         - condition: state
           entity_id: binary_sensor.front_door_contact
-        state: 'on'
+          state: "on"
         - condition: state
           entity_id: binary_sensor.garage_door
-        state: 'on'
+          state: "on"
         # - condition: state
         #   entity_id: binary_sensor.outer_garage_door
         #   state: 'on'
         - condition: state
           entity_id: binary_sensor.outer_garage_door_contact
-        state: 'on'
+          state: "on"
         # Or somebody has just arrived
         - condition: template
           value_template: "{{ is_state('input_select.clint_status_dropdown','Just Arrived') }}"
@@ -74,7 +74,7 @@ condition:
         - condition: template
           value_template: "{{ is_state('input_select.guest_status_dropdown','Just Arrived') }}"
 action:
-  - service: logbook.log
+  - action: logbook.log
     data_template:
       name: Returned Home
       entity_id: automation.returned_home

automations/people/something_open_too_warm_or_cold.yaml

@@ -1,14 +1,14 @@
-alias: 'Something open too warm or cold'
+alias: "Something open too warm or cold"
 id: automation_something_open_too_warm_or_cold
 mode: restart
 
 trigger:
   - platform: state
     entity_id: binary_sensor.something_open_too_warm_or_cold
-    to: 'on'
+    to: "on"
 
 action:
-  - service: notify.mobile_app_pixel_7
+  - action: notify.mobile_app_pixel_7
     data:
       message: >-
         Its too hot or cold to leave these open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_hvac_affecting_openings', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }}

automations/people/teens_asleep.yaml

@@ -10,7 +10,7 @@ trigger:
       - input_boolean.marshall_is_awake
       - input_boolean.tess_is_awake
       - input_boolean.asleep
-    to: 'off'
+    to: "off"
 
 action:
   - choose:
@@ -21,25 +21,24 @@ action:
                 conditions:
                   - condition: state
                     entity_id: input_boolean.marshall_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.marshall_home
-                state: 'on'
+                    state: "on"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.tess_is_awake
-                state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.tess_home
-                state: 'on'
+                    state: "on"
         sequence:
-          - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             data:
               entity_id: input_boolean.teens_asleep
 
     default:
-      - service: input_boolean.turn_off
+      - action: input_boolean.turn_off
         data:
           entity_id: input_boolean.teens_asleep
-

automations/people/teens_awake.yaml

@@ -9,7 +9,7 @@ trigger:
       - input_boolean.marshall_is_awake
       - input_boolean.tess_is_awake
       - binary_sensor.morning
-    to: 'on'
+    to: "on"
 
   - platform: homeassistant
     event: start
@@ -18,68 +18,67 @@ condition:
   - condition: or
     conditions:
       - condition: time
-      before: '19:00:00'
-      after: '06:00:00'
+        before: "19:00:00"
+        after: "06:00:00"
       - condition: and
         conditions:
           - condition: or
             conditions:
               - condition: state
                 entity_id: input_boolean.marshall_home
-          state: 'off'
+                state: "off"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.marshall_is_awake
-            state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.marshall_home
-            state: 'on'
+                    state: "on"
           - condition: or
             conditions:
               - condition: state
                 entity_id: input_boolean.tess_home
-          state: 'off'
+                state: "off"
               - condition: and
                 conditions:
                   - condition: state
                     entity_id: input_boolean.tess_is_awake
-            state: 'off'
+                    state: "off"
                   - condition: state
                     entity_id: input_boolean.tess_home
-            state: 'on'
+                    state: "on"
 
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id:
       - input_boolean.teens_bedtime
       - input_boolean.teens_asleep
 
-
   - choose:
       - conditions:
           - condition: state
             entity_id: input_boolean.marshall_is_awake
-        state: 'off'
+            state: "off"
           - condition: state
             entity_id: input_boolean.marshall_home
-        state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.marshall_in_bed
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.marshall_is_awake
 
   - choose:
       - conditions:
           - condition: state
             entity_id: input_boolean.tess_is_awake
-        state: 'off'
+            state: "off"
           - condition: state
             entity_id: input_boolean.tess_home
-        state: 'on'
+            state: "on"
         sequence:
-        - service: input_boolean.turn_off
+          - action: input_boolean.turn_off
             entity_id: input_boolean.tess_in_bed
-        - service: input_boolean.turn_on
+          - action: input_boolean.turn_on
             entity_id: input_boolean.tess_is_awake

automations/people/vacation.yaml

@@ -1,25 +1,25 @@
-alias: 'Vacation'
+alias: "Vacation"
 id: automation_vacation
-initial_state: 'on'
+initial_state: "on"
 trigger:
   - platform: state
     entity_id:
       - input_boolean.clint_travelling
       - input_boolean.emmett_travelling
       - input_boolean.bridget_travelling
-    to: 'on'
+    to: "on"
 condition:
   condition: and
   conditions:
     - condition: state
       entity_id: input_boolean.clint_travelling
-      state: 'on'
+      state: "on"
     - condition: state
       entity_id: input_boolean.emmett_travelling
-      state: 'on'
+      state: "on"
     - condition: state
       entity_id: input_boolean.bridget_travelling
-      state: 'on'
+      state: "on"
 action:
-  - service: input_boolean.turn_on
+  - action: input_boolean.turn_on
     entity_id: input_boolean.vacation_mode

automations/people/vacation_over.yaml

@@ -1,25 +1,25 @@
-alias: 'Vacation over'
+alias: "Vacation over"
 id: automation_vacation_over
-initial_state: 'on'
+initial_state: "on"
 trigger:
   - platform: state
     entity_id:
       - input_boolean.clint_travelling
       - input_boolean.emmett_travelling
       - input_boolean.bridget_travelling
-    to: 'off'
+    to: "off"
 condition:
   condition: and
   conditions:
     - condition: state
       entity_id: input_boolean.clint_travelling
-      state: 'off'
+      state: "off"
     - condition: state
       entity_id: input_boolean.emmett_travelling
-      state: 'off'
+      state: "off"
     - condition: state
       entity_id: input_boolean.bridget_travelling
-      state: 'off'
+      state: "off"
 action:
-  - service: input_boolean.turn_off
+  - action: input_boolean.turn_off
     entity_id: input_boolean.vacation_mode

automations/platform/home_assistant_update_available.yaml

@@ -4,8 +4,8 @@ id: automation_home_assistant_update_available
 trigger:
   - platform: state
     entity_id: binary_sensor.latest_version_update_available
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 
   - platform: homeassistant
     event: start
@@ -14,10 +14,10 @@ condition:
   - alias: "Update Available"
     condition: state
     entity_id: binary_sensor.latest_version_update_available
-    state: 'on'
+    state: "on"
 
 action:
-  - service: notify.mobile_app_pixel_7
+  - action: notify.mobile_app_pixel_7
     data:
       title: Update Available
       message: A Home Assistant update is available

automations/rooms/blue_room/blue_room_lights_to_off.yaml

@@ -1,67 +0,0 @@
-alias: Blue Room Lights to Off
-id: automation_blue_room_lights_to_off
-mode: restart
-
-trigger:
-  - platform: state
-    entity_id: input_select.blue_room_mode
-
-  - platform: state
-    entity_id: input_boolean.blue_room_occupied
-    to: 'off'
-
-  #- platform: time_pattern
-  #  minutes: "/5"
-
-condition:
-  - condition: state
-    entity_id: light.blue_room_hue
-    state: 'on'
-
-  - condition: state
-    entity_id: input_boolean.lights_off_manually
-    state: 'off'
-  - condition: or
-    conditions:
-      - condition: state
-        entity_id: input_select.blue_room_mode
-        state: 'Off'
-      - condition: state
-        entity_id: input_boolean.blue_room_occupied
-        state: 'off'
-
-action:
-  - choose:
-    - conditions:
-      - condition: state
-        entity_id: input_boolean.lighting_automations
-        state: 'on'
-      - condition: or
-        conditions:
-          - condition: state
-            entity_id: input_select.blue_room_mode
-            state: 'Off'
-          - condition: state
-            entity_id: input_boolean.blue_room_occupied
-            state: 'off'
-      - condition: not
-        conditions:
-        - condition: state
-          entity_id: input_select.blue_room_mode
-          state: 'Manual'
-      sequence:
-        - service: scene.turn_on
-          data:
-            transition:  5
-          target:
-            entity_id: scene.blue_room_hue_off
-        - choose:
-          - conditions:
-            - condition: state
-              entity_id: input_boolean.guest_mode
-              state: 'on'
-            sequence:
-              - alias: "Turn off z-wave switch since all lights are off"
-                service: homeassistant.turn_off
-                target:
-                  entity_id: switch.blue_room_motion_switch

automations/rooms/blue_room/blue_room_lights_to_on.yaml

@@ -1,168 +0,0 @@
-alias: Blue Room Lights to On
-id: automation_blue_room_lights_to_on
-mode: single
-# Hide warnings when triggered while in delay.
-max_exceeded: silent
-
-trigger:
-  - platform: state
-    id: mode_change
-    entity_id:
-      - input_select.blue_room_mode
-      - input_select.automatic_light_profile
-
-  - platform: state
-    id: occupied
-    entity_id:
-      - binary_sensor.blue_room_occupied
-      - input_boolean.blue_room_occupied
-    to: "on"
-
-  # - platform: state
-  #   id: motion
-  #   entity_id: group.blue_room_motion
-  #   to: "on"
-
-  - platform: state
-    id: light_level
-    entity_id: binary_sensor.blue_room_naturally_lit
-    from: 'on'
-    to: 'off'
-
-condition:
-  - alias: "Home is occupied"
-    condition: state
-    entity_id: input_boolean.home_occupied
-    state: "on"
-
-  - alias: "Check if light should turn on"
-    condition: or
-    conditions:
-
-      - alias: "Guest mode is on"
-        condition: state
-        entity_id: input_boolean.guest_mode
-        state: "on"
-
-      - alias: "Motion or occupancy were detected in a dim room"
-        condition: and
-        conditions:
-          - alias: "Light level below trigger amount"
-            condition: state
-            entity_id: binary_sensor.blue_room_naturally_lit
-            state: 'off'
-
-          - alias: "Motion or occupancy were detected"
-            condition: or
-            conditions:
-              - alias: "Motion was detected"
-                condition: trigger
-                id: "motion"
-              - alias: "Occupancy was detected"
-                condition: trigger
-                id: "occupied"
-
-      - alias: "A scene changed and the lights are already on"
-        condition: and
-        conditions:
-          - condition: trigger
-            id: "mode_change"
-          - condition: state
-            entity_id: input_boolean.blue_room_occupied
-            state: "on"
-
-      - alias: "The light level changed, the room is occupied, and the light is off"
-        condition: and
-        conditions:
-          - condition: trigger
-            id: light_level
-          - condition: state
-            entity_id: input_boolean.blue_room_occupied
-            state: 'on'
-          - condition: state
-            entity_id: light.blue_room_hue
-            state: 'off'
-
-variables:
-  switch_name: switch.blue_room_motion_switch
-  light_name: blue_room_hue
-  mode_name: input_select.blue_room_mode
-
-action:
-  - alias: "Make sure Z-Wave switch is turned on"
-    service: homeassistant.turn_on
-    target:
-      entity_id: "{{ switch_name }}"
-  - choose:
-    - alias: "If the room is set to manual, just turn the lights on"
-      conditions:
-      - alias: "Room set to manual"
-        condition: state
-        entity_id: input_select.blue_room_mode
-        state: Manual
-      sequence:
-        - service: light.turn_on
-          target:
-            entity_id: light.blue_room_hue
-
-    - alias: "If the room is set to auto, the lights are already on, and the room is dim, change to the Automatic Light Profile scene with a transition"
-      conditions:
-      - alias: "Room set to auto"
-        condition: state
-        entity_id: input_select.blue_room_mode
-        state: Auto
-      - alias: "Lights are on"
-        condition: state
-        entity_id: light.blue_room_hue
-        state: 'on'
-      - "{{ states('sensor.blue_room_multisensor_illuminance') | float(default=0) < states('input_number.blue_room_light_level_trigger') | float(default=0) }}"
-      sequence:
-        - service: scene.turn_on
-          data:
-            transition:  "{{ states('input_number.light_scene_transition') }}"
-          target:
-            entity_id: "scene.{{light_name}}_{{states('input_select.automatic_light_profile').lower().replace(' ','_')}}"
-
-    - alias: "If the room is set to auto and the lights are off, change to the Automatic Light Profile scene without a transition"
-      conditions:
-      - alias: "Room set to auto"
-        condition: state
-        entity_id: input_select.blue_room_mode
-        state: Auto
-      - alias: "Lights are off"
-        condition: state
-        entity_id: light.blue_room_hue
-        state: 'off'
-      - "{{ states('sensor.blue_room_multisensor_illuminance') | float(default=0) < states('input_number.blue_room_light_level_trigger') | float(default=0) }}"
-      sequence:
-        - service: scene.turn_on
-          target:
-            entity_id: "scene.{{light_name}}_{{states('input_select.automatic_light_profile').lower().replace(' ','_')}}"
-
-    - alias: "If the room is not set to auto and the lights are on, change to the Blue Room Mode scene with a transition"
-      conditions:
-      - alias: "Room not manual or auto and lights are on"
-        condition: state
-        entity_id: light.blue_room_hue
-        state: 'on'
-      - "{{ states('sensor.blue_room_multisensor_illuminance') | float(default=0) < states('input_number.blue_room_light_level_trigger') | float(default=0) }}"
-      sequence:
-        - service: scene.turn_on
-          data:
-            transition:  "{{ states('input_number.light_scene_transition') }}"
-          target:
-            entity_id: "scene.{{light_name}}_{{states(mode_name).lower().replace(' ','_')}}"
-
-    - alias: "If the room is not set to auto and the lights are on, change to the Blue Room Mode scene without a transition"
-      conditions:
-      - alias: "Room not manual or auto and lights are off"
-        condition: state
-        entity_id: light.blue_room_hue
-        state: 'off'
-      - "{{ states('sensor.blue_room_multisensor_illuminance') | float(default=0) < states('input_number.blue_room_light_level_trigger') | float(default=0) }}"
-      sequence:
-        - service: scene.turn_on
-          target:
-            entity_id: "scene.{{light_name}}_{{states(mode_name).lower().replace(' ','_')}}"
-
-  - delay: 1

automations/rooms/blue_room/blue_room_not_occupied.yaml

@@ -1,59 +0,0 @@
-alias: 'Blue Room Not Occupied'
-id: automation_blue_room_not_occupied
-mode: restart
-trigger:
-  - platform: state
-    entity_id: input_boolean.home_occupied
-    from: 'on'
-    to: 'off'
-
-  - platform: state
-    entity_id:
-      - input_boolean.home_occupied
-      - binary_sensor.blue_room_occupied
-    to: 'off'
-    for: '00:10:00'
-
-  # - platform: time_pattern
-  #   minutes: "/5"
-
-condition:
-  - condition: or
-    conditions:
-      - condition: state
-        entity_id: input_boolean.home_occupied
-        state: 'off'
-      - condition: and
-        conditions:
-          - condition: state
-            entity_id: input_boolean.blue_room_occupied
-            state: 'on'
-          - condition: state
-            entity_id: binary_sensor.blue_room_occupied
-            state: 'off'
-            for: '00:10:00'
-
-action:
-  - choose:
-    - conditions:
-      - condition: state
-        entity_id: input_boolean.home_occupied
-        state: 'off'
-      sequence:
-        - service: homeassistant.turn_off
-          entity_id: input_boolean.blue_room_occupied
-    - conditions:
-      - condition: or
-        conditions:
-        - condition: state
-          entity_id: input_select.house
-          state: 'Auto'
-        - condition: state
-          entity_id: input_select.house
-          state: 'Dad'
-        - condition: state
-          entity_id: input_select.house
-          state: 'Bachelor'
-      sequence:
-        - service: homeassistant.turn_off
-          entity_id: input_boolean.blue_room_occupied

automations/rooms/blue_room/blue_room_occupied.yaml

@@ -1,25 +0,0 @@
-alias: Blue Room Occupied
-id: automation_blue_room_occupied
-mode: restart
-
-trigger:
-  - platform: state
-    entity_id:
-      - binary_sensor.blue_room_occupied
-    to: 'on'
-
-condition:
-  - condition: state
-    entity_id: input_boolean.blue_room_occupied
-    state: 'off'
-
-action:
-  - service: input_boolean.turn_on
-    entity_id: input_boolean.blue_room_occupied
-
-  - service: logbook.log
-    data_template:
-      name: Blue Room Occupied
-      entity_id: automation.blue_room_occupied
-      message: >
-        {{ states("sensor.date_time_iso") }} Blue Room Occupied ran