diff --git a/atom.xml b/atom.xml
index a5b4d5a7d6..eec72f9a76 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -53,7 +53,7 @@
 <ul>
   <li>Tahoma platform will get new entity IDs (<a href="https://github.com/glpatcern">@glpatcern</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11547">#11547</a>) (<a href="https://home-assistant.io/components/tahoma/">tahoma docs</a>) (<a href="https://home-assistant.io/components/cover.tahoma/">cover.tahoma docs</a>) (breaking change)</li>
   <li>Mold indicator: attribute names no longer include spaces or periods (<a href="https://github.com/olskar">@olskar</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11694">#11694</a>) (<a href="https://home-assistant.io/components/sensor.mold_indicator/">sensor.mold_indicator docs</a>) (breaking change)</li>
-  <li>Custom component devs only: <code class="highlighter-rouge">EntityComponent.add_entity(entity)</code> and <code class="highlighter-rouge">EntityComponent.async_add_entity(entity)</code> have been removed. Use <code class="highlighter-rouge">EntityComponent.add_entities([entity])</code> and <code class="highlighter-rouge">EntityComponent.async_add_entities([entity])</code> instead. (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11691">#11691</a>) (breaking change)</li>
+  <li>Custom component devs only: <code class="highlighter-rouge">EntityComponent.add_entity(entity)</code> and <code class="highlighter-rouge">EntityComponent.async_add_entity(entity)</code> have been removed. Use <code class="highlighter-rouge">EntityComponent.add_entities([entity])</code> and <code class="highlighter-rouge">EntityComponent.async_add_entities([entity])</code> instead. Also <code class="highlighter-rouge">EntityComponent.entities</code> is no longer a dictionary but instead an iterable. Use <code class="highlighter-rouge">EntityComponent.get_entity(entity_id)</code> to get entity by id. (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11691">#11691</a>) (breaking change)</li>
 </ul>
 
 <h2>All changes</h2>
diff --git a/blog/2014/12/18/website-launched/index.html b/blog/2014/12/18/website-launched/index.html
index b91bcf4458..b24d2a11c1 100644
--- a/blog/2014/12/18/website-launched/index.html
+++ b/blog/2014/12/18/website-launched/index.html
@@ -82,12 +82,13 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
   <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>
@@ -175,18 +176,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 51ac981826..486f936b78 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -122,6 +122,7 @@ This article will try to explain how they all relate.</p>
 <p>Home Assistant is trying to be this software. It is not there yet but trying hard. Device discovery and a user interface for configuring home automation are problems we hope to tackle in 2015 while not sacrificing any modularity or usability.</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>
@@ -209,18 +210,6 @@ This article will try to explain how they all relate.</p>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 2fe793ee4d..4cadf25278 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -112,6 +112,7 @@
 </code></pre>
 </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>
@@ -199,18 +200,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5bc89608a8..c8a1e96603 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -95,6 +95,7 @@
 </div>
 <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>
@@ -182,18 +183,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5d3741231d..5fe35421b1 100644
--- a/blog/2015/01/13/nest-in-da-house/index.html
+++ b/blog/2015/01/13/nest-in-da-house/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -99,6 +99,7 @@
 </code></pre>
 </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>
@@ -186,18 +187,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/01/24/release-notes/index.html b/blog/2015/01/24/release-notes/index.html
index 1528d9e286..065446d82a 100644
--- a/blog/2015/01/24/release-notes/index.html
+++ b/blog/2015/01/24/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -105,6 +105,7 @@ Home Assistant should now throw better errors and offer solutions if you do not
 <p><strong>Streamlined first launch</strong><br />
 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>
@@ -192,18 +193,6 @@ Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8aec79e405..28e689ebec 100644
--- a/blog/2015/02/08/looking-at-the-past/index.html
+++ b/blog/2015/02/08/looking-at-the-past/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,6 +110,7 @@ Events are saved in a local database. Google Graphs is used to draw the graph. D
   <li>Summarize usage of the different components of your house</li>
 </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>
@@ -197,18 +198,6 @@ Events are saved in a local database. Google Graphs is used to draw the graph. D
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/02/24/streaming-updates/index.html b/blog/2015/02/24/streaming-updates/index.html
index a4411efb18..3414cf7c03 100644
--- a/blog/2015/02/24/streaming-updates/index.html
+++ b/blog/2015/02/24/streaming-updates/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -96,6 +96,7 @@
 <p>A connection can go stale in Chrome without any event handler being called. This happens when a device goes into standby. For computers this is rare but for phones this occurs quite often. This has been solved by sending a regular ping from the server. The frontend will assume the connection has gone stale when it hasn’t heard any communication for a while. Sending a ping will also help the server detect broken connections and clean them up.</p>
 <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>
@@ -183,18 +184,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 d67dd94e5c..fb9f478225 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -90,6 +90,7 @@
 <p>The home-assistant.conf.example has been replaced with an updated <a href="https://github.com/home-assistant/home-assistant/blob/dev/config/configuration.yaml.example">configuration.yaml.example</a>.</p>
 <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>
@@ -177,18 +178,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/03/08/new-logo/index.html b/blog/2015/03/08/new-logo/index.html
index 3bc66aedc4..b555118358 100644
--- a/blog/2015/03/08/new-logo/index.html
+++ b/blog/2015/03/08/new-logo/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -93,6 +93,7 @@
 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>
@@ -180,18 +181,6 @@ The old logo, the new detailed logo and the new simple logo.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/03/11/release-notes/index.html b/blog/2015/03/11/release-notes/index.html
index 09976f5f3e..7a664dc122 100644
--- a/blog/2015/03/11/release-notes/index.html
+++ b/blog/2015/03/11/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -118,6 +118,7 @@ An initial version of voice control for Home Assistant has landed. The current i
 </code></pre>
 </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>
@@ -205,18 +206,6 @@ An initial version of voice control for Home Assistant has landed. The current i
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/03/22/release-notes/index.html b/blog/2015/03/22/release-notes/index.html
index 3f6ccc7c55..c7475b8c58 100644
--- a/blog/2015/03/22/release-notes/index.html
+++ b/blog/2015/03/22/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -154,6 +154,7 @@ I (Paulus) have contributed a scene component. A user can create scenes that cap
 </code></pre>
 </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>
@@ -241,18 +242,6 @@ I (Paulus) have contributed a scene component. A user can create scenes that cap
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/04/25/release-notes/index.html b/blog/2015/04/25/release-notes/index.html
index 6adfdecd72..629f1d9b6c 100644
--- a/blog/2015/04/25/release-notes/index.html
+++ b/blog/2015/04/25/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -162,6 +162,7 @@
 </code></pre>
 </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>
@@ -249,18 +250,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 b295101d41..6c57ae723e 100644
--- a/blog/2015/05/09/utc-time-zone-awareness/index.html
+++ b/blog/2015/05/09/utc-time-zone-awareness/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
   <li>the API sends all times in UTC. If you use anything else besides the frontend to talk to HA, make sure it handles it differently.</li>
 </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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/05/14/release-notes/index.html b/blog/2015/05/14/release-notes/index.html
index f08c60c194..e909058755 100644
--- a/blog/2015/05/14/release-notes/index.html
+++ b/blog/2015/05/14/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -176,6 +176,7 @@ Before diving into the newly supported devices and services, I want to highlight
 </code></pre>
 </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>
@@ -263,18 +264,6 @@ Before diving into the newly supported devices and services, I want to highlight
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/06/10/release-notes/index.html b/blog/2015/06/10/release-notes/index.html
index 0a4a177831..b58462509e 100644
--- a/blog/2015/06/10/release-notes/index.html
+++ b/blog/2015/06/10/release-notes/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -222,6 +222,7 @@ This switch platform allows you to control your motion detection setting on your
 </code></pre>
 </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>
@@ -309,18 +310,6 @@ This switch platform allows you to control your motion detection setting on your
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 43e7b24284..80db328470 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -186,6 +186,7 @@ Fabian has added support for <a href="https://forecast.io/">Forecast.io</a> to g
 </code></pre>
 </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>
@@ -273,18 +274,6 @@ Fabian has added support for <a href="https://forecast.io/">Forecast.io</a> to g
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 d720c67bad..4dd4c4e995 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -169,6 +169,7 @@ Support for Temper temperature sensors has been contributed by <a href="https://
 </code></pre>
 </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>
@@ -256,18 +257,6 @@ Support for Temper temperature sensors has been contributed by <a href="https://
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 0087a7d710..0383057dac 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
 </code></pre>
 </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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 7be8aaba68..2660170e6c 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -206,6 +206,7 @@ The automation and script syntax here is using a deprecated and no longer suppor
   <li><a href="https://github.com/LowPowerLab/RFM69/">Moteino Code</a></li>
 </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>
@@ -293,18 +294,6 @@ The automation and script syntax here is using a deprecated and no longer suppor
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 3bc31262ed..50becca419 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -167,6 +167,7 @@
 </code></pre>
 </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>
@@ -254,18 +255,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 d9a20dd551..6b8b64fc52 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -244,6 +244,7 @@
 </p>
 <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>
@@ -331,18 +332,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 031debf32a..8210fb8b5c 100644
--- a/blog/2015/09/13/home-assistant-meets-ifttt/index.html
+++ b/blog/2015/09/13/home-assistant-meets-ifttt/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -234,6 +234,7 @@
   </tbody>
 </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>
@@ -321,18 +322,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 a155ddcb20..261bea5a65 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -133,6 +133,7 @@ Glances web server started on http://0.0.0.0:61208/
 </p>
 <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>
@@ -220,18 +221,6 @@ Glances web server started on http://0.0.0.0:61208/
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 ac7d6288e2..ed931f4a70 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -129,6 +129,7 @@ Automation has gotten a lot of love. It now supports conditions, multiple trigge
 <p><strong>Verisure Alarms</strong>
 <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>
@@ -216,18 +217,6 @@ Automation has gotten a lot of love. It now supports conditions, multiple trigge
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5aa9c03eb8..94cf7bf907 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -112,6 +112,7 @@ Map in Home Assistant showing two people and three zones (home, school, work)
   <li>Scene support for media player (<a href="https://github.com/maddox">@maddox</a>)</li>
 </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>
@@ -199,18 +200,6 @@ Map in Home Assistant showing two people and three zones (home, school, work)
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 6a1c5f0bc2..bf14886164 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
@@ -84,7 +84,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -297,6 +297,7 @@ Home Assistant will keep track of historical values and allow you to integrate i
 </code></pre>
 </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>
@@ -384,18 +385,6 @@ Home Assistant will keep track of historical values and allow you to integrate i
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e4e51ce171..74fb0986f0 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -102,6 +102,7 @@
 </ul>
 <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>
@@ -189,18 +190,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 f67f36d3ca..98d9092ff3 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -119,6 +119,7 @@ It is no longer possible to turn a scene off after it has been activated. The wa
 <p><strong>Downloader treats relative paths now relative to the config dir instead of the current working dir.</strong>
 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>
@@ -206,18 +207,6 @@ This makes more sense as most people run Home Assistant as a daemon</p>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 51b92a135a..abb0aa758c 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -117,6 +117,7 @@
   <li>Re-install platform and component dependencies after a Home Assistant version upgrade (<a href="https://github.com/balloob">@balloob</a>)</li>
 </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>
@@ -204,18 +205,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/11/22/survey-november-2015/index.html b/blog/2015/11/22/survey-november-2015/index.html
index 71dd0deade..b54ab1b488 100644
--- a/blog/2015/11/22/survey-november-2015/index.html
+++ b/blog/2015/11/22/survey-november-2015/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -144,6 +144,7 @@
 <p>The conclusion is that <a href="http://mqtt.org/">MQTT</a> is popular in almost every section from Alarm Control Panel, presence detection with <a href="http://owntracks.org/">owntracks</a>, sensors and switches, and now even for lights.</p>
 <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>
@@ -231,18 +232,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/12/05/community-highlights/index.html b/blog/2015/12/05/community-highlights/index.html
index 4b748f7569..d86a30fedc 100644
--- a/blog/2015/12/05/community-highlights/index.html
+++ b/blog/2015/12/05/community-highlights/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -95,6 +95,7 @@
 </div>
 <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>
@@ -182,18 +183,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5adc34b07f..74b25d5028 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -103,6 +103,7 @@
 <img src="/images/screenshots/lock-and-rollershutter-card.png" />
 </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>
@@ -190,18 +191,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2015/12/07/influxdb-and-grafana/index.html b/blog/2015/12/07/influxdb-and-grafana/index.html
index 7d17ffa1d6..c47d2dffcf 100644
--- a/blog/2015/12/07/influxdb-and-grafana/index.html
+++ b/blog/2015/12/07/influxdb-and-grafana/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -157,6 +157,7 @@ name: binary_sensor
   Grafana Temperature graph
 </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>
@@ -244,18 +245,6 @@ name: binary_sensor
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 64a8a2525e..d9e6ce83d1 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -124,6 +124,7 @@ This is where we’ll configure our task, so select the plus icon to select an a
 </div>
 <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>
@@ -211,18 +212,6 @@ This is where we’ll configure our task, so select the plus icon to select an a
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 c61af42f01..adec2a78aa 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,6 +110,7 @@ Philips Hue FAQ entries regarding 3rd party light bulbs.
 <p>I have read, but have been unable to confirm it, that resetting your hub will force a software upgrade. So beware of that too.</p>
 <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>
@@ -197,18 +198,6 @@ Philips Hue FAQ entries regarding 3rd party light bulbs.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 f5d1394631..79b73f9071 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -152,6 +152,7 @@ sudo docker run -it --rm -p 80:80 --name certbot <span class="se">\</span>
 <p>You can now navigate to https://hass-example.duckdns.org and enjoy encryption!</p>
 <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>
@@ -239,18 +240,6 @@ sudo docker run -it --rm -p 80:80 --name certbot <span class="se">\</span>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 b3cb7e50bd..23cefe3d07 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -127,6 +127,7 @@
   <li>automation: <a href="/getting-started/automation-trigger/#numeric-state-trigger">numeric_state</a></li>
 </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>
@@ -214,18 +215,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 0974728713..f3126c54bd 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -118,6 +118,7 @@
   <li>Geofancy platform has been renamed to <a href="/components/device_tracker.locative/">Locative</a>.</li>
 </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>
@@ -205,18 +206,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/01/19/perfect-home-automation/index.html b/blog/2016/01/19/perfect-home-automation/index.html
index 4fab70b79d..27857fd8c7 100644
--- a/blog/2016/01/19/perfect-home-automation/index.html
+++ b/blog/2016/01/19/perfect-home-automation/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -107,6 +107,7 @@
 <p><strong>Good home automation never annoys but is missed when it is not working.</strong></p>
 <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>
@@ -194,18 +195,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8863a58b01..483c1043b5 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -121,6 +121,7 @@ Example of the new views in the frontend. <a href="/components/group/">Learn mor
   <li>Entity IDs for Z-Wave devices are now generated in a deterministic way causing all IDs to change starting this release. This is a one time change. <a href="/blog/2016/10/22/flash-briefing-updater-hacktoberfest/">(Changed again in 0.31)</a></li>
 </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>
@@ -208,18 +209,6 @@ Example of the new views in the frontend. <a href="/components/group/">Learn mor
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 3daac90649..8db94cf08f 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -241,6 +241,7 @@ Z-Wave light bulb    |
   <li><strong>Authentication for MQTT Bridge</strong>: Right now the bridge expects that anyone subscribing is the SmartThings hub. This could use proper authentication.</li>
 </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>
@@ -328,18 +329,6 @@ Z-Wave light bulb    |
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 bad489ce9f..046188e6e8 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -215,6 +215,7 @@
   <li>Calling a service on Home Assistant will return all states that changed while the service was executing. This sadly does not always include the new state of devices that push their new state, as they might arrive after the service has finished.</li>
 </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>
@@ -302,18 +303,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 4d0aa250fd..a1ad70baf2 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -126,6 +126,7 @@
   <li>Bug fixes and improvements by <a href="https://github.com/persandstrom/">@persandstrom</a>, <a href="https://github.com/fabaff/">@fabaff</a>, <a href="https://github.com/balloob/">@balloob</a>, <a href="https://github.com/pavoni/">@pavoni</a>, <a href="https://github.com/philipbl/">@philipbl</a>, <a href="https://github.com/MartinHjelmare/">@MartinHjelmare</a>, <a href="https://github.com/rmkraus/">@rmkraus</a>, <a href="https://github.com/molobrakos/">@molobrakos</a>, <a href="https://github.com/lukas-hetzenecker/">@lukas-hetzenecker</a>, <a href="https://github.com/TangoAlpha/">@TangoAlpha</a>, <a href="https://github.com/deisi/">@deisi</a>, <a href="https://github.com/Danielhiversen/">@Danielhiversen</a>, <a href="https://github.com/roqeer/">@roqeer</a>, <a href="https://github.com/jaharkes/">@jaharkes</a></li>
 </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>
@@ -213,18 +214,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 95004a07df..2b18fca44c 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -180,6 +180,7 @@
 </code></pre>
 </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>
@@ -267,18 +268,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/02/20/community-highlights/index.html b/blog/2016/02/20/community-highlights/index.html
index c8120c0fcc..aa35194789 100644
--- a/blog/2016/02/20/community-highlights/index.html
+++ b/blog/2016/02/20/community-highlights/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -123,6 +123,7 @@
 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>
@@ -210,18 +211,6 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 b4adc55d56..87376e843e 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -125,6 +125,7 @@
   <li>The rfxtrx sensors entity ids will incur a one time change to move to a stable format. See <a href="/components/sensor.rfxtrx/">the docs</a> for more details.</li>
 </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>
@@ -212,18 +213,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 803b09f005..1e3e37fc30 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -126,6 +126,7 @@
 player state attributes. This change affects automations, scripts and scenes.</li>
 </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>
@@ -213,18 +214,6 @@ player state attributes. This change affects automations, scripts and scenes.</l
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 359df72b2c..23deaae3c3 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -134,6 +134,7 @@
 </code></pre>
 </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>
@@ -221,18 +222,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5c9b46d6bd..e4b96c4719 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -94,6 +94,7 @@
 <p>Your hub should not be affected when your internet breaks down or the company that sold you your hub goes out of business. It should work locally so that it can continue to work even long after the vendor goes out of business or decides to kill it. Preferably, your hub should also be open so that the community can take over development after the vendor stops caring.</p>
 <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>
@@ -181,18 +182,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/04/07/static-website/index.html b/blog/2016/04/07/static-website/index.html
index a10b117ddf..29149cc9ae 100644
--- a/blog/2016/04/07/static-website/index.html
+++ b/blog/2016/04/07/static-website/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -97,6 +97,7 @@
 <p>The <a href="https://pypi.python.org/pypi/hbmqtt">HBMQTT</a> broker provides websockets support for MQTT and mqttws31.js included in web page gives you access to the MQTT messages. It’s a matter of minutes. OK, it took a little longer because I’m not a Javascript guy to create the software part that will show details about your environment. The source is available at <a href="https://github.com/fabaff/home-assistant-display">https://github.com/fabaff/home-assistant-display</a> and the screenshot above shows the result. I guess that every person who is familiar with Javascript would be able to reduce the amount of code and to make it more flexible. Well, it’s a only prototype and showcase to include an image in this blog post.</p>
 <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>
@@ -184,18 +185,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 7a609aa626..e05d3a4a1c 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
 <h3>Breaking changes</h3>
 <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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/04/17/updated-documentation/index.html b/blog/2016/04/17/updated-documentation/index.html
index 37f2f233d1..062911ba3a 100644
--- a/blog/2016/04/17/updated-documentation/index.html
+++ b/blog/2016/04/17/updated-documentation/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
 <p>Today it has been almost 1.5 years since we started the website. We now have <a href="/components/">264 components and platforms</a> under our belt and have been honored with 1.5 million page views ✨. And hopefully we now also have documentation that our community deserves.</p>
 <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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 c7d2432347..8ba8da3e0f 100644
--- a/blog/2016/04/19/to-infinity-and-beyond/index.html
+++ b/blog/2016/04/19/to-infinity-and-beyond/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -104,6 +104,7 @@
 <p>Cheers to the future!</p>
 <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>
@@ -191,18 +192,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 1602811f7e..d819ac3f80 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -126,6 +126,7 @@
   </li>
 </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>
@@ -213,18 +214,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 318159c196..55d532c6b5 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
@@ -84,7 +84,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -168,6 +168,7 @@ For example, my wife works next door - and I couldn’t detect whether she’s a
 <p>You can achieve the same effect by using the same the same <code class="highlighter-rouge">UUID</code> but different <code class="highlighter-rouge">major</code> / <code class="highlighter-rouge">minor</code> numbers - and tell OwnTracks not to worry about the <code class="highlighter-rouge">minor</code> / <code class="highlighter-rouge">major</code> numbers for a particular region by setting them to 0).</p>
 <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>
@@ -255,18 +256,6 @@ For example, my wife works next door - and I couldn’t detect whether she’s a
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 97fb66b254..632ae5ba8d 100644
--- a/blog/2016/05/06/open-iot-summit-talk/index.html
+++ b/blog/2016/05/06/open-iot-summit-talk/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/4-6rTwKl6ww" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e2a7da2123..7d08eb8d27 100644
--- a/blog/2016/05/07/empowering-scripts-and-alexa/index.html
+++ b/blog/2016/05/07/empowering-scripts-and-alexa/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -166,6 +166,7 @@
 </code></pre>
 </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>
@@ -253,18 +254,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 ad11b8a400..dbd57acd3c 100644
--- a/blog/2016/05/12/video-configuring-home-assistant/index.html
+++ b/blog/2016/05/12/video-configuring-home-assistant/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/hFDVB2H6TNo" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 bd3f73931d..f145dafbc3 100644
--- a/blog/2016/05/18/why-we-use-polymer/index.html
+++ b/blog/2016/05/18/why-we-use-polymer/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -98,6 +98,7 @@
 <p>Most of this blog post has been comparing Polymer to React. In many ways Polymer is similar to React but it is not as far evolved yet. I like React but I do not see it as a technology that will be around forever. Given the trend of previous popular JS frameworks, React will probably get replaced by another framework that works even better. Web components however will be here forever as they are part of the HTML standard. And this gives us peace of mind at the virtual Home Assistant headquarters: we do not have to be afraid of having to rewrite our frontend just to stay relevant or because people don’t want to include another dependency just to run this legacy piece.</p>
 <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>
@@ -185,18 +186,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/05/21/release-020/index.html b/blog/2016/05/21/release-020/index.html
index db750e6a1a..1a859c2ea1 100644
--- a/blog/2016/05/21/release-020/index.html
+++ b/blog/2016/05/21/release-020/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -122,6 +122,7 @@
 </code></pre>
 </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>
@@ -209,18 +210,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 64f401646e..41a7f4292b 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -95,6 +95,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/VGl3KTrYo6s" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -182,18 +183,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 2f36453f5f..fedb7f96cc 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
@@ -84,7 +84,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -196,6 +196,7 @@
 <h3><a class="title-link" name="notes" href="#notes"></a> Notes</h3>
 <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>
@@ -283,18 +284,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/06/01/community-highlights/index.html b/blog/2016/06/01/community-highlights/index.html
index c328560c00..1869f44971 100644
--- a/blog/2016/06/01/community-highlights/index.html
+++ b/blog/2016/06/01/community-highlights/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -104,6 +104,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/UM15pRk56h8" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -191,18 +192,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 57505f0620..d1a0c9812a 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -136,6 +136,7 @@
   <li>Add support for OPTIONS HTTP command to get CORS working (<a href="https://github.com/JshWright">@JshWright</a>)</li>
 </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>
@@ -223,18 +224,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 3ff347448c..4513bed8be 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -108,6 +108,7 @@
 </p>
 <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>
@@ -195,18 +196,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 38971b7e48..14f6bac99a 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -130,6 +130,7 @@
   <li>Insteon Hub lights will load again</li>
 </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>
@@ -217,18 +218,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 6a0970e36b..3b0426014a 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -176,6 +176,7 @@ target_dir /tmp
 </div>
 <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>
@@ -263,18 +264,6 @@ target_dir /tmp
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 91c4d86859..9a9bf05d71 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -131,6 +131,7 @@
   <li><code class="highlighter-rouge">elevation: </code> was introduced to the configuration for weather/sunrise data. For existing <a href="https://home-assistant.io/getting-started/basic/">configurations</a> add the value shown in the warning <code class="highlighter-rouge">[homeassistant.config] Incomplete core config. Auto detected elevation: 665</code> to your <code class="highlighter-rouge">configuration.yaml</code> file.</li>
 </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>
@@ -218,18 +219,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 a644278d54..c2be478375 100644
--- a/blog/2016/07/06/pocketchip-running-home-assistant/index.html
+++ b/blog/2016/07/06/pocketchip-running-home-assistant/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -121,6 +121,7 @@ Over a year ago I participated in the <a href="https://www.kickstarter.com/proje
 </p>
 <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>
@@ -208,18 +209,6 @@ Over a year ago I participated in the <a href="https://www.kickstarter.com/proje
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 4f9429cedf..cc00de138c 100644
--- a/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html
+++ b/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -127,6 +127,7 @@
   <li>Entity IDs of Verisure locks will change. This is a one time change but should improve readability.</li>
 </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>
@@ -214,18 +215,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 300c85ee36..0d57eaaf4c 100644
--- a/blog/2016/07/19/visualizing-your-iot-data/index.html
+++ b/blog/2016/07/19/visualizing-your-iot-data/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -164,6 +164,7 @@ SQLite version 3.11.0 2016-02-15 17:29:24
 </p>
 <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>
@@ -251,18 +252,6 @@ SQLite version 3.11.0 2016-02-15 17:29:24
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 ada4140ebe..c5b278dd2c 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -131,6 +131,7 @@ One of the graphs created with this tutorial.
 <p>Thanks to the magic of Jupyter, all of the code is customizable: want to selectively display your data, only covering a specific entity? Sure thing! Want to change the properties of the plots? No problem!</p>
 <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>
@@ -218,18 +219,6 @@ One of the graphs created with this tutorial.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 c43f5c5572..c45a6b39ec 100644
--- a/blog/2016/07/28/esp8266-and-micropython-part1/index.html
+++ b/blog/2016/07/28/esp8266-and-micropython-part1/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -211,6 +211,7 @@ If a module is missing then you need to download it from the <a href="https://gi
 <p>Upload <code class="highlighter-rouge">main.py</code> the same way as <code class="highlighter-rouge">boot.py</code>. After a reboot (<code class="highlighter-rouge">&gt;&gt;&gt; import machine</code> and <code class="highlighter-rouge">&gt;&gt;&gt; machine.reboot()</code>) or power-cycling your physical notifier is ready.</p>
 <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>
@@ -298,18 +299,6 @@ If a module is missing then you need to download it from the <a href="https://gi
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 fb19e65cfd..0e7937a62b 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -143,6 +143,7 @@
   <li>Google Voice SMS notification support was removed.</li>
 </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>
@@ -230,18 +231,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/08/03/laundry-automation-update/index.html b/blog/2016/08/03/laundry-automation-update/index.html
index 84c6b832dc..296b0b861b 100644
--- a/blog/2016/08/03/laundry-automation-update/index.html
+++ b/blog/2016/08/03/laundry-automation-update/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -175,6 +175,7 @@
   <li><a href="http://www.instructables.com/id/Uber-Home-Automation-w-Arduino-Pi/step13/Washer-Dryer-Smartifier-Water-Leak-Sensor/">Inspiration and Help with Arduino code</a></li>
 </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>
@@ -262,18 +263,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 164ee1e3a8..1a31c9c66c 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -170,6 +170,7 @@
   <li>Prefetch the other pages using <code class="highlighter-rouge">&lt;link rel="preload" …&gt;</code></li>
 </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>
@@ -257,18 +258,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 d930083a87..f27d76abd0 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -143,6 +143,7 @@
 </code></pre>
 </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>
@@ -230,18 +231,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 f8c3bbde1e..feb1e3983f 100644
--- a/blog/2016/08/16/we-have-apps-now/index.html
+++ b/blog/2016/08/16/we-have-apps-now/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -181,6 +181,7 @@
 <p>If this has whet your appetite, feel free to give it a try. You can find it, <a href="https://github.com/acockburn/appdaemon">here</a>, including full installation instructions, an API reference, and a number of fully fleshed out examples.</p>
 <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>
@@ -268,18 +269,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 c81a3da60e..b14f87b0e8 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
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -93,6 +93,7 @@
 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>
@@ -180,18 +181,6 @@ Heatmap
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 94d5809002..c33934ccd9 100644
--- a/blog/2016/08/28/notifications-hue-fake-unification/index.html
+++ b/blog/2016/08/28/notifications-hue-fake-unification/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -242,6 +242,7 @@
   <li>Add a default icon for the fan component (<a href="https://github.com/home-assistant/home-assistant-polymer/pull/101">#101</a>) - (<a href="https://github.com/robbiet480">@robbiet480</a>)</li>
 </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>
@@ -329,18 +330,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 40ca506766..356ae82dba 100644
--- a/blog/2016/08/31/esp8266-and-micropython-part2/index.html
+++ b/blog/2016/08/31/esp8266-and-micropython-part2/index.html
@@ -84,7 +84,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -169,6 +169,7 @@ So, part 1 of <a href="/blog/2016/07/28/esp8266-and-micropython-part1/">ESP8266
 </div>
 <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>
@@ -256,18 +257,6 @@ So, part 1 of <a href="/blog/2016/07/28/esp8266-and-micropython-part1/">ESP8266
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8ab24159d9..288a1aca4d 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -171,6 +171,7 @@
 <h3><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h3>
 <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>
@@ -258,18 +259,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 163349ef6b..3ec5697b64 100644
--- a/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html
+++ b/blog/2016/09/29/async-sleepiq-emoncms-stocks/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -176,6 +176,7 @@
 <h3><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h3>
 <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>
@@ -263,18 +264,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 92c82523ac..b563ca9bea 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -97,6 +97,7 @@
 <p>As it is today there is no pre-compiled Z-Wave support but it can be installed by following the <a href="/getting-started/z-wave/">Getting started instructions for Z-Wave</a>.</p>
 <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>
@@ -184,18 +185,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/10/02/hacktoberfest/index.html b/blog/2016/10/02/hacktoberfest/index.html
index a78ea5e575..91505e0eda 100644
--- a/blog/2016/10/02/hacktoberfest/index.html
+++ b/blog/2016/10/02/hacktoberfest/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -105,6 +105,7 @@
 <p>Are you not a programmer but still want to contribute to Home Assistant? Check out our <a href="https://github.com/home-assistant/home-assistant.github.io/labels/Hacktoberfest">list of entry-level issues for the Home Assistant website</a>.</p>
 <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>
@@ -192,18 +193,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e4ed058f47..eef3858939 100644
--- a/blog/2016/10/08/hassbian-rest-digital-ocean/index.html
+++ b/blog/2016/10/08/hassbian-rest-digital-ocean/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -187,6 +187,7 @@
 <h3><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h3>
 <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>
@@ -274,18 +275,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8314fdcb99..682cb6cf21 100644
--- a/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html
+++ b/blog/2016/10/22/flash-briefing-updater-hacktoberfest/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -359,6 +359,7 @@
 <p>Thanks for reading all of the above, especially since this week was a pretty long post. We should be back with a new post around November 5th announcing the arrival of 0.32.</p>
 <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>
@@ -446,18 +447,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/10/25/explaining-the-updater/index.html b/blog/2016/10/25/explaining-the-updater/index.html
index e97d16f9a9..11d5c2738d 100644
--- a/blog/2016/10/25/explaining-the-updater/index.html
+++ b/blog/2016/10/25/explaining-the-updater/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -115,6 +115,7 @@
 <h2><a class="title-link" name="source-code" href="#source-code"></a> Source Code</h2>
 <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>
@@ -202,18 +203,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html b/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
index d313200e32..c6939371f4 100644
--- a/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
+++ b/blog/2016/11/05/hacktoberfest-influxdb-weather/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -183,6 +183,7 @@
 <h3><a class="title-link" name="if-you-need-help" href="#if-you-need-help"></a> If you need help…</h3>
 <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>
@@ -270,18 +271,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 337ef244c1..802bfd9600 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -144,6 +144,7 @@
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting issues</h3>
 <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>
@@ -231,18 +232,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/12/03/remote-websockets-sonarr/index.html b/blog/2016/12/03/remote-websockets-sonarr/index.html
index 266e16cbde..679b75496c 100644
--- a/blog/2016/12/03/remote-websockets-sonarr/index.html
+++ b/blog/2016/12/03/remote-websockets-sonarr/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -205,6 +205,7 @@
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting Issues</h3>
 <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>
@@ -292,18 +293,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 defd655221..d23fdcee5d 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -158,6 +158,7 @@
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting Issues</h3>
 <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>
@@ -245,18 +246,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2016/12/19/thank-you/index.html b/blog/2016/12/19/thank-you/index.html
index 0ee78b63a7..53557fb23b 100644
--- a/blog/2016/12/19/thank-you/index.html
+++ b/blog/2016/12/19/thank-you/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -96,6 +96,7 @@
 <p>We’re taking a well deserved break and we will be back again in 2017 with more awesomeness. Happy holidays!</p>
 <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>
@@ -183,18 +184,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 28a881a3f1..198e053749 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
 <p>Wishing everyone the best in 2017!</p>
 <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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 92834e1815..ad1a65a9fd 100644
--- a/blog/2017/01/14/iss-usps-images-packages/index.html
+++ b/blog/2017/01/14/iss-usps-images-packages/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -175,6 +175,7 @@ You have to note:
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting Issues</h3>
 <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>
@@ -262,18 +263,6 @@ You have to note:
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/01/18/numbers/index.html b/blog/2017/01/18/numbers/index.html
index 95d8710ed7..c03be95cbe 100644
--- a/blog/2017/01/18/numbers/index.html
+++ b/blog/2017/01/18/numbers/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -98,6 +98,7 @@
 <p>What more numbers? Checkout the <a href="/help/trivia/#numbers">Trivia page</a>…</p>
 <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>
@@ -185,18 +186,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/01/21/home-assistant-governance/index.html b/blog/2017/01/21/home-assistant-governance/index.html
index d2960c6a41..59e1fef6bf 100644
--- a/blog/2017/01/21/home-assistant-governance/index.html
+++ b/blog/2017/01/21/home-assistant-governance/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -135,6 +135,7 @@
 <h2><a class="title-link" name="in-closing" href="#in-closing"></a> In closing</h2>
 <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>
@@ -222,18 +223,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/01/28/face-coffee-wink/index.html b/blog/2017/01/28/face-coffee-wink/index.html
index 147be2a777..d8a1b7203a 100644
--- a/blog/2017/01/28/face-coffee-wink/index.html
+++ b/blog/2017/01/28/face-coffee-wink/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -221,6 +221,7 @@
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting Issues</h3>
 <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>
@@ -308,18 +309,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/02/03/babyphone/index.html b/blog/2017/02/03/babyphone/index.html
index 1b4a11c218..3e318e79ce 100644
--- a/blog/2017/02/03/babyphone/index.html
+++ b/blog/2017/02/03/babyphone/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -200,6 +200,7 @@ We change the platform name for binary sensor in 0.38 from <code class="highligh
 <h3><a class="title-link" name="thanks" href="#thanks"></a> Thanks</h3>
 <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>
@@ -287,18 +288,6 @@ We change the platform name for binary sensor in 0.38 from <code class="highligh
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/02/04/hassbian-toybox/index.html b/blog/2017/02/04/hassbian-toybox/index.html
index 4584710409..b2c75c431e 100644
--- a/blog/2017/02/04/hassbian-toybox/index.html
+++ b/blog/2017/02/04/hassbian-toybox/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -126,6 +126,7 @@ On the close horizon from <a href="https://github.com/Landrash">@Landrash</a> th
 <p>To follow discussions about the development of the HASSbian image or to contribute join our <a href="https://discord.gg/8X8DTH4">Discord chat server</a>.</p>
 <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>
@@ -213,18 +214,6 @@ On the close horizon from <a href="https://github.com/Landrash">@Landrash</a> th
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 599f35c813..a07adbe2fb 100644
--- a/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html
+++ b/blog/2017/02/11/alert-appletv-mqtt-yeelight/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -213,6 +213,7 @@
 <h3><a class="title-link" name="reporting-issues" href="#reporting-issues"></a> Reporting Issues</h3>
 <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>
@@ -300,18 +301,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/02/14/clt-workshop/index.html b/blog/2017/02/14/clt-workshop/index.html
index 2fa41bfe2d..6496999315 100644
--- a/blog/2017/02/14/clt-workshop/index.html
+++ b/blog/2017/02/14/clt-workshop/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -96,6 +96,7 @@
   <li>Language: German</li>
 </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>
@@ -183,18 +184,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5bf3cc923c..e437e8629d 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -130,6 +130,7 @@
   Cool kid listening to music + sidekick. Both wearing the new blue Home Assistant shirt.  – <a href="https://teespring.com/hass-blue-shirt-eu-2">🇪🇺 EU</a> – <a href="https://teespring.com/home-assistant-shirt">🇺🇸 US</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>
@@ -217,18 +218,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 29450d4b5b..f6460f43e7 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -268,6 +268,7 @@
 <h3>Reporting Issues</h3>
 <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>
@@ -355,18 +356,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e921b6b8c6..7cdf056971 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -301,6 +301,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
   <li>Android webcam better error handling / pump library 0.4 (<a href="https://github.com/pvizeli">@pvizeli</a>)</li>
 </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>
@@ -388,18 +389,6 @@ Screenshot of all the different functionality the IP webcam integration offers.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/03/22/broken-dependencies/index.html b/blog/2017/03/22/broken-dependencies/index.html
index 7ca81e60f3..77de37215c 100644
--- a/blog/2017/03/22/broken-dependencies/index.html
+++ b/blog/2017/03/22/broken-dependencies/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -98,6 +98,7 @@
 </ul>
 <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>
@@ -185,18 +186,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 46eafec81a..809611e2e3 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -91,6 +91,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/osq_2-Qlan0" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -178,18 +179,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/03/25/todo-volumio-workday/index.html b/blog/2017/03/25/todo-volumio-workday/index.html
index 5e200310de..57c94486a0 100644
--- a/blog/2017/03/25/todo-volumio-workday/index.html
+++ b/blog/2017/03/25/todo-volumio-workday/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -246,6 +246,7 @@
   <li>Version bump to 0.41 (<a href="https://github.com/balloob">@balloob</a>)</li>
 </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>
@@ -333,18 +334,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 06c02daf69..58bf6c577a 100644
--- a/blog/2017/03/28/http-to-mqtt-bridge/index.html
+++ b/blog/2017/03/28/http-to-mqtt-bridge/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -139,6 +139,7 @@
 <h3><a class="title-link" name="thanks" href="#thanks"></a> Thanks</h3>
 <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>
@@ -226,18 +227,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/04/01/thomas-krenn-award/index.html b/blog/2017/04/01/thomas-krenn-award/index.html
index 6e382a0ea7..50850dff88 100644
--- a/blog/2017/04/01/thomas-krenn-award/index.html
+++ b/blog/2017/04/01/thomas-krenn-award/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -100,6 +100,7 @@
 <p>The decision of the jury will be final. If there will be a dispute then the Top-5 committer of the Home Assistant organization on Github will decide. Also, we reserve us the right to ban applications if we suspect cheating or unfair methods. Updates will be available in the <a href="https://community.home-assistant.io/c/contest-2017">Forum</a> and on <a href="https://twitter.com/home_assistant">Twitter</a>.</p>
 <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>
@@ -187,18 +188,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 c4ed80bd60..ebd9ccaad2 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -299,6 +299,7 @@
   <li>Bump Amcrest module to 1.1.8 (<a href="https://github.com/tchellomello">@tchellomello</a> - <a href="https://github.com/home-assistant/home-assistant/pull/6990">#6990</a>)</li>
 </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>
@@ -386,18 +387,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/04/15/ios/index.html b/blog/2017/04/15/ios/index.html
index eb5762c0d6..cc3e24da23 100644
--- a/blog/2017/04/15/ios/index.html
+++ b/blog/2017/04/15/ios/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -103,6 +103,7 @@
 <p><em>Please note, you must have Home Assistant 0.42.4 or later installed for the app to function properly.</em></p>
 <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>
@@ -190,18 +191,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 2e671518fc..f17f022718 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -156,6 +156,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
 <p>With Trådfri, IKEA has managed to put out an affordable and secure home automation system that does not compromise on functionality or design. There are still some downsides which I expect to get resolved in the future.</p>
 <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>
@@ -243,18 +244,6 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/04/22/ikea-tradfri-spotify/index.html b/blog/2017/04/22/ikea-tradfri-spotify/index.html
index d8bb4d651a..43d954474a 100644
--- a/blog/2017/04/22/ikea-tradfri-spotify/index.html
+++ b/blog/2017/04/22/ikea-tradfri-spotify/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -301,6 +301,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
   <li>Issue 6749 updated pylgtv to 0.1.6 to fix thread leak in asyncio loop (<a href="https://github.com/hmn">@hmn</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7199">#7199</a>) (<a href="/components/media_player.webostv/">media_player.webostv docs</a>) (<a href="/components/notify.webostv/">notify.webostv docs</a>)</li>
 </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>
@@ -388,18 +389,6 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/04/24/hardware-contest-2017/index.html b/blog/2017/04/24/hardware-contest-2017/index.html
index ef3f4a4d5e..fc39b96787 100644
--- a/blog/2017/04/24/hardware-contest-2017/index.html
+++ b/blog/2017/04/24/hardware-contest-2017/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -96,6 +96,7 @@
 <p>The voting is now open. To keep things simple are we using the voting feature of the <a href="https://community.home-assistant.io/c/contest-2017">forum</a>. Vote for your choices.</p>
 <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>
@@ -183,18 +184,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/04/25/influxdb-grafana-docker/index.html b/blog/2017/04/25/influxdb-grafana-docker/index.html
index 744e1cde3a..3221fe4c28 100644
--- a/blog/2017/04/25/influxdb-grafana-docker/index.html
+++ b/blog/2017/04/25/influxdb-grafana-docker/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -138,6 +138,7 @@
   </li>
 </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>
@@ -225,18 +226,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 5df83fee03..7bdfe7a4f5 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -113,6 +113,7 @@
 <p>To follow discussions about the development of the HASSbian image or to contribute join our <a href="https://discord.gg/8X8DTH4">Discord chat server</a>.</p>
 <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>
@@ -200,18 +201,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 460b0f767c..fe0faeb192 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -127,6 +127,7 @@ $ sudo systemctl start install_homeassistant.service
 <p>To try it out, go to <a href="http://hassbian:8123">http://hassbian:8123</a> or <a href="http://hassbian.local:8123">http://hassbian.local:8123</a> if you’re using Mac.</p>
 <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>
@@ -214,18 +215,6 @@ $ sudo systemctl start install_homeassistant.service
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/05/05/podcast-init-interview/index.html b/blog/2017/05/05/podcast-init-interview/index.html
index 42241020c2..842512da9a 100644
--- a/blog/2017/05/05/podcast-init-interview/index.html
+++ b/blog/2017/05/05/podcast-init-interview/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
 <p>Earlier this year I was interviewed by Tobias Macey from <a href="https://www.podcastinit.com/">Podcast.__init__</a> about Python and Home Assistant. Just realized that we never shared this on the blog, oops. Here it is, enjoy!</p>
 <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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/05/06/zigbee-opencv-dlib/index.html b/blog/2017/05/06/zigbee-opencv-dlib/index.html
index be90b3fe3d..da4ecb9af0 100644
--- a/blog/2017/05/06/zigbee-opencv-dlib/index.html
+++ b/blog/2017/05/06/zigbee-opencv-dlib/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -290,6 +290,7 @@
   <li>sensor.envirophat: add missing requirement (<a href="https://github.com/imrehg">@imrehg</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7451">#7451</a>) (<a href="https://home-assistant.io/components/sensor.envirophat/">sensor.envirophat docs</a>)</li>
 </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>
@@ -377,18 +378,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 bb8dc82f56..97fe004d67 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
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -93,6 +93,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/KNFZSSCPUyM" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -180,18 +181,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8e77777752..bc3176fb2b 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -196,6 +196,7 @@ Reading package lists... Done
 </p>
 <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>
@@ -283,18 +284,6 @@ Reading package lists... Done
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 b9dca3adfb..c584a7bb08 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -91,6 +91,7 @@
 <p>We will also be taken part in the <a href="https://us.pycon.org/2017/community/sprints/">development sprints</a> from Monday-Wednesday. You only need to bring a laptop. We’ll help you get set up with a dev environment and you can be coding on top of Home Assistant in no time. <del>Exact location inside the conference center to be announced.</del> <strong>We are sitting in room A108.</strong></p>
 <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>
@@ -178,18 +179,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 cd3842604c..d99a748bcc 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -249,6 +249,7 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
   <li>Fix automation failing to setup if no automations specified (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7647">#7647</a>) ([automation.<strong>init</strong> docs])</li>
 </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>
@@ -336,18 +337,6 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 905912982a..bd3d16755d 100644
--- a/blog/2017/06/02/home-assistant-podcast-1/index.html
+++ b/blog/2017/06/02/home-assistant-podcast-1/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
   <li>Download: <a href="https://hasspodcast.io/podcast-download/13/ha001.mp3">https://hasspodcast.io/podcast-download/13/ha001.mp3</a></li>
 </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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/06/04/release-46/index.html b/blog/2017/06/04/release-46/index.html
index ce11182c17..39b3178e62 100644
--- a/blog/2017/06/04/release-46/index.html
+++ b/blog/2017/06/04/release-46/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -235,6 +235,7 @@
   <li>Fix MQTT camera test (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7878">#7878</a>)</li>
 </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>
@@ -322,18 +323,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 efa3050a64..98b8c69ffb 100644
--- a/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html
+++ b/blog/2017/06/10/interview-with-jupiter-broadcasting/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -91,6 +91,7 @@
   <iframe width="560" height="315" src="https://www.youtube.com/embed/LQbOtUmITv8" frameborder="0" allowfullscreen=""></iframe>
 </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>
@@ -178,18 +179,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/06/15/zwave-entity-ids/index.html b/blog/2017/06/15/zwave-entity-ids/index.html
index 2fc7edc0b0..87e0b31005 100644
--- a/blog/2017/06/15/zwave-entity-ids/index.html
+++ b/blog/2017/06/15/zwave-entity-ids/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -91,6 +91,7 @@
 <p>With the release of 0.47, this feature will be opt-in. Setting <code class="highlighter-rouge">new_entity_ids: true</code> under <code class="highlighter-rouge">zwave:</code> in your configuration.yaml will enable the new generation. After 0.48 this feature will become opt-out. From 0.48 onward, unless you’ve declared <code class="highlighter-rouge">new_entity_ids: false</code> you will switch to the new entity_id generation. At an undecided point in the future, the old entity_id generation will be removed completely.</p>
 <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>
@@ -178,18 +179,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/06/17/release-47/index.html b/blog/2017/06/17/release-47/index.html
index 0415f9e285..2c25ff7d45 100644
--- a/blog/2017/06/17/release-47/index.html
+++ b/blog/2017/06/17/release-47/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -332,6 +332,7 @@ trigger:
   <li>bump ups (<a href="https://github.com/happyleavesaoc">@happyleavesaoc</a> - <a href="https://github.com/home-assistant/home-assistant/pull/8075">#8075</a>) (<a href="https://home-assistant.io/components/sensor.ups/">sensor.ups docs</a>)</li>
 </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>
@@ -419,18 +420,6 @@ trigger:
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e49d229bb7..92b8de134d 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -115,6 +115,7 @@ Founder, Home Assistant</p>
 <p><strong>Robbie Trencheny</strong><br />
 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>
@@ -202,18 +203,6 @@ Core Developer, Home Assistant</p>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/02/release-48/index.html b/blog/2017/07/02/release-48/index.html
index df6b8a8b67..23b8c61e0b 100644
--- a/blog/2017/07/02/release-48/index.html
+++ b/blog/2017/07/02/release-48/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -302,6 +302,7 @@
   <li>Create an index on the states table to help hass startup time (<a href="https://github.com/cmsimike">@cmsimike</a> - <a href="https://github.com/home-assistant/home-assistant/pull/8255">#8255</a>)</li>
 </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>
@@ -389,18 +390,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 425516886b..626977a945 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -138,6 +138,7 @@
 <p><strong>Dale Higgs</strong><br />
 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>
@@ -225,18 +226,6 @@ Community Leader, Home Assistant</p>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/05/hasspodcast-ep-3/index.html b/blog/2017/07/05/hasspodcast-ep-3/index.html
index 6bf8f4520d..ca7441eca5 100644
--- a/blog/2017/07/05/hasspodcast-ep-3/index.html
+++ b/blog/2017/07/05/hasspodcast-ep-3/index.html
@@ -82,13 +82,14 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
   <p>The third episode of the Home Assistant Podcast is out. Paulus joins to talk about some stats and the release of 0.47 and Petar tells all about his Floorplan project for Home Assistant.</p>
 <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>
@@ -176,18 +177,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/15/release-49/index.html b/blog/2017/07/15/release-49/index.html
index e9c1efc9fc..384867a54f 100644
--- a/blog/2017/07/15/release-49/index.html
+++ b/blog/2017/07/15/release-49/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -288,6 +288,7 @@ Screenshot of a green dashboard
   <li>Add kiosk-mode panel (<a href="https://github.com/andrey-git">@andrey-git</a> - <a href="https://github.com/home-assistant/home-assistant/pull/8457">#8457</a>)</li>
 </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>
@@ -375,18 +376,6 @@ Screenshot of a green dashboard
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/17/hasspodcast-ep-4/index.html b/blog/2017/07/17/hasspodcast-ep-4/index.html
index 48d3b8fca8..591955c61d 100644
--- a/blog/2017/07/17/hasspodcast-ep-4/index.html
+++ b/blog/2017/07/17/hasspodcast-ep-4/index.html
@@ -82,13 +82,14 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
   <p>We quickly cover off a few community items including the move to Discord and Carlo talks with Phil about his use of Floorplan.</p>
 <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>
@@ -176,18 +177,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/25/introducing-hassio/index.html b/blog/2017/07/25/introducing-hassio/index.html
index c1cdbfc7eb..1a95654bd3 100644
--- a/blog/2017/07/25/introducing-hassio/index.html
+++ b/blog/2017/07/25/introducing-hassio/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -123,6 +123,7 @@ Hass.io dashboard
 <h4><a class="title-link" name="is-there-a-roadmap" href="#is-there-a-roadmap"></a> Is there a roadmap?</h4>
 <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>
@@ -210,18 +211,6 @@ Hass.io dashboard
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/27/talk-python-podcast/index.html b/blog/2017/07/27/talk-python-podcast/index.html
index 9af960b757..8115954691 100644
--- a/blog/2017/07/27/talk-python-podcast/index.html
+++ b/blog/2017/07/27/talk-python-podcast/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -92,6 +92,7 @@
   Visit the episode page on Talk Python
 </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>
@@ -179,18 +180,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/07/29/release-50/index.html b/blog/2017/07/29/release-50/index.html
index 797da707da..2190c8dc2f 100644
--- a/blog/2017/07/29/release-50/index.html
+++ b/blog/2017/07/29/release-50/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -260,6 +260,7 @@
   <li>Persist shopping list + clear completed (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/8697">#8697</a>) (<a href="https://home-assistant.io/components/shopping_list/">shopping_list docs</a>)</li>
 </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>
@@ -347,18 +348,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/08/01/hasspodcast-ep-5/index.html b/blog/2017/08/01/hasspodcast-ep-5/index.html
index 4abaf29be3..db3277e778 100644
--- a/blog/2017/08/01/hasspodcast-ep-5/index.html
+++ b/blog/2017/08/01/hasspodcast-ep-5/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -90,6 +90,7 @@
 <p>Show notes available on the <a href="https://hasspodcast.io/ha005/">Home Assistant Podcast Website</a></p>
 <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>
@@ -177,18 +178,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/08/12/release-51/index.html b/blog/2017/08/12/release-51/index.html
index 4e9c0ebc5f..18fee12dff 100644
--- a/blog/2017/08/12/release-51/index.html
+++ b/blog/2017/08/12/release-51/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -257,6 +257,7 @@
   <li>Fix SET_TEMPERATURE_SCHEMA in climate component (<a href="https://github.com/MartinHjelmare">@MartinHjelmare</a> - <a href="https://github.com/home-assistant/home-assistant/pull/8879">#8879</a>) (<a href="https://home-assistant.io/components/climate/">climate docs</a>)</li>
 </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>
@@ -344,18 +345,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/08/26/release-0-52/index.html b/blog/2017/08/26/release-0-52/index.html
index c8a2f0f2a0..029daa5d73 100644
--- a/blog/2017/08/26/release-0-52/index.html
+++ b/blog/2017/08/26/release-0-52/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -246,6 +246,7 @@
   <li>Refactor mysensors callback and add validation (<a href="https://github.com/MartinHjelmare">@MartinHjelmare</a> - <a href="https://github.com/home-assistant/home-assistant/pull/9069">#9069</a>) (<a href="https://home-assistant.io/components/mysensors/">mysensors docs</a>) (<a href="https://home-assistant.io/components/binary_sensor.mysensors/">binary_sensor.mysensors docs</a>) (<a href="https://home-assistant.io/components/climate.mysensors/">climate.mysensors docs</a>) (<a href="https://home-assistant.io/components/cover.mysensors/">cover.mysensors docs</a>) (<a href="https://home-assistant.io/components/device_tracker.mysensors/">device_tracker.mysensors docs</a>) (<a href="https://home-assistant.io/components/light.mysensors/">light.mysensors docs</a>) (<a href="https://home-assistant.io/components/notify.mysensors/">notify.mysensors docs</a>) (<a href="https://home-assistant.io/components/sensor.mysensors/">sensor.mysensors docs</a>) (<a href="https://home-assistant.io/components/switch.mysensors/">switch.mysensors docs</a>) (breaking change)</li>
 </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>
@@ -333,18 +334,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/09/09/release-53/index.html b/blog/2017/09/09/release-53/index.html
index 6080111810..f8fd40279f 100644
--- a/blog/2017/09/09/release-53/index.html
+++ b/blog/2017/09/09/release-53/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -270,6 +270,7 @@ Screenshot of the new customize editor.
   <li>Bump pyHik version to add IO support (<a href="https://github.com/mezz64">@mezz64</a> - <a href="https://github.com/home-assistant/home-assistant/pull/9341">#9341</a>) (<a href="https://home-assistant.io/components/binary_sensor.hikvision/">binary_sensor.hikvision docs</a>)</li>
 </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>
@@ -357,18 +358,6 @@ Screenshot of the new customize editor.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 e2fda6dcc0..319cca71e5 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
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -99,6 +99,7 @@ Other than that the changes are mostly to our tool <code class="highlighter-roug
 <p>To follow discussions about the development of the HASSbian image or to contribute join our <a href="https://discord.gg/RkajcgS">Discord chat server</a>.</p>
 <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>
@@ -186,18 +187,6 @@ Other than that the changes are mostly to our tool <code class="highlighter-roug
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/09/23/release-54/index.html b/blog/2017/09/23/release-54/index.html
index 843242ca3e..8af3c57db7 100644
--- a/blog/2017/09/23/release-54/index.html
+++ b/blog/2017/09/23/release-54/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -205,6 +205,7 @@
   <li>LIFX: improve performance of setting multi-zone lights to a single color (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/9526">#9526</a>) (<a href="/components/light.lifx/">light.lifx docs</a>)</li>
 </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>
@@ -292,18 +293,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 9ad26c425a..b0bfb446d8 100644
--- a/blog/2017/09/26/new-hassio-build-system/index.html
+++ b/blog/2017/09/26/new-hassio-build-system/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -109,6 +109,7 @@ FROM $BUILD_FROM
 <p>The new system will become active with Hass.io 0.64 and Host OS 1.1. Host OS 1.1 is available today. Navigate to Advanced Settings in the Hass.io panel to start the OTA update.</p>
 <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>
@@ -196,18 +197,6 @@ FROM $BUILD_FROM
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 8682faa352..09697ed412 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -112,6 +112,7 @@
   <li><a href="https://letsencrypt.org/">Let’s Encrypt</a></li>
 </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>
@@ -199,18 +200,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/09/29/hacktoberfest/index.html b/blog/2017/09/29/hacktoberfest/index.html
index 21a56db052..215e28221d 100644
--- a/blog/2017/09/29/hacktoberfest/index.html
+++ b/blog/2017/09/29/hacktoberfest/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
 <p>Our participation for <a href="https://home-assistant.io/blog/2016/11/05/hacktoberfest-influxdb-weather/#hacktoberfest">Hacktoberfest 2016</a> was a huge success. Join us to repeat it this year.</p>
 <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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/01/hass-podcast-ep9/index.html b/blog/2017/10/01/hass-podcast-ep9/index.html
index c61e57af12..a4f04fc510 100644
--- a/blog/2017/10/01/hass-podcast-ep9/index.html
+++ b/blog/2017/10/01/hass-podcast-ep9/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -91,6 +91,7 @@
 <p>Show notes available on the <a href="https://hasspodcast.io/ha009/">Home Assistant Podcast Website</a>.</p>
 <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>
@@ -178,18 +179,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 6a822108a5..81633a1884 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
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -98,6 +98,7 @@
 <h4>Other Debian based systems</h4>
 <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>
@@ -185,18 +186,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/07/release-55/index.html b/blog/2017/10/07/release-55/index.html
index 3e1123f554..074fa4e4b0 100644
--- a/blog/2017/10/07/release-55/index.html
+++ b/blog/2017/10/07/release-55/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -232,6 +232,7 @@
   <li>[light.tradfri] Clone all of aiocoap to ensure pinned commit will be present (<a href="https://github.com/lwis">@lwis</a> - <a href="https://github.com/home-assistant/home-assistant/pull/9713">#9713</a>)</li>
 </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>
@@ -319,18 +320,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/15/templating-date-time/index.html b/blog/2017/10/15/templating-date-time/index.html
index af162d91e9..1183395384 100644
--- a/blog/2017/10/15/templating-date-time/index.html
+++ b/blog/2017/10/15/templating-date-time/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -106,6 +106,7 @@
 <p><a href="/blog/2017/09/29/hacktoberfest/">Hacktoberfest</a> is still running. Working on the documentation is pretty easy. If you know a nice <a href="/cookbook/">trick</a>, want to help improving the page of a platform or just fix typo then please do. Our <a href="/developers/documentation/">Website/Documentation section</a> contains some requirements which are defined in the <a href="/developers/documentation/standards/">Documentation Standards</a> and the “<a href="/developers/documentation/create_page/">Create a page</a>” documentation for other useful details.</p>
 <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>
@@ -193,18 +194,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/18/hasspodcast-ep-10/index.html b/blog/2017/10/18/hasspodcast-ep-10/index.html
index 632cd99762..446c722614 100644
--- a/blog/2017/10/18/hasspodcast-ep-10/index.html
+++ b/blog/2017/10/18/hasspodcast-ep-10/index.html
@@ -82,13 +82,14 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
   <p>Show notes available on the <a href="https://hasspodcast.io/HA010/">Home Assistant Podcast Website</a></p>
 <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>
@@ -176,18 +177,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/21/release-56/index.html b/blog/2017/10/21/release-56/index.html
index f2ff760798..cf9c2a88a9 100644
--- a/blog/2017/10/21/release-56/index.html
+++ b/blog/2017/10/21/release-56/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -287,6 +287,7 @@
   <li>Remove async_update (<a href="https://github.com/pvizeli">@pvizeli</a> - <a href="https://github.com/home-assistant/home-assistant/pull/9997">#9997</a>)</li>
 </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>
@@ -374,18 +375,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/23/simple-analog-sensor/index.html b/blog/2017/10/23/simple-analog-sensor/index.html
index 417f4f73b3..ab7d17dc87 100644
--- a/blog/2017/10/23/simple-analog-sensor/index.html
+++ b/blog/2017/10/23/simple-analog-sensor/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -165,6 +165,7 @@
 </div>
 <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>
@@ -252,18 +253,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/10/28/demo/index.html b/blog/2017/10/28/demo/index.html
index 4d13316631..ce4ecd8537 100644
--- a/blog/2017/10/28/demo/index.html
+++ b/blog/2017/10/28/demo/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -157,6 +157,7 @@ Demo is running... -&gt; CTRL + C to shutdown
 <p>It will create sensors, a light, and a switch and update the states as long the script is running. It possible to stop and restart script without losing the entities.</p>
 <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>
@@ -244,18 +245,6 @@ Demo is running... -&gt; CTRL + C to shutdown
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/02/secure-shell-tunnel/index.html b/blog/2017/11/02/secure-shell-tunnel/index.html
index 5e6ccfad5b..0de6cf36e9 100644
--- a/blog/2017/11/02/secure-shell-tunnel/index.html
+++ b/blog/2017/11/02/secure-shell-tunnel/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -132,6 +132,7 @@ Last login: Fri Oct 27 17:50:09 2017
   <li>Use <a href="https://docs-old.fedoraproject.org/en-US/Fedora/14/html/Deployment_Guide/s2-ssh-configuration-keypairs.html">SSH keys for authentication</a> instead of passwords to avoid bruteforce attacks.</li>
 </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>
@@ -219,18 +220,6 @@ Last login: Fri Oct 27 17:50:09 2017
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/04/release-57/index.html b/blog/2017/11/04/release-57/index.html
index 15a8a36405..ea2b0fe73d 100644
--- a/blog/2017/11/04/release-57/index.html
+++ b/blog/2017/11/04/release-57/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -337,6 +337,7 @@ The Home Assistant sidebar in 12 different languages.
   <li>Move timer into correct folder (<a href="https://github.com/pvizeli">@pvizeli</a> - <a href="https://github.com/home-assistant/home-assistant/pull/10324">#10324</a>) (<a href="https://home-assistant.io/components/timer/">timer docs</a>)</li>
 </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>
@@ -424,18 +425,6 @@ The Home Assistant sidebar in 12 different languages.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/05/frontend-translations/index.html b/blog/2017/11/05/frontend-translations/index.html
index 6c83994360..e2b0dfac0f 100644
--- a/blog/2017/11/05/frontend-translations/index.html
+++ b/blog/2017/11/05/frontend-translations/index.html
@@ -81,7 +81,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -94,6 +94,7 @@ The Home Assistant sidebar in 12 different languages.
 <p>Lokalise allows us to open up translations for all of our multilingual users willing to contribute. Users can join the project using our <a href="https://lokalise.co/signup/3420425759f6d6d241f598.13594006/all/">public signup link</a>, and start translating right away. We’ve created a <a href="https://home-assistant.io/developers/frontend_translation/">translation startup guide</a> with additional details about how to contribute. Instructions are provided there for how to request a new language.</p>
 <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>
@@ -181,18 +182,6 @@ The Home Assistant sidebar in 12 different languages.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/10/ttn-with-mqtt/index.html b/blog/2017/11/10/ttn-with-mqtt/index.html
index 9fd0899c53..a0457237d1 100644
--- a/blog/2017/11/10/ttn-with-mqtt/index.html
+++ b/blog/2017/11/10/ttn-with-mqtt/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -253,6 +253,7 @@
 </div>
 <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 an 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>
@@ -340,18 +341,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/12/tor/index.html b/blog/2017/11/12/tor/index.html
index e959ee67e0..d56514b6a8 100644
--- a/blog/2017/11/12/tor/index.html
+++ b/blog/2017/11/12/tor/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -160,6 +160,7 @@ INFO: -----------------------------------------------------------
 <p>This “Stealth”-mode adds an extra layer of security to your Hidden Service by only responding to a client that passes a unique secret cookie as it connects. Obviously, this requires additional configuration on the Tor client applications.</p>
 <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>
@@ -247,18 +248,6 @@ INFO: -----------------------------------------------------------
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/18/release-58/index.html b/blog/2017/11/18/release-58/index.html
index 6d41fb3692..7dcefece70 100644
--- a/blog/2017/11/18/release-58/index.html
+++ b/blog/2017/11/18/release-58/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -258,6 +258,7 @@ For Custom UI users: your custom UI will need to be updated before it can work w
   <li>Implement entity and domain exclude/include for Alexa (<a href="https://github.com/robbiet480">@robbiet480</a> - <a href="https://github.com/home-assistant/home-assistant/pull/10647">#10647</a>)</li>
 </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>
@@ -345,18 +346,6 @@ For Custom UI users: your custom UI will need to be updated before it can work w
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/11/29/hassio-virtual-machine/index.html b/blog/2017/11/29/hassio-virtual-machine/index.html
index 6a211f7fb8..f47e3af14e 100644
--- a/blog/2017/11/29/hassio-virtual-machine/index.html
+++ b/blog/2017/11/29/hassio-virtual-machine/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -195,6 +195,7 @@ ada5bbfc74f0        homeassistant/qemux86-64-homeassistant   <span class="s2">"/
 </p>
 <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>
@@ -282,18 +283,6 @@ ada5bbfc74f0        homeassistant/qemux86-64-homeassistant   <span class="s2">"/
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/12/03/release-59/index.html b/blog/2017/12/03/release-59/index.html
index 221f4892c7..6364183bbf 100644
--- a/blog/2017/12/03/release-59/index.html
+++ b/blog/2017/12/03/release-59/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -242,6 +242,7 @@
   <li>Bugfix #10902 (<a href="https://github.com/turbokongen">@turbokongen</a> - <a href="https://github.com/home-assistant/home-assistant/pull/10904">#10904</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
 </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>
@@ -329,18 +330,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
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 289f26abbf..cfd014985e 100644
--- a/blog/2017/12/17/introducing-home-assistant-cloud/index.html
+++ b/blog/2017/12/17/introducing-home-assistant-cloud/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -143,6 +143,7 @@
 <p>The plan is to hire developers to work fulltime on Home Assistant. We have grown a lot in the last 4 years and the work load is pushing the limits of what our core developers can do. Open source burn out is very common (<a href="https://nolanlawson.com/2017/03/05/what-it-feels-like-to-be-an-open-source-maintainer/">1</a>, <a href="https://www.kennethreitz.org/essays/the-reality-of-developer-burnout">2</a>) and we want to avoid this by moving most organization and release chores to a paid position.</p>
 <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>
@@ -227,18 +228,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/12/17/release-60/index.html b/blog/2017/12/17/release-60/index.html
index c893d27458..c9d9a59cfe 100644
--- a/blog/2017/12/17/release-60/index.html
+++ b/blog/2017/12/17/release-60/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -228,6 +228,7 @@
   <li>Revbump to SoCo 0.13 and add support for Night Sound and Speech Enhancement. (<a href="https://github.com/rbdixon">@rbdixon</a> - <a href="https://github.com/home-assistant/home-assistant/pull/10765">#10765</a>) (<a href="https://home-assistant.io/components/media_player.sonos/">media_player.sonos docs</a>)</li>
 </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>
@@ -315,18 +316,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2017/12/28/thank-you/index.html b/blog/2017/12/28/thank-you/index.html
index 24a838948a..809b1ea05a 100644
--- a/blog/2017/12/28/thank-you/index.html
+++ b/blog/2017/12/28/thank-you/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -96,6 +96,7 @@
 <p>Stay tuned for more Home Assistant awesomeness in 2018. We will keep the pace but first: Happy New Year!</p>
 <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>
@@ -180,18 +181,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2018/01/14/release-61/index.html b/blog/2018/01/14/release-61/index.html
index a65b79b224..a30a87108e 100644
--- a/blog/2018/01/14/release-61/index.html
+++ b/blog/2018/01/14/release-61/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -438,6 +438,7 @@ Note however, that this feature was replaced by a new ignore_string config optio
   <li>Update Pyarlo to 0.1.2 (<a href="https://github.com/arsaboo">@arsaboo</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11626">#11626</a>)</li>
 </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>
@@ -522,18 +523,6 @@ Note however, that this feature was replaced by a new ignore_string config optio
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2018/01/21/clarification-emulated-hue/index.html b/blog/2018/01/21/clarification-emulated-hue/index.html
index bfa253e671..a76f47bf6b 100644
--- a/blog/2018/01/21/clarification-emulated-hue/index.html
+++ b/blog/2018/01/21/clarification-emulated-hue/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -101,6 +101,7 @@
   <li>Read the <a href="https://home-assistant.io/components/emulated_hue/#configuration">documentation on how to configure Emulated Hue</a></li>
 </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>
@@ -185,18 +186,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/2018/01/27/release-62/index.html b/blog/2018/01/27/release-62/index.html
index 06fc592dd4..fab3f22ca6 100644
--- a/blog/2018/01/27/release-62/index.html
+++ b/blog/2018/01/27/release-62/index.html
@@ -82,7 +82,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="#disqus_thread"
+         href="#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -108,7 +108,7 @@
 <ul>
   <li>Tahoma platform will get new entity IDs (<a href="https://github.com/glpatcern">@glpatcern</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11547">#11547</a>) (<a href="https://home-assistant.io/components/tahoma/">tahoma docs</a>) (<a href="https://home-assistant.io/components/cover.tahoma/">cover.tahoma docs</a>) (breaking change)</li>
   <li>Mold indicator: attribute names no longer include spaces or periods (<a href="https://github.com/olskar">@olskar</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11694">#11694</a>) (<a href="https://home-assistant.io/components/sensor.mold_indicator/">sensor.mold_indicator docs</a>) (breaking change)</li>
-  <li>Custom component devs only: <code class="highlighter-rouge">EntityComponent.add_entity(entity)</code> and <code class="highlighter-rouge">EntityComponent.async_add_entity(entity)</code> have been removed. Use <code class="highlighter-rouge">EntityComponent.add_entities([entity])</code> and <code class="highlighter-rouge">EntityComponent.async_add_entities([entity])</code> instead. (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11691">#11691</a>) (breaking change)</li>
+  <li>Custom component devs only: <code class="highlighter-rouge">EntityComponent.add_entity(entity)</code> and <code class="highlighter-rouge">EntityComponent.async_add_entity(entity)</code> have been removed. Use <code class="highlighter-rouge">EntityComponent.add_entities([entity])</code> and <code class="highlighter-rouge">EntityComponent.async_add_entities([entity])</code> instead. Also <code class="highlighter-rouge">EntityComponent.entities</code> is no longer a dictionary but instead an iterable. Use <code class="highlighter-rouge">EntityComponent.get_entity(entity_id)</code> to get entity by id. (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11691">#11691</a>) (breaking change)</li>
 </ul>
 <h2>All changes</h2>
 <ul>
@@ -242,10 +242,17 @@
   <li>Update pyhomematic to 0.1.38 (<a href="https://github.com/danielperna84">@danielperna84</a> - <a href="https://github.com/home-assistant/home-assistant/pull/11936">#11936</a>) (<a href="https://home-assistant.io/components/homematic/">homematic docs</a>)</li>
 </ul>
 </article>
-<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>
+<div id='post-comments'></div>
+<div id='discourse-comments'></div>
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'https://community.home-assistant.io/',
+                     discourseEmbedUrl: 'https://home-assistant.io/blog/2018/01/27/release-62/' };
+  (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">
           <div class="grid">
@@ -326,18 +333,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    // var disqus_developer = 1;
-    var disqus_identifier = 'https://home-assistant.io/blog/2018/01/27/release-62/';
-    var disqus_url = 'https://home-assistant.io/blog/2018/01/27/release-62/';
-    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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/archives/index.html b/blog/archives/index.html
index 1f6d1f7e5f..e174945fbb 100644
--- a/blog/archives/index.html
+++ b/blog/archives/index.html
@@ -3758,15 +3758,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 1266584690..2ab70a0161 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/index.html b/blog/categories/announcements/index.html
index e7e07d1437..23b8223d16 100644
--- a/blog/categories/announcements/index.html
+++ b/blog/categories/announcements/index.html
@@ -225,15 +225,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 0663b5d38f..b6581b26fd 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/index.html b/blog/categories/community/index.html
index ac7be5ac29..8b596997ca 100644
--- a/blog/categories/community/index.html
+++ b/blog/categories/community/index.html
@@ -525,15 +525,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 6ac89d254e..53461ba9a0 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/index.html b/blog/categories/device-tracking/index.html
index 0cecc400d2..7dd0144ee4 100644
--- a/blog/categories/device-tracking/index.html
+++ b/blog/categories/device-tracking/index.html
@@ -185,15 +185,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 17c73fa1ba..ffba67a738 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/index.html b/blog/categories/esp8266/index.html
index c20668b567..509504ec87 100644
--- a/blog/categories/esp8266/index.html
+++ b/blog/categories/esp8266/index.html
@@ -233,15 +233,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 0ea8bd7ff7..bf6373f5fe 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/index.html b/blog/categories/how-to/index.html
index f2fa5dca2d..260c3dffde 100644
--- a/blog/categories/how-to/index.html
+++ b/blog/categories/how-to/index.html
@@ -807,15 +807,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index bf1b7a173a..f16a51dce6 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/index.html b/blog/categories/ibeacons/index.html
index 75339bf6df..1bfc2dbd04 100644
--- a/blog/categories/ibeacons/index.html
+++ b/blog/categories/ibeacons/index.html
@@ -208,15 +208,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 8d88b729fe..febf3e79e2 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/index.html b/blog/categories/internet-of-things/index.html
index d52d539029..007a74d39a 100644
--- a/blog/categories/internet-of-things/index.html
+++ b/blog/categories/internet-of-things/index.html
@@ -269,15 +269,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 4e6920c6e6..fbfbdfd054 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/index.html b/blog/categories/iot-data/index.html
index 542a2c6cd1..9c8b40d5f7 100644
--- a/blog/categories/iot-data/index.html
+++ b/blog/categories/iot-data/index.html
@@ -228,15 +228,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index 62135533b1..ff88c05c60 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/media/index.html b/blog/categories/media/index.html
index dd67ce938e..ed1d1a274a 100644
--- a/blog/categories/media/index.html
+++ b/blog/categories/media/index.html
@@ -372,15 +372,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index 2415e89557..b0f1c54b75 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/index.html b/blog/categories/merchandise/index.html
index 0d4d8e5ed0..ac8868585e 100644
--- a/blog/categories/merchandise/index.html
+++ b/blog/categories/merchandise/index.html
@@ -183,15 +183,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 31efd3977c..4de5a26e7b 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/index.html b/blog/categories/micropython/index.html
index 62206ce869..d896e41374 100644
--- a/blog/categories/micropython/index.html
+++ b/blog/categories/micropython/index.html
@@ -232,15 +232,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 64036319be..33f3a0d833 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/index.html b/blog/categories/mqtt/index.html
index 9deb1f8186..cc29958222 100644
--- a/blog/categories/mqtt/index.html
+++ b/blog/categories/mqtt/index.html
@@ -254,15 +254,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/organization/atom.xml b/blog/categories/organization/atom.xml
index 1c42eb82e2..a1e435e37f 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organization/index.html b/blog/categories/organization/index.html
index b46ea4c7b7..d3ae8becd5 100644
--- a/blog/categories/organization/index.html
+++ b/blog/categories/organization/index.html
@@ -248,15 +248,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 9f422c26cf..cdb4da0029 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/index.html b/blog/categories/owntracks/index.html
index 1d284d02e5..265b59fbb4 100644
--- a/blog/categories/owntracks/index.html
+++ b/blog/categories/owntracks/index.html
@@ -208,15 +208,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 7673eddde4..8adcec2e5c 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/index.html b/blog/categories/presence-detection/index.html
index 057f8610c8..f4a2425c6c 100644
--- a/blog/categories/presence-detection/index.html
+++ b/blog/categories/presence-detection/index.html
@@ -185,15 +185,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index efc49f245f..f92a5dc531 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/index.html b/blog/categories/public-service-announcement/index.html
index 42e42a8533..c127d7e948 100644
--- a/blog/categories/public-service-announcement/index.html
+++ b/blog/categories/public-service-announcement/index.html
@@ -227,15 +227,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index aa9b6fa169..0e5f28361c 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -50,7 +50,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 
 - Tahoma platform will get new entity IDs ([@glpatcern] - [#11547]) ([tahoma docs]) ([cover.tahoma docs]) (breaking change)
 - Mold indicator: attribute names no longer include spaces or periods ([@olskar] - [#11694]) ([sensor.mold_indicator docs]) (breaking change)
-- Custom component devs only: `EntityComponent.add_entity(entity)` and `EntityComponent.async_add_entity(entity)` have been removed. Use `EntityComponent.add_entities([entity])` and `EntityComponent.async_add_entities([entity])` instead. ([@balloob] - [#11691]) (breaking change)
+- Custom component devs only: `EntityComponent.add_entity(entity)` and `EntityComponent.async_add_entity(entity)` have been removed. Use `EntityComponent.add_entities([entity])` and `EntityComponent.async_add_entities([entity])` instead. Also `EntityComponent.entities` is no longer a dictionary but instead an iterable. Use `EntityComponent.get_entity(entity_id)` to get entity by id. ([@balloob] - [#11691]) (breaking change)
 
 ## All changes
 
diff --git a/blog/categories/release-notes/index.html b/blog/categories/release-notes/index.html
index 410a337122..601f938c39 100644
--- a/blog/categories/release-notes/index.html
+++ b/blog/categories/release-notes/index.html
@@ -1804,15 +1804,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 1f784d032c..3a252a83a0 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/index.html b/blog/categories/survey/index.html
index 673eb1f128..03d246a646 100644
--- a/blog/categories/survey/index.html
+++ b/blog/categories/survey/index.html
@@ -183,15 +183,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 809801e282..639eadd92c 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/index.html b/blog/categories/talks/index.html
index 2806c14805..c234b18d89 100644
--- a/blog/categories/talks/index.html
+++ b/blog/categories/talks/index.html
@@ -184,15 +184,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 0b4c887786..829b71cf1e 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/index.html b/blog/categories/technology/index.html
index ec68689187..dbc094784d 100644
--- a/blog/categories/technology/index.html
+++ b/blog/categories/technology/index.html
@@ -352,15 +352,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 2a8b2be0fb..2696fb9b03 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/index.html b/blog/categories/user-stories/index.html
index 6a1f1b63c8..0c6b912243 100644
--- a/blog/categories/user-stories/index.html
+++ b/blog/categories/user-stories/index.html
@@ -205,15 +205,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index c77c036f52..5e58c60409 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/index.html b/blog/categories/video/index.html
index 5ac462acf9..6d1d188582 100644
--- a/blog/categories/video/index.html
+++ b/blog/categories/video/index.html
@@ -314,15 +314,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 769b41d686..33e170a5ea 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-01-27T07:46:41+00:00</updated>
+  <updated>2018-01-27T08:43:39+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/index.html b/blog/categories/website/index.html
index ad7b0d7023..2a881af1fa 100644
--- a/blog/categories/website/index.html
+++ b/blog/categories/website/index.html
@@ -205,15 +205,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/index.html b/blog/index.html
index d237695bf6..2dff928dd4 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2018/01/27/release-62/#disqus_thread"
+         href="/blog/2018/01/27/release-62/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -125,7 +125,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2018/01/21/clarification-emulated-hue/#disqus_thread"
+         href="/blog/2018/01/21/clarification-emulated-hue/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -163,7 +163,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2018/01/14/release-61/#disqus_thread"
+         href="/blog/2018/01/14/release-61/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -234,7 +234,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/12/28/thank-you/#disqus_thread"
+         href="/blog/2017/12/28/thank-you/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -267,7 +267,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/12/17/introducing-home-assistant-cloud/#disqus_thread"
+         href="/blog/2017/12/17/introducing-home-assistant-cloud/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -347,7 +347,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/12/17/release-60/#disqus_thread"
+         href="/blog/2017/12/17/release-60/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -419,7 +419,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/12/03/release-59/#disqus_thread"
+         href="/blog/2017/12/03/release-59/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -498,7 +498,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/29/hassio-virtual-machine/#disqus_thread"
+         href="/blog/2017/11/29/hassio-virtual-machine/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -524,7 +524,7 @@ broadlink.send_packet_192_168_0_107 -&gt; switch.broadlink_send_packet_192_168_0
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/18/release-58/#disqus_thread"
+         href="/blog/2017/11/18/release-58/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -597,7 +597,7 @@ For Custom UI users: your custom UI will need to be updated before it can work w
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/12/tor/#disqus_thread"
+         href="/blog/2017/11/12/tor/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -694,15 +694,6 @@ For Custom UI users: your custom UI will need to be updated before it can work w
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/10/index.html b/blog/posts/10/index.html
index 6301db4abb..404eeaa9a1 100644
--- a/blog/posts/10/index.html
+++ b/blog/posts/10/index.html
@@ -84,7 +84,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/#disqus_thread"
+         href="/blog/2016/08/19/github-style-calendar-heatmap-of-device-data/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -113,7 +113,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/16/we-have-apps-now/#disqus_thread"
+         href="/blog/2016/08/16/we-have-apps-now/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -139,7 +139,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/#disqus_thread"
+         href="/blog/2016/08/13/foursquare-fast-com-ffmpeg-gpsd/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -219,7 +219,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/#disqus_thread"
+         href="/blog/2016/08/07/optimizing-the-home-assistant-mobile-web-app/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -259,7 +259,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/03/laundry-automation-update/#disqus_thread"
+         href="/blog/2016/08/03/laundry-automation-update/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -291,7 +291,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/#disqus_thread"
+         href="/blog/2016/07/30/custom-frontend-panels-jupyter-notebooks-directv/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -373,7 +373,7 @@ Heatmap
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/28/esp8266-and-micropython-part1/#disqus_thread"
+         href="/blog/2016/07/28/esp8266-and-micropython-part1/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -402,7 +402,7 @@ The first release of Micropython for ESP8266 was delivered a couple of weeks ago
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/#disqus_thread"
+         href="/blog/2016/07/23/internet-of-things-data-exploration-with-jupyter-notebooks/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -441,7 +441,7 @@ One of the graphs created with this tutorial.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/19/visualizing-your-iot-data/#disqus_thread"
+         href="/blog/2016/07/19/visualizing-your-iot-data/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -469,7 +469,7 @@ One of the graphs created with this tutorial.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/#disqus_thread"
+         href="/blog/2016/07/16/sqlalchemy-knx-join-simplisafe/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -597,15 +597,6 @@ One of the graphs created with this tutorial.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/11/index.html b/blog/posts/11/index.html
index d88dca33e2..e113a88b20 100644
--- a/blog/posts/11/index.html
+++ b/blog/posts/11/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/06/pocketchip-running-home-assistant/#disqus_thread"
+         href="/blog/2016/07/06/pocketchip-running-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,7 +110,7 @@ Over a year ago I participated in the <a href="https://www.kickstarter.com/proje
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/#disqus_thread"
+         href="/blog/2016/07/01/envisalink-homematic-hdmi-cec-and-sony-bravia-tv/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -178,7 +178,7 @@ Over a year ago I participated in the <a href="https://www.kickstarter.com/proje
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/06/23/usb-webcams-and-home-assistant/#disqus_thread"
+         href="/blog/2016/06/23/usb-webcams-and-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -206,7 +206,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/#disqus_thread"
+         href="/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -273,7 +273,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/06/13/home-assistant-at-pycon-2016/#disqus_thread"
+         href="/blog/2016/06/13/home-assistant-at-pycon-2016/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -308,7 +308,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/06/08/super-fast-web-enocean-lirc/#disqus_thread"
+         href="/blog/2016/06/08/super-fast-web-enocean-lirc/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -382,7 +382,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/06/01/community-highlights/#disqus_thread"
+         href="/blog/2016/06/01/community-highlights/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -424,7 +424,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/#disqus_thread"
+         href="/blog/2016/05/26/ibeacons-how-to-track-things-that-cant-track-themselves-part-ii/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -461,7 +461,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/22/get-started-with-all-in-one-installer/#disqus_thread"
+         href="/blog/2016/05/22/get-started-with-all-in-one-installer/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -493,7 +493,7 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/21/release-020/#disqus_thread"
+         href="/blog/2016/05/21/release-020/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -616,15 +616,6 @@ In the past month I was thinking about ways to integrate USB webcams into Home A
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/12/index.html b/blog/posts/12/index.html
index 2da226a070..b385c8be72 100644
--- a/blog/posts/12/index.html
+++ b/blog/posts/12/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/18/why-we-use-polymer/#disqus_thread"
+         href="/blog/2016/05/18/why-we-use-polymer/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -112,7 +112,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/12/video-configuring-home-assistant/#disqus_thread"
+         href="/blog/2016/05/12/video-configuring-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -141,7 +141,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/07/empowering-scripts-and-alexa/#disqus_thread"
+         href="/blog/2016/05/07/empowering-scripts-and-alexa/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -245,7 +245,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/05/06/open-iot-summit-talk/#disqus_thread"
+         href="/blog/2016/05/06/open-iot-summit-talk/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -275,7 +275,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/#disqus_thread"
+         href="/blog/2016/04/30/ibeacons-part-1-making-presence-detection-work-better/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -306,7 +306,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/#disqus_thread"
+         href="/blog/2016/04/20/bluetooth-lg-webos-tvs-and-roombas/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -369,7 +369,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/19/to-infinity-and-beyond/#disqus_thread"
+         href="/blog/2016/04/19/to-infinity-and-beyond/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -410,7 +410,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/17/updated-documentation/#disqus_thread"
+         href="/blog/2016/04/17/updated-documentation/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -439,7 +439,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/#disqus_thread"
+         href="/blog/2016/04/09/onkyo-panasonic-gtfs-and-config-validation/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -482,7 +482,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/07/static-website/#disqus_thread"
+         href="/blog/2016/04/07/static-website/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -576,15 +576,6 @@
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/13/index.html b/blog/posts/13/index.html
index b04f7cbb65..7e3c637a52 100644
--- a/blog/posts/13/index.html
+++ b/blog/posts/13/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/04/05/your-hub-should-be-local-and-open/#disqus_thread"
+         href="/blog/2016/04/05/your-hub-should-be-local-and-open/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -114,7 +114,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/#disqus_thread"
+         href="/blog/2016/03/26/embedded-mqtt-broker-uber-yamaha-growl/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -185,7 +185,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/03/12/z-wave-pep257-templated-service-calls/#disqus_thread"
+         href="/blog/2016/03/12/z-wave-pep257-templated-service-calls/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -248,7 +248,7 @@ player state attributes. This change affects automations, scripts and scenes.</l
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/#disqus_thread"
+         href="/blog/2016/02/27/steam-d-link-smart-plugs-and-neurio-energy-sensors/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -311,7 +311,7 @@ player state attributes. This change affects automations, scripts and scenes.</l
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/20/community-highlights/#disqus_thread"
+         href="/blog/2016/02/20/community-highlights/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -370,7 +370,7 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/18/multi-room-audio-with-snapcast/#disqus_thread"
+         href="/blog/2016/02/18/multi-room-audio-with-snapcast/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -403,7 +403,7 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/#disqus_thread"
+         href="/blog/2016/02/13/speedtest-bloomsky-splunk-and-garage-doors/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -466,7 +466,7 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/12/classifying-the-internet-of-things/#disqus_thread"
+         href="/blog/2016/02/12/classifying-the-internet-of-things/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -541,7 +541,7 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/#disqus_thread"
+         href="/blog/2016/02/09/Smarter-Smart-Things-with-MQTT-and-Home-Assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -573,7 +573,7 @@ Hold your NFC tag against the belly of Garfield to unlock the alarm.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/#disqus_thread"
+         href="/blog/2016/01/30/insteon-lifx-twitter-and-zigbee/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -695,15 +695,6 @@ Example of the new views in the frontend. <a href="/components/group/">Learn mor
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/14/index.html b/blog/posts/14/index.html
index bdb2c44d16..b648a67234 100644
--- a/blog/posts/14/index.html
+++ b/blog/posts/14/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/01/19/perfect-home-automation/#disqus_thread"
+         href="/blog/2016/01/19/perfect-home-automation/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -113,7 +113,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/01/17/extended-support-for-diy-solutions/#disqus_thread"
+         href="/blog/2016/01/17/extended-support-for-diy-solutions/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -168,7 +168,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/22/amazon-echo-icloud-and-templates/#disqus_thread"
+         href="/blog/2015/12/22/amazon-echo-icloud-and-templates/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -212,7 +212,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/13/setup-encryption-using-lets-encrypt/#disqus_thread"
+         href="/blog/2015/12/13/setup-encryption-using-lets-encrypt/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -245,7 +245,7 @@ The instructions in this blog post are outdated. Please have a look at the <a hr
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/#disqus_thread"
+         href="/blog/2015/12/12/philips-hue-blocks-3rd-party-bulbs/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -276,7 +276,7 @@ Philips Hue FAQ entries regarding reversing the decision.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/#disqus_thread"
+         href="/blog/2015/12/10/activating-tasker-tasks-from-home-assistant-using-command-line-switches/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -304,7 +304,7 @@ In this tutorial I will explain how you can activate Tasker tasks from Home Assi
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/07/influxdb-and-grafana/#disqus_thread"
+         href="/blog/2015/12/07/influxdb-and-grafana/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -332,7 +332,7 @@ The <a href="https://influxdb.com/">InfluxDB</a> database is a so-called time se
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/#disqus_thread"
+         href="/blog/2015/12/06/locks-rollershutters-binary-sensors-and-influxdb-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -373,7 +373,7 @@ The <a href="https://influxdb.com/">InfluxDB</a> database is a so-called time se
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/12/05/community-highlights/#disqus_thread"
+         href="/blog/2015/12/05/community-highlights/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -404,7 +404,7 @@ The <a href="https://influxdb.com/">InfluxDB</a> database is a so-called time se
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/11/22/survey-november-2015/#disqus_thread"
+         href="/blog/2015/11/22/survey-november-2015/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -495,15 +495,6 @@ The <a href="https://influxdb.com/">InfluxDB</a> database is a so-called time se
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/15/index.html b/blog/posts/15/index.html
index b3643faf34..ab2eb6afdd 100644
--- a/blog/posts/15/index.html
+++ b/blog/posts/15/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/#disqus_thread"
+         href="/blog/2015/11/16/zwave-switches-lights-and-honeywell-thermostats-now-supported/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -137,7 +137,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/10/26/firetv-and-radiotherm-now-supported/#disqus_thread"
+         href="/blog/2015/10/26/firetv-and-radiotherm-now-supported/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -185,7 +185,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/#disqus_thread"
+         href="/blog/2015/10/11/measure-temperature-with-esp8266-and-report-to-mqtt/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -220,7 +220,7 @@ Home Assistant will keep track of historical values and allow you to integrate i
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/#disqus_thread"
+         href="/blog/2015/10/11/rfxtrx-blinkstick-and-snmp-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -259,7 +259,7 @@ Home Assistant will keep track of historical values and allow you to integrate i
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/#disqus_thread"
+         href="/blog/2015/10/05/home-assistant-goes-geo-with-owntracks/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -308,7 +308,7 @@ Map in Home Assistant showing two people and three zones (home, school, work)
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/09/19/alarm-sonos-and-itunes-support/#disqus_thread"
+         href="/blog/2015/09/19/alarm-sonos-and-itunes-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -348,7 +348,7 @@ Map in Home Assistant showing two people and three zones (home, school, work)
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/09/18/monitoring-with-glances-and-home-assistant/#disqus_thread"
+         href="/blog/2015/09/18/monitoring-with-glances-and-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -376,7 +376,7 @@ Inspired by a <a href="https://github.com/home-assistant/home-assistant/issues/3
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/09/13/home-assistant-meets-ifttt/#disqus_thread"
+         href="/blog/2015/09/13/home-assistant-meets-ifttt/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -408,7 +408,7 @@ Inspired by a <a href="https://github.com/home-assistant/home-assistant/issues/3
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/#disqus_thread"
+         href="/blog/2015/09/11/different-ways-to-use-mqtt-with-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -436,7 +436,7 @@ Inspired by a <a href="https://github.com/home-assistant/home-assistant/issues/3
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/#disqus_thread"
+         href="/blog/2015/08/31/version-7-revamped-ui-and-improved-distribution/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -541,15 +541,6 @@ Inspired by a <a href="https://github.com/home-assistant/home-assistant/issues/3
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/16/index.html b/blog/posts/16/index.html
index 49468f81d5..7099799dd8 100644
--- a/blog/posts/16/index.html
+++ b/blog/posts/16/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/#disqus_thread"
+         href="/blog/2015/08/26/laundry-automation-with-moteino-mqtt-and-home-assistant/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -118,7 +118,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/08/17/verisure-and-modern-tp-link-router-support/#disqus_thread"
+         href="/blog/2015/08/17/verisure-and-modern-tp-link-router-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -161,7 +161,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/#disqus_thread"
+         href="/blog/2015/08/09/mqtt-raspberry-pi-squeezebox-asuswrt-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -200,7 +200,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/#disqus_thread"
+         href="/blog/2015/07/11/ip-cameras-arduino-kodi-efergy-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -242,7 +242,7 @@ To update to the latest version, run <code>scripts/update</code>. Please report
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/06/10/release-notes/#disqus_thread"
+         href="/blog/2015/06/10/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -276,7 +276,7 @@ To update to the latest version, run <code>scripts/update</code>. Please report
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/05/14/release-notes/#disqus_thread"
+         href="/blog/2015/05/14/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -307,7 +307,7 @@ To update to the latest version, run <code>scripts/update</code>. Please report
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/05/09/utc-time-zone-awareness/#disqus_thread"
+         href="/blog/2015/05/09/utc-time-zone-awareness/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -350,7 +350,7 @@ To update to the latest version, run <code>scripts/update</code>. Please report
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/04/25/release-notes/#disqus_thread"
+         href="/blog/2015/04/25/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -395,7 +395,7 @@ To update to the latest version, run <code>scripts/update</code>. Please report
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/03/22/release-notes/#disqus_thread"
+         href="/blog/2015/03/22/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -442,7 +442,7 @@ Andythigpen has contributed a script component. This allows users to create a se
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/03/11/release-notes/#disqus_thread"
+         href="/blog/2015/03/11/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -561,15 +561,6 @@ An initial version of voice control for Home Assistant has landed. The current i
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/17/index.html b/blog/posts/17/index.html
index cd8d077b55..5d6a439371 100644
--- a/blog/posts/17/index.html
+++ b/blog/posts/17/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/03/08/new-logo/#disqus_thread"
+         href="/blog/2015/03/08/new-logo/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -113,7 +113,7 @@ The old logo, the new detailed logo and the new simple logo.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/03/01/home-assistant-migrating-to-yaml/#disqus_thread"
+         href="/blog/2015/03/01/home-assistant-migrating-to-yaml/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -141,7 +141,7 @@ The old logo, the new detailed logo and the new simple logo.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/02/24/streaming-updates/#disqus_thread"
+         href="/blog/2015/02/24/streaming-updates/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -169,7 +169,7 @@ The old logo, the new detailed logo and the new simple logo.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/02/08/looking-at-the-past/#disqus_thread"
+         href="/blog/2015/02/08/looking-at-the-past/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -210,7 +210,7 @@ Events are saved in a local database. Google Graphs is used to draw the graph. D
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/01/24/release-notes/#disqus_thread"
+         href="/blog/2015/01/24/release-notes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -252,7 +252,7 @@ Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/01/13/nest-in-da-house/#disqus_thread"
+         href="/blog/2015/01/13/nest-in-da-house/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -288,7 +288,7 @@ Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/01/11/bootstrapping-your-setup-with-discovery/#disqus_thread"
+         href="/blog/2015/01/11/bootstrapping-your-setup-with-discovery/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -320,7 +320,7 @@ Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/#disqus_thread"
+         href="/blog/2015/01/04/hey-pushbullet-nice-talking-to-you/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -352,7 +352,7 @@ Home Assistant now supports <code class="highlighter-rouge">--open-ui</code> and
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2014/12/26/home-control-home-automation-and-the-smart-home/#disqus_thread"
+         href="/blog/2014/12/26/home-control-home-automation-and-the-smart-home/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -388,7 +388,7 @@ This article will try to explain how they all relate.</p>
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2014/12/18/website-launched/#disqus_thread"
+         href="/blog/2014/12/18/website-launched/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -476,15 +476,6 @@ This article will try to explain how they all relate.</p>
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/2/index.html b/blog/posts/2/index.html
index 639d1ae96f..daa745056d 100644
--- a/blog/posts/2/index.html
+++ b/blog/posts/2/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/10/ttn-with-mqtt/#disqus_thread"
+         href="/blog/2017/11/10/ttn-with-mqtt/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,7 +110,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/05/frontend-translations/#disqus_thread"
+         href="/blog/2017/11/05/frontend-translations/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -142,7 +142,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/04/release-57/#disqus_thread"
+         href="/blog/2017/11/04/release-57/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -238,7 +238,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/11/02/secure-shell-tunnel/#disqus_thread"
+         href="/blog/2017/11/02/secure-shell-tunnel/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -265,7 +265,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/28/demo/#disqus_thread"
+         href="/blog/2017/10/28/demo/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -296,7 +296,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/23/simple-analog-sensor/#disqus_thread"
+         href="/blog/2017/10/23/simple-analog-sensor/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -327,7 +327,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/21/release-56/#disqus_thread"
+         href="/blog/2017/10/21/release-56/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -400,7 +400,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/18/hasspodcast-ep-10/#disqus_thread"
+         href="/blog/2017/10/18/hasspodcast-ep-10/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -426,7 +426,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/15/templating-date-time/#disqus_thread"
+         href="/blog/2017/10/15/templating-date-time/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -457,7 +457,7 @@ The Home Assistant sidebar in 12 different languages.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/07/release-55/#disqus_thread"
+         href="/blog/2017/10/07/release-55/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -585,15 +585,6 @@ The Home Assistant sidebar in 12 different languages.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/3/index.html b/blog/posts/3/index.html
index d487022463..e2e54d7c28 100644
--- a/blog/posts/3/index.html
+++ b/blog/posts/3/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/06/deprecating-python-3.4-support/#disqus_thread"
+         href="/blog/2017/10/06/deprecating-python-3.4-support/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -118,7 +118,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/10/01/hass-podcast-ep9/#disqus_thread"
+         href="/blog/2017/10/01/hass-podcast-ep9/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -146,7 +146,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/29/hacktoberfest/#disqus_thread"
+         href="/blog/2017/09/29/hacktoberfest/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -189,7 +189,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/#disqus_thread"
+         href="/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -238,7 +238,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/26/new-hassio-build-system/#disqus_thread"
+         href="/blog/2017/09/26/new-hassio-build-system/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -285,7 +285,7 @@ FROM $BUILD_FROM
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/23/release-54/#disqus_thread"
+         href="/blog/2017/09/23/release-54/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -330,7 +330,7 @@ FROM $BUILD_FROM
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/#disqus_thread"
+         href="/blog/2017/09/16/hassbian-1.3-a-bit-of-a-stretch/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -367,7 +367,7 @@ Other than that the changes are mostly to our tool <code class="highlighter-roug
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/09/09/release-53/#disqus_thread"
+         href="/blog/2017/09/09/release-53/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -449,7 +449,7 @@ Screenshot of the new customize editor.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/08/26/release-0-52/#disqus_thread"
+         href="/blog/2017/08/26/release-0-52/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -519,7 +519,7 @@ Screenshot of the new customize editor.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/08/12/release-51/#disqus_thread"
+         href="/blog/2017/08/12/release-51/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -659,15 +659,6 @@ Screenshot of the new customize editor.
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/4/index.html b/blog/posts/4/index.html
index 05265b7581..5e7dc2534e 100644
--- a/blog/posts/4/index.html
+++ b/blog/posts/4/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/08/01/hasspodcast-ep-5/#disqus_thread"
+         href="/blog/2017/08/01/hasspodcast-ep-5/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,7 +110,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/29/release-50/#disqus_thread"
+         href="/blog/2017/07/29/release-50/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -188,7 +188,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/27/talk-python-podcast/#disqus_thread"
+         href="/blog/2017/07/27/talk-python-podcast/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -217,7 +217,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/25/introducing-hassio/#disqus_thread"
+         href="/blog/2017/07/25/introducing-hassio/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -265,7 +265,7 @@ Hass.io dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/17/hasspodcast-ep-4/#disqus_thread"
+         href="/blog/2017/07/17/hasspodcast-ep-4/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -291,7 +291,7 @@ Hass.io dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/15/release-49/#disqus_thread"
+         href="/blog/2017/07/15/release-49/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -373,7 +373,7 @@ Screenshot of a green dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/05/hasspodcast-ep-3/#disqus_thread"
+         href="/blog/2017/07/05/hasspodcast-ep-3/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -399,7 +399,7 @@ Screenshot of a green dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/03/home-assistant-is-moving-to-discord/#disqus_thread"
+         href="/blog/2017/07/03/home-assistant-is-moving-to-discord/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -426,7 +426,7 @@ Screenshot of a green dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/07/02/release-48/#disqus_thread"
+         href="/blog/2017/07/02/release-48/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -498,7 +498,7 @@ Screenshot of a green dashboard
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/20/things-you-should-know-about-senic-covi/#disqus_thread"
+         href="/blog/2017/06/20/things-you-should-know-about-senic-covi/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -590,15 +590,6 @@ Screenshot of a green dashboard
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/5/index.html b/blog/posts/5/index.html
index 339ac402ad..a75f5e6c9f 100644
--- a/blog/posts/5/index.html
+++ b/blog/posts/5/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/17/release-47/#disqus_thread"
+         href="/blog/2017/06/17/release-47/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -165,7 +165,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/15/zwave-entity-ids/#disqus_thread"
+         href="/blog/2017/06/15/zwave-entity-ids/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -194,7 +194,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/10/interview-with-jupiter-broadcasting/#disqus_thread"
+         href="/blog/2017/06/10/interview-with-jupiter-broadcasting/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -222,7 +222,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/04/release-46/#disqus_thread"
+         href="/blog/2017/06/04/release-46/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -292,7 +292,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/06/02/home-assistant-podcast-1/#disqus_thread"
+         href="/blog/2017/06/02/home-assistant-podcast-1/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -321,7 +321,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/20/automation-editor-zwave-panel-ocr/#disqus_thread"
+         href="/blog/2017/05/20/automation-editor-zwave-panel-ocr/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -403,7 +403,7 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/19/home-assistant-at-pycon-us-2017/#disqus_thread"
+         href="/blog/2017/05/19/home-assistant-at-pycon-us-2017/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -431,7 +431,7 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/13/home-assistant-on-orange-pi-zero/#disqus_thread"
+         href="/blog/2017/05/13/home-assistant-on-orange-pi-zero/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -461,7 +461,7 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/#disqus_thread"
+         href="/blog/2017/05/07/grazer-linuxtage-2017-talk-python-everywhere/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -490,7 +490,7 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/06/zigbee-opencv-dlib/#disqus_thread"
+         href="/blog/2017/05/06/zigbee-opencv-dlib/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -619,15 +619,6 @@ If you have a security key set in your Open Z-Wave <code class="highlighter-roug
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/6/index.html b/blog/posts/6/index.html
index 793c719965..1bcb448e7b 100644
--- a/blog/posts/6/index.html
+++ b/blog/posts/6/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/05/podcast-init-interview/#disqus_thread"
+         href="/blog/2017/05/05/podcast-init-interview/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -112,7 +112,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/#disqus_thread"
+         href="/blog/2017/05/01/home-assistant-on-raspberry-pi-zero-in-30-minutes/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -176,7 +176,7 @@ $ sudo systemctl start install_homeassistant.service
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/30/hassbian-1.21-its-about-time/#disqus_thread"
+         href="/blog/2017/04/30/hassbian-1.21-its-about-time/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -227,7 +227,7 @@ $ sudo systemctl start install_homeassistant.service
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/25/influxdb-grafana-docker/#disqus_thread"
+         href="/blog/2017/04/25/influxdb-grafana-docker/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -302,7 +302,7 @@ $ sudo systemctl start install_homeassistant.service
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/24/hardware-contest-2017/#disqus_thread"
+         href="/blog/2017/04/24/hardware-contest-2017/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -335,7 +335,7 @@ $ sudo systemctl start install_homeassistant.service
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/22/ikea-tradfri-spotify/#disqus_thread"
+         href="/blog/2017/04/22/ikea-tradfri-spotify/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -384,7 +384,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/#disqus_thread"
+         href="/blog/2017/04/17/ikea-tradfri-internet-of-things-done-right/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -423,7 +423,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/15/ios/#disqus_thread"
+         href="/blog/2017/04/15/ios/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -463,7 +463,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/#disqus_thread"
+         href="/blog/2017/04/08/eddystone-beacons-lockitron-locks-total-connect/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -501,7 +501,7 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/04/01/thomas-krenn-award/#disqus_thread"
+         href="/blog/2017/04/01/thomas-krenn-award/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -603,15 +603,6 @@ After automatic discovery, Home Assistant will ask the user to finish pairing wi
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/7/index.html b/blog/posts/7/index.html
index 4deac7a9b8..dab59640f0 100644
--- a/blog/posts/7/index.html
+++ b/blog/posts/7/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/03/28/http-to-mqtt-bridge/#disqus_thread"
+         href="/blog/2017/03/28/http-to-mqtt-bridge/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,7 +110,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/03/25/todo-volumio-workday/#disqus_thread"
+         href="/blog/2017/03/25/todo-volumio-workday/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -163,7 +163,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/#disqus_thread"
+         href="/blog/2017/03/23/opensourcecraft-interview-with-founder-paulus-schoutsen/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -191,7 +191,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/03/22/broken-dependencies/#disqus_thread"
+         href="/blog/2017/03/22/broken-dependencies/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -226,7 +226,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/#disqus_thread"
+         href="/blog/2017/03/11/repurpose-any-android-phone-as-ip-camera/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -314,7 +314,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/25/config-panel-and-state-restoration/#disqus_thread"
+         href="/blog/2017/02/25/config-panel-and-state-restoration/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -407,7 +407,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/22/home-assistant-tshirts-have-arrived/#disqus_thread"
+         href="/blog/2017/02/22/home-assistant-tshirts-have-arrived/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -454,7 +454,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/14/clt-workshop/#disqus_thread"
+         href="/blog/2017/02/14/clt-workshop/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -487,7 +487,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/11/alert-appletv-mqtt-yeelight/#disqus_thread"
+         href="/blog/2017/02/11/alert-appletv-mqtt-yeelight/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -637,7 +637,7 @@ Screenshot of all the different functionality the IP webcam integration offers.
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/04/hassbian-toybox/#disqus_thread"
+         href="/blog/2017/02/04/hassbian-toybox/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -765,15 +765,6 @@ On the close horizon from <a href="https://github.com/Landrash">@Landrash</a> th
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/8/index.html b/blog/posts/8/index.html
index 3533265ba5..9562dbdd4a 100644
--- a/blog/posts/8/index.html
+++ b/blog/posts/8/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/02/03/babyphone/#disqus_thread"
+         href="/blog/2017/02/03/babyphone/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -110,7 +110,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/01/28/face-coffee-wink/#disqus_thread"
+         href="/blog/2017/01/28/face-coffee-wink/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -268,7 +268,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/01/21/home-assistant-governance/#disqus_thread"
+         href="/blog/2017/01/21/home-assistant-governance/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -299,7 +299,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/01/18/numbers/#disqus_thread"
+         href="/blog/2017/01/18/numbers/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -334,7 +334,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/01/14/iss-usps-images-packages/#disqus_thread"
+         href="/blog/2017/01/14/iss-usps-images-packages/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -446,7 +446,7 @@ You have to note:
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2017/01/03/control-my-christmas-tree-stats/#disqus_thread"
+         href="/blog/2017/01/03/control-my-christmas-tree-stats/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -479,7 +479,7 @@ You have to note:
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/12/19/thank-you/#disqus_thread"
+         href="/blog/2016/12/19/thank-you/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -512,7 +512,7 @@ You have to note:
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/#disqus_thread"
+         href="/blog/2016/12/17/text-to-speech-aquostv-flic-zamg/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -607,7 +607,7 @@ You have to note:
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/12/03/remote-websockets-sonarr/#disqus_thread"
+         href="/blog/2016/12/03/remote-websockets-sonarr/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -749,7 +749,7 @@ You have to note:
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/#disqus_thread"
+         href="/blog/2016/11/20/calendar-wink-thermostats-cisco-ios/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -894,15 +894,6 @@ You have to note:
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/blog/posts/9/index.html b/blog/posts/9/index.html
index 5023f5bbaa..a20e84bf46 100644
--- a/blog/posts/9/index.html
+++ b/blog/posts/9/index.html
@@ -83,7 +83,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/11/05/hacktoberfest-influxdb-weather/#disqus_thread"
+         href="/blog/2016/11/05/hacktoberfest-influxdb-weather/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -203,7 +203,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/10/25/explaining-the-updater/#disqus_thread"
+         href="/blog/2016/10/25/explaining-the-updater/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -229,7 +229,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/10/22/flash-briefing-updater-hacktoberfest/#disqus_thread"
+         href="/blog/2016/10/22/flash-briefing-updater-hacktoberfest/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -525,7 +525,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/10/08/hassbian-rest-digital-ocean/#disqus_thread"
+         href="/blog/2016/10/08/hassbian-rest-digital-ocean/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -649,7 +649,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/10/02/hacktoberfest/#disqus_thread"
+         href="/blog/2016/10/02/hacktoberfest/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -691,7 +691,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/10/01/we-have-raspberry-image-now/#disqus_thread"
+         href="/blog/2016/10/01/we-have-raspberry-image-now/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -726,7 +726,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/09/29/async-sleepiq-emoncms-stocks/#disqus_thread"
+         href="/blog/2016/09/29/async-sleepiq-emoncms-stocks/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -839,7 +839,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/09/10/notify-group-reload-api-pihole/#disqus_thread"
+         href="/blog/2016/09/10/notify-group-reload-api-pihole/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -950,7 +950,7 @@
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/31/esp8266-and-micropython-part2/#disqus_thread"
+         href="/blog/2016/08/31/esp8266-and-micropython-part2/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -977,7 +977,7 @@ So, part 1 of <a href="/blog/2016/07/28/esp8266-and-micropython-part1/">ESP8266
     </ul>
   </span>
       <a class='comments'
-         href="/blog/2016/08/28/notifications-hue-fake-unification/#disqus_thread"
+         href="/blog/2016/08/28/notifications-hue-fake-unification/#post-comments"
          >Comments</a>
   </div>
 </header>
@@ -1220,15 +1220,6 @@ So, part 1 of <a href="/blog/2016/07/28/esp8266-and-micropython-part1/">ESP8266
   g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
   s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
-<script>
-  var disqus_shortname = 'home-assistant';
-    var disqus_script = 'count.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);
-  }());
-</script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
 <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script type="text/javascript">
diff --git a/sitemap.xml b/sitemap.xml
index 9bb0dccccf..5e08ebb585 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3974,7 +3974,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4658,99 +4658,99 @@
 </url>
 <url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2018-01-27T07:46:41+00:00</lastmod>
+<lastmod>2018-01-27T08:43:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -5905,62 +5905,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:01+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:02+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:02+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2018-01-27T07:46:02+00:00</lastmod>
+<lastmod>2018-01-27T08:43:02+00:00</lastmod>
 </url>
 </urlset>