diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html
new file mode 100644
index 0000000..4b91353
--- /dev/null
+++ b/.themes/classic/source/_includes/disqus.html
@@ -0,0 +1,22 @@
+{% comment %} Load script if disquss comments are enabled and `page.comments` is either empty (index) or set to true {% endcomment %}
+{% if site.disqus_short_name and page.comments != false %}
+<script type="text/javascript">
+    (function () {
+      var disqus_shortname = '{{ site.disqus_short_name }}';
+      {% if page.comments == true %}
+        {% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
+        // var disqus_developer = 1;
+        var disqus_identifier = '{{ site.url }}{{ page.url }}';
+        var disqus_url = '{{ site.url }}{{ page.url }}';
+        var disqus_script = 'embed.js'
+      {% else %}
+        {% comment %} As `page.comments` is empty, we must be on the index page. {% endcomment %}
+        var disqus_script = 'count.js'
+      {% endif %}
+
+      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+      dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script;
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    }());
+</script>
+{% endif %}
diff --git a/.themes/classic/source/_includes/post/disqus_thread.html b/.themes/classic/source/_includes/post/disqus_thread.html
index f966f03..b1acd8c 100644
--- a/.themes/classic/source/_includes/post/disqus_thread.html
+++ b/.themes/classic/source/_includes/post/disqus_thread.html
@@ -1,13 +1 @@
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-  var disqus_shortname = '{{ site.disqus_short_name }}';
-  var disqus_identifier = '{{ site.url }}{{ page.url }}';
-  var disqus_url = '{{ site.url }}{{ page.url }}';
-  //var disqus_developer = 1;
-  (function() {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  })();
-</script>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 629468d..d84da44 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -9,6 +9,7 @@
     </div>
   </div>
   <footer>{% include footer.html %}</footer>
+  {% include disqus.html %}
   {% include google_analytics.html %}
   {% include google_plus_one.html %}
   {% include twitter_sharing.html %}
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index dbf209c..20c1745 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -27,7 +27,7 @@ layout: default
 {% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
+    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index ce8a5de..e81cc78 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -17,10 +17,10 @@ single: true
     {% endunless %}
   </footer>
 </article>
-{% if site.disqus_short_name and page.comments != false %}
+{% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
+    <div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index e7e9695..1e896b0 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -3,35 +3,24 @@ layout: default
 ---
 
 <div class="blog-index">
-{% assign index = true %}
-{% for post in paginator.posts %}
-{% assign content = post.content %}
-  <article>
-    {% include article.html %}
-  </article>
-{% endfor %}
-<nav role="pagination">
-  <div>
-    {% if paginator.next_page %}
-      <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
-    {% endif %}
-    <a href="/blog/archives">Blog Archives</a>
-    {% if paginator.previous_page %}
-    <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
-    {% endif %}
-  </div>
-</nav>
-{% if site.disqus_short_name %}
-<script type="text/javascript">
-    var disqus_shortname = '{{ site.disqus_short_name }}';
-    (function () {
-      var s = document.createElement('script'); s.async = true;
-      s.type = 'text/javascript';
-      s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
-      (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-{% endif %}
+  {% assign index = true %}
+  {% for post in paginator.posts %}
+  {% assign content = post.content %}
+    <article>
+      {% include article.html %}
+    </article>
+  {% endfor %}
+  <nav role="pagination">
+    <div>
+      {% if paginator.next_page %}
+        <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
+      {% endif %}
+      <a href="/blog/archives">Blog Archives</a>
+      {% if paginator.previous_page %}
+      <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
+      {% endif %}
+    </div>
+  </nav>
 </div>
 <aside role=sidebar>
   {% if site.blog_index_asides.size %}