diff --git a/source/_data/glossary.yml b/source/_data/glossary.yml
index 4835728a5d9..ca527351d30 100644
--- a/source/_data/glossary.yml
+++ b/source/_data/glossary.yml
@@ -146,6 +146,8 @@
   link: /docs/configuration/state_object/
   excerpt: >
     An entity represents a sensor, actor, or function in Home Assistant. Entities are used to monitor physical properties or to control other entities. An entity is usually part of a device or a service.
+  aliases:
+    - entities
 
 - term: Event
   definition: >-
@@ -281,6 +283,8 @@
     Scripts are components that allow users to specify a sequence of actions
     to be executed by Home Assistant when turned on.
   link: /docs/scripts/
+  aliases:
+    - scripts
 
 - term: Sensor
   definition: >-
diff --git a/source/_docs/scene/editor.markdown b/source/_docs/scene/editor.markdown
index 06d2f3eb431..931110b9998 100644
--- a/source/_docs/scene/editor.markdown
+++ b/source/_docs/scene/editor.markdown
@@ -3,23 +3,27 @@ title: "Scenes Editor"
 description: "Instructions on how to use the scenes editor."
 ---
 
-In Home Assistant 0.102 we introduced the first version of our scene editor. If you just created a new configuration with Home Assistant, then you're all set! Go to the UI and enjoy.
-
 From the UI choose **Settings** which is located in the sidebar, then click on **Automations & Scenes** to go to the scene editor. Press the **Add Scene** button in the lower right corner to get started.
 
 Choose a meaningful name for your scene.
 
-<p class='img'>
-  <img src='/images/docs/scenes/editor.png' />
-</p>
+![Scene editor](/images/docs/scenes/editor.png)
 
-Select all the devices (or entities when advanced mode is enabled on your user profile) you want to include in your scene.
+Select all the {% term devices %} (or {% term entities %} when advanced mode is enabled on your user profile) you want to include in your scene.
 The state of your devices will be saved, so it can be restored when you are finished creating your scene.
 Set the state of the devices to how you want them to be in your scene, this can be done by clicking on it and edit the state from the popup, or any other method that changes the state.
 On the moment you save the scene, all the states of your devices are stored in the scene.
 When you leave the editor the states of the devices are restored to the state from before you started editing.
 The menu on the top-right has options to **Duplicate scene** and **Delete scene**.
 
+A scene can be called in {% term automation %} action and {% term scripts %} using a turn on scene {% term service %}:
+
+```yaml
+service: scene.turn_on
+target:
+  entity_id: scene.my_unique_id
+```
+
 ## Updating your configuration to use the editor
 
 First, check that you have activated the configuration editor.