Hopefully fixing master bed presence and cleaning up a lot of junk

automations/rooms/entryway/entryway_lights_to_on.yaml

@@ -4,30 +4,30 @@ mode: single
 # Hide warnings when triggered while in delay.
 max_exceeded: silent
 
-trigger:
-  - platform: state
+triggers:
+  - trigger: state
     id: "mode_change"
     entity_id:
       - input_select.entryway_mode
       - input_select.automatic_light_profile
 
-  - platform: state
+  - trigger: state
     id: light_level
     entity_id: binary_sensor.entryway_naturally_lit
     from: 'on'
     to: 'off'
 
-  - platform: state
+  - trigger: state
     id: occupied
     entity_id:
       - binary_sensor.entryway_occupied
       - input_boolean.entryway_occupied
     to: "on"
 
-  - platform: state
+  - trigger: state
     id: door
     entity_id:
-      - binary_sensor.inner_garage_door
+      # - binary_sensor.inner_garage_door
       - binary_sensor.inner_garage_door_contact
       - binary_sensor.front_door_contact
     to: "on"
@@ -87,9 +87,9 @@ variables:
   light_name: entryway_hue
   mode_name: input_select.entryway_mode
 
-action:
+actions:
   - alias: "Make sure Z-Wave switch is turned on"
-    service: homeassistant.turn_on
+    action: homeassistant.turn_on
     target:
       entity_id: "{{ switch_name }}"
   - choose:
@@ -100,7 +100,7 @@ action:
         entity_id: input_select.entryway_mode
         state: Manual
       sequence:
-        - service: light.turn_on
+        - action: light.turn_on
           target:
             entity_id: light.entryway_hue
 
@@ -115,7 +115,7 @@ action:
         entity_id: light.entryway_hue
         state: 'on'
       sequence:
-        - service: scene.turn_on
+        - action: scene.turn_on
           data:
             transition:  "{{ states('input_number.light_scene_transition') }}"
           target:
@@ -132,7 +132,7 @@ action:
         entity_id: light.entryway_hue
         state: 'off'
       sequence:
-        - service: scene.turn_on
+        - action: scene.turn_on
           target:
             entity_id: "scene.{{light_name}}_{{states('input_select.automatic_light_profile').lower().replace(' ','_')}}"
 
@@ -143,7 +143,7 @@ action:
         entity_id: light.entryway_hue
         state: 'on'
       sequence:
-        - service: scene.turn_on
+        - action: scene.turn_on
           data:
             transition:  "{{ states('input_number.light_scene_transition') }}"
           target:
@@ -156,7 +156,7 @@ action:
         entity_id: light.entryway_hue
         state: 'off'
       sequence:
-        - service: scene.turn_on
+        - action: scene.turn_on
           target:
             entity_id: "scene.{{light_name}}_{{states(mode_name).lower().replace(' ','_')}}"