diff --git a/atom.xml b/atom.xml
index bba8d89ae1..b8cca0b5a5 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -20,9 +20,9 @@
     <id>https://home-assistant.io/blog/2017/05/06/zigbee-opencv-dlib</id>
     <content type="html"><![CDATA[<p><a href="https://home-assistant.io/components/#added_in_current_version/"><img src="https://home-assistant.io/images/blog/2017-05-0.44/components.png" style="border: 0;box-shadow: none;" /></a></p>
 
-<p>This release brings some great new integrations. The biggest one is the native ZigBee integration by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
+<p>This release brings some great new integrations. The biggest one is the <a href="https://home-assistant.io/components/zha/">native ZigBee integration</a> by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
 
-<p>Another great new addition is OpenCV by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new DLib integration added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
+<p>Another great new addition is <a href="https://home-assistant.io/components/opencv/">OpenCV</a> by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new <a href="https://home-assistant.io/components/image_processing.dlib_face_identify/">DLib integration</a> added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
 
 <p>This release also includes a <a href="https://home-assistant.io/components/rss_feed_template/">new component</a> to dynamically generate RSS feeds based on a template. This means that any RSS widget on your phone, tablet or computer can now be used to show Home Assistant data!</p>
 
@@ -326,14 +326,14 @@ $ sudo systemctl start install_homeassistant.service
 <p>To allow you to customize your installation further, we have included a tool called <code class="highlighter-rouge">hassbian-config</code>. This tool comes with a set of packages that can easily be installed for easier customization of your Home Assistant installation. This replaces the <code class="highlighter-rouge">hassbian-scripts</code> functionality from 1.1.</p>
 
 <ul>
-  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
-  <li>Install Libcec. Adds local <a href="https://home-assistant.io/components/hdmi_cec/">HDMI CEC support</a>.</li>
+  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
   <li>Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.</li>
+  <li>Install Libcec. Adds local <a href="https://home-assistant.io/components/hdmi_cec/">HDMI CEC support</a>.</li>
   <li>Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.</li>
   <li>Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.</li>
-  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
-  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
+  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
   <li>Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.</li>
+  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
 </ul>
 
 <h3><a class="title-link" name="spring-cleaning" href="#spring-cleaning"></a> Spring cleaning</h3>
diff --git a/blog/2017/04/30/hassbian-1.21-its-about-time/index.html b/blog/2017/04/30/hassbian-1.21-its-about-time/index.html
index 97f1142122..35a9de24a6 100644
--- a/blog/2017/04/30/hassbian-1.21-its-about-time/index.html
+++ b/blog/2017/04/30/hassbian-1.21-its-about-time/index.html
@@ -85,14 +85,14 @@
 <h3><a class="title-link" name="hassbian-config" href="#hassbian-config"></a> Hassbian-config</h3>
 <p>To allow you to customize your installation further, we have included a tool called <code class="highlighter-rouge">hassbian-config</code>. This tool comes with a set of packages that can easily be installed for easier customization of your Home Assistant installation. This replaces the <code class="highlighter-rouge">hassbian-scripts</code> functionality from 1.1.</p>
 <ul>
-  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
-  <li>Install Libcec. Adds local <a href="/components/hdmi_cec/">HDMI CEC support</a>.</li>
+  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
   <li>Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.</li>
+  <li>Install Libcec. Adds local <a href="/components/hdmi_cec/">HDMI CEC support</a>.</li>
   <li>Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.</li>
   <li>Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.</li>
-  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
-  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
+  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
   <li>Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.</li>
+  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
 </ul>
 <h3><a class="title-link" name="spring-cleaning" href="#spring-cleaning"></a> Spring cleaning</h3>
 <p>With this image there also quite a bit of cleaning of the base system and the script that generates our Raspberry Pi image.</p>
diff --git a/blog/2017/05/06/zigbee-opencv-dlib/index.html b/blog/2017/05/06/zigbee-opencv-dlib/index.html
index d0fc99182c..633fa5496b 100644
--- a/blog/2017/05/06/zigbee-opencv-dlib/index.html
+++ b/blog/2017/05/06/zigbee-opencv-dlib/index.html
@@ -79,8 +79,8 @@
   </div>
 </header>
   <p><a href="/components/#added_in_current_version"><img src="/images/blog/2017-05-0.44/components.png" style="border: 0;box-shadow: none;" /></a></p>
-<p>This release brings some great new integrations. The biggest one is the native ZigBee integration by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
-<p>Another great new addition is OpenCV by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new DLib integration added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
+<p>This release brings some great new integrations. The biggest one is the <a href="https://home-assistant.io/components/zha/">native ZigBee integration</a> by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
+<p>Another great new addition is <a href="https://home-assistant.io/components/opencv/">OpenCV</a> by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new <a href="https://home-assistant.io/components/image_processing.dlib_face_identify/">DLib integration</a> added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
 <p>This release also includes a <a href="https://home-assistant.io/components/rss_feed_template/">new component</a> to dynamically generate RSS feeds based on a template. This means that any RSS widget on your phone, tablet or computer can now be used to show Home Assistant data!</p>
 <p>Enjoy!</p>
 <h2><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h2>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 78807aff50..4c545bb7ac 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>2017-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 96a21a39f8..f73370db0d 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 4942decb19..65baf3f708 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 6a4eda62a9..640f787d43 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 8da79f6f60..2bc48d0459 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 3daffddc24..da5bcd1d5a 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 0a16be8a53..abc1e1e2fa 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 f24c7813c3..dbfe089a62 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 6dc99bba42..fb0c4d5a29 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 1bf97d9937..4aca4bb152 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 a7fadd8acb..5d010133ff 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 4687ee25d9..325ea90309 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 32cc37390a..55506c48f3 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 7661f22d56..feb2e3860b 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 3f0bf489d3..681fee6fd8 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 8b306d1c81..337bddac66 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -20,9 +20,9 @@
     <id>https://home-assistant.io/blog/2017/05/06/zigbee-opencv-dlib</id>
     <content type="html"><![CDATA[<a href='https://home-assistant.io/components/#added_in_current_version/'><img src='https://home-assistant.io/images/blog/2017-05-0.44/components.png' style='border: 0;box-shadow: none;'></a>
 
-This release brings some great new integrations. The biggest one is the native ZigBee integration by [Russell Cloran][@rcloran]. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)
+This release brings some great new integrations. The biggest one is the [native ZigBee integration][zha docs] by [Russell Cloran][@rcloran]. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)
 
-Another great new addition is OpenCV by [Teagan Glenn][@teagan42]. So now you'll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new DLib integration added by [Pascal Vizeli][@pvizeli] in this release.
+Another great new addition is [OpenCV][opencv docs] by [Teagan Glenn][@teagan42]. So now you'll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new [DLib integration][image_processing.dlib_face_identify docs] added by [Pascal Vizeli][@pvizeli] in this release.
 
 This release also includes a [new component][rss_feed_template docs] to dynamically generate RSS feeds based on a template. This means that any RSS widget on your phone, tablet or computer can now be used to show Home Assistant data!
 
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index e39e63ff4a..8872d7716a 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 ab2cf381f4..26ecdfee87 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 7a6df96164..12f8cc5e00 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -30,14 +30,14 @@ With the release of 1.21 a small problem with the OpenZWave build script wasn't
 
 To allow you to customize your installation further, we have included a tool called `hassbian-config`. This tool comes with a set of packages that can easily be installed for easier customization of your Home Assistant installation. This replaces the `hassbian-scripts` functionality from 1.1.
 
-  - Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it's usage is not recommended if you share your network with others.
-  - Install Libcec. Adds local [HDMI CEC support][cec].
-  - Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.
-  - Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.
-  - Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.
-  - Install Tradfri. Installs dependencies for using IKEA Trådfri.
   - Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.
-  - Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.
+ - Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.
+ - Install Libcec. Adds local [HDMI CEC support][cec].
+ - Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.
+ - Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.
+ - Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it's usage is not recommended if you share your network with others.
+ - Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.
+ - Install Tradfri. Installs dependencies for using IKEA Trådfri.
 
 ### <a class='title-link' name='spring-cleaning' href='#spring-cleaning'></a> Spring cleaning 
 
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 9a34f1791c..85f87667d7 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 ccad785588..c55ae0e640 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+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 9e3e7a00a9..048e07e48e 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-05-06T20:41:56+00:00</updated>
+  <updated>2017-05-06T21:02:24+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/index.html b/blog/index.html
index 90fd51ff63..b61bfa8de6 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -81,8 +81,8 @@
 </header>
   <div class="entry-content clearfix">
     <p><a href="/components/#added_in_current_version"><img src="/images/blog/2017-05-0.44/components.png" style="border: 0;box-shadow: none;" /></a></p>
-<p>This release brings some great new integrations. The biggest one is the native ZigBee integration by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
-<p>Another great new addition is OpenCV by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new DLib integration added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
+<p>This release brings some great new integrations. The biggest one is the <a href="https://home-assistant.io/components/zha/">native ZigBee integration</a> by <a href="https://github.com/rcloran">Russell Cloran</a>. This will allow Home Assistant to natively control Philips Hue lights without the need for a hub! (IKEA Tradfri lights not yet due to implementing a different profile)</p>
+<p>Another great new addition is <a href="https://home-assistant.io/components/opencv/">OpenCV</a> by <a href="https://github.com/Teagan42">Teagan Glenn</a>. So now you’ll be able to unlock all the cool stuff from OpenCV right in Home Assistant. And if OpenCV is not your style, you can try out the new <a href="https://home-assistant.io/components/image_processing.dlib_face_identify/">DLib integration</a> added by <a href="https://github.com/pvizeli">Pascal Vizeli</a> in this release.</p>
 <p>This release also includes a <a href="https://home-assistant.io/components/rss_feed_template/">new component</a> to dynamically generate RSS feeds based on a template. This means that any RSS widget on your phone, tablet or computer can now be used to show Home Assistant data!</p>
 <p>Enjoy!</p>
 <h2><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h2>
@@ -231,14 +231,14 @@ $ sudo systemctl start install_homeassistant.service
 <h3><a class="title-link" name="hassbian-config" href="#hassbian-config"></a> Hassbian-config</h3>
 <p>To allow you to customize your installation further, we have included a tool called <code class="highlighter-rouge">hassbian-config</code>. This tool comes with a set of packages that can easily be installed for easier customization of your Home Assistant installation. This replaces the <code class="highlighter-rouge">hassbian-scripts</code> functionality from 1.1.</p>
 <ul>
-  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
-  <li>Install Libcec. Adds local <a href="/components/hdmi_cec/">HDMI CEC support</a>.</li>
+  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
   <li>Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.</li>
+  <li>Install Libcec. Adds local <a href="/components/hdmi_cec/">HDMI CEC support</a>.</li>
   <li>Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.</li>
   <li>Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.</li>
-  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
-  <li>Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.</li>
+  <li>Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it’s usage is not recommended if you share your network with others.</li>
   <li>Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.</li>
+  <li>Install Tradfri. Installs dependencies for using IKEA Trådfri.</li>
 </ul>
 <h3><a class="title-link" name="spring-cleaning" href="#spring-cleaning"></a> Spring cleaning</h3>
 <p>With this image there also quite a bit of cleaning of the base system and the script that generates our Raspberry Pi image.</p>
diff --git a/sitemap.xml b/sitemap.xml
index 199b7d6e4f..48576b9254 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3351,62 +3351,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-05-06T20:41:05+00:00</lastmod>
+<lastmod>2017-05-06T21:01:39+00:00</lastmod>
 </url>
 </urlset>