diff --git a/atom.xml b/atom.xml
index eabc464bf8..8992795020 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index bd28e0183b..82b1005846 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/cloud/atom.xml b/blog/categories/cloud/atom.xml
index 9a338820f1..6aa6d902a4 100644
--- a/blog/categories/cloud/atom.xml
+++ b/blog/categories/cloud/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Cloud | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/cloud/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 015f5b779c..c25ef0aaba 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 7f8bb25da3..1b941ecf56 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 2669a9d580..70872a9d0f 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 0496411dec..6386561694 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 1731370f34..9bae7bb3c1 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 3ac7458acf..737d32d2ef 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 2201201f17..349a4ef75a 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index b2335fd836..b1c9d02509 100644
--- a/blog/categories/media/atom.xml
+++ b/blog/categories/media/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Media | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/media/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index 4e027188bc..d35eabdf41 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index c915920dfe..47f75daf47 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index eb17585876..68f8cf5783 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organization/atom.xml b/blog/categories/organization/atom.xml
index ddbf619cd6..b419bb82ee 100644
--- a/blog/categories/organization/atom.xml
+++ b/blog/categories/organization/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organization | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organization/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index b002b2e388..2abb7d12dc 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 6f1d6118a5..1fc7b09e65 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 0c416f657e..94f08cc155 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 9fa8ff013c..472969d3d5 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 5d1a3cf8f5..82b95a9c99 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index a76e9aaa4e..d7c1df6b39 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index b8cdafaee9..45ec3270b9 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index d6200b9d01..fcbf99ec01 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 05aa1d3707..547fddfede 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index bc251b0ad6..fbcb1ea3d9 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-23T00:39:56+00:00</updated>
+  <updated>2018-02-23T07:21:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/docs/asterisk_mbox/index.html b/docs/asterisk_mbox/index.html
index 621309cecb..d3b4738700 100644
--- a/docs/asterisk_mbox/index.html
+++ b/docs/asterisk_mbox/index.html
@@ -173,7 +173,7 @@ This assumes that your Asterisk PBX server is using <code class="highlighter-rou
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -193,6 +193,7 @@ This assumes that your Asterisk PBX server is using <code class="highlighter-rou
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/action/index.html b/docs/automation/action/index.html
index bf160ca42b..571468a023 100644
--- a/docs/automation/action/index.html
+++ b/docs/automation/action/index.html
@@ -138,7 +138,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -158,6 +158,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/condition/index.html b/docs/automation/condition/index.html
index 268f875219..90c7993f7f 100644
--- a/docs/automation/condition/index.html
+++ b/docs/automation/condition/index.html
@@ -104,7 +104,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -124,6 +124,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/editor/index.html b/docs/automation/editor/index.html
index d9f326209d..061595fa57 100644
--- a/docs/automation/editor/index.html
+++ b/docs/automation/editor/index.html
@@ -146,7 +146,7 @@ Any comments in the YAML file will be lost when you update an automation via the
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -166,6 +166,7 @@ Any comments in the YAML file will be lost when you update an automation via the
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/examples/index.html b/docs/automation/examples/index.html
index e85c66f3da..40a0274ba6 100644
--- a/docs/automation/examples/index.html
+++ b/docs/automation/examples/index.html
@@ -153,7 +153,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -173,6 +173,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/index.html b/docs/automation/index.html
index f46637dc69..2cc3e9fbba 100644
--- a/docs/automation/index.html
+++ b/docs/automation/index.html
@@ -138,7 +138,7 @@ As of version 0.42 you have to set an initial state in your automations in order
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -158,6 +158,7 @@ As of version 0.42 you have to set an initial state in your automations in order
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/templating/index.html b/docs/automation/templating/index.html
index 6e9c7646df..9741eb3727 100644
--- a/docs/automation/templating/index.html
+++ b/docs/automation/templating/index.html
@@ -353,7 +353,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -373,6 +373,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/trigger/index.html b/docs/automation/trigger/index.html
index bf66121f89..662779110a 100644
--- a/docs/automation/trigger/index.html
+++ b/docs/automation/trigger/index.html
@@ -249,7 +249,7 @@ With template triggers you can also evaluate attribute changes by using is_state
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -269,6 +269,7 @@ With template triggers you can also evaluate attribute changes by using is_state
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/automation/troubleshooting/index.html b/docs/automation/troubleshooting/index.html
index 57a614eabd..f3588678d6 100644
--- a/docs/automation/troubleshooting/index.html
+++ b/docs/automation/troubleshooting/index.html
@@ -93,7 +93,7 @@ INFO [homeassistant.components.automation] Initialized rule Rain is over
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -113,6 +113,7 @@ INFO [homeassistant.components.automation] Initialized rule Rain is over
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/index.html b/docs/autostart/index.html
index f3c3d4a85c..85a81686b7 100644
--- a/docs/autostart/index.html
+++ b/docs/autostart/index.html
@@ -92,7 +92,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -112,6 +112,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/init.d/index.html b/docs/autostart/init.d/index.html
index feac84bd1f..8d6d67dfcb 100644
--- a/docs/autostart/init.d/index.html
+++ b/docs/autostart/init.d/index.html
@@ -358,7 +358,7 @@ remove_piddir<span class="o">()</span> <span class="o">{</span>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -378,6 +378,7 @@ remove_piddir<span class="o">()</span> <span class="o">{</span>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/macos/index.html b/docs/autostart/macos/index.html
index 5086cfaf21..2e4d5ef305 100644
--- a/docs/autostart/macos/index.html
+++ b/docs/autostart/macos/index.html
@@ -98,7 +98,7 @@ Home Assistant has been uninstalled.
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -118,6 +118,7 @@ Home Assistant has been uninstalled.
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/synology/index.html b/docs/autostart/synology/index.html
index 840ee3a165..cde87bb577 100644
--- a/docs/autostart/synology/index.html
+++ b/docs/autostart/synology/index.html
@@ -113,7 +113,7 @@ stop on runlevel <span class="o">[</span>06]
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -133,6 +133,7 @@ stop on runlevel <span class="o">[</span>06]
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/systemd/index.html b/docs/autostart/systemd/index.html
index 65a819516f..95889921b5 100644
--- a/docs/autostart/systemd/index.html
+++ b/docs/autostart/systemd/index.html
@@ -183,7 +183,7 @@ WantedBy=multi-user.target
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -203,6 +203,7 @@ WantedBy=multi-user.target
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/autostart/upstart/index.html b/docs/autostart/upstart/index.html
index dfff6a5cce..81931a9793 100644
--- a/docs/autostart/upstart/index.html
+++ b/docs/autostart/upstart/index.html
@@ -202,7 +202,7 @@ esac
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -222,6 +222,7 @@ esac
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/backend/database/index.html b/docs/backend/database/index.html
index d08b8d299c..4e21a0f44c 100644
--- a/docs/backend/database/index.html
+++ b/docs/backend/database/index.html
@@ -178,7 +178,7 @@ group.all_switches              8018
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -198,6 +198,7 @@ group.all_switches              8018
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/backend/index.html b/docs/backend/index.html
index c3591f492f..2d6c51fc7a 100644
--- a/docs/backend/index.html
+++ b/docs/backend/index.html
@@ -87,7 +87,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -107,6 +107,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/backend/updater/index.html b/docs/backend/updater/index.html
index e8ce99901c..79049f7783 100644
--- a/docs/backend/updater/index.html
+++ b/docs/backend/updater/index.html
@@ -249,7 +249,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -269,6 +269,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/basic/index.html b/docs/configuration/basic/index.html
index b152420225..3b9c825df4 100644
--- a/docs/configuration/basic/index.html
+++ b/docs/configuration/basic/index.html
@@ -117,7 +117,7 @@ If you decide to expose your Home Assistant instance to the internet and forget
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -137,6 +137,7 @@ If you decide to expose your Home Assistant instance to the internet and forget
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a class='active' href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/customizing-devices/index.html b/docs/configuration/customizing-devices/index.html
index 1afb7c37e2..4da880823e 100644
--- a/docs/configuration/customizing-devices/index.html
+++ b/docs/configuration/customizing-devices/index.html
@@ -190,7 +190,7 @@ New customize information will be applied the next time the state of the entity
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -210,6 +210,7 @@ New customize information will be applied the next time the state of the entity
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a class='active' href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/devices/index.html b/docs/configuration/devices/index.html
index 7a1d4a0608..fddf35c00f 100644
--- a/docs/configuration/devices/index.html
+++ b/docs/configuration/devices/index.html
@@ -132,7 +132,7 @@ Each group consists of a name and a list of entity IDs. Entity IDs can be retrie
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -152,6 +152,7 @@ Each group consists of a name and a list of entity IDs. Entity IDs can be retrie
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a class='active' href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/entity-registry/index.html b/docs/configuration/entity-registry/index.html
new file mode 100644
index 0000000000..8f3816eceb
--- /dev/null
+++ b/docs/configuration/entity-registry/index.html
@@ -0,0 +1,382 @@
+<!doctype html>
+  <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+  <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+  <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+  <!--[if gt IE 8]><!--> <html> <!--<![endif]-->
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Entity Registry - Home Assistant</title>
+    <meta name="author" content="Home Assistant">
+    <meta name="description" content="The entity registry contains.">
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/docs/configuration/entity-registry/">
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Entity Registry">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/docs/configuration/entity-registry/">
+    <meta property="og:type" content="article">
+    <meta property="og:description" content="The entity registry contains.">
+    <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@home_assistant">
+    <meta name="twitter:title" content="Entity Registry">
+    <meta name="twitter:description" content="The entity registry contains.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
+    <link href="/stylesheets/screen.css" media="screen, projection, print" rel="stylesheet">
+    <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link rel='shortcut icon' href='/images/favicon.ico' />
+    <link rel='icon' type='image/png' href='/images/favicon-192x192.png' sizes='192x192' />
+  </head>
+  <body >
+    <header class='site-header'>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item three-tenths lap-two-sixths palm-one-whole ha-title">
+  <a href="/" class="site-title">
+    <img width='40' src='/demo/favicon-192x192.png'>
+    <span>Home Assistant</span>
+  </a>
+</div>
+<div class="grid__item seven-tenths lap-four-sixths palm-one-whole">
+  <nav>
+    <input type="checkbox" id="toggle">
+<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
+<ul class="menu pull-right">
+  <li><a href="/getting-started/">Getting started</a></li>
+  <li><a href="/components/">Components</a></li>
+  <li><a href="/docs/">Docs</a></li>
+  <li><a href="/cookbook/">Examples</a></li>
+  <li><a href="/developers/">Developers</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="/help/">Need help?</a></li>
+  <li><a href='#' class='show-search'><i class="icon-search"></i></a></li>
+</ul>
+  </nav>
+  <div class='search-container' style='display: none'>
+    <div class='search'>
+      <i class="icon-search"></i>
+      <input id='search' placeholder='Search the docs…'>
+      <a href='#' class='close'><i class="icon-remove-sign"></i></a>
+    </div>
+  </div>
+</div>
+  </div>
+</div>
+    </header>
+    <div class="grid-wrapper">
+      <div class="grid grid-center">
+        <div class="grid__item two-thirds lap-one-whole palm-one-whole">
+          <article class="page">
+    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_docs/configuration/entity-registry.markdown'>Edit this page on GitHub</a></div>
+  <header>
+    <h1 class="title indent">
+      Entity Registry
+    </h1>
+  </header>
+  <hr class="divider">
+  <p class="note">
+This is a new and experimental feature of Home Assistant.
+</p>
+<p>Starting with version 0.63, Home Assistant keeps a registry of known entities.
+The entity registry makes sure that entities get unique identifiers and allow
+customizing the identifiers and names of these entities.</p>
+<p>As this is still a very new part of Home Assistant, changes will require a
+restart of Home Assistant to take affect. A config user interface will be added
+in a future version.</p>
+<p class="note">
+An entity needs to have a unique ID to be registered in the entity registry.
+Not all integrations currently provide a unique id for their entities.
+</p>
+<p>The entity registry is stored in <code class="highlighter-rouge">&lt;config&gt;/entity_registry.yaml</code>. As a user,
+you are unable to add entries, only update them. Here is an example file:</p>
+<div class="highlighter-rouge"><pre class="highlight"><code>climate.downstairs_virtual:
+  platform: nest
+  unique_id: EPoMyWkpNyoYu3pGlmGxabcdefghijkl
+  name: Downstairs thermostat
+light.study_ceiling:
+  platform: hue
+  unique_id: f0:fe:6b:00:14:00:00:00-00
+  disabled_by: user
+</code></pre>
+</div>
+<p>As a user, you can change the <code class="highlighter-rouge">entity_id</code> and add the <code class="highlighter-rouge">name</code> and <code class="highlighter-rouge">disabled_by</code>
+value to each entry.</p>
+<ul>
+  <li>
+    <p>The value of <code class="highlighter-rouge">name</code> will override the name of the entity as given by the
+integration.</p>
+    <p><em>Added in Home Assistant 0.64.</em></p>
+  </li>
+  <li>
+    <p>The key <code class="highlighter-rouge">disabled_by</code> can either be <code class="highlighter-rouge">hass</code> or <code class="highlighter-rouge">user</code>. This functionality
+is even more experimental than the whole entity registry itself and might
+cause integrations to fail and might be removed in the future.</p>
+    <p><em>Added in Home Assistant 0.64.</em></p>
+  </li>
+</ul>
+</article>
+        </div>
+        <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
+          <div class="grid">
+    <section class="aside-module grid__item one-whole lap-one-half">
+  <div class='section'>
+    <h1 class="title delta">Topics</h1>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <b><a  href='/faq/'>FAQ </a></b> |
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
+      </li>
+      <li>
+        <b><a  href='/docs/installation/'>Installation </a></b>
+        <ul>
+          <li><a  href='/hassio/'>Hass.io </a></li>
+          <li><a  href='/docs/installation/virtualenv/'>Python Virtual Env </a></li>
+          <li><a  href='/docs/installation/hassbian/'>Hassbian </a></li>
+          <!--<li><a  href='/docs/installation/raspberry-pi-all-in-one/'>Raspberry Pi All-in-One </a></li>-->
+          <li><a  href='/docs/installation/updating/'>Updating </a></li>
+          <li><a  href='/docs/installation/troubleshooting/'>Troubleshooting </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/configuration/'>Configuration </a></b>
+        <ul>
+          <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
+          <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
+          <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a class='active' href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
+          <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
+          <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
+          <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
+        </ul>
+      </li>
+      <li>
+        <b>Advanced Configuration</b>
+        <ul>
+          <li><a  href='/docs/configuration/remote/'>Remote access </a></li>
+          <li><a  href='/docs/configuration/packages/'>Packages </a></li>
+          <li><a  href='/docs/configuration/splitting_configuration/'>Splitting up the configuration </a></li>
+          <li><a  href='/docs/configuration/secrets/'>Storing Secrets </a></li>
+          <li><a  href='/docs/configuration/templating/'>Templating </a></li>
+          <li><a  href='/docs/configuration/group_visibility/'>Group Visibility </a></li>
+          <li><a  href='/docs/configuration/platform_options/'>Entity component platform options </a></li>
+        </ul>
+      </li>
+      <li>
+        <b>Core objects</b>
+        <ul>
+          <li><a  href='/docs/configuration/events/'>Events </a></li>
+          <li><a  href='/docs/configuration/state_object/'>State Objects </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/automation/'>Automation </a></b>
+        <ul>
+          <li><a  href='/docs/automation/examples/'>Examples </a></li>
+          <li><a  href='/docs/automation/editor/'>Editor </a></li>
+          <li><a  href='/docs/automation/trigger/'>Triggers </a></li>
+          <li><a  href='/docs/automation/condition/'>Conditions </a></li>
+          <li><a  href='/docs/automation/action/'>Actions </a></li>
+          <li><a  href='/docs/automation/templating/'>Templates </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/frontend/'>Frontend </a></b>
+        <ul>
+          <li><a  href='/docs/frontend/mobile/'>Android/iOS Homescreen </a></li>
+          <li><a  href='/docs/frontend/webserver/'>Web server fingerprint </a></li>
+          <li><a  href='/docs/frontend/browsers/'>Browser Compatibility List </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/backend/'>Backend </a></b>
+        <ul>
+          <li><a  href='/docs/backend/database/'>Database </a></li>
+          <li><a  href='/docs/backend/updater/'>Updater </a></li>
+          <li><a  href='/developers/api/'>API </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/scripts/'>Scripts </a></b>
+        <ul>
+          <li><a  href='/docs/scripts/service-calls/'>Service Calls </a></li>
+          <li><a  href='/docs/scripts/conditions/'>Conditions </a></li>
+          <li><a  href='/docs/scripts/editor/'>Editor </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/tools/'>Tools and Helpers </a></b>
+        <ul>
+          <li><a  href='/docs/tools/dev-tools/'>Developer Tools </a></li>
+          <li><a  href='/docs/tools/hass/'>hass </a></li>
+          <li><a  href='/docs/tools/benchmark/'>benchmark </a></li>
+          <li><a  href='/docs/tools/check_config/'>check_config </a></li>
+          <li><a  href='/docs/tools/credstash/'>credstash </a></li>
+          <li><a  href='/docs/tools/db_migrator/'>db_migrator </a></li>
+          <li><a  href='/docs/tools/ensure_config/'>ensure_config </a></li>
+          <li><a  href='/docs/tools/influxdb_import/'>influxdb_import </a></li>
+          <li><a  href='/docs/tools/influxdb_migrator/'>influxdb_migrator </a></li>
+          <li><a  href='/docs/tools/keyring/'>keyring </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/z-wave/'>Z-Wave </a></b>
+        <ul>
+          <li><a  href='/docs/z-wave/installation/'>Configuring the Z-Wave component </a></li>
+          <li><a  href='/docs/z-wave/adding/'>Adding devices </a></li>
+          <li><a  href='/docs/z-wave/control-panel/'>The Z-Wave control panel </a></li>
+          <li><a  href='/docs/z-wave/controllers/'>Controllers </a></li>
+          <li><a  href='/docs/z-wave/devices/'>Devices </a> and <a  href='/docs/z-wave/entities/'>Entities </a></li>
+          <li><a  href='/docs/z-wave/query-stage/'>Query Stages </a> for devices</li>
+          <li><a  href='/docs/z-wave/device-specific/'>Device Specific </a> configuration</li>
+          <li><a  href='/docs/z-wave/events/'>Events </a> and <a  href='/docs/z-wave/services/'>Services </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/mqtt/'>MQTT </a></b>
+        <ul>
+          <li><a  href='/docs/mqtt/broker/'>Broker </a></li>
+          <li><a  href='/docs/mqtt/certificate/'>Certificate </a></li>
+          <li><a  href='/docs/mqtt/discovery/'>Discovery </a></li>
+          <li><a  href='/docs/mqtt/service/'>Publish service </a></li>
+          <li><a  href='/docs/mqtt/birth_will/'>Birth and last will messages </a></li>
+          <li><a  href='/docs/mqtt/testing/'>Testing your setup </a></li>
+          <li><a  href='/docs/mqtt/logging/'>Logging </a></li>
+          <li><a  href='/docs/mqtt/processing_json/'>Processing JSON </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/ecosystem/ios/'>iOS </a></b>
+        <ul>
+          <li><a  href='/docs/ecosystem/ios/notifications/basic/'>Basic notifications </a></li>
+          <ul>
+            <li><a  href='/docs/ecosystem/ios/notifications/sounds/'>Sounds </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/architecture/'>Architecture </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/privacy_security_rate_limits/'>Privacy, rate limiting and security </a></li>
+          </ul>
+          <li>Advanced notifications</li>
+          <ul>
+            <li><a  href='/docs/ecosystem/ios/notifications/attachments/'>Attachments </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/content_extensions/'>Dynamic content </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/actions/'>Actionable notifications </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/requesting_location_updates/'>Requesting location updates </a></li>
+          </ul>
+          <li><a  href='/docs/ecosystem/ios/location/'>Location Tracking </a></li>
+          <li><a  href='/docs/ecosystem/ios/integration/'>Integration with other apps </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/docs/ecosystem/'>Ecosystem </a>
+        <ul>
+          <li>
+            <a  href='/docs/autostart/'>Autostart </a>
+            <ul>
+              <li><a  href='/docs/autostart/systemd/'>systemd (Linux) </a></li>
+              <li><a  href='/docs/autostart/upstart/'>Upstart (Linux) </a></li>
+              <li><a  href='/docs/autostart/init.d/'>init.d (Linux) </a></li>
+              <li><a  href='/docs/autostart/macos/'>macOS </a></li>
+              <li><a  href='/docs/autostart/synology/'>Synology NAS </a></li>
+            </ul>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/appdaemon/'>AppDaemon </a>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/hadashboard/'>HADashboard </a>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/notebooks/'>Notebooks </a>
+            <ul>
+              <li><a  href='/docs/ecosystem/notebooks/'>Introduction </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/installation/'>Installation </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/graph/'>Graph </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/api/'>Home Assistant API </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/database/'>Database </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/stats/'>Statistics </a></li>
+            </ul>
+          </li>
+          <li>
+            Remote access
+            <ul>
+              <li><a  href='/docs/ecosystem/apache/'>Apache </a></li>
+              <li><a  href='/docs/ecosystem/caddy/'>Caddy Server </a></li>
+              <li><a  href='/docs/ecosystem/nginx/'>NGINX </a></li>
+              <li><a  href='/docs/ecosystem/nginx_subdomain/'>NGINX with subdomain</a></li>
+              <li><a  href='/docs/ecosystem/tor/'>Tor Onion Service </a></li>
+            </ul>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/certificates/'>Certificates </a>
+            <ul>
+              <li><a  href='/docs/ecosystem/certificates/tls_self_signed_certificate/'>Self-signed certificate </a></li>
+              <li><a  href='/docs/ecosystem/certificates/tls_domain_certificate/'>Certificate domain owners </a></li>
+              <li><a  href='/docs/ecosystem/certificates/lets_encrypt/'>Let's Encrypt (detailed) </a></li>
+            </ul>
+          </li>
+          <li>
+            Backup
+            <ul>
+              <li><a  href='/docs/ecosystem/backup/backup_github/'>Backup to GitHub </a></li>
+              <li><a  href='/docs/ecosystem/backup/backup_dropbox/'>Backup to Dropbox </a></li>
+              <li><a  href='/docs/ecosystem/backup/backup_usb/'>Backup to USB device </a></li>
+            </ul>
+          </li>
+          <li><a  href='/docs/ecosystem/scenegen/'>scenegen </a></li>
+          <li><a  href='/docs/ecosystem/synology/'>Synology </a></li>
+          <li><a  href='/docs/ecosystem/hass-configurator/'>HASS Configurator </a></li>
+        </ul>
+    </ul>
+  </div>
+</section>
+</div>
+        </aside>
+      </div>
+    </div>
+    <footer>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item">
+      <div class="copyright">
+  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
+  <a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
+  <a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
+  <a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
+  <div class="credit">
+    Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a> (no support!).<br>
+    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
+    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
+  </div>
+  <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">home-assistant.io</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+</div>
+    </div>
+  </div>
+</div>
+    </footer>
+    <script>
+  var _gaq=[['_setAccount','UA-57927901-1'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+</script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
+<script type="text/javascript">
+docsearch({
+  apiKey: 'ae96d94b201c5444c8a443093edf3efb',
+  indexName: 'home-assistant',
+  inputSelector: '#search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+});
+document.querySelector('.search .close').addEventListener('click', function(ev) {
+  ev.preventDefault();
+  document.querySelector('.search-container').style.display = 'none';
+});
+document.querySelector('.show-search').addEventListener('click', function(ev) {
+  ev.preventDefault();
+  document.querySelector('.search-container').style.display = 'block';
+  document.getElementById('toggle').checked = false;
+  document.querySelector('.search-container input').focus();
+});
+</script>
+  </body>
+</html>
diff --git a/docs/configuration/events/index.html b/docs/configuration/events/index.html
index e05b4903df..eb2fdc5379 100644
--- a/docs/configuration/events/index.html
+++ b/docs/configuration/events/index.html
@@ -230,7 +230,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -250,6 +250,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/group_visibility/index.html b/docs/configuration/group_visibility/index.html
index 17aec3ae4c..7b0d3d0bd2 100644
--- a/docs/configuration/group_visibility/index.html
+++ b/docs/configuration/group_visibility/index.html
@@ -235,7 +235,7 @@ If you are using docker to run Home Assistant then the occasion.py script will b
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -255,6 +255,7 @@ If you are using docker to run Home Assistant then the occasion.py script will b
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/index.html b/docs/configuration/index.html
index a5204504d7..2d39d14eff 100644
--- a/docs/configuration/index.html
+++ b/docs/configuration/index.html
@@ -117,7 +117,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -137,6 +137,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/packages/index.html b/docs/configuration/packages/index.html
index fb3f0b5b69..9ae86e8c8a 100644
--- a/docs/configuration/packages/index.html
+++ b/docs/configuration/packages/index.html
@@ -149,7 +149,7 @@ See the documentation about <a href="/docs/configuration/splitting_configuration
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -169,6 +169,7 @@ See the documentation about <a href="/docs/configuration/splitting_configuration
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/platform_options/index.html b/docs/configuration/platform_options/index.html
index d508e966cf..61562818ec 100644
--- a/docs/configuration/platform_options/index.html
+++ b/docs/configuration/platform_options/index.html
@@ -101,7 +101,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -121,6 +121,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/remote/index.html b/docs/configuration/remote/index.html
index 79525caca7..855dbb8b16 100644
--- a/docs/configuration/remote/index.html
+++ b/docs/configuration/remote/index.html
@@ -90,7 +90,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -110,6 +110,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/secrets/index.html b/docs/configuration/secrets/index.html
index e5762d0b98..1c11f0f006 100644
--- a/docs/configuration/secrets/index.html
+++ b/docs/configuration/secrets/index.html
@@ -124,7 +124,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -144,6 +144,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/securing/index.html b/docs/configuration/securing/index.html
index 5cfe619d12..c88cea46eb 100644
--- a/docs/configuration/securing/index.html
+++ b/docs/configuration/securing/index.html
@@ -100,7 +100,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -120,6 +120,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a class='active' href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/splitting_configuration/index.html b/docs/configuration/splitting_configuration/index.html
index fa1f71c608..543e53265a 100644
--- a/docs/configuration/splitting_configuration/index.html
+++ b/docs/configuration/splitting_configuration/index.html
@@ -449,7 +449,7 @@ the -id: line must be removed from each of the split files.</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -469,6 +469,7 @@ the -id: line must be removed from each of the split files.</p>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/state_object/index.html b/docs/configuration/state_object/index.html
index 829a194499..d6c482010b 100644
--- a/docs/configuration/state_object/index.html
+++ b/docs/configuration/state_object/index.html
@@ -166,7 +166,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -186,6 +186,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/templating/index.html b/docs/configuration/templating/index.html
index 903c192b86..024529c50b 100644
--- a/docs/configuration/templating/index.html
+++ b/docs/configuration/templating/index.html
@@ -317,7 +317,7 @@ Closest to an entity: {{ closest(states.zone.school, 'group.children') }}
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -337,6 +337,7 @@ Closest to an entity: {{ closest(states.zone.school, 'group.children') }}
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/troubleshooting/index.html b/docs/configuration/troubleshooting/index.html
index 80e4891114..83a6281303 100644
--- a/docs/configuration/troubleshooting/index.html
+++ b/docs/configuration/troubleshooting/index.html
@@ -146,7 +146,7 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -166,6 +166,7 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a class='active' href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/configuration/yaml/index.html b/docs/configuration/yaml/index.html
index 341e7d1eb8..e533fbca14 100644
--- a/docs/configuration/yaml/index.html
+++ b/docs/configuration/yaml/index.html
@@ -145,7 +145,7 @@ The other properties (like name) are specified using mappings. Note that the sec
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -165,6 +165,7 @@ The other properties (like name) are specified using mappings. Note that the sec
           <li><a class='active' href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/apache/index.html b/docs/ecosystem/apache/index.html
index 6b8b34e7f8..52fdde355c 100644
--- a/docs/ecosystem/apache/index.html
+++ b/docs/ecosystem/apache/index.html
@@ -173,7 +173,7 @@ In case you are getting occasional HTTP 504 error messages (“Gateway Timeout
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -193,6 +193,7 @@ In case you are getting occasional HTTP 504 error messages (“Gateway Timeout
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/api/index.html b/docs/ecosystem/appdaemon/api/index.html
index b97f5f02dd..3a4234c064 100644
--- a/docs/ecosystem/appdaemon/api/index.html
+++ b/docs/ecosystem/appdaemon/api/index.html
@@ -1443,7 +1443,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -1463,6 +1463,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/configuration/index.html b/docs/ecosystem/appdaemon/configuration/index.html
index 3f178df3cc..87943a671d 100644
--- a/docs/ecosystem/appdaemon/configuration/index.html
+++ b/docs/ecosystem/appdaemon/configuration/index.html
@@ -142,7 +142,7 @@ timezone = &lt;timezone&gt;
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -162,6 +162,7 @@ timezone = &lt;timezone&gt;
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/example_apps/index.html b/docs/ecosystem/appdaemon/example_apps/index.html
index 3563bb2468..2d368d3249 100644
--- a/docs/ecosystem/appdaemon/example_apps/index.html
+++ b/docs/ecosystem/appdaemon/example_apps/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/index.html b/docs/ecosystem/appdaemon/index.html
index a725ac153d..44e6bea738 100644
--- a/docs/ecosystem/appdaemon/index.html
+++ b/docs/ecosystem/appdaemon/index.html
@@ -165,7 +165,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -185,6 +185,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/installation/index.html b/docs/ecosystem/appdaemon/installation/index.html
index 03aa90fa05..79b4b7e122 100644
--- a/docs/ecosystem/appdaemon/installation/index.html
+++ b/docs/ecosystem/appdaemon/installation/index.html
@@ -86,7 +86,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -106,6 +106,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/operation/index.html b/docs/ecosystem/appdaemon/operation/index.html
index fb0c8951ac..d069b531ed 100644
--- a/docs/ecosystem/appdaemon/operation/index.html
+++ b/docs/ecosystem/appdaemon/operation/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/reboot/index.html b/docs/ecosystem/appdaemon/reboot/index.html
index 6bbbb0fc1e..7182f9ff2d 100644
--- a/docs/ecosystem/appdaemon/reboot/index.html
+++ b/docs/ecosystem/appdaemon/reboot/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/running/index.html b/docs/ecosystem/appdaemon/running/index.html
index c57f5fcb70..debfdfff38 100644
--- a/docs/ecosystem/appdaemon/running/index.html
+++ b/docs/ecosystem/appdaemon/running/index.html
@@ -147,7 +147,7 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -167,6 +167,7 @@ optional arguments:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/tutorial/index.html b/docs/ecosystem/appdaemon/tutorial/index.html
index d017ca8d6b..1e2cd58dbc 100644
--- a/docs/ecosystem/appdaemon/tutorial/index.html
+++ b/docs/ecosystem/appdaemon/tutorial/index.html
@@ -178,7 +178,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -198,6 +198,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/updating/index.html b/docs/ecosystem/appdaemon/updating/index.html
index 0f94d65b96..ac6b7b35c4 100644
--- a/docs/ecosystem/appdaemon/updating/index.html
+++ b/docs/ecosystem/appdaemon/updating/index.html
@@ -89,7 +89,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -109,6 +109,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/appdaemon/windows/index.html b/docs/ecosystem/appdaemon/windows/index.html
index 7d21b36dbd..227169dedc 100644
--- a/docs/ecosystem/appdaemon/windows/index.html
+++ b/docs/ecosystem/appdaemon/windows/index.html
@@ -92,7 +92,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -112,6 +112,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/backup/backup_dropbox/index.html b/docs/ecosystem/backup/backup_dropbox/index.html
index 0f83ee6dae..fdbb783fa1 100644
--- a/docs/ecosystem/backup/backup_dropbox/index.html
+++ b/docs/ecosystem/backup/backup_dropbox/index.html
@@ -113,7 +113,7 @@ Add it to your crontab, edit the <strong>path/to</strong> part.</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -133,6 +133,7 @@ Add it to your crontab, edit the <strong>path/to</strong> part.</p>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/backup/backup_github/index.html b/docs/ecosystem/backup/backup_github/index.html
index 43a17fffa4..4426b61972 100644
--- a/docs/ecosystem/backup/backup_github/index.html
+++ b/docs/ecosystem/backup/backup_github/index.html
@@ -233,7 +233,7 @@ no changes added to commit <span class="o">(</span>use <span class="s2">"git add
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -253,6 +253,7 @@ no changes added to commit <span class="o">(</span>use <span class="s2">"git add
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/backup/backup_usb/index.html b/docs/ecosystem/backup/backup_usb/index.html
index e9296b93a9..dbef2e3df5 100644
--- a/docs/ecosystem/backup/backup_usb/index.html
+++ b/docs/ecosystem/backup/backup_usb/index.html
@@ -164,7 +164,7 @@ Change below path to where you placed the <code class="highlighter-rouge">usb_ba
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -184,6 +184,7 @@ Change below path to where you placed the <code class="highlighter-rouge">usb_ba
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/caddy/index.html b/docs/ecosystem/caddy/index.html
index e19bc15d88..052d536459 100644
--- a/docs/ecosystem/caddy/index.html
+++ b/docs/ecosystem/caddy/index.html
@@ -93,7 +93,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -113,6 +113,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/certificates/index.html b/docs/ecosystem/certificates/index.html
index 0548461896..f5c1bc845f 100644
--- a/docs/ecosystem/certificates/index.html
+++ b/docs/ecosystem/certificates/index.html
@@ -86,7 +86,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -106,6 +106,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/certificates/lets_encrypt/index.html b/docs/ecosystem/certificates/lets_encrypt/index.html
index 9854631397..4da999be68 100644
--- a/docs/ecosystem/certificates/lets_encrypt/index.html
+++ b/docs/ecosystem/certificates/lets_encrypt/index.html
@@ -479,7 +479,7 @@ In cases where, for whatever reason, apt-get installing is not appropriate for y
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -499,6 +499,7 @@ In cases where, for whatever reason, apt-get installing is not appropriate for y
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/certificates/tls_domain_certificate/index.html b/docs/ecosystem/certificates/tls_domain_certificate/index.html
index e45ecece54..2b2966ecf6 100644
--- a/docs/ecosystem/certificates/tls_domain_certificate/index.html
+++ b/docs/ecosystem/certificates/tls_domain_certificate/index.html
@@ -135,7 +135,7 @@ Press Enter to Continue
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -155,6 +155,7 @@ Press Enter to Continue
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
index 20ea3c6218..ffc009b36b 100644
--- a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
+++ b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
@@ -110,7 +110,7 @@ The solution is to use a self-signed certificate. As you most likely don’t hav
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -130,6 +130,7 @@ The solution is to use a self-signed certificate. As you most likely don’t hav
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/hadashboard/index.html b/docs/ecosystem/hadashboard/index.html
index 99ca36e7f8..dc93d620ee 100644
--- a/docs/ecosystem/hadashboard/index.html
+++ b/docs/ecosystem/hadashboard/index.html
@@ -106,7 +106,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -126,6 +126,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/hass-configurator/index.html b/docs/ecosystem/hass-configurator/index.html
index e7fd35775d..4a8fb9661d 100644
--- a/docs/ecosystem/hass-configurator/index.html
+++ b/docs/ecosystem/hass-configurator/index.html
@@ -193,7 +193,7 @@ To resume the screen session, log in to your machine and execute <code class="hi
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -213,6 +213,7 @@ To resume the screen session, log in to your machine and execute <code class="hi
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/index.html b/docs/ecosystem/index.html
index 907f4dd415..5fb97c7487 100644
--- a/docs/ecosystem/index.html
+++ b/docs/ecosystem/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/devices_file/index.html b/docs/ecosystem/ios/devices_file/index.html
index 016845b149..b73df743d0 100644
--- a/docs/ecosystem/ios/devices_file/index.html
+++ b/docs/ecosystem/ios/devices_file/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/index.html b/docs/ecosystem/ios/index.html
index 7c404d86bb..85c9c5d33c 100644
--- a/docs/ecosystem/ios/index.html
+++ b/docs/ecosystem/ios/index.html
@@ -120,7 +120,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -140,6 +140,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/integration/index.html b/docs/ecosystem/ios/integration/index.html
index 89e3b6f183..345862cdb7 100644
--- a/docs/ecosystem/ios/integration/index.html
+++ b/docs/ecosystem/ios/integration/index.html
@@ -93,7 +93,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -113,6 +113,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/location/index.html b/docs/ecosystem/ios/location/index.html
index 96b920fbc9..60c743e633 100644
--- a/docs/ecosystem/ios/location/index.html
+++ b/docs/ecosystem/ios/location/index.html
@@ -113,7 +113,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -133,6 +133,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/actions/index.html b/docs/ecosystem/ios/notifications/actions/index.html
index 27aad1edbc..b497ba8093 100644
--- a/docs/ecosystem/ios/notifications/actions/index.html
+++ b/docs/ecosystem/ios/notifications/actions/index.html
@@ -207,7 +207,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -227,6 +227,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/architecture/index.html b/docs/ecosystem/ios/notifications/architecture/index.html
index a364d52c4b..a273fb6a2d 100644
--- a/docs/ecosystem/ios/notifications/architecture/index.html
+++ b/docs/ecosystem/ios/notifications/architecture/index.html
@@ -88,7 +88,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -108,6 +108,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/attachments/index.html b/docs/ecosystem/ios/notifications/attachments/index.html
index 5caf376f25..b6ac779313 100644
--- a/docs/ecosystem/ios/notifications/attachments/index.html
+++ b/docs/ecosystem/ios/notifications/attachments/index.html
@@ -134,7 +134,7 @@ To expand a notification on 3D Touch devices simply force touch any notification
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -154,6 +154,7 @@ To expand a notification on 3D Touch devices simply force touch any notification
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/basic/index.html b/docs/ecosystem/ios/notifications/basic/index.html
index 5f46a98e0d..27be65bb3d 100644
--- a/docs/ecosystem/ios/notifications/basic/index.html
+++ b/docs/ecosystem/ios/notifications/basic/index.html
@@ -152,7 +152,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -172,6 +172,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/content_extensions/index.html b/docs/ecosystem/ios/notifications/content_extensions/index.html
index 808de74726..a9f22324f6 100644
--- a/docs/ecosystem/ios/notifications/content_extensions/index.html
+++ b/docs/ecosystem/ios/notifications/content_extensions/index.html
@@ -161,7 +161,7 @@ The notification content is a real time MJPEG stream of a camera (assuming the c
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -181,6 +181,7 @@ The notification content is a real time MJPEG stream of a camera (assuming the c
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/index.html b/docs/ecosystem/ios/notifications/index.html
index 57968e7c1a..04cc9f40bf 100644
--- a/docs/ecosystem/ios/notifications/index.html
+++ b/docs/ecosystem/ios/notifications/index.html
@@ -93,7 +93,7 @@ Your device ID can be found in the <code class="highlighter-rouge">ios.conf</cod
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -113,6 +113,7 @@ Your device ID can be found in the <code class="highlighter-rouge">ios.conf</cod
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html b/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
index 0e235e3bc5..8880601494 100644
--- a/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
+++ b/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
@@ -90,7 +90,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -110,6 +110,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/requesting_location_updates/index.html b/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
index af04c95df3..3f27bf73db 100644
--- a/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
+++ b/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
@@ -99,7 +99,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -119,6 +119,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/ios/notifications/sounds/index.html b/docs/ecosystem/ios/notifications/sounds/index.html
index 5c5ab93cf1..e3a2088b11 100644
--- a/docs/ecosystem/ios/notifications/sounds/index.html
+++ b/docs/ecosystem/ios/notifications/sounds/index.html
@@ -254,7 +254,7 @@ US-EN-Morgan-Freeman-Wife-Is-Arriving.wav
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -274,6 +274,7 @@ US-EN-Morgan-Freeman-Wife-Is-Arriving.wav
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/nginx/index.html b/docs/ecosystem/nginx/index.html
index 18686e303b..45ee65d16a 100644
--- a/docs/ecosystem/nginx/index.html
+++ b/docs/ecosystem/nginx/index.html
@@ -180,7 +180,7 @@ server {
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -200,6 +200,7 @@ server {
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/nginx_subdomain/index.html b/docs/ecosystem/nginx_subdomain/index.html
index 71fc46b771..952edfa6d5 100644
--- a/docs/ecosystem/nginx_subdomain/index.html
+++ b/docs/ecosystem/nginx_subdomain/index.html
@@ -177,7 +177,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -197,6 +197,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/api/index.html b/docs/ecosystem/notebooks/api/index.html
index e54ba4dd63..e5eb917487 100644
--- a/docs/ecosystem/notebooks/api/index.html
+++ b/docs/ecosystem/notebooks/api/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/database/index.html b/docs/ecosystem/notebooks/database/index.html
index 49b9e12ceb..a2f88291a6 100644
--- a/docs/ecosystem/notebooks/database/index.html
+++ b/docs/ecosystem/notebooks/database/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/graph/index.html b/docs/ecosystem/notebooks/graph/index.html
index b0e4b280e7..19323950f3 100644
--- a/docs/ecosystem/notebooks/graph/index.html
+++ b/docs/ecosystem/notebooks/graph/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/index.html b/docs/ecosystem/notebooks/index.html
index 741e520c4e..1191814b1c 100644
--- a/docs/ecosystem/notebooks/index.html
+++ b/docs/ecosystem/notebooks/index.html
@@ -90,7 +90,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -110,6 +110,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/installation/index.html b/docs/ecosystem/notebooks/installation/index.html
index 501e6d6bf8..5a43ca5db9 100644
--- a/docs/ecosystem/notebooks/installation/index.html
+++ b/docs/ecosystem/notebooks/installation/index.html
@@ -110,7 +110,7 @@ Certain notebooks hosted in the <a href="https://github.com/home-assistant/home-
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -130,6 +130,7 @@ Certain notebooks hosted in the <a href="https://github.com/home-assistant/home-
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/notebooks/stats/index.html b/docs/ecosystem/notebooks/stats/index.html
index 326ea65cfc..e2d50ca19f 100644
--- a/docs/ecosystem/notebooks/stats/index.html
+++ b/docs/ecosystem/notebooks/stats/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/scenegen/index.html b/docs/ecosystem/scenegen/index.html
index 3d48663482..665d5eb1ff 100644
--- a/docs/ecosystem/scenegen/index.html
+++ b/docs/ecosystem/scenegen/index.html
@@ -200,7 +200,7 @@ light.bedside:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -220,6 +220,7 @@ light.bedside:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/synology/index.html b/docs/ecosystem/synology/index.html
index 1c00065876..9fa56db8d8 100644
--- a/docs/ecosystem/synology/index.html
+++ b/docs/ecosystem/synology/index.html
@@ -95,7 +95,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -115,6 +115,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/ecosystem/tor/index.html b/docs/ecosystem/tor/index.html
index 838925fe45..0c376db2ee 100644
--- a/docs/ecosystem/tor/index.html
+++ b/docs/ecosystem/tor/index.html
@@ -143,7 +143,7 @@ HiddenServiceAuthorizeClient stealth haremote1
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -163,6 +163,7 @@ HiddenServiceAuthorizeClient stealth haremote1
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/frontend/browsers/index.html b/docs/frontend/browsers/index.html
index 62f38a5d9c..5374541d43 100644
--- a/docs/frontend/browsers/index.html
+++ b/docs/frontend/browsers/index.html
@@ -303,7 +303,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -323,6 +323,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/frontend/index.html b/docs/frontend/index.html
index 53e2925f34..d9b44a1814 100644
--- a/docs/frontend/index.html
+++ b/docs/frontend/index.html
@@ -90,7 +90,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -110,6 +110,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/frontend/mobile/index.html b/docs/frontend/mobile/index.html
index 4d38707a22..3baa4dd26e 100644
--- a/docs/frontend/mobile/index.html
+++ b/docs/frontend/mobile/index.html
@@ -105,7 +105,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -125,6 +125,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/frontend/webserver/index.html b/docs/frontend/webserver/index.html
index 974e1d9be2..f7ea74bede 100644
--- a/docs/frontend/webserver/index.html
+++ b/docs/frontend/webserver/index.html
@@ -108,7 +108,7 @@ Nmap <span class="k">done</span>: 1 IP address <span class="o">(</span>1 host up
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -128,6 +128,7 @@ Nmap <span class="k">done</span>: 1 IP address <span class="o">(</span>1 host up
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/glossary/index.html b/docs/glossary/index.html
index 84e8b4f438..644bfec15a 100644
--- a/docs/glossary/index.html
+++ b/docs/glossary/index.html
@@ -159,7 +159,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a class='active' href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -179,6 +179,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/index.html b/docs/index.html
index 3000b6f3a6..d5f47d7ed9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -125,7 +125,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -145,6 +145,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/archlinux/index.html b/docs/installation/archlinux/index.html
index 95a12938fc..740a3dbd0e 100644
--- a/docs/installation/archlinux/index.html
+++ b/docs/installation/archlinux/index.html
@@ -98,7 +98,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -118,6 +118,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/armbian/index.html b/docs/installation/armbian/index.html
index f2b66e2b3d..43ee16c453 100644
--- a/docs/installation/armbian/index.html
+++ b/docs/installation/armbian/index.html
@@ -106,7 +106,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -126,6 +126,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/centos/index.html b/docs/installation/centos/index.html
index 37baa96d4f..4eafd6861d 100644
--- a/docs/installation/centos/index.html
+++ b/docs/installation/centos/index.html
@@ -122,7 +122,7 @@ WantedBy=multi-user.target
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -142,6 +142,7 @@ WantedBy=multi-user.target
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/docker/index.html b/docs/installation/docker/index.html
index 110302623a..170b9a6113 100644
--- a/docs/installation/docker/index.html
+++ b/docs/installation/docker/index.html
@@ -184,7 +184,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB Stick with Home Assista
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -204,6 +204,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB Stick with Home Assista
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/fedora/index.html b/docs/installation/fedora/index.html
index 59be31f1cf..7d44492b69 100644
--- a/docs/installation/fedora/index.html
+++ b/docs/installation/fedora/index.html
@@ -109,7 +109,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -129,6 +129,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/freenas/index.html b/docs/installation/freenas/index.html
index af54aa41db..3b581dd68a 100644
--- a/docs/installation/freenas/index.html
+++ b/docs/installation/freenas/index.html
@@ -113,7 +113,7 @@ USB Z-wave sticks may give <code class="highlighter-rouge">dmesg</code> warnings
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -133,6 +133,7 @@ USB Z-wave sticks may give <code class="highlighter-rouge">dmesg</code> warnings
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/common-tasks/index.html b/docs/installation/hassbian/common-tasks/index.html
index 31123081b4..e2fa51b82d 100644
--- a/docs/installation/hassbian/common-tasks/index.html
+++ b/docs/installation/hassbian/common-tasks/index.html
@@ -174,7 +174,7 @@ Log in as the <code class="highlighter-rouge">pi</code> account and execute the
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -194,6 +194,7 @@ Log in as the <code class="highlighter-rouge">pi</code> account and execute the
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/customization/index.html b/docs/installation/hassbian/customization/index.html
index ff33badcc3..af482ab676 100644
--- a/docs/installation/hassbian/customization/index.html
+++ b/docs/installation/hassbian/customization/index.html
@@ -107,7 +107,7 @@ The tool is available by running <code class="highlighter-rouge">hassbian-config
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -127,6 +127,7 @@ The tool is available by running <code class="highlighter-rouge">hassbian-config
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/index.html b/docs/installation/hassbian/index.html
index bfcc6248b9..765d9b5423 100644
--- a/docs/installation/hassbian/index.html
+++ b/docs/installation/hassbian/index.html
@@ -91,7 +91,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -111,6 +111,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/installation/index.html b/docs/installation/hassbian/installation/index.html
index b0f707d825..f9ba03f580 100644
--- a/docs/installation/hassbian/installation/index.html
+++ b/docs/installation/hassbian/installation/index.html
@@ -124,7 +124,7 @@ Please remember to ensure you’re using an <a href="https://www.raspberrypi.org
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -144,6 +144,7 @@ Please remember to ensure you’re using an <a href="https://www.raspberrypi.org
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/integrations/index.html b/docs/installation/hassbian/integrations/index.html
index 72ff9d8c10..c4454e2f3e 100644
--- a/docs/installation/hassbian/integrations/index.html
+++ b/docs/installation/hassbian/integrations/index.html
@@ -115,7 +115,7 @@ To enable One Wire support add the following line to the end of <code class="hig
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -135,6 +135,7 @@ To enable One Wire support add the following line to the end of <code class="hig
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/hassbian/upgrading/index.html b/docs/installation/hassbian/upgrading/index.html
index 44abd06204..4b22ed70be 100644
--- a/docs/installation/hassbian/upgrading/index.html
+++ b/docs/installation/hassbian/upgrading/index.html
@@ -103,7 +103,7 @@ You can also use <code class="highlighter-rouge">hassbian-config</code> to autom
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -123,6 +123,7 @@ You can also use <code class="highlighter-rouge">hassbian-config</code> to autom
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/index.html b/docs/installation/index.html
index becd067ed1..8e6eb51bb8 100644
--- a/docs/installation/index.html
+++ b/docs/installation/index.html
@@ -182,7 +182,7 @@ Beginners should check our <a href="/getting-started/">Getting started guide</a>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -202,6 +202,7 @@ Beginners should check our <a href="/getting-started/">Getting started guide</a>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/macos/index.html b/docs/installation/macos/index.html
index 35844534b3..6e198a7a24 100644
--- a/docs/installation/macos/index.html
+++ b/docs/installation/macos/index.html
@@ -91,7 +91,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -111,6 +111,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/python/index.html b/docs/installation/python/index.html
index 530d5b9d28..c20dd87aa9 100644
--- a/docs/installation/python/index.html
+++ b/docs/installation/python/index.html
@@ -102,7 +102,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -122,6 +122,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/raspberry-pi-all-in-one/index.html b/docs/installation/raspberry-pi-all-in-one/index.html
index f667fd4110..9f1c09ea2c 100644
--- a/docs/installation/raspberry-pi-all-in-one/index.html
+++ b/docs/installation/raspberry-pi-all-in-one/index.html
@@ -87,7 +87,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -107,6 +107,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/raspberry-pi/index.html b/docs/installation/raspberry-pi/index.html
index 52d6ddb1a2..92b646d39f 100644
--- a/docs/installation/raspberry-pi/index.html
+++ b/docs/installation/raspberry-pi/index.html
@@ -134,7 +134,7 @@ When you run the <code class="highlighter-rouge">hass</code> command for the fir
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -154,6 +154,7 @@ When you run the <code class="highlighter-rouge">hass</code> command for the fir
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/synology/index.html b/docs/installation/synology/index.html
index 99ec4a2c36..a3c104ae52 100644
--- a/docs/installation/synology/index.html
+++ b/docs/installation/synology/index.html
@@ -287,7 +287,7 @@ That’s it… you’re all set to go</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -307,6 +307,7 @@ That’s it… you’re all set to go</p>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/troubleshooting/index.html b/docs/installation/troubleshooting/index.html
index 0731285b9b..a80572a6e6 100644
--- a/docs/installation/troubleshooting/index.html
+++ b/docs/installation/troubleshooting/index.html
@@ -128,7 +128,7 @@ chrome -&gt; settings -&gt; site settings -&gt; storage -&gt; search for your UR
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -148,6 +148,7 @@ chrome -&gt; settings -&gt; site settings -&gt; storage -&gt; search for your UR
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/updating/index.html b/docs/installation/updating/index.html
index 12acf0854f..8dfaabeb62 100644
--- a/docs/installation/updating/index.html
+++ b/docs/installation/updating/index.html
@@ -110,7 +110,7 @@ To avoid permission errors, the upgrade must be run as the same user as the inst
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -130,6 +130,7 @@ To avoid permission errors, the upgrade must be run as the same user as the inst
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/vagrant/index.html b/docs/installation/vagrant/index.html
index 7dfd5c98c1..2146bcc73c 100644
--- a/docs/installation/vagrant/index.html
+++ b/docs/installation/vagrant/index.html
@@ -142,7 +142,7 @@ This command will only restart the Home Assistant process inside the Vagrant VM,
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -162,6 +162,7 @@ This command will only restart the Home Assistant process inside the Vagrant VM,
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/virtualenv/index.html b/docs/installation/virtualenv/index.html
index eca9c0926c..56a1942b73 100644
--- a/docs/installation/virtualenv/index.html
+++ b/docs/installation/virtualenv/index.html
@@ -151,7 +151,7 @@ Looking for more advanced guides? Check our <a href="/docs/installation/raspberr
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -171,6 +171,7 @@ Looking for more advanced guides? Check our <a href="/docs/installation/raspberr
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/installation/windows/index.html b/docs/installation/windows/index.html
index cd4ae36655..5875f99349 100644
--- a/docs/installation/windows/index.html
+++ b/docs/installation/windows/index.html
@@ -98,7 +98,7 @@ The Microsoft Windows platform is not a primary target to install Home Assistant
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -118,6 +118,7 @@ The Microsoft Windows platform is not a primary target to install Home Assistant
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/birth_will/index.html b/docs/mqtt/birth_will/index.html
index e740b64a75..f26f2c2564 100644
--- a/docs/mqtt/birth_will/index.html
+++ b/docs/mqtt/birth_will/index.html
@@ -115,7 +115,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -135,6 +135,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/broker/index.html b/docs/mqtt/broker/index.html
index 894d69d1ee..29281e57a6 100644
--- a/docs/mqtt/broker/index.html
+++ b/docs/mqtt/broker/index.html
@@ -237,7 +237,7 @@ Home Assistant will automatically load the correct certificate if you connect to
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -257,6 +257,7 @@ Home Assistant will automatically load the correct certificate if you connect to
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/certificate/index.html b/docs/mqtt/certificate/index.html
index 9e1f983c08..c11de3c7f5 100644
--- a/docs/mqtt/certificate/index.html
+++ b/docs/mqtt/certificate/index.html
@@ -97,7 +97,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -117,6 +117,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/discovery/index.html b/docs/mqtt/discovery/index.html
index 09b2f7e4cd..5c8143e428 100644
--- a/docs/mqtt/discovery/index.html
+++ b/docs/mqtt/discovery/index.html
@@ -163,7 +163,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -183,6 +183,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/index.html b/docs/mqtt/index.html
index 4f54fffe4a..120b3fcd50 100644
--- a/docs/mqtt/index.html
+++ b/docs/mqtt/index.html
@@ -102,7 +102,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -122,6 +122,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/logging/index.html b/docs/mqtt/logging/index.html
index 7a5f8fa957..e7cb4a5120 100644
--- a/docs/mqtt/logging/index.html
+++ b/docs/mqtt/logging/index.html
@@ -92,7 +92,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -112,6 +112,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/processing_json/index.html b/docs/mqtt/processing_json/index.html
index 2bd7ee9fba..4b929e4464 100644
--- a/docs/mqtt/processing_json/index.html
+++ b/docs/mqtt/processing_json/index.html
@@ -120,7 +120,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -140,6 +140,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/service/index.html b/docs/mqtt/service/index.html
index 4fc081426e..0d8996f0be 100644
--- a/docs/mqtt/service/index.html
+++ b/docs/mqtt/service/index.html
@@ -97,7 +97,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -117,6 +117,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/mqtt/testing/index.html b/docs/mqtt/testing/index.html
index c21da61958..e7a06f4c0f 100644
--- a/docs/mqtt/testing/index.html
+++ b/docs/mqtt/testing/index.html
@@ -116,7 +116,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -136,6 +136,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/scripts/conditions/index.html b/docs/scripts/conditions/index.html
index 40ad054283..34aedd8bb4 100644
--- a/docs/scripts/conditions/index.html
+++ b/docs/scripts/conditions/index.html
@@ -320,7 +320,7 @@ Time condition windows can span across the midnight threshold. In the example ab
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -340,6 +340,7 @@ Time condition windows can span across the midnight threshold. In the example ab
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/scripts/editor/index.html b/docs/scripts/editor/index.html
index bb9683d345..b7b5f47221 100644
--- a/docs/scripts/editor/index.html
+++ b/docs/scripts/editor/index.html
@@ -95,7 +95,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -115,6 +115,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/scripts/index.html b/docs/scripts/index.html
index cbe9e58214..baa1824d55 100644
--- a/docs/scripts/index.html
+++ b/docs/scripts/index.html
@@ -202,7 +202,7 @@ an event trigger.</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -222,6 +222,7 @@ an event trigger.</p>
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/scripts/service-calls/index.html b/docs/scripts/service-calls/index.html
index b1d59a0494..e4a6bff6d0 100644
--- a/docs/scripts/service-calls/index.html
+++ b/docs/scripts/service-calls/index.html
@@ -136,7 +136,7 @@ Service Data: <code class="highlighter-rouge"><span class="p">{</span><span clas
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -156,6 +156,7 @@ Service Data: <code class="highlighter-rouge"><span class="p">{</span><span clas
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/benchmark/index.html b/docs/tools/benchmark/index.html
index 58c6366fb4..58b0c150ec 100644
--- a/docs/tools/benchmark/index.html
+++ b/docs/tools/benchmark/index.html
@@ -89,7 +89,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -109,6 +109,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/check_config/index.html b/docs/tools/check_config/index.html
index dc75528ab4..0d235cb25a 100644
--- a/docs/tools/check_config/index.html
+++ b/docs/tools/check_config/index.html
@@ -88,7 +88,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -108,6 +108,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/credstash/index.html b/docs/tools/credstash/index.html
index a18089073f..de0e9f220c 100644
--- a/docs/tools/credstash/index.html
+++ b/docs/tools/credstash/index.html
@@ -98,7 +98,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -118,6 +118,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/db_migrator/index.html b/docs/tools/db_migrator/index.html
index fb1a480d46..0cde8dfe09 100644
--- a/docs/tools/db_migrator/index.html
+++ b/docs/tools/db_migrator/index.html
@@ -139,7 +139,7 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -159,6 +159,7 @@ optional arguments:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/dev-tools/index.html b/docs/tools/dev-tools/index.html
index 937242a788..66aa50d38a 100644
--- a/docs/tools/dev-tools/index.html
+++ b/docs/tools/dev-tools/index.html
@@ -178,7 +178,7 @@ Even though MQTT in general provides deeper functionality, the developer tools s
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -198,6 +198,7 @@ Even though MQTT in general provides deeper functionality, the developer tools s
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/ensure_config/index.html b/docs/tools/ensure_config/index.html
index 1b8924a861..7fd568c5cc 100644
--- a/docs/tools/ensure_config/index.html
+++ b/docs/tools/ensure_config/index.html
@@ -88,7 +88,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -108,6 +108,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/hass/index.html b/docs/tools/hass/index.html
index 4bb0e8fd62..e763447dad 100644
--- a/docs/tools/hass/index.html
+++ b/docs/tools/hass/index.html
@@ -116,7 +116,7 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -136,6 +136,7 @@ optional arguments:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/index.html b/docs/tools/index.html
index 8557a4f68a..5b22bc4a31 100644
--- a/docs/tools/index.html
+++ b/docs/tools/index.html
@@ -85,7 +85,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -105,6 +105,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/influxdb_import/index.html b/docs/tools/influxdb_import/index.html
index b6ded818ef..b7eb91cb87 100644
--- a/docs/tools/influxdb_import/index.html
+++ b/docs/tools/influxdb_import/index.html
@@ -128,7 +128,7 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -148,6 +148,7 @@ optional arguments:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/influxdb_migrator/index.html b/docs/tools/influxdb_migrator/index.html
index 28d082b92e..807cd70dff 100644
--- a/docs/tools/influxdb_migrator/index.html
+++ b/docs/tools/influxdb_migrator/index.html
@@ -108,7 +108,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -128,6 +128,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/keyring/index.html b/docs/tools/keyring/index.html
index 84e40a079f..c1c7e5309c 100644
--- a/docs/tools/keyring/index.html
+++ b/docs/tools/keyring/index.html
@@ -106,7 +106,7 @@ Please enter password <span class="k">for </span>encrypted keyring:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -126,6 +126,7 @@ Please enter password <span class="k">for </span>encrypted keyring:
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/tools/scripts/index.html b/docs/tools/scripts/index.html
index 7f89a87850..ccde1f3cc3 100644
--- a/docs/tools/scripts/index.html
+++ b/docs/tools/scripts/index.html
@@ -84,7 +84,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -104,6 +104,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/adding/index.html b/docs/z-wave/adding/index.html
index f9b3b857ca..537653cfcf 100644
--- a/docs/z-wave/adding/index.html
+++ b/docs/z-wave/adding/index.html
@@ -134,7 +134,7 @@ Ensure you keep a backup of this key. If you have to rebuild your system and don
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -154,6 +154,7 @@ Ensure you keep a backup of this key. If you have to rebuild your system and don
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/control-panel/index.html b/docs/z-wave/control-panel/index.html
index 9d3256455a..65ab72fab0 100644
--- a/docs/z-wave/control-panel/index.html
+++ b/docs/z-wave/control-panel/index.html
@@ -205,7 +205,7 @@ Select <strong>Refresh</strong> to display the log if you need it to check activ
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -225,6 +225,7 @@ Select <strong>Refresh</strong> to display the log if you need it to check activ
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/controllers/index.html b/docs/z-wave/controllers/index.html
index 45a06935c4..fc7ee7187e 100644
--- a/docs/z-wave/controllers/index.html
+++ b/docs/z-wave/controllers/index.html
@@ -172,7 +172,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -192,6 +192,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/device-specific/index.html b/docs/z-wave/device-specific/index.html
index 7f72f1331e..aa47e51ed0 100644
--- a/docs/z-wave/device-specific/index.html
+++ b/docs/z-wave/device-specific/index.html
@@ -377,7 +377,7 @@ These devices will either show as a binary sensor or a sensor called <code class
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -397,6 +397,7 @@ These devices will either show as a binary sensor or a sensor called <code class
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/devices/index.html b/docs/z-wave/devices/index.html
index 911ca8c316..b2797bc471 100644
--- a/docs/z-wave/devices/index.html
+++ b/docs/z-wave/devices/index.html
@@ -123,7 +123,7 @@ The Z-Wave capability <em>routing</em> doesn’t mean the device routes traffic,
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -143,6 +143,7 @@ The Z-Wave capability <em>routing</em> doesn’t mean the device routes traffic,
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/entities/index.html b/docs/z-wave/entities/index.html
index 3368d3405d..c8f3d75a1a 100644
--- a/docs/z-wave/entities/index.html
+++ b/docs/z-wave/entities/index.html
@@ -245,7 +245,7 @@ This is a work in progress, based upon reports in the forum, the author’s own
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -265,6 +265,7 @@ This is a work in progress, based upon reports in the forum, the author’s own
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/events/index.html b/docs/z-wave/events/index.html
index e6c581ae44..6ea9de9ede 100644
--- a/docs/z-wave/events/index.html
+++ b/docs/z-wave/events/index.html
@@ -157,7 +157,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -177,6 +177,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/index.html b/docs/z-wave/index.html
index 33b33bc26a..6fc3d1ec37 100644
--- a/docs/z-wave/index.html
+++ b/docs/z-wave/index.html
@@ -98,7 +98,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -118,6 +118,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/installation/index.html b/docs/z-wave/installation/index.html
index a57d1f67b9..4ec764a7d4 100644
--- a/docs/z-wave/installation/index.html
+++ b/docs/z-wave/installation/index.html
@@ -262,7 +262,7 @@ The device type is <code class="highlighter-rouge">c</code> (character special)
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -282,6 +282,7 @@ The device type is <code class="highlighter-rouge">c</code> (character special)
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/query-stage/index.html b/docs/z-wave/query-stage/index.html
index c392e2a427..d59126937a 100644
--- a/docs/z-wave/query-stage/index.html
+++ b/docs/z-wave/query-stage/index.html
@@ -170,7 +170,7 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -190,6 +190,7 @@
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/docs/z-wave/services/index.html b/docs/z-wave/services/index.html
index aa70201fa0..2e6c3cc9f9 100644
--- a/docs/z-wave/services/index.html
+++ b/docs/z-wave/services/index.html
@@ -204,7 +204,7 @@ Using the <code class="highlighter-rouge">soft_reset</code> function with some Z
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/faq/'>FAQ </a></b> |
         <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
@@ -224,6 +224,7 @@ Using the <code class="highlighter-rouge">soft_reset</code> function with some Z
           <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
           <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
           <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/entity-registry/'>Entity Registry </a></li>
           <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
           <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
           <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 0b6eff6457..f2a6d75d04 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4022,7 +4022,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4393,6 +4393,10 @@
 <lastmod>2016-04-20T06:00:00+00:00</lastmod>
 </url>
 <url>
+<loc>https://home-assistant.io/docs/configuration/entity-registry/</loc>
+<lastmod>2016-04-20T06:00:00+00:00</lastmod>
+</url>
+<url>
 <loc>https://home-assistant.io/docs/automation/action/</loc>
 <lastmod>2016-04-24T07:30:00+00:00</lastmod>
 </url>
@@ -4706,131 +4710,131 @@
 </url>
 <url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/benchmark/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/check_config/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/credstash/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/db_migrator/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/ensure_config/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_import/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_migrator/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/keyring/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2018-02-23T00:39:56+00:00</lastmod>
+<lastmod>2018-02-23T07:21:46+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -6013,62 +6017,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2018-02-23T00:39:13+00:00</lastmod>
+<lastmod>2018-02-23T07:20:44+00:00</lastmod>
 </url>
 </urlset>