@@ -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>

@@ -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 %}

@@ -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 %}

@@ -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>