4 files changed, 25 insertions, 4 deletions
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index f6333435..57147575 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -6,9 +6,6 @@
   <div id="main">
     <div id="content">
       {{ content | expand_urls: root_url | backtick_codeblock | smart_quotes }}
-      {% unless page.sidebar == false %}
-        <aside role=sidebar>{% include sidebar.html %}</aside>
-      {% endunless %}
     </div>
   </div>
   <footer>{% include footer.html %}</footer>
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index 34cb3430..6710f8b1 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -29,3 +29,12 @@ layout: default
   </section>
 {% endif %}
 </div>
+{% unless page.sidebar == false %}
+<aside role=sidebar>
+  {% if site.page_asides.size %}
+    {% include_array page_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>
+{% endunless %}
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index 0e1004f0..78557c04 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -24,3 +24,12 @@ single: true
   </section>
 {% endif %}
 </div>
+{% unless page.sidebar == false %}
+<aside role=sidebar>
+  {% if site.post_asides.size %}
+    {% include_array post_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>
+{% endunless %}
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index 4719cd12..7f4c0e12 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -1,6 +1,5 @@
 ---
 layout: default
-meta: false
 footer: false
 ---
 <div class="blog-index">
@@ -36,3 +35,10 @@ footer: false
 </script>
 {% endif %}
 </div>
+<aside role=sidebar>
+  {% if site.blog_index_asides.size %}
+    {% include_array blog_index_asides %}
+  {% else %}
+    {% include_array default_asides %}
+  {% endif %}
+</aside>