diff --git a/source/_docs/automation/editor.markdown b/source/_docs/automation/editor.markdown
index 0821703ee2a..6f5cb4d303e 100644
--- a/source/_docs/automation/editor.markdown
+++ b/source/_docs/automation/editor.markdown
@@ -3,33 +3,39 @@ title: "Automation Editor"
description: "Instructions on how to use the automation editor."
---
-From the UI choose **{% my config %}** which is located in the sidebar, then click on **{% my automations %}** to go to the automation editor. Press the **+** sign in the lower right corner to get started. This page uses the [Random sensor](/integrations/random#sensor) as an example. Any other sensor with a numeric value, can be used as well.
+The automation editor is an easy way of creating and editing automations from the UI. This page uses the [Random sensor](/integrations/random#sensor) as an example, though any other sensor with a numeric value, can be used as well.
-Choose a meaningful name for your automation rules.
+From the UI choose **{% my config %}** which is located in the sidebar, then click on **{% my automations %}** to go to the automation editor. Press the **+** sign in the lower right corner to get started. You will be presented with options to create the automation from a description or from a [blueprint](/automation/using_blueprints/).
+
+
+
+
+
+Select "Start with an empty automation" and choose a meaningful name for your new automation.
-If the value of the sensor is greater than 10, then the automation rule should apply.
+If the value of the sensor is greater than 10, then the automation should trigger.
-Firing a [persistent notification](/integrations/persistent_notification/) is the result.
+The action for this automation creates a [persistent notification](/integrations/persistent_notification/).
-As "Service Data" we want a simple text that is shown as part of the notification.
+As the message we want a simple text that is shown as part of the notification.
```yaml
message: Sensor value greater than 10
```
-Automations created or edited via the user interface are activated immediately after saving the automation.
+Automations created or edited via the user interface are activated immediately after saving the automation. Read the documentation for [Automating Home Assistant](/getting-started/automation/) to learn more about automations.
## Troubleshooting missing automations
diff --git a/source/images/docs/automation-editor/create-automation.png b/source/images/docs/automation-editor/create-automation.png
new file mode 100644
index 00000000000..b862c025f37
Binary files /dev/null and b/source/images/docs/automation-editor/create-automation.png differ
diff --git a/source/images/docs/automation-editor/new-action.png b/source/images/docs/automation-editor/new-action.png
index 9dc7679f034..992b679f82f 100644
Binary files a/source/images/docs/automation-editor/new-action.png and b/source/images/docs/automation-editor/new-action.png differ
diff --git a/source/images/docs/automation-editor/new-automation.png b/source/images/docs/automation-editor/new-automation.png
index 9bae39fc709..0014365ba0a 100644
Binary files a/source/images/docs/automation-editor/new-automation.png and b/source/images/docs/automation-editor/new-automation.png differ
diff --git a/source/images/docs/automation-editor/new-trigger.png b/source/images/docs/automation-editor/new-trigger.png
index d3b2ec5a301..4569b0e1187 100644
Binary files a/source/images/docs/automation-editor/new-trigger.png and b/source/images/docs/automation-editor/new-trigger.png differ