diff --git a/atom.xml b/atom.xml
index 6142af9af1..964dc58962 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 be28b25fe1..33d596754a 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 8745128692..1e85cd7778 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 f8f9bc7122..f2bd1aa59e 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 1d99723a15..0bef57991b 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 57c4adc087..d826c473b1 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 2754d2139b..bdf1dc5c27 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 5a49b3adcd..ce9c13db7b 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 1107a2f26e..6c6e347189 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 41e7821426..91b50aed7f 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 3b16776332..2d5b3c4582 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 696df0e9b8..f41f06cf7c 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 670f555890..558aa450d4 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 9c54b96beb..11ce58c3d3 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 9d9462a637..312fb782c2 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 d003a74650..7d70cbc3db 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 ccf258649c..29def97fd7 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 c8069beac8..3478a1d4c6 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 3e4937870c..c27ffe9b3e 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+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 c052bda528..66fdb63bfc 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>2016-08-05T16:53:53+00:00</updated>
+  <updated>2016-08-06T16:14:33+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/getting-started/automation-condition/index.html b/getting-started/automation-condition/index.html
index d58abb6a62..50ed72486d 100644
--- a/getting-started/automation-condition/index.html
+++ b/getting-started/automation-condition/index.html
@@ -111,8 +111,8 @@
     <span class="key">entity_id</span>: <span class="string"><span class="content">sensor.mini_despacho</span></span>
     <span class="key">to</span>: <span class="string"><span class="content">'ON'</span></span>
   <span class="key">condition</span>:
-      <span class="key">condition</span>: <span class="string"><span class="content">or</span></span>
-      <span class="key">conditions</span>:
+    <span class="key">condition</span>: <span class="string"><span class="content">or</span></span>
+    <span class="key">conditions</span>:
       - <span class="string"><span class="content">condition: template</span></span>
         <span class="key">value_template</span>: <span class="string"><span class="content">''</span></span>
       - <span class="string"><span class="content">condition: template</span></span>
diff --git a/sitemap.xml b/sitemap.xml
index bfcc4a9d8d..f7ced4bd9a 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2034,62 +2034,62 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-08-05T16:53:11+00:00</lastmod>
+    <lastmod>2016-08-06T16:13:47+00:00</lastmod>
   </url>
 </urlset>