diff --git a/atom.xml b/atom.xml
index 64a548a708..38dae4cb28 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 17ade4636c..155a22a19f 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 1aac197adb..20baa61ce7 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 7a1cea185a..10aa59532f 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 d15d6901a3..3799df2fa6 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 64bbeda46e..d59b1d09eb 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 38e8c249e1..d6bd408dde 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 0350336f31..bc6237b028 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 6f30683b9b..e268c392b8 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 e4950e9d6a..bfa455b018 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 ad51c2401b..18df37bac9 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 4d90df4371..7ae1239a11 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 f1577c26a1..da53a28375 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 008a33e48c..a4743d1769 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 70b1cb1078..bf3c3e6fb8 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 2aa7ea4f49..5359f57d7a 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 308c3ab5da..b1dc1e3efe 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 ec25286fb1..4658d8d945 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 f7f0882c8c..d8ffb01c8d 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 8bb8ccb8e0..3fbb24d690 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 3bbfa0877d..d6f23956be 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 ae0af1b993..3dff4dd632 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 92c989a50e..4e05df05b5 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 a9429576c9..95295adadb 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+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 f52808a344..766ee2ecff 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-03-11T20:28:40+00:00</updated>
+  <updated>2018-03-11T22:06:17+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/influxdb/#data-import-script.html b/components/influxdb/#data-import-script.html
deleted file mode 100644
index a3fda9b492..0000000000
--- a/components/influxdb/#data-import-script.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/influxdb_import/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/influxdb_import/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/influxdb_import/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/influxdb_import/"</script>
-</html>
diff --git a/components/influxdb/#data-migration.html b/components/influxdb/#data-migration.html
deleted file mode 100644
index f5251a9c0d..0000000000
--- a/components/influxdb/#data-migration.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/db_migrator/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/db_migrator/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/db_migrator/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/db_migrator/"</script>
-</html>
diff --git a/components/mqtt/#discovery.html b/components/mqtt/#discovery.html
deleted file mode 100644
index fedc13367d..0000000000
--- a/components/mqtt/#discovery.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/discovery/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/discovery/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/discovery/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/discovery/"</script>
-</html>
diff --git a/components/mqtt/#logging.html b/components/mqtt/#logging.html
deleted file mode 100644
index 3b277b7d04..0000000000
--- a/components/mqtt/#logging.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/logging/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/logging/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/logging/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/logging/"</script>
-</html>
diff --git a/components/mqtt/#picking-a-broker.html b/components/mqtt/#picking-a-broker.html
deleted file mode 100644
index 29042fc933..0000000000
--- a/components/mqtt/#picking-a-broker.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/broker/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/broker/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/broker/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/broker/"</script>
-</html>
diff --git a/components/mqtt/#processing-json.html b/components/mqtt/#processing-json.html
deleted file mode 100644
index 9f7b319a1f..0000000000
--- a/components/mqtt/#processing-json.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/processing_json/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/processing_json/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/processing_json/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/processing_json/"</script>
-</html>
diff --git a/components/mqtt/#publish-service.html b/components/mqtt/#publish-service.html
deleted file mode 100644
index b5b78d1d99..0000000000
--- a/components/mqtt/#publish-service.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/service/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/service/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/service/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/service/"</script>
-</html>
diff --git a/components/mqtt/#testing-your-setup.html b/components/mqtt/#testing-your-setup.html
deleted file mode 100644
index 8018b5acb2..0000000000
--- a/components/mqtt/#testing-your-setup.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/mqtt/testing/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/mqtt/testing/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/mqtt/testing/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/mqtt/testing/"</script>
-</html>
diff --git a/docs/configuration/secrets/#storing-passwords-in-a-keyring-managed-by-your-os.html b/docs/configuration/secrets/#storing-passwords-in-a-keyring-managed-by-your-os.html
deleted file mode 100644
index d17d80346e..0000000000
--- a/docs/configuration/secrets/#storing-passwords-in-a-keyring-managed-by-your-os.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/keyring/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/keyring/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/keyring/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/keyring/"</script>
-</html>
diff --git a/docs/configuration/secrets/#storing-passwords-securely-in-aws.html b/docs/configuration/secrets/#storing-passwords-securely-in-aws.html
deleted file mode 100644
index 58ee780fec..0000000000
--- a/docs/configuration/secrets/#storing-passwords-securely-in-aws.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/credstash/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/credstash/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/credstash/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/credstash/"</script>
-</html>
diff --git a/docs/tools/scripts/#benchmark.html b/docs/tools/scripts/#benchmark.html
deleted file mode 100644
index 14fc78c657..0000000000
--- a/docs/tools/scripts/#benchmark.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/benchmark/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/benchmark/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/benchmark/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/benchmark/"</script>
-</html>
diff --git a/docs/tools/scripts/#configuration-check.html b/docs/tools/scripts/#configuration-check.html
deleted file mode 100644
index b60e322b52..0000000000
--- a/docs/tools/scripts/#configuration-check.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/check_config/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/check_config/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/check_config/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/check_config/"</script>
-</html>
diff --git a/docs/tools/scripts/#existence-of-configuration.html b/docs/tools/scripts/#existence-of-configuration.html
deleted file mode 100644
index 0258ad5156..0000000000
--- a/docs/tools/scripts/#existence-of-configuration.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/tools/ensure_config/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/tools/ensure_config/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/tools/ensure_config/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/tools/ensure_config/"</script>
-</html>
diff --git a/getting-started/basic/#remote-access.html b/getting-started/basic/#remote-access.html
deleted file mode 100644
index 6a1784f6ad..0000000000
--- a/getting-started/basic/#remote-access.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting…</title>
-  <link rel="canonical" href="https://home-assistant.io/docs/configuration/remote/">
-  <meta http-equiv="refresh" content="0; url=https://home-assistant.io/docs/configuration/remote/">
-  <h1>Redirecting…</h1>
-  <a href="https://home-assistant.io/docs/configuration/remote/">Click here if you are not redirected.</a>
-  <script>location="https://home-assistant.io/docs/configuration/remote/"</script>
-</html>
diff --git a/sitemap.xml b/sitemap.xml
index 03a6bc2eca..1c99fd4bd7 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4158,7 +4158,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4846,131 +4846,131 @@
 </url>
 <url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/benchmark/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/check_config/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/credstash/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/db_migrator/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/ensure_config/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_import/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_migrator/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/keyring/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2018-03-11T20:28:40+00:00</lastmod>
+<lastmod>2018-03-11T22:06:17+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -6170,62 +6170,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2018-03-11T20:27:44+00:00</lastmod>
+<lastmod>2018-03-11T22:05:15+00:00</lastmod>
 </url>
 </urlset>