diff --git a/atom.xml b/atom.xml
index 0bff78d586..5f462f1b74 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/architecture/atom.xml b/blog/categories/architecture/atom.xml
index 10bfd95754..ed2182023a 100644
--- a/blog/categories/architecture/atom.xml
+++ b/blog/categories/architecture/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Architecture | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/architecture/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/branding/atom.xml b/blog/categories/branding/atom.xml
index 955da188df..5b3c06d391 100644
--- a/blog/categories/branding/atom.xml
+++ b/blog/categories/branding/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Branding | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/branding/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index d1a5c2e6f8..da9f5bbce7 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 7f42a6e1a5..1e4bdd7491 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 357078cffa..f38713626c 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 6653b3f14e..cd87059bfc 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index a380dbef75..e9f9fff7b4 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 77a169e117..81da44c896 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index aa9fa15a66..e4e3eb6870 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 300b9d02b9..59aa62fef9 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-03-24T04:51:05+00:00</updated>
+  <updated>2016-03-24T16:03:48+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/sitemap.xml b/sitemap.xml
index a6924cc9bd..3119c5a2d7 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1137,6 +1137,9 @@
     <url>
       <loc>https://home-assistant.io/topics/state_object/</loc>
     </url>
+    <url>
+      <loc>https://home-assistant.io/topics/z-wave/</loc>
+    </url>
     <url>
       <loc>https://home-assistant.io/blog/2014/12/18/website-launched/</loc>
     </url>
@@ -1283,626 +1286,626 @@
     </url>
   <url>
     <loc>https://home-assistant.io/components/alarm_control_panel.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/alarm_control_panel.manual.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/alarm_control_panel.mqtt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/arduino.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/automation.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/browser.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/camera.foscam.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/camera.generic.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/configurator.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/conversation.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_sun_light_trigger.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.actiontec.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.aruba.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.asuswrt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.ddwrt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.locative.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.luci.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.mqtt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.netgear.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.nmap_scanner.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.owntracks.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.snmp.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.thomson.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.tomato.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.tplink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/device_tracker.ubus.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/discovery.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/downloader.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/ecobee.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/group.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/history.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/ifttt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/ifttt.manything.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/introduction.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/isy994.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/keyboard.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.blinksticklight.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.hue.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.hyperion.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.limitlessled.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.rfxtrx.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.tellstick.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.vera.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/light.wink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/lock.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/lock.wink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/logbook.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.cast.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.denon.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.firetv.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.itunes.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.kodi.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.mpd.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.plex.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.sonos.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/media_player.squeezebox.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/modbus.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/mqtt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.file.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.instapush.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.nma.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.pushbullet.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.pushover.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.slack.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.smtp.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.syslog.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.telegram.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/notify.xmpp.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/rfxtrx.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/scene.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/script.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.arduino.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.arest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.bitcoin.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.command_sensor.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.cpuspeed.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.dht.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.ecobee.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.efergy.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.forecast.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.glances.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.modbus.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.mqtt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.mysensors.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.openweathermap.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.rest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.rfxtrx.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.rpi_gpio.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.sabnzbd.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.speedtest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.swiss_public_transport.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.systemmonitor.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.tellstick.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.temper.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.time_date.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.transmission.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.vera.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.wink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sensor.worldclock.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/shell_command.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/simple_alarm.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/sun.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.arduino.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.arest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.command_switch.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.edimax.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.hikvision.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.modbus.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.mqtt.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.rest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.rfxtrx.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.rpi_gpio.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.tellstick.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.transmission.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.vera.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.wemo.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/switch.wink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/tellstick.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.ecobee.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.heat_control.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.nest.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/thermostat.radiotherm.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/vera.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/verisure.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/wink.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/zone.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/components/zwave.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/add_new_platform.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/api.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/architecture.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/creating_components.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/credits.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/frontend.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/python_api.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/rest_api.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/developers/website.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/android.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/automation.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/autostart.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/configuration.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/devices.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/presence-detection.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/templating.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/troubleshooting-configuration.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/getting-started/troubleshooting.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-03-24T04:50:26+00:00</lastmod>
+    <lastmod>2016-03-24T16:03:01+00:00</lastmod>
   </url>
 </urlset>
diff --git a/topics/index.html b/topics/index.html
index 9731e5d483..da976e9242 100644
--- a/topics/index.html
+++ b/topics/index.html
@@ -130,6 +130,9 @@
   <li>
     <p><a href="/topics/templating/">Templating</a></p>
   </li>
+  <li>
+    <p><a href="/topics/z-wave/">Z-Wave</a></p>
+  </li>
 </ul>
 
 
diff --git a/topics/templating/index.html b/topics/templating/index.html
index 7cb7b5d42f..112072c32e 100644
--- a/topics/templating/index.html
+++ b/topics/templating/index.html
@@ -115,9 +115,12 @@
   <hr class="divider">
   
 
-  <p class="note">
-This is an advanced feature of Home Assistant. You’ll need a basic understanding of the <a href="/developers/architecture/">Home Assistant architecture</a>, especially states.
-</p>
+  <p>This is an advanced feature of Home Assistant. You’ll need a basic understanding of the following things:</p>
+
+<ul>
+  <li><a href="/developers/architecture/">Home Assistant architecture</a>, especially states.</li>
+  <li><a href="/topics/state_object/">State object</a></li>
+</ul>
 
 <p>Templating is a powerful feature in Home Assistant that allows the user control over information that is going into and out of the system. It is used for:</p>
 
diff --git a/topics/z-wave/index.html b/topics/z-wave/index.html
new file mode 100644
index 0000000000..5f42e5eca2
--- /dev/null
+++ b/topics/z-wave/index.html
@@ -0,0 +1,176 @@
+<!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>Z-Wave - Home Assistant</title>
+    <meta name="author" content="Paulus Schoutsen">
+    <meta name="description" content="Extended instructions how to setup Z-Wave.">
+    
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/topics/z-wave/">
+
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Z-Wave">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/topics/z-wave/">
+    <meta property="og:type" content="article">
+    <meta property="og:description" content="Extended instructions how to setup Z-Wave.">
+    <meta property="og:image" content="https://home-assistant.io/images/home-assistant-logo-2164x2164.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:site" content="@home_assistant">
+    
+    <meta name="twitter:title" content="Z-Wave">
+    <meta name="twitter:description" content="Extended instructions how to setup Z-Wave.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/home-assistant-logo-2164x2164.png">
+
+    <link href="/stylesheets/screen.css" media="screen, projection" 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>
+      <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>Getting started <i class="icon icon-caret-down"></i></a>
+    <ul>
+      <li><a href='/getting-started/'>Installing Home Assistant</a></li>
+      <li><a href='/getting-started/configuration/'>Configuration Basics</a></li>
+      <li><a href='/getting-started/devices/'>Adding devices</a></li>
+      <li><a href='/getting-started/presence-detection/'>Presence Detection</a></li>
+      <li><a href='/getting-started/automation/'>Automation</a></li>
+      <li><a href='/topics/'>Advanced Topics</a></li>
+    </ul>
+  </li>
+  <li><a href='/components/'>Components</a></li>
+  <li><a href='/cookbook'>Examples</a></li>
+  <li>
+    <a>Developers <i class="icon icon-caret-down"></i></a>
+    <ul>
+      <li><a href="/developers/">Setup Development</a></li>
+      <li><a href="/developers/architecture/">Architecture</a></li>
+      <li><a href="/developers/frontend/">Frontend Development</a></li>
+      <li><a href="/developers/creating_components/">
+        Creating Components
+      </a></li>
+      <li><a href="/developers/add_new_platform/">
+        Adding Platform Support
+      </a></li>
+      <li><a href="/developers/api/">API</a></li>
+      <li><a href="/developers/credits/">Credits</a></li>
+    </ul>
+  </li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="/help/">Need help?</a></li>
+</ul>
+  </nav>
+</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/balloob/home-assistant.io/tree/master/source/_topics/z-wave.markdown'>Edit this page on GitHub</a></div>
+  
+
+  
+  <header>
+    <h1 class="title indent">
+      Z-Wave
+    </h1>
+  </header>
+  <hr class="divider">
+  
+
+  <p><img src="https://i.imgur.com/WkBB4BV.gif" alt="Under Construction" /></p>
+
+<p>Z-Wave is a popular home automation protocol that is not always straightforward to setup. This page will try to help you make sense of it all.</p>
+
+<h2><a class="title-link" name="supported-z-wave-sticks" href="#supported-z-wave-sticks"></a> Supported Z-Wave Sticks</h2>
+
+<h4>Aeotec Z-Stick Series 2</h4>
+
+<p>Works fine on Linux.</p>
+
+<h2><a class="title-link" name="stick-alternatives" href="#stick-alternatives"></a> Stick Alternatives</h2>
+
+<p>The alternative to a stick is a hub that supports Z-Wave. Home Assistant supports the following hubs with Z-Wave support:</p>
+
+<ul>
+  <li><a href="/components/vera/">Vera</a></li>
+</ul>
+
+
+</article>
+
+
+        </div>
+
+        
+      </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://github.com/balloob/home-assistant'><i class="icon-github"></i></a>
+
+  <div class="credit">
+    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>
+</div>
+    </div>
+  </div>
+</div>
+    </footer>
+
+    <!--[if lt IE 7]>
+      <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+    <![endif]-->
+
+    <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>
+
+  </body>
+</html>
\ No newline at end of file