diff --git a/source/_components/ifttt.manything.markdown b/source/_components/ifttt.manything.markdown
index eadb8d9d29b..0a872785773 100644
--- a/source/_components/ifttt.manything.markdown
+++ b/source/_components/ifttt.manything.markdown
@@ -20,46 +20,42 @@ After setting up IFTTT, Maker Channel and ManyThing Channel, you can use the fol
 ```yaml
 # Example configuration.yaml entry
 automation:
-- alias: 'ManyThing Recording ON'
-  # This calls an IFTTT recipe to turn on recording of the ManyThing Camera
-  # if we leave the house during the day.
-  trigger:
-   - platform: state
-     entity_id: group.all_devices
-     state: 'not_home'
+  - alias: 'ManyThing Recording ON'
+    # This calls an IFTTT recipe to turn on recording of the ManyThing Camera
+    # if we leave the house during the day.
+    trigger:
+      - platform: state
+        entity_id: group.all_devices
+       state: 'not_home'
+    condition:
+      - platform: state
+        entity_id: sun.sun
+       state: 'above_horizon'
+    action:
+      service: ifttt.trigger
+      data: {"event":"manything_on"}
 
-  condition:
-   - platform: state
-     entity_id: sun.sun
-     state: 'above_horizon'
-
-  action:
-     service: ifttt.trigger
-     data: {"event":"manything_on"}
-
-- alias: 'ManyThing Recording OFF'
-  # This calls an IFTTT recipe to turn off recording of the ManyThing Camera
-  # when we are home unless it's nighttime.
-  trigger:
-   - platform: state
-     entity_id: group.all_devices
-     state: 'home'
-   - platform: state
-     entity_id: sun.sun
-     state: 'above_horizon'
-
-  condition: use_trigger_values
-
-  action:
-     service: ifttt.trigger
-     data: {"event":"manything_off"}
+  - alias: 'ManyThing Recording OFF'
+    # This calls an IFTTT recipe to turn off recording of the ManyThing Camera
+    # when we are home unless it's nighttime.
+    trigger:
+      - platform: state
+        entity_id: group.all_devices
+        state: 'home'
+    condition:
+      - condition: state
+        entity_id: sun.sun
+        state: 'above_horizon'
+    action:
+      service: ifttt.trigger
+      data: {"event":"manything_off"}
 ```
 
 ### {% linkable_title Setting up a recipe %}
 
 <p class='img'>
 <img src='/images/components/ifttt/IFTTT_manything_trigger.png' />
-You need to setup a unique trigger for each event you sent to IFTTT.
+You need to setup a unique trigger for each event you sent to IFTTT. 
 For ManyThing support, you need to set up an `on` and `off` event.
 </p>
 
@@ -73,4 +69,3 @@ domain | `ifttt`
 service | `trigger`
 Service Data | `{"event": "manything_on"}`
 
-
diff --git a/source/_cookbook/automation_for_rainy_days.markdown b/source/_cookbook/automation_for_rainy_days.markdown
index f141a71a714..d33a8cbef24 100644
--- a/source/_cookbook/automation_for_rainy_days.markdown
+++ b/source/_cookbook/automation_for_rainy_days.markdown
@@ -16,42 +16,37 @@ Turn on a light in the living room when it starts raining, someone is home, and
 
 ```yaml
 automation:
-  alias: 'Rainy Day'
-
-  trigger:
-       - platform: state
-         entity_id: sensor.precip_intensity
-         state: 'rain'
-       - platform: state
-         entity_id: group.all_devices
-         state: 'home'
-       - platform: time
-         after: '14:00'
-         before: '23:00'
-
-  condition: use_trigger_values
-
-  action:
-    service: light.turn_on
-    entity_id: light.couch_lamp
+  - alias: 'Rainy Day'
+    trigger:
+      - platform: state
+        entity_id: sensor.precip_intensity
+        state: 'rain'
+    condition:
+      - platform: state
+        entity_id: group.all_devices
+        state: 'home'
+      - platform: time
+        after: '14:00'
+        before: '23:00'
+    action:
+      service: light.turn_on
+      entity_id: light.couch_lamp
 ```
 
 And then of course turn off the lamp when it stops raining but only if it's within an hour before sunset.
 
 ```yaml
-automation 2:
-  alias: 'Rain is over'
-  trigger:
-       - platform: state
-         entity_id: sensor.precip_intensity
-         state: 'None'
-       - platform: sun
-         event: 'sunset'
-         offset: '-01:00:00'
-
-  condition: use_trigger_values
-  action:
-    service: light.turn_off
-    entity_id: light.couch_lamp
+  - alias: 'Rain is over'
+    trigger:
+      - platform: state
+        entity_id: sensor.precip_intensity
+        state: 'None'
+    condition:
+      - condition: sun
+        after: 'sunset'
+        offset: '-01:00:00'
+    action:
+      service: light.turn_off
+      entity_id: light.couch_lamp
 ```
 
diff --git a/source/_docs/automation/examples.markdown b/source/_docs/automation/examples.markdown
index 941e7a97895..f31c35df84e 100644
--- a/source/_docs/automation/examples.markdown
+++ b/source/_docs/automation/examples.markdown
@@ -17,51 +17,51 @@ Just some sample automation rules to get you started.
 automation:
 # Turns on lights 1 hour before sunset if people are home
 # and if people get home between 16:00-23:00
-- alias: 'Rule 1 Light on in the evening'
-  trigger:
-    # Prefix the first line of each trigger configuration
-    # with a '-' to enter multiple
-    - platform: sun
-      event: sunset
-      offset: '-01:00:00'
-    - platform: state
-      entity_id: group.all_devices
-      state: 'home'
-  condition:
-    # Prefix the first line of each condition configuration
-    # with a '-'' to enter multiple
-    - condition: state
-      entity_id: group.all_devices
-      state: 'home'
-    - condition: time
-      after: '16:00:00'
-      before: '23:00:00'
-  action:
-    service: homeassistant.turn_on
-    entity_id: group.living_room
+  - alias: 'Rule 1 Light on in the evening'
+    trigger:
+      # Prefix the first line of each trigger configuration
+      # with a '-' to enter multiple
+      - platform: sun
+        event: sunset
+        offset: '-01:00:00'
+      - platform: state
+        entity_id: group.all_devices
+        state: 'home'
+    condition:
+      # Prefix the first line of each condition configuration
+      # with a '-'' to enter multiple
+      - condition: state
+        entity_id: group.all_devices
+        state: 'home'
+      - condition: time
+        after: '16:00:00'
+        before: '23:00:00'
+    action:
+      service: homeassistant.turn_on
+      entity_id: group.living_room
 
 # Turn off lights when everybody leaves the house
-- alias: 'Rule 2 - Away Mode'
-  trigger:
-    platform: state
-    entity_id: group.all_devices
-    state: 'not_home'
-  action:
-    service: light.turn_off
-    entity_id: group.all_lights
+  - alias: 'Rule 2 - Away Mode'
+    trigger:
+      platform: state
+      entity_id: group.all_devices
+      state: 'not_home'
+    action:
+      service: light.turn_off
+      entity_id: group.all_lights
 
 # Notify when Paulus leaves the house in the evening
-- alias: 'Leave Home notification'
-  trigger:
-    platform: zone
-    event: leave
-    zone: zone.home
-    entity_id: device_tracker.paulus
-  condition:
-    condition: time
-    after: '20:00'
-  action:
-    service: notify.notify
-    data:
-      message: 'Paulus left the house'
+  - alias: 'Leave Home notification'
+    trigger:
+      platform: zone
+      event: leave
+      zone: zone.home
+      entity_id: device_tracker.paulus
+    condition:
+      condition: time
+      after: '20:00'
+    action:
+      service: notify.notify
+      data:
+        message: 'Paulus left the house'
 ```