diff --git a/layout/_layout.swig b/layout/_layout.swig
index 4012cc9cc1..1198a2c4aa 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -94,31 +94,30 @@
     {% endif %}
   </div>
 
-  {{ partial('_scripts/vendors.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_scripts/commons.swig', {}, {cache: theme.cache.enable}) }}
+  {% include '_scripts/vendors.swig' %}
+  {% include '_scripts/commons.swig' %}
 
   {% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
-  {{ partial(scheme_script, {}, {cache: theme.cache.enable}) }}
+  {% include scheme_script %}
 
   {% block script_extra %}{% endblock %}
 
-  {{ partial('_scripts/boostrap.swig', {}, {cache: theme.cache.enable}) }}
-
-  {{ partial('_third-party/comments/index.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/search/index.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/analytics/lean-analytics.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/analytics/firestore.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/seo/baidu-push.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/schedule.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/math/index.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/needsharebutton.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/rating.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/pangu.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/scroll-cookie.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/exturl.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/bookmark.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/copy-code.swig', {}, {cache: theme.cache.enable}) }}
-  {{ partial('_third-party/pdf.swig', {}, {cache: theme.cache.enable}) }}
-
+  {% include '_scripts/boostrap.swig' %}
+
+  {% include '_third-party/comments/index.swig' %}
+  {% include '_third-party/search/index.swig' %}
+  {% include '_third-party/analytics/lean-analytics.swig' %}
+  {% include '_third-party/analytics/firestore.swig' %}
+  {% include '_third-party/seo/baidu-push.swig' %}
+  {% include '_third-party/schedule.swig' %}
+  {% include '_third-party/math/index.swig' %}
+  {% include '_third-party/needsharebutton.swig' %}
+  {% include '_third-party/rating.swig' %}
+  {% include '_third-party/pangu.swig' %}
+  {% include '_third-party/scroll-cookie.swig' %}
+  {% include '_third-party/exturl.swig' %}
+  {% include '_third-party/bookmark.swig' %}
+  {% include '_third-party/copy-code.swig' %}
+  {% include '_third-party/pdf.swig' %}
 </body>
 </html>
diff --git a/layout/_partials/sidebar.swig b/layout/_macro/sidebar.swig
similarity index 98%
rename from layout/_partials/sidebar.swig
rename to layout/_macro/sidebar.swig
index a4bb9e9bd3..a83cd2f48f 100644
--- a/layout/_partials/sidebar.swig
+++ b/layout/_macro/sidebar.swig
@@ -1,3 +1,4 @@
+{% macro render(is_post) %}
   <div class="sidebar-toggle">
     <div class="sidebar-toggle-line-wrap">
       <span class="sidebar-toggle-line sidebar-toggle-line-first"></span>
@@ -12,7 +13,7 @@
     {% endif %}
     <div class="sidebar-inner">
 
-      {% set display_toc = is_post and theme.toc.enable %}
+      {% set display_toc = is_post and theme.toc.enable or is_page and theme.toc.enable %}
 
       {% if display_toc and toc(page.content).length > 1 %}
         <ul class="sidebar-nav motion-element">
@@ -83,7 +84,6 @@
                   {% if hasTagsPage %}</a>{% endif %}
                 </div>
               {% endif %}
-
             </nav>
           {% endif %}
 
@@ -186,3 +186,4 @@
 
     </div>
   </aside>
+{% endmacro %}
diff --git a/layout/archive.swig b/layout/archive.swig
index a0239a4737..fc146b6bf1 100644
--- a/layout/archive.swig
+++ b/layout/archive.swig
@@ -1,5 +1,6 @@
 {% extends '_layout.swig' %}
 {% import '_macro/post-collapse.swig' as post_template %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
 
 {% block title %}{{ __('title.archive') }} | {{ title }}{% endblock %}
 
@@ -59,5 +60,5 @@
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(false) }}
 {% endblock %}
diff --git a/layout/category.swig b/layout/category.swig
index a6788895a2..e28bdbce5d 100644
--- a/layout/category.swig
+++ b/layout/category.swig
@@ -1,5 +1,6 @@
 {% extends '_layout.swig' %}
 {% import '_macro/post-collapse.swig' as post_template %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
 
 {% block title %}{{ __('title.category') }}: {{ page.category }} | {{ title }}{% endblock %}
 
@@ -33,5 +34,5 @@
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(false) }}
 {% endblock %}
diff --git a/layout/index.swig b/layout/index.swig
index cac5154239..9fd359f078 100644
--- a/layout/index.swig
+++ b/layout/index.swig
@@ -1,5 +1,6 @@
 {% extends '_layout.swig' %}
 {% import '_macro/post.swig' as post_template %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
 
 {% block title %}{{ title }}{% if theme.index_with_subtitle and subtitle %} – {{ subtitle }}{% endif %}{% endblock %}
 
@@ -18,5 +19,5 @@
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(false) }}
 {% endblock %}
diff --git a/layout/page.swig b/layout/page.swig
index d23d9c937b..5498cc0265 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -1,4 +1,5 @@
 {% extends '_layout.swig' %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
 
   {% block title %}{#
   #}{% set page_title_suffix = ' | ' + title %}{#
@@ -78,7 +79,7 @@
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(false) }}
 {% endblock %}
 
 {% block script_extra %}
diff --git a/layout/post.swig b/layout/post.swig
index 1f897396c9..b778c9c81e 100644
--- a/layout/post.swig
+++ b/layout/post.swig
@@ -1,18 +1,23 @@
 {% extends '_layout.swig' %}
 {% import '_macro/post.swig' as post_template %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
+
 
 {% block title %}{{ page.title }} | {{ title }}{% endblock %}
 
 {% block page_class %}page-post-detail{% endblock %}
 
+
 {% block content %}
+
   <div id="posts" class="posts-expand">
     {{ post_template.render(page) }}
   </div>
+
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(true) }}
 {% endblock %}
 
 {% block script_extra %}
diff --git a/layout/tag.swig b/layout/tag.swig
index a7748b2a0b..7af5a77c75 100644
--- a/layout/tag.swig
+++ b/layout/tag.swig
@@ -1,5 +1,6 @@
 {% extends '_layout.swig' %}
 {% import '_macro/post-collapse.swig' as post_template %}
+{% import '_macro/sidebar.swig' as sidebar_template %}
 
 {% block title %}{{ __('title.tag') }}: {{ page.tag }} | {{ title }}{% endblock %}
 
@@ -32,5 +33,5 @@
 {% endblock %}
 
 {% block sidebar %}
-{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }}
+  {{ sidebar_template.render(false) }}
 {% endblock %}