diff --git a/atom.xml b/atom.xml
index 38b04e246e..8ddcd81cac 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 44aa984ada..9bff6df8a5 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 7a80cce9d2..5edda72b45 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 6c1db9c17f..6df8a3f592 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 30efed47f4..8d9000e6d2 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 d7f87b0a29..edc82818d1 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 5e86b911dc..77769f3a3b 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 b5ee05c92c..6e9e422a66 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 221ec6f399..7f09c2f841 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 e1542c2530..16723c79f8 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 f306d1d8ba..9c31de4246 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 1e9ada18f5..1d4d5bd991 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 ca4bc33a1f..fcf5af0d3f 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 281490a97a..7b4d431fc7 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 9f251463d5..2dc54200ab 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 1c54340aae..3ee8623136 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 664dbd334c..e66bfb6654 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 5faa916877..e12b92ac9d 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 f07841751e..1978847e0c 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 c7688d008a..244bd42c44 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 d932d098a3..8088271b64 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+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 a3e5e87687..7449696338 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>2017-03-07T18:42:11+00:00</updated>
+  <updated>2017-03-08T03:28:51+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/docs/automation/templating/index.html b/docs/automation/templating/index.html
index a1a5dbf2ef..16fe9328e3 100644
--- a/docs/automation/templating/index.html
+++ b/docs/automation/templating/index.html
@@ -94,7 +94,7 @@
 
   <p>In Home Assistant 0.19 we introduced a new powerful feature: variables in scripts and automations. This makes it possible to adjust your condition and action based on the information of the trigger.</p>
 
-<p>The trigger data made is available during <a href="/configuration/templating/">template</a> rendering as the <code class="highlighter-rouge">trigger</code> variable.</p>
+<p>The trigger data made is available during <a href="/docs/configuration/templating/">template</a> rendering as the <code class="highlighter-rouge">trigger</code> variable.</p>
 
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entries</span>
 <span class="s">automation</span><span class="pi">:</span>
@@ -221,11 +221,11 @@
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.from_state</code></td>
-      <td>The previous <a href="/configuration/state_object/">state object</a> of the entity.</td>
+      <td>The previous <a href="/docs/configuration/state_object/">state object</a> of the entity.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.to_state</code></td>
-      <td>The new <a href="/configuration/state_object/">state object</a> that triggered trigger.</td>
+      <td>The new <a href="/docs/configuration/state_object/">state object</a> that triggered trigger.</td>
     </tr>
   </tbody>
 </table>
@@ -250,11 +250,11 @@
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.from_state</code></td>
-      <td>The previous <a href="/configuration/state_object/">state object</a> of the entity.</td>
+      <td>The previous <a href="/docs/configuration/state_object/">state object</a> of the entity.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.to_state</code></td>
-      <td>The new <a href="/configuration/state_object/">state object</a> that triggered trigger.</td>
+      <td>The new <a href="/docs/configuration/state_object/">state object</a> that triggered trigger.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.for</code></td>
@@ -308,11 +308,11 @@
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.from_state</code></td>
-      <td>Previous <a href="/configuration/state_object/">state object</a> of entity that caused change.</td>
+      <td>Previous <a href="/docs/configuration/state_object/">state object</a> of entity that caused change.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.to_state</code></td>
-      <td>New <a href="/configuration/state_object/">state object</a> of entity that caused template to change.</td>
+      <td>New <a href="/docs/configuration/state_object/">state object</a> of entity that caused template to change.</td>
     </tr>
   </tbody>
 </table>
@@ -358,11 +358,11 @@
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.from_state</code></td>
-      <td>Previous <a href="/configuration/state_object/">state object</a> of the entity.</td>
+      <td>Previous <a href="/docs/configuration/state_object/">state object</a> of the entity.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.to_state</code></td>
-      <td>New <a href="/configuration/state_object/">state object</a> of the entity.</td>
+      <td>New <a href="/docs/configuration/state_object/">state object</a> of the entity.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trigger.zone</code></td>
diff --git a/sitemap.xml b/sitemap.xml
index 0ea070d788..bfd520a793 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2954,62 +2954,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-03-07T18:41:07+00:00</lastmod>
+<lastmod>2017-03-08T03:28:07+00:00</lastmod>
 </url>
 </urlset>