From 823567f52f97bf56544feea22da1e2dac7d018f1 Mon Sep 17 00:00:00 2001
From: Travis CI <balloob+bot@gmail.com>
Date: Thu, 8 Feb 2018 19:29:57 +0000
Subject: [PATCH] Site updated at 2018-02-08 19:29:57 UTC

---
 atom.xml                                      |  2 +-
 blog/2014/12/18/website-launched/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 blog/2015/01/13/nest-in-da-house/index.html   | 24 ++---
 blog/2015/01/24/release-notes/index.html      | 24 ++---
 .../2015/02/08/looking-at-the-past/index.html | 24 ++---
 blog/2015/02/24/streaming-updates/index.html  | 24 ++---
 .../index.html                                | 24 ++---
 blog/2015/03/08/new-logo/index.html           | 24 ++---
 blog/2015/03/11/release-notes/index.html      | 24 ++---
 blog/2015/03/22/release-notes/index.html      | 24 ++---
 blog/2015/04/25/release-notes/index.html      | 24 ++---
 .../05/09/utc-time-zone-awareness/index.html  | 24 ++---
 blog/2015/05/14/release-notes/index.html      | 24 ++---
 blog/2015/06/10/release-notes/index.html      | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../13/home-assistant-meets-ifttt/index.html  | 24 ++---
 .../index.html                                | 24 ++---
 .../alarm-sonos-and-itunes-support/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../11/22/survey-november-2015/index.html     | 24 ++---
 .../12/05/community-highlights/index.html     | 24 ++---
 .../index.html                                | 24 ++---
 .../12/07/influxdb-and-grafana/index.html     | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../01/19/perfect-home-automation/index.html  | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../multi-room-audio-with-snapcast/index.html | 24 ++---
 .../02/20/community-highlights/index.html     | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 blog/2016/04/07/static-website/index.html     | 24 ++---
 .../index.html                                | 24 ++---
 .../04/17/updated-documentation/index.html    | 24 ++---
 .../04/19/to-infinity-and-beyond/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../05/06/open-iot-summit-talk/index.html     | 24 ++---
 .../empowering-scripts-and-alexa/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 blog/2016/05/18/why-we-use-polymer/index.html | 24 ++---
 blog/2016/05/21/release-020/index.html        | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../06/01/community-highlights/index.html     | 24 ++---
 .../08/super-fast-web-enocean-lirc/index.html | 24 ++---
 .../home-assistant-at-pycon-2016/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../usb-webcams-and-home-assistant/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../sqlalchemy-knx-join-simplisafe/index.html | 24 ++---
 .../19/visualizing-your-iot-data/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../esp8266-and-micropython-part1/index.html  | 24 ++---
 .../index.html                                | 24 ++---
 .../03/laundry-automation-update/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 blog/2016/08/16/we-have-apps-now/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../esp8266-and-micropython-part2/index.html  | 24 ++---
 .../notify-group-reload-api-pihole/index.html | 24 ++---
 .../async-sleepiq-emoncms-stocks/index.html   | 24 ++---
 .../01/we-have-raspberry-image-now/index.html | 24 ++---
 blog/2016/10/02/hacktoberfest/index.html      | 24 ++---
 .../08/hassbian-rest-digital-ocean/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../10/25/explaining-the-updater/index.html   | 24 ++---
 .../hacktoberfest-influxdb-weather/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../12/03/remote-websockets-sonarr/index.html | 24 ++---
 .../index.html                                | 24 ++---
 blog/2016/12/19/thank-you/index.html          | 24 ++---
 .../index.html                                | 24 ++---
 .../01/14/iss-usps-images-packages/index.html | 24 ++---
 blog/2017/01/18/numbers/index.html            | 24 ++---
 .../21/home-assistant-governance/index.html   | 24 ++---
 blog/2017/01/28/face-coffee-wink/index.html   | 24 ++---
 blog/2017/02/03/babyphone/index.html          | 24 ++---
 blog/2017/02/04/hassbian-toybox/index.html    | 24 ++---
 .../11/alert-appletv-mqtt-yeelight/index.html | 24 ++---
 blog/2017/02/14/clt-workshop/index.html       | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../2017/03/22/broken-dependencies/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../03/25/todo-volumio-workday/index.html     | 24 ++---
 .../2017/03/28/http-to-mqtt-bridge/index.html | 24 ++---
 blog/2017/04/01/thomas-krenn-award/index.html | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/04/15/ios/index.html                | 24 ++---
 .../index.html                                | 24 ++---
 .../04/22/ikea-tradfri-spotify/index.html     | 24 ++---
 .../04/24/hardware-contest-2017/index.html    | 24 ++---
 .../04/25/influxdb-grafana-docker/index.html  | 24 ++---
 .../hassbian-1.21-its-about-time/index.html   | 24 ++---
 .../index.html                                | 24 ++---
 .../05/05/podcast-init-interview/index.html   | 24 ++---
 blog/2017/05/06/zigbee-opencv-dlib/index.html | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../index.html                                | 24 ++---
 .../06/02/home-assistant-podcast-1/index.html | 24 ++---
 blog/2017/06/04/release-46/index.html         | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/06/15/zwave-entity-ids/index.html   | 24 ++---
 blog/2017/06/17/release-47/index.html         | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/07/02/release-48/index.html         | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/07/05/hasspodcast-ep-3/index.html   | 24 ++---
 blog/2017/07/15/release-49/index.html         | 24 ++---
 blog/2017/07/17/hasspodcast-ep-4/index.html   | 24 ++---
 blog/2017/07/25/introducing-hassio/index.html | 24 ++---
 .../2017/07/27/talk-python-podcast/index.html | 24 ++---
 blog/2017/07/29/release-50/index.html         | 24 ++---
 blog/2017/08/01/hasspodcast-ep-5/index.html   | 24 ++---
 blog/2017/08/12/release-51/index.html         | 24 ++---
 blog/2017/08/26/release-0-52/index.html       | 24 ++---
 blog/2017/09/09/release-53/index.html         | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/09/23/release-54/index.html         | 24 ++---
 .../09/26/new-hassio-build-system/index.html  | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/09/29/hacktoberfest/index.html      | 24 ++---
 blog/2017/10/01/hass-podcast-ep9/index.html   | 24 ++---
 .../deprecating-python-3.4-support/index.html | 24 ++---
 blog/2017/10/07/release-55/index.html         | 24 ++---
 .../10/15/templating-date-time/index.html     | 24 ++---
 blog/2017/10/18/hasspodcast-ep-10/index.html  | 24 ++---
 blog/2017/10/21/release-56/index.html         | 24 ++---
 .../10/23/simple-analog-sensor/index.html     | 24 ++---
 blog/2017/10/28/demo/index.html               | 24 ++---
 .../2017/11/02/secure-shell-tunnel/index.html | 24 ++---
 blog/2017/11/04/release-57/index.html         | 24 ++---
 .../11/05/frontend-translations/index.html    | 24 ++---
 blog/2017/11/10/ttn-with-mqtt/index.html      | 24 ++---
 blog/2017/11/12/tor/index.html                | 24 ++---
 blog/2017/11/18/release-58/index.html         | 24 ++---
 .../11/29/hassio-virtual-machine/index.html   | 24 ++---
 blog/2017/12/03/release-59/index.html         | 24 ++---
 .../index.html                                | 24 ++---
 blog/2017/12/17/release-60/index.html         | 24 ++---
 blog/2017/12/28/thank-you/index.html          | 24 ++---
 blog/2018/01/14/release-61/index.html         | 24 ++---
 .../21/clarification-emulated-hue/index.html  | 24 ++---
 blog/categories/announcements/atom.xml        |  2 +-
 blog/categories/community/atom.xml            |  2 +-
 blog/categories/device-tracking/atom.xml      |  2 +-
 blog/categories/esp8266/atom.xml              |  2 +-
 blog/categories/how-to/atom.xml               |  2 +-
 blog/categories/ibeacons/atom.xml             |  2 +-
 blog/categories/internet-of-things/atom.xml   |  2 +-
 blog/categories/iot-data/atom.xml             |  2 +-
 blog/categories/media/atom.xml                |  2 +-
 blog/categories/merchandise/atom.xml          |  2 +-
 blog/categories/micropython/atom.xml          |  2 +-
 blog/categories/mqtt/atom.xml                 |  2 +-
 blog/categories/organization/atom.xml         |  2 +-
 blog/categories/owntracks/atom.xml            |  2 +-
 blog/categories/presence-detection/atom.xml   |  2 +-
 .../public-service-announcement/atom.xml      |  2 +-
 blog/categories/release-notes/atom.xml        |  2 +-
 blog/categories/survey/atom.xml               |  2 +-
 blog/categories/talks/atom.xml                |  2 +-
 blog/categories/technology/atom.xml           |  2 +-
 blog/categories/user-stories/atom.xml         |  2 +-
 blog/categories/video/atom.xml                |  2 +-
 blog/categories/website/atom.xml              |  2 +-
 components/device_tracker.unifi/index.html    | 16 ++--
 components/google_assistant/index.html        | 13 +++
 sitemap.xml                                   | 96 +++++++++----------
 196 files changed, 1612 insertions(+), 2617 deletions(-)

diff --git a/atom.xml b/atom.xml
index e2b9bb1195..a6b5d72909 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/2014/12/18/website-launched/index.html b/blog/2014/12/18/website-launched/index.html
index 66e810035a..4cce2c30d0 100644
--- a/blog/2014/12/18/website-launched/index.html
+++ b/blog/2014/12/18/website-launched/index.html
@@ -89,21 +89,15 @@
   <p>I finally took the time to setup a simple website to help people getting started with Home Assistant. The process was super smooth thanks to the great tools <a href="http://jekyllrb.com">Jekyll</a> and <a href="http://octopress.org">Octopress</a> and the great services <a href="https://pages.github.com">GitHub Pages</a> and <a href="https://cloudflare.com">CloudFlare</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2014/12/18/website-launched/';
-    var disqus_url = 'https://home-assistant.io/blog/2014/12/18/website-launched/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2014/12/18/website-launched/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2014/12/26/home-control-home-automation-and-the-smart-home/index.html b/blog/2014/12/26/home-control-home-automation-and-the-smart-home/index.html
index 5f2759207f..5439086d29 100644
--- a/blog/2014/12/26/home-control-home-automation-and-the-smart-home/index.html
+++ b/blog/2014/12/26/home-control-home-automation-and-the-smart-home/index.html
@@ -123,21 +123,15 @@ This article will try to explain how they all relate.</p>
 <p>Happy new year!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2014/12/26/home-control-home-automation-and-the-smart-home/';
-    var disqus_url = 'https://home-assistant.io/blog/2014/12/26/home-control-home-automation-and-the-smart-home/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2014/12/26/home-control-home-automation-and-the-smart-home/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/index.html b/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/index.html
index 104cff6bc6..4c6dfe601f 100644
--- a/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/index.html
+++ b/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/index.html
@@ -113,21 +113,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/01/11/bootstrapping-your-setup-with-discovery/index.html b/blog/2015/01/11/bootstrapping-your-setup-with-discovery/index.html
index 9447a11040..9bfb39fb08 100644
--- a/blog/2015/01/11/bootstrapping-your-setup-with-discovery/index.html
+++ b/blog/2015/01/11/bootstrapping-your-setup-with-discovery/index.html
@@ -96,21 +96,15 @@
 <p>A new <a href="/developers/add_new_platform/#discovery">discovery section</a> has been added to the Adding a new platform page with instructions how to make your platform discoverable.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/01/11/bootstrapping-your-setup-with-discovery/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/01/11/bootstrapping-your-setup-with-discovery/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/01/11/bootstrapping-your-setup-with-discovery/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/01/13/nest-in-da-house/index.html b/blog/2015/01/13/nest-in-da-house/index.html
index 1cd7f5eee4..54b5f4aeb2 100644
--- a/blog/2015/01/13/nest-in-da-house/index.html
+++ b/blog/2015/01/13/nest-in-da-house/index.html
@@ -100,21 +100,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/01/13/nest-in-da-house/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/01/13/nest-in-da-house/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/01/13/nest-in-da-house/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/01/24/release-notes/index.html b/blog/2015/01/24/release-notes/index.html
index ab33d04223..b15f724cc3 100644
--- a/blog/2015/01/24/release-notes/index.html
+++ b/blog/2015/01/24/release-notes/index.html
@@ -106,21 +106,15 @@ Home Assistant should now throw better errors and offer solutions if you do not
 Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and <code class="highlighter-rouge">--demo-mode</code> command line properties to open the browser automatically and have something to show. Home Assistant now supports to be run without a password, allowing the interface to login automatically on launch.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/01/24/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/01/24/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/01/24/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/02/08/looking-at-the-past/index.html b/blog/2015/02/08/looking-at-the-past/index.html
index 0e1c6a0dd4..55443b6b4b 100644
--- a/blog/2015/02/08/looking-at-the-past/index.html
+++ b/blog/2015/02/08/looking-at-the-past/index.html
@@ -111,21 +111,15 @@ Events are saved in a local database. Google Graphs is used to draw the graph. D
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/02/08/looking-at-the-past/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/02/08/looking-at-the-past/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/02/08/looking-at-the-past/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/02/24/streaming-updates/index.html b/blog/2015/02/24/streaming-updates/index.html
index 989b8518cf..c9f84bc33c 100644
--- a/blog/2015/02/24/streaming-updates/index.html
+++ b/blog/2015/02/24/streaming-updates/index.html
@@ -97,21 +97,15 @@
 <p>Another issue that I encountered is that Safari and Firefox would not fire the <code class="highlighter-rouge">open</code> event when the connection has been opened but when the first message has been received. To work around this the server will now fire a ping when the connection gets opened.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/02/24/streaming-updates/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/02/24/streaming-updates/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/02/24/streaming-updates/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/03/01/home-assistant-migrating-to-yaml/index.html b/blog/2015/03/01/home-assistant-migrating-to-yaml/index.html
index b69e959bd0..9723db65ed 100644
--- a/blog/2015/03/01/home-assistant-migrating-to-yaml/index.html
+++ b/blog/2015/03/01/home-assistant-migrating-to-yaml/index.html
@@ -91,21 +91,15 @@
 <p>Users of Home Assistant should migrate as the old configuration format is deprecated.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/03/01/home-assistant-migrating-to-yaml/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/03/01/home-assistant-migrating-to-yaml/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/03/01/home-assistant-migrating-to-yaml/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/03/08/new-logo/index.html b/blog/2015/03/08/new-logo/index.html
index caabdde6f3..826a0c658f 100644
--- a/blog/2015/03/08/new-logo/index.html
+++ b/blog/2015/03/08/new-logo/index.html
@@ -94,21 +94,15 @@ The old logo, the new detailed logo and the new simple logo.
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/03/08/new-logo/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/03/08/new-logo/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/03/08/new-logo/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/03/11/release-notes/index.html b/blog/2015/03/11/release-notes/index.html
index 5a4cb4f3c3..b68f923d09 100644
--- a/blog/2015/03/11/release-notes/index.html
+++ b/blog/2015/03/11/release-notes/index.html
@@ -119,21 +119,15 @@ An initial version of voice control for Home Assistant has landed. The current i
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/03/11/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/03/11/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/03/11/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/03/22/release-notes/index.html b/blog/2015/03/22/release-notes/index.html
index 40ce00cecd..c0d25222ca 100644
--- a/blog/2015/03/22/release-notes/index.html
+++ b/blog/2015/03/22/release-notes/index.html
@@ -155,21 +155,15 @@ I (Paulus) have contributed a scene component. A user can create scenes that cap
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/03/22/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/03/22/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/03/22/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/04/25/release-notes/index.html b/blog/2015/04/25/release-notes/index.html
index 31d3ca4f5d..f780e9cffa 100644
--- a/blog/2015/04/25/release-notes/index.html
+++ b/blog/2015/04/25/release-notes/index.html
@@ -163,21 +163,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/04/25/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/04/25/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/04/25/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/05/09/utc-time-zone-awareness/index.html b/blog/2015/05/09/utc-time-zone-awareness/index.html
index 063e6249af..d6c235625b 100644
--- a/blog/2015/05/09/utc-time-zone-awareness/index.html
+++ b/blog/2015/05/09/utc-time-zone-awareness/index.html
@@ -107,21 +107,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/05/09/utc-time-zone-awareness/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/05/09/utc-time-zone-awareness/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/05/09/utc-time-zone-awareness/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/05/14/release-notes/index.html b/blog/2015/05/14/release-notes/index.html
index 512b3775a2..3a9a133d29 100644
--- a/blog/2015/05/14/release-notes/index.html
+++ b/blog/2015/05/14/release-notes/index.html
@@ -177,21 +177,15 @@ Before diving into the newly supported devices and services, I want to highlight
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/05/14/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/05/14/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/05/14/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/06/10/release-notes/index.html b/blog/2015/06/10/release-notes/index.html
index 8fcea16c11..d41c764dc7 100644
--- a/blog/2015/06/10/release-notes/index.html
+++ b/blog/2015/06/10/release-notes/index.html
@@ -223,21 +223,15 @@ This switch platform allows you to control your motion detection setting on your
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/06/10/release-notes/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/06/10/release-notes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/06/10/release-notes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/index.html b/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/index.html
index 873e0965c4..e65eba49ce 100644
--- a/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/index.html
+++ b/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/index.html
@@ -187,21 +187,15 @@ Fabian has added support for <a href="https://forecast.io/">Forecast.io</a> to g
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/index.html b/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/index.html
index d1e6270c44..b0a454e731 100644
--- a/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/index.html
+++ b/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/index.html
@@ -170,21 +170,15 @@ Support for Temper temperature sensors has been contributed by <a href="https://
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/08/17/verisure-and-modern-tp-link-router-support/index.html b/blog/2015/08/17/verisure-and-modern-tp-link-router-support/index.html
index 6b28105211..d48ac2bc3b 100644
--- a/blog/2015/08/17/verisure-and-modern-tp-link-router-support/index.html
+++ b/blog/2015/08/17/verisure-and-modern-tp-link-router-support/index.html
@@ -107,21 +107,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/08/17/verisure-and-modern-tp-link-router-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/08/17/verisure-and-modern-tp-link-router-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/08/17/verisure-and-modern-tp-link-router-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/index.html b/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/index.html
index 5f79bb993f..5c32e33f09 100644
--- a/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/index.html
+++ b/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/index.html
@@ -207,21 +207,15 @@ The automation and script syntax here is using a deprecated and no longer suppor
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/index.html b/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/index.html
index f16bd2731e..c5fcac7419 100644
--- a/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/index.html
+++ b/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/index.html
@@ -168,21 +168,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/index.html b/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/index.html
index f226f1ca7e..943e6e6fee 100644
--- a/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/index.html
+++ b/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/index.html
@@ -245,21 +245,15 @@
 <p>I hope that this post could give you some ideas about the usage Home Assistant and MQTT. If you are working on a cool project that includes Home Assistant, please let us now.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/09/13/home-assistant-meets-ifttt/index.html b/blog/2015/09/13/home-assistant-meets-ifttt/index.html
index 15d47d8afe..2e4a2ec93c 100644
--- a/blog/2015/09/13/home-assistant-meets-ifttt/index.html
+++ b/blog/2015/09/13/home-assistant-meets-ifttt/index.html
@@ -235,21 +235,15 @@
 </table>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/09/13/home-assistant-meets-ifttt/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/09/13/home-assistant-meets-ifttt/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/09/13/home-assistant-meets-ifttt/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/09/18/monitoring-with-glances-and-home-assistant/index.html b/blog/2015/09/18/monitoring-with-glances-and-home-assistant/index.html
index 0a3a16e666..aaf846c744 100644
--- a/blog/2015/09/18/monitoring-with-glances-and-home-assistant/index.html
+++ b/blog/2015/09/18/monitoring-with-glances-and-home-assistant/index.html
@@ -134,21 +134,15 @@ Glances web server started on http://0.0.0.0:61208/
 <p><a href="https://github.com/nicolargo/glances">Glances</a> has a couple of optional dependencies which are extenting the range of provided information. This means that it would be possible to get details about the RAID system, HDD temperature, IP addresses, sensors, etc., please create a <a href="https://github.com/home-assistant/home-assistant/pulls">Pull request</a> with your additions or a <a href="https://github.com/home-assistant/home-assistant/issues/new">Feature request</a> if you want see more details in your Home Assistant frontend.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/09/18/monitoring-with-glances-and-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/09/18/monitoring-with-glances-and-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/09/18/monitoring-with-glances-and-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/09/19/alarm-sonos-and-itunes-support/index.html b/blog/2015/09/19/alarm-sonos-and-itunes-support/index.html
index e94248b139..9095c50ac0 100644
--- a/blog/2015/09/19/alarm-sonos-and-itunes-support/index.html
+++ b/blog/2015/09/19/alarm-sonos-and-itunes-support/index.html
@@ -130,21 +130,15 @@ Automation has gotten a lot of love. It now supports conditions, multiple trigge
 <img src="/images/supported_brands/verisure.png" style="border:none; box-shadow: none; float: right;" height="50" /> We now support arming and disarming your verisure alarm from within Home Assistant thanks to added support by <a href="https://github.com/persandstrom">@persandstrom</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/09/19/alarm-sonos-and-itunes-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/09/19/alarm-sonos-and-itunes-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/09/19/alarm-sonos-and-itunes-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/index.html b/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/index.html
index c4720a3f30..87424ffc73 100644
--- a/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/index.html
+++ b/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/index.html
@@ -113,21 +113,15 @@ Map in Home Assistant showing two people and three zones (home, school, work)
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/index.html b/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/index.html
index 8110624197..c591174a4b 100644
--- a/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/index.html
+++ b/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/index.html
@@ -298,21 +298,15 @@ Home Assistant will keep track of historical values and allow you to integrate i
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/index.html b/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/index.html
index 4d6be79c6a..abf6076a82 100644
--- a/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/index.html
+++ b/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/index.html
@@ -103,21 +103,15 @@
 <p>Also, the media player was extended by <a href="https://github.com/maddox">@maddox</a> to support the play media command. This has been implemented for the <a href="/components/media_player.itunes/">iTunes platform</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/10/26/firetv-and-radiotherm-now-supported/index.html b/blog/2015/10/26/firetv-and-radiotherm-now-supported/index.html
index 3b6d17ce31..5a7ecee14d 100644
--- a/blog/2015/10/26/firetv-and-radiotherm-now-supported/index.html
+++ b/blog/2015/10/26/firetv-and-radiotherm-now-supported/index.html
@@ -120,21 +120,15 @@ It is no longer possible to turn a scene off after it has been activated. The wa
 This makes more sense as most people run Home Assistant as a daemon</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/10/26/firetv-and-radiotherm-now-supported/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/10/26/firetv-and-radiotherm-now-supported/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/10/26/firetv-and-radiotherm-now-supported/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/index.html b/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/index.html
index ae84c30ae5..8691b4d5e1 100644
--- a/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/index.html
+++ b/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/index.html
@@ -118,21 +118,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/11/22/survey-november-2015/index.html b/blog/2015/11/22/survey-november-2015/index.html
index cc52f90588..a3a10e539b 100644
--- a/blog/2015/11/22/survey-november-2015/index.html
+++ b/blog/2015/11/22/survey-november-2015/index.html
@@ -145,21 +145,15 @@
 <p>The interpretation of the data is up to you. Again, thanks for participating in this survey.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/11/22/survey-november-2015/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/11/22/survey-november-2015/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/11/22/survey-november-2015/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/05/community-highlights/index.html b/blog/2015/12/05/community-highlights/index.html
index 8a276641e6..f685e8ce7c 100644
--- a/blog/2015/12/05/community-highlights/index.html
+++ b/blog/2015/12/05/community-highlights/index.html
@@ -96,21 +96,15 @@
 <p>And last but not least, Midwestern Mac did a <a href="http://www.midwesternmac.com/blogs/jeff-geerling/raspberry-pi-microsd-card">microSD card performance comparison</a> for the Raspberry Pi. If you’re using a Pi, make sure to check it out!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/05/community-highlights/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/05/community-highlights/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/05/community-highlights/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/index.html b/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/index.html
index 15a7ff8b84..23f63f0865 100644
--- a/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/index.html
+++ b/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/index.html
@@ -104,21 +104,15 @@
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/07/influxdb-and-grafana/index.html b/blog/2015/12/07/influxdb-and-grafana/index.html
index 1aff3d654c..91f34ae026 100644
--- a/blog/2015/12/07/influxdb-and-grafana/index.html
+++ b/blog/2015/12/07/influxdb-and-grafana/index.html
@@ -158,21 +158,15 @@ name: binary_sensor
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/07/influxdb-and-grafana/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/07/influxdb-and-grafana/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/07/influxdb-and-grafana/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/index.html b/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/index.html
index 171dbec80b..90f053d5bc 100644
--- a/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/index.html
+++ b/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/index.html
@@ -125,21 +125,15 @@ This is where we’ll configure our task, so select the plus icon to select an a
 <p>Now load up Home Assistant and whenever you toggle the switch you created your Android device will respond with either “On” or “Off”. :-)</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/index.html b/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/index.html
index 82c3db9d5f..e37b87e8b1 100644
--- a/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/index.html
+++ b/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/index.html
@@ -111,21 +111,15 @@ Philips Hue FAQ entries regarding 3rd party light bulbs.
 <p>I will no longer suggest people to buy into the Philips Hue ecosystem.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/13/setup-encryption-using-lets-encrypt/index.html b/blog/2015/12/13/setup-encryption-using-lets-encrypt/index.html
index 639614b412..de56770330 100644
--- a/blog/2015/12/13/setup-encryption-using-lets-encrypt/index.html
+++ b/blog/2015/12/13/setup-encryption-using-lets-encrypt/index.html
@@ -153,21 +153,15 @@ sudo docker run -it --rm -p 80:80 --name certbot <span class="se">\</span>
 <p><em>Big thanks to Fabian Affolter for his help and feedback on this article.</em></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/13/setup-encryption-using-lets-encrypt/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/13/setup-encryption-using-lets-encrypt/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/13/setup-encryption-using-lets-encrypt/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2015/12/22/amazon-echo-icloud-and-templates/index.html b/blog/2015/12/22/amazon-echo-icloud-and-templates/index.html
index c0b5148f8a..d82c9b26f0 100644
--- a/blog/2015/12/22/amazon-echo-icloud-and-templates/index.html
+++ b/blog/2015/12/22/amazon-echo-icloud-and-templates/index.html
@@ -128,21 +128,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2015/12/22/amazon-echo-icloud-and-templates/';
-    var disqus_url = 'https://home-assistant.io/blog/2015/12/22/amazon-echo-icloud-and-templates/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2015/12/22/amazon-echo-icloud-and-templates/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/01/17/extended-support-for-diy-solutions/index.html b/blog/2016/01/17/extended-support-for-diy-solutions/index.html
index 12781e80bf..524f487f38 100644
--- a/blog/2016/01/17/extended-support-for-diy-solutions/index.html
+++ b/blog/2016/01/17/extended-support-for-diy-solutions/index.html
@@ -119,21 +119,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/01/17/extended-support-for-diy-solutions/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/01/17/extended-support-for-diy-solutions/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/01/17/extended-support-for-diy-solutions/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/01/19/perfect-home-automation/index.html b/blog/2016/01/19/perfect-home-automation/index.html
index 15cb6ac80c..95ff4bea1d 100644
--- a/blog/2016/01/19/perfect-home-automation/index.html
+++ b/blog/2016/01/19/perfect-home-automation/index.html
@@ -108,21 +108,15 @@
 <p><em>Thanks to Chris LaRose for this feedback and comments.</em></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/01/19/perfect-home-automation/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/01/19/perfect-home-automation/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/01/19/perfect-home-automation/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/index.html b/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/index.html
index 99eddb7131..b7837dc170 100644
--- a/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/index.html
+++ b/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/index.html
@@ -122,21 +122,15 @@ Example of the new views in the frontend. <a href="/components/group/">Learn mor
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/index.html b/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/index.html
index 08b069183d..e29425f704 100644
--- a/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/index.html
+++ b/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/index.html
@@ -242,21 +242,15 @@ Z-Wave light bulb    |
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/12/classifying-the-internet-of-things/index.html b/blog/2016/02/12/classifying-the-internet-of-things/index.html
index 524685bf86..9c00b8d624 100644
--- a/blog/2016/02/12/classifying-the-internet-of-things/index.html
+++ b/blog/2016/02/12/classifying-the-internet-of-things/index.html
@@ -216,21 +216,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/12/classifying-the-internet-of-things/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/12/classifying-the-internet-of-things/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/12/classifying-the-internet-of-things/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/index.html b/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/index.html
index 4636e43d08..60bad5b1ca 100644
--- a/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/index.html
+++ b/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/index.html
@@ -127,21 +127,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/18/multi-room-audio-with-snapcast/index.html b/blog/2016/02/18/multi-room-audio-with-snapcast/index.html
index ecbc8451b5..a568c528fa 100644
--- a/blog/2016/02/18/multi-room-audio-with-snapcast/index.html
+++ b/blog/2016/02/18/multi-room-audio-with-snapcast/index.html
@@ -181,21 +181,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/18/multi-room-audio-with-snapcast/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/18/multi-room-audio-with-snapcast/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/18/multi-room-audio-with-snapcast/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/20/community-highlights/index.html b/blog/2016/02/20/community-highlights/index.html
index 69bb6935d9..0dbeec1096 100644
--- a/blog/2016/02/20/community-highlights/index.html
+++ b/blog/2016/02/20/community-highlights/index.html
@@ -124,21 +124,15 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/20/community-highlights/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/20/community-highlights/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/20/community-highlights/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/index.html b/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/index.html
index c8d2241a81..d0bb869f11 100644
--- a/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/index.html
+++ b/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/index.html
@@ -126,21 +126,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/03/12/z-wave-pep257-templated-service-calls/index.html b/blog/2016/03/12/z-wave-pep257-templated-service-calls/index.html
index 2d1329233f..1af53ab54e 100644
--- a/blog/2016/03/12/z-wave-pep257-templated-service-calls/index.html
+++ b/blog/2016/03/12/z-wave-pep257-templated-service-calls/index.html
@@ -127,21 +127,15 @@ player state attributes. This change affects automations, scripts and scenes.</l
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/03/12/z-wave-pep257-templated-service-calls/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/03/12/z-wave-pep257-templated-service-calls/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/03/12/z-wave-pep257-templated-service-calls/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/index.html b/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/index.html
index ace1d02a06..66b0ff94d8 100644
--- a/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/index.html
+++ b/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/index.html
@@ -135,21 +135,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/05/your-hub-should-be-local-and-open/index.html b/blog/2016/04/05/your-hub-should-be-local-and-open/index.html
index 0fb541c093..dd47bd65fd 100644
--- a/blog/2016/04/05/your-hub-should-be-local-and-open/index.html
+++ b/blog/2016/04/05/your-hub-should-be-local-and-open/index.html
@@ -95,21 +95,15 @@
 <p>Unless you can afford losing a product here and there, be cautious when buying IoT products that depend on the cloud from companies that are not well established. The chances are high that they go bankrupt or get acquired and closed. This however is easier said than done as <a href="http://www.gartner.com/newsroom/id/2869521">Gartner</a> predicts that by 2017, 50 percent of IoT solutions will originate in startups that are less than three years old.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/05/your-hub-should-be-local-and-open/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/05/your-hub-should-be-local-and-open/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/05/your-hub-should-be-local-and-open/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/07/static-website/index.html b/blog/2016/04/07/static-website/index.html
index 7a9291fea8..718c843897 100644
--- a/blog/2016/04/07/static-website/index.html
+++ b/blog/2016/04/07/static-website/index.html
@@ -98,21 +98,15 @@
 <p>I hope that this little article could give you an idea of extending Home Assistant in an unconventional way.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/07/static-website/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/07/static-website/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/07/static-website/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/index.html b/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/index.html
index 58ddad0ea1..9375bf5426 100644
--- a/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/index.html
+++ b/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/index.html
@@ -107,21 +107,15 @@
 <p>As of now we are not aware of any breaking changes. However, it might be that Home Assistant will not start for you because of an invalid configuration. A common mistake that people are making is that they are still referring to <code class="highlighter-rouge">execute_service</code> in their script configs. This should be <code class="highlighter-rouge">service</code>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/17/updated-documentation/index.html b/blog/2016/04/17/updated-documentation/index.html
index 4727590248..e614581d87 100644
--- a/blog/2016/04/17/updated-documentation/index.html
+++ b/blog/2016/04/17/updated-documentation/index.html
@@ -93,21 +93,15 @@
 <p>Finally, if you see some content that could use more clarifcation or is outdated, don’t hesitate to use the ‘Edit in GitHub’ link that is present on each page.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/17/updated-documentation/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/17/updated-documentation/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/17/updated-documentation/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/19/to-infinity-and-beyond/index.html b/blog/2016/04/19/to-infinity-and-beyond/index.html
index 7b5e812871..8610397f3e 100644
--- a/blog/2016/04/19/to-infinity-and-beyond/index.html
+++ b/blog/2016/04/19/to-infinity-and-beyond/index.html
@@ -105,21 +105,15 @@
 <p>Paulus</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/19/to-infinity-and-beyond/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/19/to-infinity-and-beyond/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/19/to-infinity-and-beyond/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/index.html b/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/index.html
index 6a2575e41e..72ace73bbd 100644
--- a/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/index.html
+++ b/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/index.html
@@ -127,21 +127,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/index.html b/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/index.html
index d8b10d8916..de8a154ef2 100644
--- a/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/index.html
+++ b/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/index.html
@@ -169,21 +169,15 @@ For example, my wife works next door - and I couldn’t detect whether she’s a
 <p><em>Make sure to also check out <a href="/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/">part II</a> where I talk about how to use iBeacons to track any object.</em></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/06/open-iot-summit-talk/index.html b/blog/2016/05/06/open-iot-summit-talk/index.html
index 9ee0eeabfd..d9d91361a1 100644
--- a/blog/2016/05/06/open-iot-summit-talk/index.html
+++ b/blog/2016/05/06/open-iot-summit-talk/index.html
@@ -93,21 +93,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/06/open-iot-summit-talk/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/06/open-iot-summit-talk/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/06/open-iot-summit-talk/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/07/empowering-scripts-and-alexa/index.html b/blog/2016/05/07/empowering-scripts-and-alexa/index.html
index 2f37ba97f5..410b7509a7 100644
--- a/blog/2016/05/07/empowering-scripts-and-alexa/index.html
+++ b/blog/2016/05/07/empowering-scripts-and-alexa/index.html
@@ -167,21 +167,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/07/empowering-scripts-and-alexa/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/07/empowering-scripts-and-alexa/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/07/empowering-scripts-and-alexa/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/12/video-configuring-home-assistant/index.html b/blog/2016/05/12/video-configuring-home-assistant/index.html
index 1c9c9d9e0f..e318da8b75 100644
--- a/blog/2016/05/12/video-configuring-home-assistant/index.html
+++ b/blog/2016/05/12/video-configuring-home-assistant/index.html
@@ -93,21 +93,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/12/video-configuring-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/12/video-configuring-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/12/video-configuring-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/18/why-we-use-polymer/index.html b/blog/2016/05/18/why-we-use-polymer/index.html
index dfa1fef217..0157f5130e 100644
--- a/blog/2016/05/18/why-we-use-polymer/index.html
+++ b/blog/2016/05/18/why-we-use-polymer/index.html
@@ -99,21 +99,15 @@
 <p>So there it is, the reason why we use Polymer.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/18/why-we-use-polymer/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/18/why-we-use-polymer/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/18/why-we-use-polymer/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/21/release-020/index.html b/blog/2016/05/21/release-020/index.html
index c1f30f5ea8..9e7e5ddf4b 100644
--- a/blog/2016/05/21/release-020/index.html
+++ b/blog/2016/05/21/release-020/index.html
@@ -123,21 +123,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/21/release-020/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/21/release-020/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/21/release-020/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/22/get-started-with-all-in-one-installer/index.html b/blog/2016/05/22/get-started-with-all-in-one-installer/index.html
index 226be5c085..a90a8e0a26 100644
--- a/blog/2016/05/22/get-started-with-all-in-one-installer/index.html
+++ b/blog/2016/05/22/get-started-with-all-in-one-installer/index.html
@@ -96,21 +96,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/22/get-started-with-all-in-one-installer/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/22/get-started-with-all-in-one-installer/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/22/get-started-with-all-in-one-installer/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/index.html b/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/index.html
index eec1e91a50..392b249dc6 100644
--- a/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/index.html
+++ b/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/index.html
@@ -197,21 +197,15 @@
 <p>Please see the <a href="/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/#tips">notes at the end of Part 1</a> for documentation information.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/06/01/community-highlights/index.html b/blog/2016/06/01/community-highlights/index.html
index 767b2fddb6..1ebd8cc6b9 100644
--- a/blog/2016/06/01/community-highlights/index.html
+++ b/blog/2016/06/01/community-highlights/index.html
@@ -105,21 +105,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/06/01/community-highlights/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/06/01/community-highlights/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/06/01/community-highlights/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/06/08/super-fast-web-enocean-lirc/index.html b/blog/2016/06/08/super-fast-web-enocean-lirc/index.html
index d2bda37fdd..d55e89e729 100644
--- a/blog/2016/06/08/super-fast-web-enocean-lirc/index.html
+++ b/blog/2016/06/08/super-fast-web-enocean-lirc/index.html
@@ -137,21 +137,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/06/08/super-fast-web-enocean-lirc/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/06/08/super-fast-web-enocean-lirc/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/06/08/super-fast-web-enocean-lirc/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/06/13/home-assistant-at-pycon-2016/index.html b/blog/2016/06/13/home-assistant-at-pycon-2016/index.html
index c1231d8a32..52a95a9a2f 100644
--- a/blog/2016/06/13/home-assistant-at-pycon-2016/index.html
+++ b/blog/2016/06/13/home-assistant-at-pycon-2016/index.html
@@ -109,21 +109,15 @@
 <p>I’ve had a really great time at PyCon. It was awesome to meet everyone in person and I hope to see many of you next year!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/06/13/home-assistant-at-pycon-2016/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/06/13/home-assistant-at-pycon-2016/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/06/13/home-assistant-at-pycon-2016/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html b/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
index 4994694230..415a4acf10 100644
--- a/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
+++ b/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
@@ -131,21 +131,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/06/23/usb-webcams-and-home-assistant/index.html b/blog/2016/06/23/usb-webcams-and-home-assistant/index.html
index ad1e19fa30..65cf3f6a1d 100644
--- a/blog/2016/06/23/usb-webcams-and-home-assistant/index.html
+++ b/blog/2016/06/23/usb-webcams-and-home-assistant/index.html
@@ -177,21 +177,15 @@ target_dir /tmp
 <p><a href="http://lavrsen.dk/foswiki/bin/view/Motion/WebHome">motion</a> is a powerful tool and this blog post only showed two very simple use cases. Take a look at the <a href="http://www.lavrsen.dk/foswiki/bin/view/Motion/MotionGuide">documentation</a> of <code class="highlighter-rouge">motion</code> to unleash its potential.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/06/23/usb-webcams-and-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/06/23/usb-webcams-and-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/06/23/usb-webcams-and-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/index.html b/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/index.html
index 9168e8f087..32e4f97c7e 100644
--- a/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/index.html
+++ b/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/index.html
@@ -132,21 +132,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/06/pocketchip-running-home-assistant/index.html b/blog/2016/07/06/pocketchip-running-home-assistant/index.html
index eb197c5ba6..8306958327 100644
--- a/blog/2016/07/06/pocketchip-running-home-assistant/index.html
+++ b/blog/2016/07/06/pocketchip-running-home-assistant/index.html
@@ -122,21 +122,15 @@ Over a year ago I participated in the <a href="https://www.kickstarter.com/proje
 <p>Well, with PocketCHIP and Home Assistant you could run your home automation on a 49 USD device with a touchscreen, an integrated USP, and a keyboard. With the GPIO available on top of the display you could even connect your PocketCHIP directly to sensors and actuators.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/06/pocketchip-running-home-assistant/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/06/pocketchip-running-home-assistant/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/06/pocketchip-running-home-assistant/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html b/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html
index 6aefc9972a..a3a5cd4e3b 100644
--- a/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html
+++ b/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html
@@ -128,21 +128,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/19/visualizing-your-iot-data/index.html b/blog/2016/07/19/visualizing-your-iot-data/index.html
index 0233532fc8..723e1159be 100644
--- a/blog/2016/07/19/visualizing-your-iot-data/index.html
+++ b/blog/2016/07/19/visualizing-your-iot-data/index.html
@@ -165,21 +165,15 @@ SQLite version 3.11.0 2016-02-15 17:29:24
 <p>Most of the graphs are pretty ugly. So, further beautification will be needed. If you have created a nice report including some amazing graphs then the Home Assistant community would be grateful for sharing them in our <a href="https://community.home-assistant.io/">forum</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/19/visualizing-your-iot-data/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/19/visualizing-your-iot-data/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/19/visualizing-your-iot-data/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/index.html b/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/index.html
index a4523ff351..ab0d54ce14 100644
--- a/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/index.html
+++ b/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/index.html
@@ -132,21 +132,15 @@ One of the graphs created with this tutorial.
 <p>While you learn and explore your IoT data, we will be working on providing more ready-to-use Jupyter Notebooks. Feel free to ask questions or provide suggestions. Would you like to see a specific visualization? Is there a particular facet of data you’re interested in? Let’s talk about it, let’s dive into the world of data together!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/28/esp8266-and-micropython-part1/index.html b/blog/2016/07/28/esp8266-and-micropython-part1/index.html
index 43cfc0a7d8..b16c4fad2a 100644
--- a/blog/2016/07/28/esp8266-and-micropython-part1/index.html
+++ b/blog/2016/07/28/esp8266-and-micropython-part1/index.html
@@ -212,21 +212,15 @@ If a module is missing then you need to download it from the <a href="https://gi
 <p>If you run into trouble, press “Ctrl+c” in the REPL to stop the execution of the code, enter <code class="highlighter-rouge">&gt;&gt;&gt; import webrepl</code> and <code class="highlighter-rouge">&gt;&gt;&gt; webrepl.start()</code>, and upload your fixed file.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/28/esp8266-and-micropython-part1/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/28/esp8266-and-micropython-part1/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/28/esp8266-and-micropython-part1/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/index.html b/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/index.html
index 0aed748e0c..1f5f8357f1 100644
--- a/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/index.html
+++ b/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/index.html
@@ -144,21 +144,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/03/laundry-automation-update/index.html b/blog/2016/08/03/laundry-automation-update/index.html
index aac94a7e67..c49b59507b 100644
--- a/blog/2016/08/03/laundry-automation-update/index.html
+++ b/blog/2016/08/03/laundry-automation-update/index.html
@@ -176,21 +176,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/03/laundry-automation-update/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/03/laundry-automation-update/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/03/laundry-automation-update/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/index.html b/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/index.html
index 158f3841f9..744ff793ec 100644
--- a/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/index.html
+++ b/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/index.html
@@ -171,21 +171,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/index.html b/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/index.html
index 1ffe2da06b..79719d13af 100644
--- a/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/index.html
+++ b/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/index.html
@@ -144,21 +144,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/16/we-have-apps-now/index.html b/blog/2016/08/16/we-have-apps-now/index.html
index 48f97338d7..14820691a4 100644
--- a/blog/2016/08/16/we-have-apps-now/index.html
+++ b/blog/2016/08/16/we-have-apps-now/index.html
@@ -182,21 +182,15 @@
 <p>Happy Automating!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/16/we-have-apps-now/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/16/we-have-apps-now/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/16/we-have-apps-now/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/index.html b/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/index.html
index 20f9cd4352..2419f6228a 100644
--- a/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/index.html
+++ b/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/index.html
@@ -94,21 +94,15 @@ Heatmap
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/28/notifications-hue-fake-unification/index.html b/blog/2016/08/28/notifications-hue-fake-unification/index.html
index 52f6cc0c6b..553e7fb1ee 100644
--- a/blog/2016/08/28/notifications-hue-fake-unification/index.html
+++ b/blog/2016/08/28/notifications-hue-fake-unification/index.html
@@ -243,21 +243,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/28/notifications-hue-fake-unification/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/28/notifications-hue-fake-unification/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/28/notifications-hue-fake-unification/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/08/31/esp8266-and-micropython-part2/index.html b/blog/2016/08/31/esp8266-and-micropython-part2/index.html
index 577d298b31..2a78e81ed6 100644
--- a/blog/2016/08/31/esp8266-and-micropython-part2/index.html
+++ b/blog/2016/08/31/esp8266-and-micropython-part2/index.html
@@ -170,21 +170,15 @@ So, part 1 of <a href="/blog/2016/07/28/esp8266-and-micropython-part1/">ESP8266
 <p><a href="https://github.com/davea">@davea</a> created <a href="https://github.com/davea/sonoff-mqtt">sonoff-mqtt</a>. This code will work on ESP8622 based devices too and shows how to use a button to control a relay.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/08/31/esp8266-and-micropython-part2/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/08/31/esp8266-and-micropython-part2/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/08/31/esp8266-and-micropython-part2/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/09/10/notify-group-reload-api-pihole/index.html b/blog/2016/09/10/notify-group-reload-api-pihole/index.html
index 0b372f517b..805c2ee43c 100644
--- a/blog/2016/09/10/notify-group-reload-api-pihole/index.html
+++ b/blog/2016/09/10/notify-group-reload-api-pihole/index.html
@@ -172,21 +172,15 @@
 <p>…don’t hesitate to use our <a href="https://community.home-assistant.io/">Forum</a> or join us for a little <a href="https://discord.gg/c5DvZ4e">chat</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/09/10/notify-group-reload-api-pihole/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/09/10/notify-group-reload-api-pihole/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/09/10/notify-group-reload-api-pihole/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html b/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html
index 0fb2225592..db3e2ea431 100644
--- a/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html
+++ b/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html
@@ -177,21 +177,15 @@
 <p>…don’t hesitate to use our <a href="https://community.home-assistant.io/">Forum</a> or join us for a little <a href="https://discord.gg/c5DvZ4e">chat</a>. The release notes have comments enabled but it’s preferred if you the former communication channels. Thanks.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/09/29/async-sleepiq-emoncms-stocks/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/09/29/async-sleepiq-emoncms-stocks/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/09/29/async-sleepiq-emoncms-stocks/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/10/01/we-have-raspberry-image-now/index.html b/blog/2016/10/01/we-have-raspberry-image-now/index.html
index 769c259c73..081750063d 100644
--- a/blog/2016/10/01/we-have-raspberry-image-now/index.html
+++ b/blog/2016/10/01/we-have-raspberry-image-now/index.html
@@ -98,21 +98,15 @@
 <p>Happy Automating!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/10/01/we-have-raspberry-image-now/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/10/01/we-have-raspberry-image-now/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/10/01/we-have-raspberry-image-now/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/10/02/hacktoberfest/index.html b/blog/2016/10/02/hacktoberfest/index.html
index dc0734178a..29771c9967 100644
--- a/blog/2016/10/02/hacktoberfest/index.html
+++ b/blog/2016/10/02/hacktoberfest/index.html
@@ -106,21 +106,15 @@
 <p><a href="https://hacktoberfest.digitalocean.com/"><img src="/images/blog/2016-10-hacktoberfest/hacktoberfest.png" alt="Hacktober fest logo" /></a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/10/02/hacktoberfest/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/10/02/hacktoberfest/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/10/02/hacktoberfest/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/10/08/hassbian-rest-digital-ocean/index.html b/blog/2016/10/08/hassbian-rest-digital-ocean/index.html
index 8db444b546..5acd16ed02 100644
--- a/blog/2016/10/08/hassbian-rest-digital-ocean/index.html
+++ b/blog/2016/10/08/hassbian-rest-digital-ocean/index.html
@@ -188,21 +188,15 @@
 <p>…don’t hesitate to use our <a href="https://community.home-assistant.io/">Forum</a> or join us for a little <a href="https://discord.gg/c5DvZ4e">chat</a>. The release notes have comments enabled but it’s preferred if you the former communication channels. Thanks.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/10/08/hassbian-rest-digital-ocean/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/10/08/hassbian-rest-digital-ocean/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/10/08/hassbian-rest-digital-ocean/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html b/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html
index fcfc248a9b..c62230ea18 100644
--- a/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html
+++ b/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html
@@ -360,21 +360,15 @@
 <p>– Robbie</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/10/22/flash-briefing-updater-hacktoberfest/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/10/22/flash-briefing-updater-hacktoberfest/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/10/22/flash-briefing-updater-hacktoberfest/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/10/25/explaining-the-updater/index.html b/blog/2016/10/25/explaining-the-updater/index.html
index 7cfa668861..4924bd376c 100644
--- a/blog/2016/10/25/explaining-the-updater/index.html
+++ b/blog/2016/10/25/explaining-the-updater/index.html
@@ -116,21 +116,15 @@
 <p>The source code of our updater AWS Lambda function is now available <a href="https://github.com/home-assistant/Analytics-Receiver">here</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/10/25/explaining-the-updater/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/10/25/explaining-the-updater/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/10/25/explaining-the-updater/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html b/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
index e43006555c..24dfc07b3e 100644
--- a/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
+++ b/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
@@ -184,21 +184,15 @@
 <p>…don’t hesitate to use our <a href="https://community.home-assistant.io/">Forum</a> or join us for a little <a href="https://discord.gg/c5DvZ4e">chat</a>. The release notes have comments enabled but it’s preferred if you the former communication channels. Thanks.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/11/05/hacktoberfest-influxdb-weather/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/11/05/hacktoberfest-influxdb-weather/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/11/05/hacktoberfest-influxdb-weather/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/index.html b/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/index.html
index 88bebd0cdd..69db9e0896 100644
--- a/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/index.html
+++ b/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/index.html
@@ -145,21 +145,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/12/03/remote-websockets-sonarr/index.html b/blog/2016/12/03/remote-websockets-sonarr/index.html
index 474d351f2d..131ac316bd 100644
--- a/blog/2016/12/03/remote-websockets-sonarr/index.html
+++ b/blog/2016/12/03/remote-websockets-sonarr/index.html
@@ -206,21 +206,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/12/03/remote-websockets-sonarr/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/12/03/remote-websockets-sonarr/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/12/03/remote-websockets-sonarr/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/index.html b/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/index.html
index d39efb054d..31deeb9612 100644
--- a/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/index.html
+++ b/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/index.html
@@ -159,21 +159,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2016/12/19/thank-you/index.html b/blog/2016/12/19/thank-you/index.html
index 72efa4722b..90f3cd2141 100644
--- a/blog/2016/12/19/thank-you/index.html
+++ b/blog/2016/12/19/thank-you/index.html
@@ -97,21 +97,15 @@
 <p>– Paulus</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2016/12/19/thank-you/';
-    var disqus_url = 'https://home-assistant.io/blog/2016/12/19/thank-you/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2016/12/19/thank-you/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/01/03/control-my-christmas-tree-stats/index.html b/blog/2017/01/03/control-my-christmas-tree-stats/index.html
index b62893d438..7c85ad4580 100644
--- a/blog/2017/01/03/control-my-christmas-tree-stats/index.html
+++ b/blog/2017/01/03/control-my-christmas-tree-stats/index.html
@@ -107,21 +107,15 @@
 <p>Cheers! -Ben</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/01/03/control-my-christmas-tree-stats/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/01/03/control-my-christmas-tree-stats/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/01/03/control-my-christmas-tree-stats/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/01/14/iss-usps-images-packages/index.html b/blog/2017/01/14/iss-usps-images-packages/index.html
index 0900fdbc89..feb5358b01 100644
--- a/blog/2017/01/14/iss-usps-images-packages/index.html
+++ b/blog/2017/01/14/iss-usps-images-packages/index.html
@@ -176,21 +176,15 @@ You have to note:
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/01/14/iss-usps-images-packages/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/01/14/iss-usps-images-packages/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/01/14/iss-usps-images-packages/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/01/18/numbers/index.html b/blog/2017/01/18/numbers/index.html
index a414bd733d..20f6a34f9e 100644
--- a/blog/2017/01/18/numbers/index.html
+++ b/blog/2017/01/18/numbers/index.html
@@ -99,21 +99,15 @@
 <p>– Fabian</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/01/18/numbers/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/01/18/numbers/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/01/18/numbers/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/01/21/home-assistant-governance/index.html b/blog/2017/01/21/home-assistant-governance/index.html
index fccfae896a..d1211e31cf 100644
--- a/blog/2017/01/21/home-assistant-governance/index.html
+++ b/blog/2017/01/21/home-assistant-governance/index.html
@@ -136,21 +136,15 @@
 <p>We hope you understand that our desire with these changes is only to help protect the amazing community that has been built around Home Assistant. If you have any questions, please contact us via email, <a href="https://twitter.com/home_assistant">Twitter</a> or <a href="https://discord.gg/c5DvZ4e">Discord</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/01/21/home-assistant-governance/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/01/21/home-assistant-governance/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/01/21/home-assistant-governance/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/01/28/face-coffee-wink/index.html b/blog/2017/01/28/face-coffee-wink/index.html
index 32c1a8d04b..dd4eb6c2b5 100644
--- a/blog/2017/01/28/face-coffee-wink/index.html
+++ b/blog/2017/01/28/face-coffee-wink/index.html
@@ -222,21 +222,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/01/28/face-coffee-wink/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/01/28/face-coffee-wink/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/01/28/face-coffee-wink/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/03/babyphone/index.html b/blog/2017/02/03/babyphone/index.html
index 80895c83d7..2ccfb27148 100644
--- a/blog/2017/02/03/babyphone/index.html
+++ b/blog/2017/02/03/babyphone/index.html
@@ -201,21 +201,15 @@ We change the platform name for binary sensor in 0.38 from <code class="highligh
 <p>Special thanks to <a href="https://github.com/arsaboo">arsaboo</a> for assistance in writing this blogpost.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/03/babyphone/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/03/babyphone/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/03/babyphone/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/04/hassbian-toybox/index.html b/blog/2017/02/04/hassbian-toybox/index.html
index a2a89e2571..d5e5dd63f2 100644
--- a/blog/2017/02/04/hassbian-toybox/index.html
+++ b/blog/2017/02/04/hassbian-toybox/index.html
@@ -127,21 +127,15 @@ On the close horizon from <a href="https://github.com/Landrash">@Landrash</a> th
 <p>To get started with the new image, check out the installation instructions in the <a href="/getting-started/installation-raspberry-pi-image/">getting started section</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/04/hassbian-toybox/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/04/hassbian-toybox/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/04/hassbian-toybox/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html b/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html
index 2cc0cb1709..c2566393d8 100644
--- a/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html
+++ b/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html
@@ -214,21 +214,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/11/alert-appletv-mqtt-yeelight/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/11/alert-appletv-mqtt-yeelight/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/11/alert-appletv-mqtt-yeelight/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/14/clt-workshop/index.html b/blog/2017/02/14/clt-workshop/index.html
index a1a58891cb..97fb91e576 100644
--- a/blog/2017/02/14/clt-workshop/index.html
+++ b/blog/2017/02/14/clt-workshop/index.html
@@ -97,21 +97,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/14/clt-workshop/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/14/clt-workshop/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/14/clt-workshop/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/22/home-assistant-tshirts-have-arrived/index.html b/blog/2017/02/22/home-assistant-tshirts-have-arrived/index.html
index 0f9f122475..abdee49002 100644
--- a/blog/2017/02/22/home-assistant-tshirts-have-arrived/index.html
+++ b/blog/2017/02/22/home-assistant-tshirts-have-arrived/index.html
@@ -131,21 +131,15 @@
 </p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/22/home-assistant-tshirts-have-arrived/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/22/home-assistant-tshirts-have-arrived/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/22/home-assistant-tshirts-have-arrived/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/02/25/config-panel-and-state-restoration/index.html b/blog/2017/02/25/config-panel-and-state-restoration/index.html
index ff8e8e8846..be333f47ce 100644
--- a/blog/2017/02/25/config-panel-and-state-restoration/index.html
+++ b/blog/2017/02/25/config-panel-and-state-restoration/index.html
@@ -269,21 +269,15 @@
 <p>Experiencing issues introduced by this release? Please report them in our <a href="https://github.com/home-assistant/home-assistant/issues">issue tracker</a>. Make sure to fill in all fields of the issue template.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/02/25/config-panel-and-state-restoration/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/02/25/config-panel-and-state-restoration/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/02/25/config-panel-and-state-restoration/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/index.html b/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/index.html
index 11ec854fbe..34f5292c7f 100644
--- a/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/index.html
+++ b/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/index.html
@@ -302,21 +302,15 @@ Screenshot of all the different functionality the IP webcam integration offers.
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/03/22/broken-dependencies/index.html b/blog/2017/03/22/broken-dependencies/index.html
index 722b838985..60d62e35e4 100644
--- a/blog/2017/03/22/broken-dependencies/index.html
+++ b/blog/2017/03/22/broken-dependencies/index.html
@@ -99,21 +99,15 @@
 <p>This issue has been resolved by 0.40.2. If you are on an impacted version and cannot upgrade to the latest version just yet, a temporary workaround will be to remove the <code class="highlighter-rouge">&lt;config dir&gt;/deps</code> directory and stop using the above mentioned integrations. In the case of AppleTV, you will also have to disable the discovery component to prevent it from being auto-detected.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/03/22/broken-dependencies/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/03/22/broken-dependencies/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/03/22/broken-dependencies/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/index.html b/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/index.html
index bdce319f6b..24c6d492cd 100644
--- a/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/index.html
+++ b/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/index.html
@@ -92,21 +92,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/03/25/todo-volumio-workday/index.html b/blog/2017/03/25/todo-volumio-workday/index.html
index 0e78533333..c4ccc218be 100644
--- a/blog/2017/03/25/todo-volumio-workday/index.html
+++ b/blog/2017/03/25/todo-volumio-workday/index.html
@@ -247,21 +247,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/03/25/todo-volumio-workday/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/03/25/todo-volumio-workday/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/03/25/todo-volumio-workday/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/03/28/http-to-mqtt-bridge/index.html b/blog/2017/03/28/http-to-mqtt-bridge/index.html
index 207e487f57..41d0f694d0 100644
--- a/blog/2017/03/28/http-to-mqtt-bridge/index.html
+++ b/blog/2017/03/28/http-to-mqtt-bridge/index.html
@@ -140,21 +140,15 @@
 <p>Special thanks to Ben from <a href="https://www.youtube.com/channel/UCLecVrux63S6aYiErxdiy4w/featured">BRUH Automation</a> for awesome tutorials which inspired me to do this project.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/03/28/http-to-mqtt-bridge/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/03/28/http-to-mqtt-bridge/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/03/28/http-to-mqtt-bridge/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/01/thomas-krenn-award/index.html b/blog/2017/04/01/thomas-krenn-award/index.html
index 4983eeea79..89da378709 100644
--- a/blog/2017/04/01/thomas-krenn-award/index.html
+++ b/blog/2017/04/01/thomas-krenn-award/index.html
@@ -101,21 +101,15 @@
 <p>Keep in mind that you may have to pay the fee for customs handling and the import duty by yourself. The plan is to ship the hardware from Germany. If you are located in a country with import/export regulations, we may not be able to ship the hardware to you.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/01/thomas-krenn-award/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/01/thomas-krenn-award/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/01/thomas-krenn-award/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/index.html b/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/index.html
index d50375208d..1fe243542b 100644
--- a/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/index.html
+++ b/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/index.html
@@ -300,21 +300,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/15/ios/index.html b/blog/2017/04/15/ios/index.html
index f241689c31..20c004a2cc 100644
--- a/blog/2017/04/15/ios/index.html
+++ b/blog/2017/04/15/ios/index.html
@@ -104,21 +104,15 @@
 <p>Thanks for everything so far, I’m looking forward to the road that lies ahead for Home Assistant on iOS!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/15/ios/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/15/ios/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/15/ios/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/index.html b/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/index.html
index 1f457c9457..d6feb995b7 100644
--- a/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/index.html
+++ b/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/index.html
@@ -157,21 +157,15 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
 <p>As it currently stands, this is going to be the perfect companion hardware to work with Home Assistant: local, affordable, secure. And as cherry on the pie, local push will make us aware of changes right away.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/22/ikea-tradfri-spotify/index.html b/blog/2017/04/22/ikea-tradfri-spotify/index.html
index 2a04ac076d..e9651e2552 100644
--- a/blog/2017/04/22/ikea-tradfri-spotify/index.html
+++ b/blog/2017/04/22/ikea-tradfri-spotify/index.html
@@ -302,21 +302,15 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/22/ikea-tradfri-spotify/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/22/ikea-tradfri-spotify/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/22/ikea-tradfri-spotify/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/24/hardware-contest-2017/index.html b/blog/2017/04/24/hardware-contest-2017/index.html
index f1ab8342e6..9d87108e19 100644
--- a/blog/2017/04/24/hardware-contest-2017/index.html
+++ b/blog/2017/04/24/hardware-contest-2017/index.html
@@ -97,21 +97,15 @@
 <p>End of the voting period: April, 30 2017 - 23.59 UTC</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/24/hardware-contest-2017/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/24/hardware-contest-2017/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/24/hardware-contest-2017/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/04/25/influxdb-grafana-docker/index.html b/blog/2017/04/25/influxdb-grafana-docker/index.html
index f66f69def6..5c0db350f0 100644
--- a/blog/2017/04/25/influxdb-grafana-docker/index.html
+++ b/blog/2017/04/25/influxdb-grafana-docker/index.html
@@ -139,21 +139,15 @@
 </ol>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/25/influxdb-grafana-docker/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/25/influxdb-grafana-docker/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/25/influxdb-grafana-docker/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
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 d9ff9927d5..4a1f4f1c6e 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
@@ -114,21 +114,15 @@
 <p>To get started with the new image, check out the installation instructions in the <a href="/getting-started/installation-raspberry-pi-image/">getting started section</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/04/30/hassbian-1.21-its-about-time/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/04/30/hassbian-1.21-its-about-time/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/04/30/hassbian-1.21-its-about-time/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/index.html b/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/index.html
index 7b2037b041..2c1030054d 100644
--- a/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/index.html
+++ b/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/index.html
@@ -128,21 +128,15 @@ $ sudo systemctl start install_homeassistant.service
 <p>For further details about HASSbian, take a look at the <a href="https://home-assistant.io/docs/hassbian/">documentation</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/05/podcast-init-interview/index.html b/blog/2017/05/05/podcast-init-interview/index.html
index fff5b0bd98..3bf969c691 100644
--- a/blog/2017/05/05/podcast-init-interview/index.html
+++ b/blog/2017/05/05/podcast-init-interview/index.html
@@ -93,21 +93,15 @@
 <script class="podigee-podcast-player" src="//cdn.podigee.com/podcast-player/javascripts/podigee-podcast-player.js" data-configuration="https://www.podcastinit.com?podigee_player=205" async=""></script>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/05/podcast-init-interview/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/05/podcast-init-interview/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/05/podcast-init-interview/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/06/zigbee-opencv-dlib/index.html b/blog/2017/05/06/zigbee-opencv-dlib/index.html
index 9e11a95e52..bcb92e6955 100644
--- a/blog/2017/05/06/zigbee-opencv-dlib/index.html
+++ b/blog/2017/05/06/zigbee-opencv-dlib/index.html
@@ -291,21 +291,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/06/zigbee-opencv-dlib/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/06/zigbee-opencv-dlib/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/06/zigbee-opencv-dlib/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/index.html b/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/index.html
index 2da840746c..169ccc757d 100644
--- a/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/index.html
+++ b/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/index.html
@@ -94,21 +94,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/13/home-assistant-on-orange-pi-zero/index.html b/blog/2017/05/13/home-assistant-on-orange-pi-zero/index.html
index e23547ee99..eff48d2dac 100644
--- a/blog/2017/05/13/home-assistant-on-orange-pi-zero/index.html
+++ b/blog/2017/05/13/home-assistant-on-orange-pi-zero/index.html
@@ -197,21 +197,15 @@ Reading package lists... Done
 <p>To make it ready for daily usage, don’t forget to enable <a href="/docs/autostart/">autostart</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/13/home-assistant-on-orange-pi-zero/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/13/home-assistant-on-orange-pi-zero/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/13/home-assistant-on-orange-pi-zero/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/19/home-assistant-at-pycon-us-2017/index.html b/blog/2017/05/19/home-assistant-at-pycon-us-2017/index.html
index c3a5b3cef7..25e1c00f49 100644
--- a/blog/2017/05/19/home-assistant-at-pycon-us-2017/index.html
+++ b/blog/2017/05/19/home-assistant-at-pycon-us-2017/index.html
@@ -92,21 +92,15 @@
 <p>On a final note, the Home Assistant community is very very active so don’t take it personal if we don’t remember your name, issue or contribution.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/19/home-assistant-at-pycon-us-2017/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/19/home-assistant-at-pycon-us-2017/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/19/home-assistant-at-pycon-us-2017/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/05/20/automation-editor-zwave-panel-ocr/index.html b/blog/2017/05/20/automation-editor-zwave-panel-ocr/index.html
index 5119943a98..af764c3191 100644
--- a/blog/2017/05/20/automation-editor-zwave-panel-ocr/index.html
+++ b/blog/2017/05/20/automation-editor-zwave-panel-ocr/index.html
@@ -250,21 +250,15 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/05/20/automation-editor-zwave-panel-ocr/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/05/20/automation-editor-zwave-panel-ocr/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/05/20/automation-editor-zwave-panel-ocr/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/02/home-assistant-podcast-1/index.html b/blog/2017/06/02/home-assistant-podcast-1/index.html
index 271b86d6cd..35d7a9f1e1 100644
--- a/blog/2017/06/02/home-assistant-podcast-1/index.html
+++ b/blog/2017/06/02/home-assistant-podcast-1/index.html
@@ -93,21 +93,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/02/home-assistant-podcast-1/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/02/home-assistant-podcast-1/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/02/home-assistant-podcast-1/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/04/release-46/index.html b/blog/2017/06/04/release-46/index.html
index c56ef7e694..f4529a4a49 100644
--- a/blog/2017/06/04/release-46/index.html
+++ b/blog/2017/06/04/release-46/index.html
@@ -236,21 +236,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/04/release-46/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/04/release-46/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/04/release-46/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html b/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html
index 06640428dc..c1604933f8 100644
--- a/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html
+++ b/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html
@@ -92,21 +92,15 @@
 </div>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/10/interview-with-jupiter-broadcasting/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/10/interview-with-jupiter-broadcasting/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/10/interview-with-jupiter-broadcasting/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/15/zwave-entity-ids/index.html b/blog/2017/06/15/zwave-entity-ids/index.html
index 316030d312..da5735368e 100644
--- a/blog/2017/06/15/zwave-entity-ids/index.html
+++ b/blog/2017/06/15/zwave-entity-ids/index.html
@@ -92,21 +92,15 @@
 <p>I’m sure all ZWave users understand that the current entity_ids aren’t easy to use. They’re annoying to type in configuration.yaml, and break if a node needs to be re-included to the network. We know that breaking changes are painful, and so we’re doing what we can to roll this change out as smoothly as possible. The end result should be a dramatic simplification of most ZWave configurations. We hope that this change will ultimately make ZWave much easier to work with, and bring ZWave configuration just a little closer to the rest of the Home Assistant platforms.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/15/zwave-entity-ids/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/15/zwave-entity-ids/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/15/zwave-entity-ids/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/17/release-47/index.html b/blog/2017/06/17/release-47/index.html
index f990a618ba..10264f711a 100644
--- a/blog/2017/06/17/release-47/index.html
+++ b/blog/2017/06/17/release-47/index.html
@@ -333,21 +333,15 @@ trigger:
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/17/release-47/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/17/release-47/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/17/release-47/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/06/20/things-you-should-know-about-senic-covi/index.html b/blog/2017/06/20/things-you-should-know-about-senic-covi/index.html
index 6cbad17e90..9eee6b9f64 100644
--- a/blog/2017/06/20/things-you-should-know-about-senic-covi/index.html
+++ b/blog/2017/06/20/things-you-should-know-about-senic-covi/index.html
@@ -116,21 +116,15 @@ Founder, Home Assistant</p>
 Core Developer, Home Assistant</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/06/20/things-you-should-know-about-senic-covi/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/06/20/things-you-should-know-about-senic-covi/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/06/20/things-you-should-know-about-senic-covi/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/02/release-48/index.html b/blog/2017/07/02/release-48/index.html
index c6fec87fce..dfc8b35fa4 100644
--- a/blog/2017/07/02/release-48/index.html
+++ b/blog/2017/07/02/release-48/index.html
@@ -303,21 +303,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/02/release-48/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/02/release-48/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/02/release-48/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/03/home-assistant-is-moving-to-discord/index.html b/blog/2017/07/03/home-assistant-is-moving-to-discord/index.html
index df6c54868a..4954b21256 100644
--- a/blog/2017/07/03/home-assistant-is-moving-to-discord/index.html
+++ b/blog/2017/07/03/home-assistant-is-moving-to-discord/index.html
@@ -139,21 +139,15 @@
 Community Leader, Home Assistant</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/03/home-assistant-is-moving-to-discord/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/03/home-assistant-is-moving-to-discord/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/03/home-assistant-is-moving-to-discord/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/05/hasspodcast-ep-3/index.html b/blog/2017/07/05/hasspodcast-ep-3/index.html
index c57679035d..6cf258cf58 100644
--- a/blog/2017/07/05/hasspodcast-ep-3/index.html
+++ b/blog/2017/07/05/hasspodcast-ep-3/index.html
@@ -90,21 +90,15 @@
 <p><a href="https://hasspodcast.io/ha003/">Listen online</a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/05/hasspodcast-ep-3/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/05/hasspodcast-ep-3/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/05/hasspodcast-ep-3/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/15/release-49/index.html b/blog/2017/07/15/release-49/index.html
index e1adfdb34b..8f882332f7 100644
--- a/blog/2017/07/15/release-49/index.html
+++ b/blog/2017/07/15/release-49/index.html
@@ -289,21 +289,15 @@ Screenshot of a green dashboard
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/15/release-49/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/15/release-49/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/15/release-49/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/17/hasspodcast-ep-4/index.html b/blog/2017/07/17/hasspodcast-ep-4/index.html
index 9419a3d0b4..5ae1833610 100644
--- a/blog/2017/07/17/hasspodcast-ep-4/index.html
+++ b/blog/2017/07/17/hasspodcast-ep-4/index.html
@@ -90,21 +90,15 @@
 <p><a href="https://hasspodcast.io/ha004/">Listen online</a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/17/hasspodcast-ep-4/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/17/hasspodcast-ep-4/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/17/hasspodcast-ep-4/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/25/introducing-hassio/index.html b/blog/2017/07/25/introducing-hassio/index.html
index 5ae52b23e2..be9c4cb611 100644
--- a/blog/2017/07/25/introducing-hassio/index.html
+++ b/blog/2017/07/25/introducing-hassio/index.html
@@ -124,21 +124,15 @@ Hass.io dashboard
 <p>We use <a href="https://www.pivotaltracker.com/n/projects/2020851">Pivotal Tracker</a> to track things that are in progress and what we might work on.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/25/introducing-hassio/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/25/introducing-hassio/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/25/introducing-hassio/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/27/talk-python-podcast/index.html b/blog/2017/07/27/talk-python-podcast/index.html
index df46ab220c..be74550bba 100644
--- a/blog/2017/07/27/talk-python-podcast/index.html
+++ b/blog/2017/07/27/talk-python-podcast/index.html
@@ -93,21 +93,15 @@
 </a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/27/talk-python-podcast/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/27/talk-python-podcast/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/27/talk-python-podcast/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/07/29/release-50/index.html b/blog/2017/07/29/release-50/index.html
index 994c7da63a..a771ef1adc 100644
--- a/blog/2017/07/29/release-50/index.html
+++ b/blog/2017/07/29/release-50/index.html
@@ -261,21 +261,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/07/29/release-50/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/07/29/release-50/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/07/29/release-50/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/08/01/hasspodcast-ep-5/index.html b/blog/2017/08/01/hasspodcast-ep-5/index.html
index cae652b820..fc35c69b2d 100644
--- a/blog/2017/08/01/hasspodcast-ep-5/index.html
+++ b/blog/2017/08/01/hasspodcast-ep-5/index.html
@@ -91,21 +91,15 @@
 <p><a href="https://hasspodcast.io/ha005/">Listen online</a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/08/01/hasspodcast-ep-5/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/08/01/hasspodcast-ep-5/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/08/01/hasspodcast-ep-5/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/08/12/release-51/index.html b/blog/2017/08/12/release-51/index.html
index 59e767634b..341ed46c93 100644
--- a/blog/2017/08/12/release-51/index.html
+++ b/blog/2017/08/12/release-51/index.html
@@ -258,21 +258,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/08/12/release-51/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/08/12/release-51/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/08/12/release-51/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/08/26/release-0-52/index.html b/blog/2017/08/26/release-0-52/index.html
index 35958018cc..0de1397fb4 100644
--- a/blog/2017/08/26/release-0-52/index.html
+++ b/blog/2017/08/26/release-0-52/index.html
@@ -247,21 +247,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/08/26/release-0-52/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/08/26/release-0-52/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/08/26/release-0-52/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/09/release-53/index.html b/blog/2017/09/09/release-53/index.html
index 24123e9228..7d7bc1644b 100644
--- a/blog/2017/09/09/release-53/index.html
+++ b/blog/2017/09/09/release-53/index.html
@@ -271,21 +271,15 @@ Screenshot of the new customize editor.
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/09/release-53/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/09/release-53/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/09/release-53/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/index.html b/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/index.html
index 06f70ad187..676693cef1 100644
--- a/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/index.html
+++ b/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/index.html
@@ -100,21 +100,15 @@ Other than that the changes are mostly to our tool <code class="highlighter-roug
 <p>To get started with the new image, check out the installation instructions on the <a href="https://home-assistant.io/docs/installation/hassbian/installation/">installing Hassbian page</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/23/release-54/index.html b/blog/2017/09/23/release-54/index.html
index 293bf65b2d..4c9ecc277c 100644
--- a/blog/2017/09/23/release-54/index.html
+++ b/blog/2017/09/23/release-54/index.html
@@ -206,21 +206,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/23/release-54/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/23/release-54/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/23/release-54/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/26/new-hassio-build-system/index.html b/blog/2017/09/26/new-hassio-build-system/index.html
index 33687c3a21..89e7cfa1a4 100644
--- a/blog/2017/09/26/new-hassio-build-system/index.html
+++ b/blog/2017/09/26/new-hassio-build-system/index.html
@@ -110,21 +110,15 @@ FROM $BUILD_FROM
 <p>We have also updated our build scripts and replaced it with a <a href="https://github.com/home-assistant/hassio-build/tree/master/builder">builder docker engine</a>. This builder makes deploying Hass.io components very easy. All basic functionality is supported. If you want more functionality, check out <a href="https://github.com/hassio-addons/build-env">the builder by the Community Hass.io Add-ons project</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/26/new-hassio-build-system/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/26/new-hassio-build-system/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/26/new-hassio-build-system/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/index.html b/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/index.html
index dc1e0cc280..575f31efc1 100644
--- a/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/index.html
+++ b/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/index.html
@@ -113,21 +113,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/09/29/hacktoberfest/index.html b/blog/2017/09/29/hacktoberfest/index.html
index 0053a9786b..5c3dcf2a9d 100644
--- a/blog/2017/09/29/hacktoberfest/index.html
+++ b/blog/2017/09/29/hacktoberfest/index.html
@@ -107,21 +107,15 @@
 <p><a href="https://hacktoberfest.digitalocean.com/"><img src="/images/blog/2016-10-hacktoberfest/hacktoberfest.png" alt="Hacktober fest logo" /></a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/09/29/hacktoberfest/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/09/29/hacktoberfest/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/09/29/hacktoberfest/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/01/hass-podcast-ep9/index.html b/blog/2017/10/01/hass-podcast-ep9/index.html
index 2c07bc3c32..0f19181db7 100644
--- a/blog/2017/10/01/hass-podcast-ep9/index.html
+++ b/blog/2017/10/01/hass-podcast-ep9/index.html
@@ -92,21 +92,15 @@
 <p><a href="https://hasspodcast.io/ha009/">Listen online</a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/01/hass-podcast-ep9/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/01/hass-podcast-ep9/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/01/hass-podcast-ep9/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/06/deprecating-python-3.4-support/index.html b/blog/2017/10/06/deprecating-python-3.4-support/index.html
index 0be857cebc..6fc13c07d5 100644
--- a/blog/2017/10/06/deprecating-python-3.4-support/index.html
+++ b/blog/2017/10/06/deprecating-python-3.4-support/index.html
@@ -99,21 +99,15 @@
 <p>If you’re running a Debian based system, follow <a href="https://linuxconfig.org/raspbian-gnu-linux-upgrade-from-jessie-to-raspbian-stretch-9">these instructions</a> to upgrade.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/06/deprecating-python-3.4-support/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/06/deprecating-python-3.4-support/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/06/deprecating-python-3.4-support/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/07/release-55/index.html b/blog/2017/10/07/release-55/index.html
index 506e066be2..103c6433d5 100644
--- a/blog/2017/10/07/release-55/index.html
+++ b/blog/2017/10/07/release-55/index.html
@@ -233,21 +233,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/07/release-55/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/07/release-55/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/07/release-55/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/15/templating-date-time/index.html b/blog/2017/10/15/templating-date-time/index.html
index 17309d39b5..e54556e9f2 100644
--- a/blog/2017/10/15/templating-date-time/index.html
+++ b/blog/2017/10/15/templating-date-time/index.html
@@ -107,21 +107,15 @@
 <p>Thanks to <a href="https://github.com/etsinko">Egor Tsinko</a> for bringing this issue to our attention.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/15/templating-date-time/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/15/templating-date-time/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/15/templating-date-time/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/18/hasspodcast-ep-10/index.html b/blog/2017/10/18/hasspodcast-ep-10/index.html
index 803b180d87..f34fe57c38 100644
--- a/blog/2017/10/18/hasspodcast-ep-10/index.html
+++ b/blog/2017/10/18/hasspodcast-ep-10/index.html
@@ -90,21 +90,15 @@
 <p><a href="https://hasspodcast.io/ha010/">Listen online</a></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/18/hasspodcast-ep-10/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/18/hasspodcast-ep-10/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/18/hasspodcast-ep-10/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/21/release-56/index.html b/blog/2017/10/21/release-56/index.html
index e5026a59ff..8505361abd 100644
--- a/blog/2017/10/21/release-56/index.html
+++ b/blog/2017/10/21/release-56/index.html
@@ -288,21 +288,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/21/release-56/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/21/release-56/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/21/release-56/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/23/simple-analog-sensor/index.html b/blog/2017/10/23/simple-analog-sensor/index.html
index e6e7306a8a..2294410b87 100644
--- a/blog/2017/10/23/simple-analog-sensor/index.html
+++ b/blog/2017/10/23/simple-analog-sensor/index.html
@@ -166,21 +166,15 @@
 <p>Hide the serial sensor if you don’t want to see the raw data in the frontend and you are done. The whole setup with a Digispark is not very reliable because there is no hardware USB support. As a showcase and if you don’t build your automation rules around it does the sensor what it should for a very small price.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/23/simple-analog-sensor/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/23/simple-analog-sensor/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/23/simple-analog-sensor/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/10/28/demo/index.html b/blog/2017/10/28/demo/index.html
index 93394a11b1..65e4464221 100644
--- a/blog/2017/10/28/demo/index.html
+++ b/blog/2017/10/28/demo/index.html
@@ -158,21 +158,15 @@ Demo is running... -&gt; CTRL + C to shutdown
 <p>Some users share their slides and other documents in <a href="https://github.com/home-assistant/home-assistant-assets">our assets repository</a>. Also, take a look at that repository if you need a logo for your slides.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/10/28/demo/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/10/28/demo/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/10/28/demo/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/02/secure-shell-tunnel/index.html b/blog/2017/11/02/secure-shell-tunnel/index.html
index e39990cef8..38f46b5bd3 100644
--- a/blog/2017/11/02/secure-shell-tunnel/index.html
+++ b/blog/2017/11/02/secure-shell-tunnel/index.html
@@ -133,21 +133,15 @@ Last login: Fri Oct 27 17:50:09 2017
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/02/secure-shell-tunnel/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/02/secure-shell-tunnel/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/02/secure-shell-tunnel/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/04/release-57/index.html b/blog/2017/11/04/release-57/index.html
index e53cbe649d..af94e214c9 100644
--- a/blog/2017/11/04/release-57/index.html
+++ b/blog/2017/11/04/release-57/index.html
@@ -338,21 +338,15 @@ The Home Assistant sidebar in 12 different languages.
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/04/release-57/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/04/release-57/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/04/release-57/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/05/frontend-translations/index.html b/blog/2017/11/05/frontend-translations/index.html
index 256b105931..ad2f7b2c55 100644
--- a/blog/2017/11/05/frontend-translations/index.html
+++ b/blog/2017/11/05/frontend-translations/index.html
@@ -95,21 +95,15 @@ The Home Assistant sidebar in 12 different languages.
 <p>Now that we have a system in place, expect a lot more of the interface to be translatable soon. We still have some technical hurdles to overcome, but the hardest work is behind us now. The community has already done an outstanding job of providing translations. The future is looking bright!</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/05/frontend-translations/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/05/frontend-translations/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/05/frontend-translations/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/10/ttn-with-mqtt/index.html b/blog/2017/11/10/ttn-with-mqtt/index.html
index a431e34a88..a2a28c49d6 100644
--- a/blog/2017/11/10/ttn-with-mqtt/index.html
+++ b/blog/2017/11/10/ttn-with-mqtt/index.html
@@ -254,21 +254,15 @@
 <p>This solution is not production-ready, scalable or stable but it could fill the gape till Home Assistant is able to connect to multiple MQTT brokers. If you have multiple devices relay all messages to your local broker and add a configuration variable to <code class="highlighter-rouge">mqtt_ttn</code> sensor which allows you to select the device.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/10/ttn-with-mqtt/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/10/ttn-with-mqtt/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/10/ttn-with-mqtt/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/12/tor/index.html b/blog/2017/11/12/tor/index.html
index c9d39c62cb..07e97047e0 100644
--- a/blog/2017/11/12/tor/index.html
+++ b/blog/2017/11/12/tor/index.html
@@ -161,21 +161,15 @@ INFO: -----------------------------------------------------------
 <p>Additional information can be found in the <a href="/docs/ecosystem/tor/">Tor documentation</a> and the <a href="https://github.com/hassio-addons/addon-tor">Tor add-on repository</a>, including how to setup the “Stealth”-mode. The Tor Project itself provides details about a variaty of topics in their  <a href="https://www.torproject.org/docs/documentation.html.en">documentation</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/12/tor/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/12/tor/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/12/tor/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/18/release-58/index.html b/blog/2017/11/18/release-58/index.html
index 8589a4d980..c7650ff2d9 100644
--- a/blog/2017/11/18/release-58/index.html
+++ b/blog/2017/11/18/release-58/index.html
@@ -259,21 +259,15 @@ For Custom UI users: your custom UI will need to be updated before it can work w
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/18/release-58/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/18/release-58/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/18/release-58/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/11/29/hassio-virtual-machine/index.html b/blog/2017/11/29/hassio-virtual-machine/index.html
index 5d1e80ea07..fec505c220 100644
--- a/blog/2017/11/29/hassio-virtual-machine/index.html
+++ b/blog/2017/11/29/hassio-virtual-machine/index.html
@@ -196,21 +196,15 @@ ada5bbfc74f0        homeassistant/qemux86-64-homeassistant   <span class="s2">"/
 <p>Keep in mind that there are limitations with this approach. Not all <a href="/addons/">add-ons</a> will work and some don’t make sense to use as the hardware is not present. E.g., use the <a href="https://github.com/hassio-addons/addon-ssh">SSH community add-on</a> instead of the default <a href="/addons/ssh/">SSH add-on</a>.</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/11/29/hassio-virtual-machine/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/11/29/hassio-virtual-machine/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/11/29/hassio-virtual-machine/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/12/03/release-59/index.html b/blog/2017/12/03/release-59/index.html
index 2c6d2db70a..e21a56ca70 100644
--- a/blog/2017/12/03/release-59/index.html
+++ b/blog/2017/12/03/release-59/index.html
@@ -243,21 +243,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/12/03/release-59/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/12/03/release-59/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/12/03/release-59/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/12/17/introducing-home-assistant-cloud/index.html b/blog/2017/12/17/introducing-home-assistant-cloud/index.html
index c11d4d43c6..58280754fd 100644
--- a/blog/2017/12/17/introducing-home-assistant-cloud/index.html
+++ b/blog/2017/12/17/introducing-home-assistant-cloud/index.html
@@ -144,21 +144,15 @@
 <p><em>For more background on these topics, check out <a href="https://hasspodcast.io/ha015/">HASS Podcast 15</a>.</em></p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/12/17/introducing-home-assistant-cloud/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/12/17/introducing-home-assistant-cloud/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/12/17/introducing-home-assistant-cloud/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/12/17/release-60/index.html b/blog/2017/12/17/release-60/index.html
index 901ef7261d..c25d8da4ec 100644
--- a/blog/2017/12/17/release-60/index.html
+++ b/blog/2017/12/17/release-60/index.html
@@ -229,21 +229,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/12/17/release-60/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/12/17/release-60/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/12/17/release-60/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2017/12/28/thank-you/index.html b/blog/2017/12/28/thank-you/index.html
index c6878b2ce1..d3f961c973 100644
--- a/blog/2017/12/28/thank-you/index.html
+++ b/blog/2017/12/28/thank-you/index.html
@@ -97,21 +97,15 @@
 <p>– Home Assistant Organization</p>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2017/12/28/thank-you/';
-    var disqus_url = 'https://home-assistant.io/blog/2017/12/28/thank-you/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2017/12/28/thank-you/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2018/01/14/release-61/index.html b/blog/2018/01/14/release-61/index.html
index fd6131c6e5..90955bbe66 100644
--- a/blog/2018/01/14/release-61/index.html
+++ b/blog/2018/01/14/release-61/index.html
@@ -439,21 +439,15 @@ Note however, that this feature was replaced by a new ignore_string config optio
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2018/01/14/release-61/';
-    var disqus_url = 'https://home-assistant.io/blog/2018/01/14/release-61/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2018/01/14/release-61/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/2018/01/21/clarification-emulated-hue/index.html b/blog/2018/01/21/clarification-emulated-hue/index.html
index 58a7e46bed..c9efa9842e 100644
--- a/blog/2018/01/21/clarification-emulated-hue/index.html
+++ b/blog/2018/01/21/clarification-emulated-hue/index.html
@@ -102,21 +102,15 @@
 </ul>
 </article>
 <div id='post-comments'></div>
-<section id="disqus">
-  <h3 class="indent title">Comments</h3>
-  <div id="disqus_thread" aria-live="polite"><noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript></div>
-</section>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2018/01/21/clarification-emulated-hue/';
-    var disqus_url = 'https://home-assistant.io/blog/2018/01/21/clarification-emulated-hue/';
-    var disqus_script = 'embed.js';
-  (function () {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/' + disqus_script;
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  }());
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2018/01/21/clarification-emulated-hue/' };
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
 </script>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index c1f62eb18b..d0968501f8 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 6dda1bec5d..adf1062441 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 627517ebe5..f7cc361d6f 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 704e6ecc47..2b30b6ccf0 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 3ac3e6c0f3..c7e77ed3fa 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 1725628adc..de5ef10026 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 6772f9811b..94a8d99e6d 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 8d7ad14393..20d6e55712 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index e7fed5862c..f1b533c7d6 100644
--- a/blog/categories/media/atom.xml
+++ b/blog/categories/media/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Media | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/media/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 e9849e94f9..f66018287e 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 7be39a6bfc..12860ff9c7 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 8d44553916..af38da2b19 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organization/atom.xml b/blog/categories/organization/atom.xml
index 0f1a4f3d43..00f72474c6 100644
--- a/blog/categories/organization/atom.xml
+++ b/blog/categories/organization/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organization | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organization/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 acc0397186..9cb8888e87 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 e493b3ea52..39b24d469e 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 2dad936c57..9cf56d3e3e 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 d4a0c78378..5a967158ad 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 c752043044..ba425bc357 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 67c5c82da5..627214c2aa 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 c5deacd7e0..d5ab50ac0a 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 5bb14b2074..a7e6dbf07d 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 c00f5ba32f..b416548002 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+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 2e744a39a0..340cbbfbd4 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-02-05T07:21:36+00:00</updated>
+  <updated>2018-02-08T19:17:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/device_tracker.unifi/index.html b/components/device_tracker.unifi/index.html
index 36b55a8f5d..7702312401 100644
--- a/components/device_tracker.unifi/index.html
+++ b/components/device_tracker.unifi/index.html
@@ -123,17 +123,13 @@
 </div>
 <p>See the <a href="/components/device_tracker/">device tracker component page</a> for instructions how to configure the people to be tracked.</p>
 <h3><a class="title-link" name="configuring-users" href="#configuring-users"></a> Configuring Users</h3>
-<p>The Unifi controller allows you to create multiple users on it besides
-the main administrator. It is recommended that you create a limited
-user that has <code class="highlighter-rouge">read-only</code> permissions for the Unifi device tracker.</p>
+<p>The Unifi controller allows you to create multiple users on it besides the main administrator. It is recommended that you create a limited user that has <code class="highlighter-rouge">read-only</code> permissions for the Unifi device tracker.</p>
 <h3><a class="title-link" name="conflicts-with-mqtt" href="#conflicts-with-mqtt"></a> Conflicts with MQTT</h3>
-<p>The Unifi controller can either be a dedicated hardware device
-(Unifi’s cloud key), or as software any Linux system. If you run the
-the Unifi controller on the same operating system as Home Assistant
-there may be conflicts in ports if you have the MQTT component as
-well.</p>
-<p>It is recommended that you run the Unifi controller in a dedicate
-virtual machine to avoid that situation.</p>
+<p>The Unifi controller can either be a dedicated hardware device (Unifi’s cloud key), or as software any Linux system. If you run the the Unifi controller on the same operating system as Home Assistant there may be conflicts in ports if you have the MQTT component as well.</p>
+<p>It is recommended that you run the Unifi controller in a dedicate virtual machine to avoid that situation.</p>
+<h3><a class="title-link" name="troubleshooting-and-time-synchronization" href="#troubleshooting-and-time-synchronization"></a> Troubleshooting and Time Synchronization</h3>
+<p>Presence detection depends on accurate time configuration between Home Assistant and the Unifi controller.</p>
+<p>If Home Assistant and the Unifi controller are running on separate machines or VMs ensure that all clocks are syncronized. Failing to have syncronized clocks will lead to Home Assistant failing to mark a device as home.</p>
 <p><a href="https://github.com/home-assistant/home-assistant/issues/10507">Related Issue</a></p>
 </article>
         </div>
diff --git a/components/google_assistant/index.html b/components/google_assistant/index.html
index b48ed5dd2f..3c6d863418 100644
--- a/components/google_assistant/index.html
+++ b/components/google_assistant/index.html
@@ -169,6 +169,19 @@ To use Google Assistant, your Home Assistant configuration has to be externally
     </dd>
   </dl>
 </div>
+<h3><a class="title-link" name="available-domains" href="#available-domains"></a> Available domains</h3>
+<p>Currently, the following domains are available to be used with Google Assistant, listed with their default types:</p>
+<ul>
+  <li>group = switch (on/off)</li>
+  <li>scene = scene (on)</li>
+  <li>script = scene (on)</li>
+  <li>switch = switch (on/off)</li>
+  <li>fan = switch (on/off)</li>
+  <li>light = light (on/off/brightness/rgb color/color temp)</li>
+  <li>cover = switch (on/off/set position (brightness) )</li>
+  <li>media_player = switch (on/off/set volume (brightness) )</li>
+  <li>climate = thermostat (temperature setting)</li>
+</ul>
 <p>It’s very important that you use very long strings for <code class="highlighter-rouge">client_id</code> and <code class="highlighter-rouge">access_token</code>. Those are essentially the credentials to your Home Assistant instance. You can generate them with the following command:</p>
 <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>cat /dev/urandom | fold -w 120 | head -n 1 | base64 -w 0 | tr -dc <span class="s1">'0-9A-Za-z'</span> | cut -c -80
 </code></pre>
diff --git a/sitemap.xml b/sitemap.xml
index 5d36e9e216..a97efd78fc 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3974,7 +3974,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4658,131 +4658,131 @@
 </url>
 <url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/benchmark/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/check_config/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/credstash/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/db_migrator/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/ensure_config/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_import/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/influxdb_migrator/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/keyring/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2018-02-05T07:21:36+00:00</lastmod>
+<lastmod>2018-02-08T19:17:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -5937,62 +5937,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2018-02-05T07:20:44+00:00</lastmod>
+<lastmod>2018-02-08T19:17:14+00:00</lastmod>
 </url>
 </urlset>