label: 3.7.0

improvement: 一句 API 改爲 https
improvement: 主頁分頁會定位到文章區域 close #519
2026-04-16 20:30:53 +08:00 · 2021-03-19 01:08:50 +08:00 · 2021-03-17 17:27:35 +08:00 · 2021-03-15 20:44:35 +08:00 · 2021-03-14 23:25:58 +08:00 · 2021-03-04 16:22:04 +08:00
125 changed files with 2642 additions and 1653 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ If you are a problem when visiting the website, please open your browser 'develo
 <!-- Check all with "x" especially FAQ & Documentation!! (使用 "x" 選擇) -->
 <!-- 請確認是否都已經翻閲過如下的資料, 尤其是安裝文件！！ -->
 - [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html).
- [] Yes, I have read [Butterfly Documentation](https://demo.jerryc.me/posts/21cfbf15/).
+- [] Yes, I have read [Butterfly Documentation](https://butterfly.js.org/posts/21cfbf15/).
 - [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me.

 ## Butterfly Information
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,19 @@
+name: npm publish
+
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # Setup .npmrc file to publish to npm
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+        registry-url: 'https://registry.npmjs.org'
+    - run: npm install
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/README.md
+++ b/README.md
@@ -1,14 +1,20 @@
+<div align="right">
+  Language:
+  🇺🇸
+  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
+</div>
+
 # hexo-theme-butterfly

-![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)

-Demo: 👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [MYW](https://immyw.com/)

-Docs: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
+Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)

 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.

@@ -71,7 +77,7 @@ npm i hexo-theme-butterfly
 - [x] Related articles
 - [x] Displays outdated notice for a post
 - [x] Share (AddThis/Sharejs/Addtoany)
- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
 - [x] Web analytics (Baidu Analytics/Google Analytics/Tencent Analytics/CNZZ Analytics)
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,15 +1,20 @@
+<div align="right">
+  語言:
+  中文
+  <a title="English" href="/README.md">英文</a>
+</div>
+
 # hexo-theme-butterfly

-![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)

+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [MYW](https://immyw.com/)

-預覽: 👍 [Butterfly](https://demo.jerryc.me/)  ||  🤞 [JerryC](https://jerryc.me/)
-
-文檔: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
+文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)

 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題

@@ -71,7 +76,7 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
--- a/_config.yml
+++ b/_config.yml
@@ -12,8 +12,8 @@ menu:
  # Tags: /tags/ || fas fa-tags
  # Categories: /categories/ || fas fa-folder-open
  # List||fas fa-list:
-  #   - Music || /music/ || fas fa-music
-  #   - Movie || /movies/ || fas fa-video
+  #   Music: /music/ || fas fa-music
+  #   Movie: /movies/ || fas fa-video
  # Link: /link/ || fas fa-link
  # About: /about/ || fas fa-heart

@@ -27,6 +27,7 @@ highlight_theme: light #  darker / pale night / light / ocean / mac / mac light
 highlight_copy: true # copy button
 highlight_lang: true # show the code language
 highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button
+highlight_height_limit: false # unit: px
 code_word_wrap: false

 # copy settings
@@ -83,9 +84,12 @@ favicon: /img/favicon.png

 # Avatar (頭像)
 avatar:
-  img:
+  img: https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png
  effect: false

+# Disable all banner image
+disable_top_img: false
+
 # The banner image of home page
 index_img:

@@ -173,6 +177,7 @@ index_post_content:
 toc:
  enable: true
  number: true
+  style_simple: false

 post_copyright:
  enable: true
@@ -191,6 +196,14 @@ reward:
    #   link:
    #   text: alipay

+# Post edit
+# Easily browse and edit blog source code online.
+post_edit:
+  enable: false
+  # url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/
+  # For example: https://github.com/jerryc127/butterfly.js.org/edit/main/source/
+  url:
+
 # Related Articles
 related_post:
  enable: true
@@ -200,6 +213,13 @@ related_post:
 # figcaption (圖片描述文字)
 photofigcaption: false

+# post_pagination (分頁)
+# value: 1 || 2 || false
+# 1: The 'next post' will link to old post
+# 2: The 'next post' will link to new post
+# false: disable pagination
+post_pagination: 1
+
 # anchor
 # when you scroll in post, the URL will update according to header id.
 anchor: false
@@ -239,7 +259,7 @@ addtoany:

 comments:
  # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo
  use:
  # - Valine
  # - Disqus
@@ -247,7 +267,8 @@ comments:
  # lazyload: The comment system will be load when comment element enters the browser's viewport.
  # If you set it to true, the comment count will be invalid
  lazyload: false
-  count: false # Display comment count in top_img
+  count: false # Display comment count in post's top_img
+  card_post_count: false # Display comment count in Home Page

 # disqus
 # https://disqus.com/
@@ -284,6 +305,7 @@ gitalk:
  distractionFreeMode: false # Facebook-like distraction free mode.
  pagerDirection: last # Comment sorting direction, available values are last and first.
  createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically
+  option:

 # valine
 # https://valine.js.org
@@ -301,6 +323,17 @@ valine:
  emojiCDN: # emoji CDN
  enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
  requiredFields: nick,mail # required fields (nick/mail)
+  visitor: false
+  option:
+
+# waline - A simple comment system with backend support fork from Valine
+# https://waline.js.org/
+waline:
+  serverURL: # Waline server address url
+  avatar: monsterid # gravatar style https://zh-tw.gravatar.com/site/implement/images/#default-image
+  emojiCDN: # emoji CDN
+  bg: # waline background
+  visitor: false
  option:

 # utterances
@@ -325,6 +358,10 @@ facebook_comments:
 # Twikoo
 # https://github.com/imaegoo/twikoo
 twikoo:
+  envId:
+  region:
+  visitor: false
+  option:

 # Chat Services
 # --------------------------------------
@@ -374,11 +411,6 @@ footer:
    since: 2020
  custom_text:
  copyright: true # Copyright of theme and framework
-  ICP: # Chinese ICP License
-    enable: false
-    url:
-    text:
-    icon: /img/icp.png

 # Analysis
 # --------------------------------------
@@ -399,6 +431,14 @@ tencent_analytics:
 # https://www.umeng.com/
 cnzz_analytics:

+# Cloudflare Analytics
+# https://www.cloudflare.com/zh-tw/web-analytics/
+cloudflare_analytics:
+
+# Microsoft Clarity
+# https://clarity.microsoft.com/
+microsoft_clarity:
+
 # Advertisement
 # --------------------------------------

@@ -542,6 +582,7 @@ ClickShowText:
    # - LOVE
    # - YOU
  fontSize: 15px
+  random: false
  mobile: false

 # Default display mode (網站默認的顯示模式)
@@ -584,10 +625,10 @@ subtitle:
  loop: true
  # source調用第三方服務
  # source: false 關閉調用
-  # source: 1  調用搏天api的隨機語錄（簡體） https://api.btstu.cn/
-  # source: 2  調用一言網的一句話（簡體） https://hitokoto.cn/
-  # source: 3  調用一句網（簡體） http://yijuzhan.com/
-  # source: 4  調用今日詩詞（簡體） https://www.jinrishici.com/
+  # source: 1  調用搏天api的隨機語錄（簡體）
+  # source: 2  調用一言網的一句話（簡體）
+  # source: 3  調用一句網（簡體）
+  # source: 4  調用今日詩詞（簡體）
  # subtitle 會先顯示 source , 再顯示 sub 的內容
  source: false
  # 如果有英文逗號' , ',請使用轉義字元 &#44;
@@ -612,6 +653,7 @@ aside:
    enable: true
    description:
    button:
+      enable: true
      icon: fab fa-github
      text: Follow Me
      link: https://github.com/xxxxxx
@@ -622,24 +664,29 @@ aside:
    enable: true
    limit: 5 # if set 0 will show all
    sort: date # date or updated
+    sort_order: # Don't modify the setting unless you know how it works
  card_categories:
    enable: true
    limit: 8 # if set 0 will show all
    expand: none # none/true/false
+    sort_order: # Don't modify the setting unless you know how it works
  card_tags:
    enable: true
    limit: 40 # if set 0 will show all
    color: false
+    sort_order: # Don't modify the setting unless you know how it works
  card_archives:
    enable: true
    type: monthly # yearly or monthly
    format: MMMM YYYY # eg: YYYY年MM月
    order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
    limit: 8 # if set 0 will show all
+    sort_order: # Don't modify the setting unless you know how it works
  card_webinfo:
    enable: true
    post_count: true
    last_push_date: true
+    sort_order: # Don't modify the setting unless you know how it works

 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -657,14 +704,12 @@ runtimeshow:
 # Aside widget - Newest Comments
 newest_comments:
  enable: false
+  sort_order: # Don't modify the setting unless you know how it works
  limit: 6
+  storage: 10 # unit: mins, save data to localStorage
  avatar: true
-  leancloud:
-    enable: false
-    appId: # leancloud application app id
-    appKey: # leancloud application app key
-    serverURL: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
-    default_avatar: # mp/identicon/monsterid/wavatar/retro/robohash/blank
+  # You can only choose one, or neither
+  valine: false
  github_issues:
    enable: false
    repo:
@@ -672,10 +717,15 @@ newest_comments:
    enable: false
    forum:
    api_key:
+  twikoo: false
+  waline: false

 # Bottom right button (右下角按鈕)
 # --------------------------------------

+# Change font size
+change_font_size: false
+
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
  enable: false
@@ -743,14 +793,7 @@ note:
 # other
 # --------------------------------------

-# Artitalk
-# see https://artitalk.js.org/
-artitalk:
-  appId:
-  appKey:
-  option:
-
-# Pjax [Beta]
+# Pjax
 # It may contain bugs and unstable, give feedback when you find the bugs.
 # https://github.com/MoOx/pjax
 pjax:
@@ -774,9 +817,6 @@ snackbar:
  bg_light: '#49b1f5' # The background color of Toast Notification in light mode
  bg_dark: '#121212' # The background color of Toast Notification in dark mode

-# Baidu Push (百度推送)
-baidu_push: false
-
 # https://instant.page/
 # prefetch (預加載)
 instantpage: false
@@ -798,21 +838,18 @@ lazyload:
 # ---------------
 # pwa:
 #   enable: false
-#   manifest: /image/pwa/manifest.json
-#   apple_touch_icon: /image/pwa/apple-touch-icon.png
-#   favicon_32_32: /image/pwa/32.png
-#   favicon_16_16: /image/pwa/16.png
-#   mask_icon: /image/pwa/safari-pinned-tab.svg
-
-# Disable Baidu transformation on mobile devices (禁止百度轉碼)
-disable_baidu_transformation: true
+#   manifest: /pwa/manifest.json
+#   apple_touch_icon: /pwa/apple-touch-icon.png
+#   favicon_32_32: /pwa/32.png
+#   favicon_16_16: /pwa/16.png
+#   mask_icon: /pwa/safari-pinned-tab.svg

 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/
 Open_Graph_meta: true

-# Caches the contents in a fragment, speed up the generation (開啟hexo自帶的緩存,加快生成速度)
-fragment_cache: true
+# Add the vendor prefixes to ensure compatibility
+css_prefix: true

 # Inject
 # Insert the code to head (before '</head>' tag) and the bottom (before '</body>' tag)
@@ -844,6 +881,7 @@ CDN:
  disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css
  utterances: https://utteranc.es/client.js
  twikoo: https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js
+  waline: https://cdn.jsdelivr.net/npm/@waline/client/dist/Waline.min.js

  # share
  addtoany: https://static.addtoany.com/menu/page.js
@@ -859,8 +897,8 @@ CDN:
  # math
  mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
  katex: https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css
-  katex_copytex: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.js
-  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css
+  katex_copytex: https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.min.js
+  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.css
  mermaid: https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js

  # count
@@ -910,5 +948,3 @@ CDN:
  prismjs_js: https://cdn.jsdelivr.net/npm/prismjs/prism.min.js
  prismjs_lineNumber_js: https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js
  prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
-
-  artitalk: https://cdn.jsdelivr.net/npm/artitalk
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -13,6 +13,8 @@ page:
  category: Category
  archives: Archives

+card_post_count: comments
+
 sticky: Sticky
 no_title: No title

@@ -30,6 +32,7 @@ post:
    copyright_notice: Copyright Notice
    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
  recommend: Related Articles
+  edit: Edited on

 search: Search
 algolia_search:
@@ -41,7 +44,6 @@ local_search:
  label: Local search
  input_placeholder: Search for Posts
  hits_empty: "We didn't find any results for the search: ${query}"
-  powered_by: Powered by

 pagination:
  prev: Previous Post
@@ -74,6 +76,10 @@ aside:
    headline: Newest Comments
    loading_text: loading...
    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+    image: image
+    link: link
+    code: code
  card_toc: Catalog

 date_suffix:
@@ -88,12 +94,15 @@ share: Share

 rightside:
  readmode_title: Read Mode
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Switch Between Light And Dark Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
+  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  night_mode_title: Toggle Between Light And Dark Mode
  back_to_top: Back To Top
  toc: Table Of Contents
  scroll_to_comment: Scroll To Comments
  setting: Setting
+  aside: Toggle between single-column and double-column

 copy_copyright:
  author: Author
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -13,6 +13,8 @@ page:
  category: Category
  archives: Archives

+card_post_count: comments
+
 sticky: Sticky
 no_title: No title

@@ -30,6 +32,7 @@ post:
    copyright_notice: Copyright Notice
    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
  recommend: Related Articles
+  edit: Edited on

 search: Search
 algolia_search:
@@ -41,7 +44,6 @@ local_search:
  label: Local search
  input_placeholder: Search for Posts
  hits_empty: "We didn't find any results for the search: ${query}"
-  powered_by: Powered by

 pagination:
  prev: Previous Post
@@ -74,6 +76,10 @@ aside:
    headline: Newest Comments
    loading_text: loading...
    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+    image: image
+    link: link
+    code: code
  card_toc: Catalog

 date_suffix:
@@ -88,12 +94,15 @@ share: Share

 rightside:
  readmode_title: Read Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
  translate_title: Switch Between Traditional Chinese And Simplified Chinese
  night_mode_title: Switch Between Light And Dark Mode
  back_to_top: Back To Top
  toc: Table Of Contents
  scroll_to_comment: Scroll To Comments
  setting: Setting
+  aside: Toggle between single-column and double-column

 copy_copyright:
  author: Author
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -13,6 +13,8 @@ page:
  category: 分类
  archives: 归档

+card_post_count: 条评论
+
 sticky: 置顶
 no_title: 无题

@@ -31,6 +33,7 @@ post:
    copyright_content: '本博客所有文章除特别声明外，均采用
      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
  recommend: 相关推荐
+  edit: 编辑

 search: 搜索
 algolia_search:
@@ -42,8 +45,6 @@ local_search:
  label: 本地搜索
  input_placeholder: 搜索文章
  hits_empty: '找不到您查询的内容：${query}'
-  powered: '提供支持'
-  by: 由

 pagination:
  prev: 上一篇
@@ -75,7 +76,11 @@ aside:
  card_newest_comments:
    headline: 最新评论
    loading_text: 正在加载中...
-    error: 无法获取资料，请确认相关配置是否正确
+    error: 无法获取评论，请确认相关配置是否正确
+    zero: 没有评论
+    image: 图片
+    link: 链接
+    code: 代码
  card_toc: 目录

 date_suffix:
@@ -90,12 +95,15 @@ share: 分享

 rightside:
  readmode_title: 阅读模式
+  font_plus_title: 放大字体
+  font_minus_title: 缩小字体
  translate_title: 简繁转换
  night_mode_title: 浅色和深色模式转换
  back_to_top: 回到顶部
  toc: 目录
  scroll_to_comment: 直达评论
  setting: 设置
+  aside: 单栏和双栏切换

 copy_copyright:
  author: 作者
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -13,6 +13,8 @@ page:
  category: 分類
  archives: 歸檔

+card_post_count: 條評論
+
 sticky: 置頂
 no_title: 無題

@@ -20,7 +22,7 @@ post:
  created: 發表於
  updated: 更新於
  wordcount: 字數總計
-  min2read: 閲讀時長
+  min2read: 閱讀時長
  min2read_unit: 分鐘
  page_pv: 閱讀量
  comments: 評論數
@@ -31,6 +33,7 @@ post:
    copyright_content: '本部落格所有文章除特別聲明外，均採用
      <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
  recommend: 相關推薦
+  edit: 編輯

 search: 搜尋
 algolia_search:
@@ -42,8 +45,6 @@ local_search:
  label: 本地搜尋
  input_placeholder: 搜尋文章
  hits_empty: '找不到您查詢的內容：${query}'
-  powered: '提供支援'
-  by: 由

 pagination:
  prev: 上一篇
@@ -74,8 +75,12 @@ aside:
  more_button: 檢視更多
  card_newest_comments:
    headline: 最新評論
-    loading_text: 正在加載中...
-    error: 無法獲取資料，請確認相關配置是否正確
+    loading_text: 正在載入中...
+    error: 無法獲取評論，請確認相關配置是否正確
+    zero: 沒有評論
+    image: 圖片
+    link: 連結
+    code: 代碼
  card_toc: 目錄

 date_suffix:
@@ -90,12 +95,15 @@ share: 分享

 rightside:
  readmode_title: 閱讀模式
+  font_plus_title: 放大字型
+  font_minus_title: 縮小字型
  translate_title: 簡繁轉換
  night_mode_title: 淺色和深色模式轉換
  back_to_top: 回到頂部
  toc: 目錄
  scroll_to_comment: 直達評論
  setting: 設定
+  aside: 單欄和雙欄切換

 copy_copyright:
  author: 作者
--- a/layout/404.pug
+++ b/layout/404.pug
@@ -1,5 +1,5 @@
 - var top_img = theme.error_404.background || theme.default_top_img
- var bg_img = `background-image: url(${url_for(top_img)})`
+- var bg_img = `background-image: url('${url_for(top_img)}')`

 doctype html
 html(lang=config.language data-theme=theme.display_mode)
@@ -7,7 +7,7 @@ html(lang=config.language data-theme=theme.display_mode)
    include includes/head.pug
  body
    if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})

    if theme.fireworks && theme.fireworks.enable
      canvas.fireworks
--- a/layout/includes/additional-js.pug
+++ b/layout/includes/additional-js.pug
@@ -1,27 +1,24 @@
 div
-  script(src=url_for(theme.CDN.jquery))
  script(src=url_for(theme.CDN.utils))
  script(src=url_for(theme.CDN.main))

-  if theme.translate && theme.translate.enable
+  if theme.translate.enable
    script(src=url_for(theme.CDN.translate))

  if theme.medium_zoom
    script(src=url_for(theme.CDN.medium_zoom))
-  else if theme.fancybox
-    script(src=url_for(theme.CDN.fancybox))

  if theme.instantpage
-    script(src=url_for(theme.CDN.instantpage) type="module" defer)
+    script(src=url_for(theme.CDN.instantpage) type="module")

  if theme.lazyload.enable
    script(src=url_for(theme.CDN.lazyload))

-  if (theme.snackbar && theme.snackbar.enable)
+  if theme.snackbar.enable
    script(src=url_for(theme.CDN.snackbar))

-  if theme.pangu && theme.pangu.enable
-    !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache})
+  if theme.pangu.enable
+    !=partial('includes/third-party/pangu.pug', {}, {cache: true})

  //- search
  if theme.algolia_search.enable
@@ -30,36 +27,33 @@ div
    script(src=url_for(theme.CDN.local_search))

  if theme.preloader
-    !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
+    !=partial('includes/loading/loading-js', {}, {cache: true})

  .js-pjax
-    if theme.subtitle.enable && is_home() && theme.index_img !== false
-      include ./third-party/subtitle.pug
+    if needLoadCountJs
+      !=partial('includes/third-party/card-post-count/index', {}, {cache: true})
    
-    if page.type === 'artitalk'
-      include ./third-party/artitalk.pug
+    if loadSubJs
+      include ./third-party/subtitle.pug

    include ./third-party/math/index.pug

    if commentsJsLoad
      include ./third-party/comments/js.pug

-    if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-      script(async src=url_for(theme.CDN.busuanzi))
-
-  !=partial('includes/third-party/prismjs', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/prismjs', {}, {cache: true})

  if theme.aside.enable && theme.newest_comments.enable
    if theme.pjax.enable
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
    else if (!is_post() && page.aside !== false)
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})

  !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})

-  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/effect', {}, {cache: true})

-  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/chat/index', {}, {cache: true})
  
  if theme.aplayerInject && theme.aplayerInject.enable
    if theme.pjax.enable || theme.aplayerInject.per_page
@@ -68,7 +62,7 @@ div
      include ./third-party/aplayer.pug

  if theme.pjax.enable
-    !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
-  
-  !=partial('includes/third-party/baidu_push', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/pjax', {}, {cache: true})
    
+  if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+    script(async data-pjax src=url_for(theme.CDN.busuanzi))
--- a/layout/includes/footer.pug
+++ b/layout/includes/footer.pug
@@ -15,9 +15,3 @@
      a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly'
  if theme.footer.custom_text
    .footer_custom_text!=`${theme.footer.custom_text}`
-  if theme.footer.ICP.enable
-    .icp
-      a(href=theme.footer.ICP.url)
-        if theme.footer.ICP.icon
-          img.icp-icon(src=url_for(theme.footer.ICP.icon) alt='ICP')
-        span=theme.footer.ICP.text
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -29,10 +29,6 @@ meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
 meta(name="theme-color" content=themeColor)

-if theme.disable_baidu_transformation
-  meta(http-equiv="Cache-Control" content="no-transform")
-  meta(http-equiv="Cache-Control" content="no-siteapp")
-
 //- Open_Graph
 include ./head/Open_Graph.pug

@@ -40,45 +36,42 @@ include ./head/Open_Graph.pug
 link(rel="canonical" href=urlNoIndex())

 //- 預解析
-!=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/preconnect', {}, {cache: true})

 //- 網站驗證
-!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/site_verification', {}, {cache: true})

 //- PWA
 if (theme.pwa && theme.pwa.enable)
-  !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
+  !=partial('includes/head/pwa', {}, {cache: true})

 //- main css
 link(rel='stylesheet', href=url_for(theme.CDN.main_css))
-link(rel='stylesheet', href=url_for(theme.CDN.fontawesome))
-
-if theme.fancybox
-  link(rel='stylesheet', href=url_for(theme.CDN.fancybox_css))
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome) media="print" onload="this.media='all'")

 if (theme.snackbar && theme.snackbar.enable)
-  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css))
+  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css) media="print" onload="this.media='all'")

 if theme.algolia_search.enable
-  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css))
+  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css) media="print" onload="this.media='all'")
  script(src=url_for(theme.CDN.algolia_search) defer)

 //- google_adsense
-!=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/google_adsense', {}, {cache: true})

 //- analytics
-!=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/analytics', {}, {cache: true})

 //- font
 if theme.blog_title_font &&　theme.blog_title_font.font_link
-  link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link))
+  link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")

 //- global config
-!=partial('includes/head/config', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/config', {}, {cache: true})

 include ./head/config_site.pug
 include ./head/noscript.pug

-!=partial('includes/head/js', {}, {cache:theme.fragment_cache})
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})

 !=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
--- a/layout/includes/head/Open_Graph.pug
+++ b/layout/includes/head/Open_Graph.pug
@@ -1,6 +1,6 @@
 if theme.Open_Graph_meta
  - let contentType = is_post() ? 'article' : 'website'
-  - let metaImage = full_url_for(page.cover || theme.avatar.img)
+  - let metaImage = (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : ''
  - let fb_appId = theme.facebook_comments.app_id || ''
  - let fb_admins = theme.facebook_comments.user_id || ''

--- a/layout/includes/head/analytics.pug
+++ b/layout/includes/head/analytics.pug
@@ -30,3 +30,14 @@ if theme.tencent_analytics

 if theme.cnzz_analytics
  script(async data-pjax src=`https://s4.cnzz.com/z_stat.php?id=${theme.cnzz_analytics}&web_id=${theme.cnzz_analytics}`)
+
+if theme.cloudflare_analytics
+  script(defer data-pjax src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon=`{"token": "${theme.cloudflare_analytics}"}`)
+
+if theme.microsoft_clarity
+  script.
+    (function(c,l,a,r,i,t,y){
+        c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+        t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+        y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+    })(window, document, "clarity", "script", "!{theme.microsoft_clarity}");
--- a/layout/includes/head/config.pug
+++ b/layout/includes/head/config.pug
@@ -50,14 +50,6 @@
    })
  }

-  let ClickShowText = 'undefined';
-  if (theme.ClickShowText && theme.ClickShowText.enable) {
-    ClickShowText = JSON.stringify({
-    text: theme.ClickShowText.text.join(","),
-      fontSize: theme.ClickShowText.fontSize
-    })
-  }
-
  let Snackbar = 'undefined';
  if (theme.snackbar && theme.snackbar.enable) {
    Snackbar = JSON.stringify({
@@ -86,12 +78,13 @@
    highlight = JSON.stringify({
      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
      highlightCopy: theme.highlight_copy,
-      highlightLang: theme.highlight_lang
+      highlightLang: theme.highlight_lang,
+      highlightHeightLimit: theme.highlight_height_limit
    })
  }

 script.
-  var GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = { 
    root: '!{config.root}',
    algolia: !{algolia},
    localSearch: !{localSearch},
@@ -116,45 +109,20 @@ script.
      month: '!{_p("date_suffix.month")}'
    },
    copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
    Snackbar: !{Snackbar},
-    justifiedGallery: {
-      js: '!{theme.CDN.justifiedGallery_js}',
-      css: '!{theme.CDN.justifiedGallery_css}'
+    source: {
+      jQuery: '!{url_for(theme.CDN.jquery)}',
+      justifiedGallery: {
+        js: '!{url_for(theme.CDN.justifiedGallery_js)}',
+        css: '!{url_for(theme.CDN.justifiedGallery_css)}'
+      },
+      fancybox: {
+        js: '!{url_for(theme.CDN.fancybox)}',
+        css: '!{url_for(theme.CDN.fancybox_css)}'
+      }
    },
    isPhotoFigcaption: !{theme.photofigcaption},
    islazyload: !{theme.lazyload.enable},
    isanchor: !{theme.anchor}
-  };
-
-  var saveToLocal = {
-    set: function setWithExpiry(key, value, ttl) {
-      const now = new Date()
-      const expiryDay = ttl * 86400000
-      const item = {
-        value: value,
-        expiry: now.getTime() + expiryDay,
-      }
-      localStorage.setItem(key, JSON.stringify(item))
-    },
-
-    get: function getWithExpiry(key) {
-      const itemStr = localStorage.getItem(key)
-
-      if (!itemStr) {
-        return undefined
-      }
-      const item = JSON.parse(itemStr)
-      const now = new Date()
-
-      if (now.getTime() > item.expiry) {
-        localStorage.removeItem(key)
-        return undefined
-      }
-      return item.value
-    }
  }
-
-
-
--- a/layout/includes/head/config_site.pug
+++ b/layout/includes/head/config_site.pug
@@ -4,11 +4,11 @@
  else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink
  else isHighlightShrink = theme.highlight_shrink

-  const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
-  const showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+  var pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
+  var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
 -

-script#config_change
+script#config-diff
  .
    var GLOBAL_CONFIG_SITE = { 
      isPost: !{is_post()},
--- a/layout/includes/head/js.pug
+++ b/layout/includes/head/js.pug
@@ -1,65 +0,0 @@
-script
-  | (function () {
-    
-  if theme.darkmode.enable
-    |   window.activateDarkMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'dark')
-    |     if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-    |     }
-    |   }
-    |   window.activateLightMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'light')
-    |    if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-    |     }
-    |   }
-
-    |   const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    |   const t = saveToLocal.get('theme')
-    |   if (autoChangeMode === '1') {
-    |     const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-    |     const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-    |     const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-    |     const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-    |     if (t === undefined) {
-    |       if (isLightMode) activateLightMode()
-    |       else if (isDarkMode) activateDarkMode()
-    |       else if (isNotSpecified || hasNoSupport) {
-    |         const now = new Date()
-    |         const hour = now.getHours()
-    |         const isNight = hour <= 6 || hour >= 18
-    |         isNight ? activateDarkMode() : activateLightMode()
-    |       }
-    |       window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-    |         if (saveToLocal.get('theme') === undefined) {
-    |           e.matches ? activateDarkMode() : activateLightMode()
-    |         }
-    |       })
-    |     } else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else if (autoChangeMode === '2') {
-    |     const now = new Date()
-    |     const hour = now.getHours()
-    |     const isNight = hour <= 6 || hour >= 18
-    |     if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-    |     else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else {
-    |     if (t === 'dark') activateDarkMode()
-    |     else if (t === 'light') activateLightMode()
-    |   }
-
-  if theme.aside.enable && theme.aside.button
-    | const asideStatus = saveToLocal.get('aside-status')
-    | if (asideStatus !== undefined) {
-    |    if (asideStatus === 'hide') {
-    |      document.documentElement.classList.add('hide-aside')
-    |    } else {
-    |      document.documentElement.classList.remove('hide-aside')
-    |    }
-    | }
-
-  | })()
-
--- a/layout/includes/head/preconnect.pug
+++ b/layout/includes/head/preconnect.pug
@@ -1,7 +1,7 @@
 link(rel="preconnect" href="//cdn.jsdelivr.net")

 if theme.google_analytics
-  link(rel="preconnect" href="//www.google-analytics.com" crossorigin)
+  link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')

 if theme.baidu_analytics
  link(rel="preconnect" href="//hm.baidu.com")
@@ -12,11 +12,14 @@ if theme.tencent_analytics
 if theme.cnzz_analytics
  link(rel="preconnect" href="//s4.cnzz.com")

+if theme.cloudflare_analytics
+  link(rel="preconnect" href="//static.cloudflareinsights.com")
+
+if theme.microsoft_clarity
+  link(rel="preconnect" href="//www.clarity.ms")
+
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
-  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin)
+  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')

 if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
  link(rel="preconnect" href="//busuanzi.ibruce.info")
-
-if theme.baidu_push
-  link(rel="preconnect" href="//zz.bdstatic.com")
--- a/layout/includes/header/index.pug
+++ b/layout/includes/header/index.pug
@@ -1,6 +1,6 @@
-if page.top_img !== false
+if !theme.disable_top_img && page.top_img !== false
  if is_post()
-    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+    - var top_img = page.top_img || page.cover || page.randomcover
  else if is_page()
    - var top_img = page.top_img || theme.default_top_img
  else if is_tag()
@@ -17,27 +17,29 @@ if page.top_img !== false
    - var top_img = page.top_img || theme.default_top_img

  if top_img !== false
-    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
    - var bg_img = top_img ? imgSource : ''
    - var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
-    - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+    - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
    - is_post() ? isHomeClass = 'post-bg' : isHomeClass
  else
-    - var isHomeClass = 'no-top-img'
+    - var isHomeClass = 'not-top-img'
 else
  - var top_img = false
-  - var isHomeClass = 'no-top-img'
+  - var isHomeClass = 'not-top-img'

 header#page-header(class=isHomeClass style=bg_img)
-  !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
+  !=partial('includes/header/nav', {}, {cache: true})
  if top_img !== false
    if is_post()
      include ./post-info.pug
    else if is_home() 
      #site-info
        h1#site-title=site_title
-        #site-subtitle
-          span#subtitle
+        if theme.subtitle.enable
+          - var loadSubJs = true
+          #site-subtitle
+            span#subtitle
        if(theme.social)
          #site_social_icons
            !=fragment_cache('social', function(){return partial('includes/header/social')})
--- a/layout/includes/header/menu_item.pug
+++ b/layout/includes/header/menu_item.pug
@@ -4,7 +4,7 @@ if theme.menu

  .menus_items
    each value, label in theme.menu
-      if !Array.isArray(value)
+      if typeof value !== 'object'
        .menus_item
          a.site-page(href=url_for(trim(value.split('||')[0])))
            if value.split('||')[1]
@@ -18,9 +18,9 @@ if theme.menu
            span=' '+ trim(label.split('||')[0])
            i.fas.fa-chevron-down.expand(class=sidebarChildHide)
          ul.menus_item_child
-            each i in value
+            each val,lab in value 
              li
-                a.site-page(href=url_for(trim(i.split('||')[1])))
-                  if i.split('||')[2]
-                    i.fa-fw(class=trim(i.split('||')[2]))
-                  span=' '+trim(i.split('||')[0])
+                a.site-page.child(href=url_for(trim(val.split('||')[0])))
+                  if val.split('||')[1]
+                    i.fa-fw(class=trim(val.split('||')[1]))
+                  span=' '+ lab
--- a/layout/includes/header/nav.pug
+++ b/layout/includes/header/nav.pug
@@ -2,15 +2,15 @@ nav#nav
  span#blog_name
    a#site-name(href=url_for('/')) #[=config.title]
    
-  span#menus
+  #menus
    if (theme.algolia_search.enable || theme.local_search.enable)
-      #search_button
+      #search-button
        a.site-page.social-icon.search
          i.fas.fa-search.fa-fw
          span=' '+_p('search')
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
+    !=partial('includes/header/menu_item', {}, {cache: true})

-    span#toggle-menu.close
+    #toggle-menu
      a.site-page
        i.fas.fa-bars.fa-fw

--- a/layout/includes/header/post-info.pug
+++ b/layout/includes/header/post-info.pug
@@ -1,5 +1,9 @@
+- let comments = theme.comments
 #post-info
  h1.post-title= page.title || _p('no_title')
+    if theme.post_edit.enable
+      a.post-edit-link(href=theme.post_edit.url + page.source title=_p('post.edit') target="_blank")
+        i.fas.fa-pencil-alt
        
  #post-meta
    .meta-firstline
@@ -48,35 +52,60 @@
            span.post-meta-label= _p('post.min2read') + ':'
            span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
    
-      if theme.busuanzi.page_pv
+      //- for pv and count
+      mixin pvBlock(parent_id,parent_class,parent_title)
        span.post-meta-separator |
-        span.post-meta-pv-cv
+        span(class=parent_class id=parent_id data-flag-title=page.title)
          i.far.fa-eye.fa-fw.post-meta-icon
          span.post-meta-label=_p('post.page_pv') + ':'
-          span#busuanzi_value_page_pv
+          if block
+            block

-      if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
-        - var whichCount = theme.comments.use[0]
-        if whichCount !== 'Livere' && whichCount !== 'Utterances'
+      if theme.busuanzi.page_pv
+        +pvBlock('','post-meta-pv-cv','')
+          span#busuanzi_value_page_pv
+      else if comments.use && !comments.lazyload
+        if (comments.use.includes('Valine') && theme.valine.visitor) || (comments.use.includes('Waline') && theme.waline.visitor)
+          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+            span.leancloud-visitors-count
+        else if (comments.use.includes('Twikoo') && theme.twikoo.visitor)
+          +pvBlock('','','')
+            span#twikoo_visitors
+
+      if comments.count && !comments.lazyload && page.comments !== false && comments.use
+        - var whichCount = comments.use[0]
+
+        mixin countBlock
          span.post-meta-separator |
          span.post-meta-commentcount
-            if whichCount === 'Disqus' || whichCount === 'Disqusjs'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
-              span.disqus-comment-count.comment-count
+            i.far.fa-comments.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.comments') + ':'
+            if block
+              block
+        
+        case whichCount
+          when 'Disqus'
+          when 'Disqusjs'
+            +countBlock
+              span.disqus-comment-count
                a(href=full_url_for(page.path) + '#disqus_thread')
-            else if whichCount === 'Valine'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
+          when 'Valine'
+            +countBlock
              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-                span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-            else if whichCount === 'Gitalk'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
+                span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+          when 'Waline'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.waline-comment-count(id=url_for(page.path))
+          when 'Gitalk'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.gitalk-comment-count
+          when 'Twikoo'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span#twikoo-count
+          when 'Facebook Comments'
+            +countBlock
              a(href=url_for(page.path) + '#post-comment')
-                span.gitalk-comment-count.comment-count
-            else if whichCount === 'Facebook Comments'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
-              a.comment-count(href=url_for(page.path) + '#post-comment')
                span.fb-comments-count(data-href=urlNoIndex())
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -1,5 +1,6 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
+- var pageType = is_post() ? 'post' : 'page'

 doctype html
 html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
@@ -7,14 +8,14 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
    include ./head.pug
  body
    if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})

    if theme.background
      #web_bg
      
-    !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
+    !=partial('includes/sidebar', {}, {cache: true})

-    #body-wrap
+    #body-wrap(class=pageType)
      include ./header/index.pug

      main#content-inner.layout(class=hideAside)
@@ -30,13 +31,13 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
        if (footerBg === true)
          - var footer_bg = bg_img
        else
-          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
      else
        - var footer_bg = ''

      footer#footer(style=footer_bg)
-        !=partial('includes/footer', {}, {cache:theme.fragment_cache})
+        !=partial('includes/footer', {}, {cache: true})

    include ./rightside.pug
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/search/index', {}, {cache: true})
    include ./additional-js.pug
--- a/layout/includes/loading/loading-js.pug
+++ b/layout/includes/loading/loading-js.pug
@@ -10,4 +10,4 @@ script.

    }
  }
-  window.addEventListener('load',()=> {preloader.endLoading()})
+  window.addEventListener('load',preloader.endLoading())
--- a/layout/includes/mixins/post-ui.pug
+++ b/layout/includes/mixins/post-ui.pug
@@ -18,7 +18,7 @@ mixin postUI(posts)
        .article-meta-wrap
          if (is_home() && (article.top || article.sticky > 0))
            span.article-meta
-              i.fas.fa-thumbtack.article-meta__icon.sticky
+              i.fas.fa-thumbtack.sticky
              span.sticky= _p('sticky')
              span.article-meta__separator |
          if (theme.post_meta.page.date_type)
@@ -42,7 +42,7 @@ mixin postUI(posts)
          if (theme.post_meta.page.categories && article.categories.data.length > 0)
            span.article-meta
              span.article-meta__separator |
-              i.fas.fa-inbox.article-meta__icon
+              i.fas.fa-inbox
              each item, index in article.categories.data
                a(href=url_for(item.path)).article-meta__categories #[=item.name]
                if (index < article.categories.data.length - 1)
@@ -50,12 +50,43 @@ mixin postUI(posts)
          if (theme.post_meta.page.tags && article.tags.data.length > 0)
            span.article-meta.tags
              span.article-meta__separator |
-              i.fas.fa-tag.article-meta__icon
+              i.fas.fa-tag
              each item, index in article.tags.data
                a(href=url_for(item.path)).article-meta__tags #[=item.name]
                if (index < article.tags.data.length - 1)
                  span.article-meta__link #[='•']
          
+          mixin countBlockInIndex
+            - needLoadCountJs = true
+            span.article-meta
+              span.article-meta__separator |
+              i.fas.fa-comments
+              if block
+                block
+              span.article-meta-label= ' ' + _p('card_post_count')
+          
+          if theme.comments.card_post_count
+            case theme.comments.use[0]
+              when 'Disqus'
+              when 'Disqusjs'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqus_thread')
+              when 'Valine'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
+                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+              when 'Waline'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.waline-comment-count(id=url_for(link))
+              when 'Twikoo'
+                +countBlockInIndex
+                  a.twikoo-count(href=url_for(link) + '#post-comment')
+              when 'Facebook Comments'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+
        //- Display the article introduction on homepage
        case theme.index_post_content.method
          when false
@@ -78,4 +109,4 @@ mixin postUI(posts)

    if theme.ad && theme.ad.index
      if (index + 1) % 3 == 0
-        .recent-post-item.ad-height!=theme.ad.index
+        .recent-post-item.ads-wrap!=theme.ad.index
--- a/layout/includes/page/artitalk.pug
+++ b/layout/includes/page/artitalk.pug
@@ -1,4 +0,0 @@
-if top_img === false
-  h1.page-title= page.title
-
-#artitalk_main
--- a/layout/includes/page/flink.pug
+++ b/layout/includes/page/flink.pug
@@ -1,19 +1,23 @@
-.flink#article-container
-  if site.data.link
-    each i in site.data.link
-      if i.class_name
-        h2!= i.class_name
-      if i.class_desc
-        .flink-desc!=i.class_desc
-      .flink-list
-        each item in i.link_list
-          .flink-list-item
-            a(href=url_for(item.link)  title=item.name target="_blank")
-              if theme.lazyload.enable
-                img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
-              else
-                img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
-              span.flink-item-name= item.name 
-              span.flink-item-desc(title=item.descr)= item.descr
-  != page.content
+#article-container
+  if top_img === false
+    h1.page-title= page.title
+
+  .flink
+    if site.data.link
+      each i in site.data.link
+        if i.class_name
+          h2!= i.class_name
+        if i.class_desc
+          .flink-desc!=i.class_desc
+        .flink-list
+          each item in i.link_list
+            .flink-list-item
+              a(href=url_for(item.link)  title=item.name target="_blank")
+                if theme.lazyload.enable
+                  img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                else
+                  img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                span.flink-item-name= item.name 
+                span.flink-item-desc(title=item.descr)= item.descr
+    != page.content

--- a/layout/includes/pagination.pug
+++ b/layout/includes/pagination.pug
@@ -6,34 +6,38 @@
    escape: false
  }

-if(!is_post())
-  nav#pagination
-    div.pagination
-      !=paginator(options)
-else
+if is_post()
+  - let prev = theme.post_pagination === 1 ? page.prev : page.next
+  - let next = theme.post_pagination === 1 ? page.next : page.prev
  nav#pagination.pagination-post
-    if(page.prev)
-      - var hasPageNext = page.next ? 'pull-left' : 'pull-full'
+    if(prev)
+      - var hasPageNext = next ? 'pull-left' : 'pull-full'
      .prev-post(class=hasPageNext)
-        - var pagination_cover = page.prev.cover === false ? page.prev.randomcover : page.prev.cover
-        a(href=url_for(page.prev.path))
+        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
+        a(href=url_for(prev.path))
          if theme.lazyload.enable
-            img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
+            img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
          else
-            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
+            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
          .pagination-info
            .label=_p('pagination.prev')
-            .prev_info=page.prev.title
+            .prev_info=prev.title
          
-    if(page.next)
-      - var hasPagePrev = page.prev ? 'pull-right' : 'pull-full'
-      - var pagination_cover = page.next.cover == false ? page.next.randomcover : page.next.cover
+    if(next)
+      - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
+      - var pagination_cover = next.cover == false ? next.randomcover : next.cover
      .next-post(class=hasPagePrev)
-        a(href=url_for(page.next.path))
+        a(href=url_for(next.path))
          if theme.lazyload.enable
-            img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
+            img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
          else
-            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
+            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
          .pagination-info
            .label=_p('pagination.next')
-            .next_info=page.next.title 
+            .next_info=next.title
+else
+  nav#pagination
+    .pagination
+      if is_home()
+        - options.format = 'page/%d/#content-inner'
+      !=paginator(options)
--- a/layout/includes/post/reward.pug
+++ b/layout/includes/post/reward.pug
@@ -1,16 +1,16 @@
 .post-reward
-  .reward-button
+  .reward-button.button--animated
    i.fas.fa-qrcode
    = ' ' + _p('donate')
-    .reward-main
-      ul.reward-all
-        each item in theme.reward.QR_code
-          - var clickTo = (item.itemlist||item).link ? (item.itemlist||item).link : (item.itemlist||item).img
-          li.reward-item
-            a(href=clickTo target='_blank')
-              if theme.lazyload.enable
-                img.post-qr-code-img(data-lazy-src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
-              else
-                img.post-qr-code-img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
-            .post-qr-code-desc=(item.itemlist||item).text
+  .reward-main
+    ul.reward-all
+      each item in theme.reward.QR_code
+        - var clickTo = item.link ? item.link : item.img
+        li.reward-item
+          a(href=url_for(clickTo) target='_blank')
+            if theme.lazyload.enable
+              img.post-qr-code-img(data-lazy-src=url_for(item.img) alt=item.text)
+            else
+              img.post-qr-code-img(src=url_for(item.img) alt=item.text)
+          .post-qr-code-desc=item.text

--- a/layout/includes/rightside.pug
+++ b/layout/includes/rightside.pug
@@ -3,25 +3,30 @@
    if is_post() && theme.readmode
      button#readmode(type="button" title=_p('rightside.readmode_title'))
        i.fas.fa-book-open
+    if theme.change_font_size
+      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
+        i.fas.fa-plus
+      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
+        i.fas.fa-minus
    if theme.translate.enable
      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
    if theme.darkmode.enable && theme.darkmode.button
      button#darkmode(type="button" title=_p('rightside.night_mode_title'))
        i.fas.fa-adjust
    if theme.aside.enable && theme.aside.button && page.aside !== false
-      button#hide-aside-btn(type="button")
+      button#hide-aside-btn(type="button" title=_p('rightside.aside'))
        i.fas.fa-arrows-alt-h
  #rightside-config-show
    if is_post()
-      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button))
+      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size)
        button#rightside_config(type="button" title=_p("rightside.setting"))
-          i.fas.fa-cog
-      if showToc && theme.aside.mobile
+          i.fas.fa-cog.fa-spin
+      if showToc
        button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
          i.fas.fa-list-ul
-    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button)
+    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size
      button#rightside_config(type="button" title=_p("rightside.setting"))
-        i.fas.fa-cog
+        i.fas.fa-cog.fa-spin

    if theme.chat_btn
      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
--- a/layout/includes/sidebar.pug
+++ b/layout/includes/sidebar.pug
@@ -28,4 +28,4 @@
              .headline= _p('aside.categories') 
              .length-num= site.categories.length
    hr
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
+    !=partial('includes/header/menu_item', {}, {cache: true})
--- a/layout/includes/third-party/aplayer.pug
+++ b/layout/includes/third-party/aplayer.pug
@@ -1,3 +1,3 @@
-link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css))
+link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css) media="print" onload="this.media='all'")
 script(src=url_for(theme.CDN.aplayer_js))
 script(src=url_for(theme.CDN.meting_js))
--- a/layout/includes/third-party/artitalk.pug
+++ b/layout/includes/third-party/artitalk.pug
@@ -1,24 +0,0 @@
- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
-
-script.
-  (()=>{
-    let setting = {
-      appId: '!{theme.artitalk.appId}',
-      appKey: '!{theme.artitalk.appKey}',
-    }
-
-    if (!{Boolean(option)}) {
-      const otherSetting = !{option}
-      setting = Object.assign({}, setting, otherSetting)
-    }
-
-    const init = () => {
-      new Artitalk(setting)
-    }
-
-    if (typeof Artitalk === 'function') {
-      init()
-    } else {
-      $.getScript('!{theme.CDN.artitalk}',init)
-    }
-  })()
--- a/layout/includes/third-party/baidu_push.pug
+++ b/layout/includes/third-party/baidu_push.pug
@@ -1,15 +0,0 @@
-if theme.baidu_push
-  script.
-    (function(){
-      const bp = document.createElement('script');
-      const curProtocol = window.location.protocol.split(':')[0];
-      if (curProtocol === 'https'){
-      bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-      }
-      else{
-      bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-      }
-      bp.dataset.pjax = ''
-      const s = document.getElementsByTagName("script")[0];
-      s.parentNode.insertBefore(bp, s);
-    })()
--- a/layout/includes/third-party/card-post-count/disqus.pug
+++ b/layout/includes/third-party/card-post-count/disqus.pug
@@ -0,0 +1,16 @@
+script.
+  (() => {
+    const getCount = () => {
+      if (window.DISQUSWIDGETS === undefined) {
+        var d = document, s = d.createElement('script');
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+        s.id = 'dsq-count-scr';
+        (d.head || d.body).appendChild(s);
+      } else {
+        DISQUSWIDGETS.getCount({reset: true});
+      }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()
--- a/layout/includes/third-party/card-post-count/fb.pug
+++ b/layout/includes/third-party/card-post-count/fb.pug
@@ -0,0 +1,15 @@
+script.
+  (()=>{
+    function loadFBComment () {
+      if (typeof FB === 'object') FB.XFBML.parse()
+      else {
+        let ele = document.createElement('script')
+        ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v9.0')
+        ele.setAttribute('async', 'true')
+        ele.setAttribute('defer', 'true')
+        ele.setAttribute('crossorigin', 'anonymous')
+        document.body.appendChild(ele)
+      }
+    }
+    window.pjax ? loadFBComment() : window.addEventListener('load', loadFBComment)
+  })()
--- a/layout/includes/third-party/card-post-count/index.pug
+++ b/layout/includes/third-party/card-post-count/index.pug
@@ -0,0 +1,12 @@
+case theme.comments.use[0]
+  when 'Twikoo'
+    include ./twikoo.pug
+  when 'Disqus'
+  when 'Disqusjs'
+    include ./disqus.pug
+  when 'Valine'
+    include ./valine.pug
+  when 'Waline'
+    include ./waline.pug
+  when 'Facebook Comments'
+    include ./fb.pug
--- a/layout/includes/third-party/card-post-count/twikoo.pug
+++ b/layout/includes/third-party/card-post-count/twikoo.pug
@@ -0,0 +1,37 @@
+script.
+  (() => { 
+    const getCommentUrl = () => {
+      const eleGroup = document.querySelectorAll('#recent-posts .article-title')
+      let urlArray = []
+      eleGroup.forEach(i=>{
+        urlArray.push(i.getAttribute('href'))
+      })
+      return urlArray
+    }
+
+    const getCount = () => {
+      const runTwikoo = () => {
+        twikoo.getCommentsCount({
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
+          urls: getCommentUrl(),
+          includeReply: false
+        }).then(function (res) {
+          document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
+            item.innerText = res[index].count
+          })
+        }).catch(function (err) {
+          console.log(err)
+        })
+      }
+
+        if (typeof twikoo === 'object') {
+          runTwikoo()
+        } else {
+          getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+        }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()
--- a/layout/includes/third-party/card-post-count/valine.pug
+++ b/layout/includes/third-party/card-post-count/valine.pug
@@ -0,0 +1,19 @@
+script.
+  (() => {
+    function loadValine () {
+      function initValine () {
+        let initData = {
+          el: '#vcomment',
+          appId: '#{theme.valine.appId}',
+          appKey: '#{theme.valine.appKey}',
+        }
+        
+        const valine = new Valine(initData)
+      }
+
+      if (typeof Valine === 'function') initValine() 
+      else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
+    }
+
+    window.pjax ? loadValine() : window.addEventListener('load', loadValine)
+  })()
--- a/layout/includes/third-party/card-post-count/waline.pug
+++ b/layout/includes/third-party/card-post-count/waline.pug
@@ -0,0 +1,18 @@
+script.
+  (() => {
+    function loadWaline () {
+      function initWaline () {
+        let initData = {
+          el: '#waline-wrap',
+          serverURL: '!{theme.waline.serverURL}',
+        }
+        
+        const waline = new Waline(initData)
+      }
+
+      if (typeof Waline === 'function') initWaline() 
+      else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+    }
+
+    window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)
+  })()
--- a/layout/includes/third-party/comments/disqusjs.pug
+++ b/layout/includes/third-party/comments/disqusjs.pug
@@ -29,7 +29,7 @@ script.
    if (window.disqusJsLoad) initDisqusjs()
    else {
      addDisqusjsCSS()
-      $.getScript('!{url_for(theme.CDN.disqusjs)}', initDisqusjs)
+      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
      window.disqusJsLoad = true
    }
  }
--- a/layout/includes/third-party/comments/facebook_comments.pug
+++ b/layout/includes/third-party/comments/facebook_comments.pug
@@ -7,7 +7,7 @@ script.
    if (typeof FB === 'object') FB.XFBML.parse()
    else {
      let ele = document.createElement('script')
-      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v9.0')
      ele.setAttribute('async', 'true')
      ele.setAttribute('defer', 'true')
      ele.setAttribute('crossorigin', 'anonymous')
--- a/layout/includes/third-party/comments/gitalk.pug
+++ b/layout/includes/third-party/comments/gitalk.pug
@@ -8,7 +8,7 @@ script.

  function loadGitalk () {
    function initGitalk () {
-      var gitalk = new Gitalk({
+      var gitalk = new Gitalk(Object.assign({
        clientID: '!{theme.gitalk.client_id}',
        clientSecret: '!{theme.gitalk.client_secret}',
        repo: '!{theme.gitalk.repo}',
@@ -21,14 +21,15 @@ script.
        pagerDirection: '!{theme.gitalk.pagerDirection}',
        createIssueManually: !{theme.gitalk.createIssueManually},
        updateCountCallback: commentCount
-      })
+      },!{JSON.stringify(theme.gitalk.option)}))
+
      gitalk.render('gitalk-container')
    }

    if (typeof Gitalk === 'function') initGitalk()
    else {
      addGitalkSource()
-      $.getScript('!{url_for(theme.CDN.gitalk)}', initGitalk)
+      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
    }
  }
  
--- a/layout/includes/third-party/comments/index.pug
+++ b/layout/includes/third-party/comments/index.pug
@@ -30,7 +30,9 @@ hr
          when 'Utterances'
            #utterances-wrap
          when 'Twikoo'
-            #twikoo
+            #twikoo-wrap
+          when 'Waline'
+            #waline-wrap
          when 'Facebook Comments'
            .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                        data-numposts= theme.facebook_comments.pageSize || 10
--- a/layout/includes/third-party/comments/js.pug
+++ b/layout/includes/third-party/comments/js.pug
@@ -1,18 +1,20 @@
 each name in theme.comments.use
  case name
    when 'Valine'
-      !=partial('includes/third-party/comments/valine', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/valine', {}, {cache: true})
    when 'Disqus'
      include ./disqus.pug
    when 'Disqusjs'
      include ./disqusjs.pug
    when 'Livere'
-      !=partial('includes/third-party/comments/livere', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/livere', {}, {cache: true})
    when 'Gitalk'
      include ./gitalk.pug
    when 'Utterances'
-      !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/utterances', {}, {cache: true})
    when 'Twikoo'
-      !=partial('includes/third-party/comments/twikoo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/twikoo', {}, {cache: true})
+    when 'Waline'
+      !=partial('includes/third-party/comments/waline', {}, {cache: true})
    when 'Facebook Comments'
-      !=partial('includes/third-party/comments/facebook_comments', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/facebook_comments', {}, {cache: true})
--- a/layout/includes/third-party/comments/twikoo.pug
+++ b/layout/includes/third-party/comments/twikoo.pug
@@ -1,24 +1,45 @@
 script.
-  function loadTwikoo () {
-    function init () {
-      twikoo.init({ 
-        envId: '!{theme.twikoo}' 
-      })
+  (()=>{
+    const $countDom = document.getElementById('twikoo-count')
+    const init = () => {
+      twikoo.init(Object.assign({
+        el: '#twikoo-wrap',
+        envId: '!{theme.twikoo.envId}',
+        region: '!{theme.twikoo.region}'
+      }, !{JSON.stringify(theme.twikoo.option)}))
    }

-    if (typeof twikoo.init === 'function') {
-      init()
+    const getCount = () => {
+      twikoo.getCommentsCount({
+        envId: '!{theme.twikoo.envId}',
+        region: '!{theme.twikoo.region}',
+        urls: [window.location.pathname],
+        includeReply: false
+      }).then(function (res) {
+        $countDom.innerText = res[0].count
+      }).catch(function (err) {
+        console.error(err);
+      });
+    }
+
+    const loadTwikoo = (bool = false) => {
+      if (typeof twikoo === 'object') {
+        init()
+        bool && $countDom && setTimeout(getCount,0)
+      } else {
+        getScript('!{theme.CDN.twikoo}').then(()=> {
+          init()
+          bool && $countDom && setTimeout(getCount,0)
+        })
+      }
+    }
+
+    if ('!{theme.comments.use[0]}' === 'Twikoo' || !!{theme.comments.lazyload}) {
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
+      else loadTwikoo(true)
    } else {
-      $.getScript('!{theme.CDN.twikoo}', init)
+      window.loadOtherComment = () => {
+        loadTwikoo()
+      }
    }
-  }
-
-  if ('!{theme.comments.use[0]}' === 'Twikoo' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('twikoo'), loadTwikoo)
-    else loadTwikoo()
-  } else {
-    function loadOtherComment () {
-      loadTwikoo()
-    }
-  }
-
+  })()
--- a/layout/includes/third-party/comments/valine.pug
+++ b/layout/includes/third-party/comments/valine.pug
@@ -1,4 +1,3 @@
- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
  - emojiMaps = JSON.stringify(site.data.valine)
@@ -6,7 +5,7 @@ if site.data.valine
 script.
  function loadValine () {
    function initValine () {
-      let initData = {
+      const valine = new Valine(Object.assign({
        el: '#vcomment',
        appId: '#{theme.valine.appId}',
        appKey: '#{theme.valine.appKey}',
@@ -21,27 +20,18 @@ script.
        emojiMaps: !{emojiMaps},
        enableQQ: #{theme.valine.enableQQ},
        path: window.location.pathname,
-      }
-
-      if (!{Boolean(theme.valine.requiredFields)}) { 
-        initData.requiredFields= ('!{theme.valine.requiredFields}'.split(','))
-      }
-      
-      if (!{Boolean(option)}) {
-        const otherData = !{option}
-        initData = Object.assign({}, initData, otherData)
-      }
-      
-      const valine = new Valine(initData)
+        requiredFields: [!{theme.valine.requiredFields ? JSON.stringify(theme.valine.requiredFields).split(',') : ''}],
+        visitor: #{theme.valine.visitor}
+      }, !{JSON.stringify(theme.valine.option)}))
    }

    if (typeof Valine === 'function') initValine() 
-    else $.getScript('!{url_for(theme.CDN.valine)}', initValine)
+    else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
  }

  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
-    else setTimeout(() => loadValine(), 0)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
+    else setTimeout(loadValine, 0)
  } else {
    function loadOtherComment () {
      loadValine()
--- a/layout/includes/third-party/comments/waline.pug
+++ b/layout/includes/third-party/comments/waline.pug
@@ -0,0 +1,32 @@
+- let emojiMaps = '""'
+if site.data.waline
+  - emojiMaps = JSON.stringify(site.data.waline)
+
+script.
+  function loadWaline () {
+    function initWaline () {
+      const waline = new Waline(Object.assign({
+        el: '#waline-wrap',
+        serverURL: '!{theme.waline.serverURL}',
+        avatar: '#{theme.waline.avatar}',
+        path: location.pathname,
+        emojiCDN: '#{theme.waline.emojiCDN}',
+        emojiMaps: !{emojiMaps},
+        visitor: #{theme.waline.visitor}
+      }, !{JSON.stringify(theme.waline.option)}))
+    }
+
+    if (typeof Waline === 'function') initWaline() 
+    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    else setTimeout(loadWaline, 0)
+  } else {
+    function loadOtherComment () {
+      loadWaline()
+    }
+  }
+  
+
--- a/layout/includes/third-party/effect.pug
+++ b/layout/includes/third-party/effect.pug
@@ -25,4 +25,11 @@ if theme.click_heart && theme.click_heart.enable
  script#click-heart(src=url_for(theme.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)

 if theme.ClickShowText && theme.ClickShowText.enable
-  script#click-show-text(src=url_for(theme.CDN.ClickShowText) async mobile=`${theme.ClickShowText.mobile}`)
+  script#click-show-text(
+    src= url_for(theme.CDN.ClickShowText)
+    data-mobile= `${theme.ClickShowText.mobile}`
+    data-text= theme.ClickShowText.text.join(",")
+    data-fontsize= theme.ClickShowText.fontSize
+    data-random= `${theme.ClickShowText.random}`
+    async
+  )
--- a/layout/includes/third-party/math/index.pug
+++ b/layout/includes/third-party/math/index.pug
@@ -1,6 +1,6 @@
 if theme.mathjax && theme.mathjax.enable
  if theme.mathjax.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
+    if is_post() || is_page()
      include ./mathjax.pug
  else
    if page.mathjax
@@ -8,7 +8,7 @@ if theme.mathjax && theme.mathjax.enable

 if theme.katex && theme.katex.enable
  if theme.katex.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
+    if is_post() || is_page()
      include ./katex.pug
  else
    if page.katex
--- a/layout/includes/third-party/math/katex.pug
+++ b/layout/includes/third-party/math/katex.pug
@@ -2,6 +2,9 @@ link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
 script(src=url_for(theme.CDN.katex_copytex))
 link(rel="stylesheet" type="text/css" href=theme.CDN.katex_copytex_css)
 script.
-  $(function () {
-    $('span.katex-display').wrap('<div class="katex-wrap"></div>')
-  })
+  (() => {
+    document.querySelectorAll('#article-container span.katex-display').forEach(item => {
+      btf.wrap(item, 'div', '', 'katex-wrap')
+    })
+  })()
+  
--- a/layout/includes/third-party/math/mermaid.pug
+++ b/layout/includes/third-party/math/mermaid.pug
@@ -2,7 +2,7 @@ script.
  if (document.getElementsByClassName('mermaid').length) {
    if (window.mermaidJsLoad) mermaid.init()
    else {
-      $.getScript('!{theme.CDN.mermaid}', function () {
+      getScript('!{theme.CDN.mermaid}').then(() => {
        window.mermaidJsLoad = true
        mermaid.initialize({
          theme: '!{theme.mermaid.theme}',
--- a/layout/includes/third-party/newest-comments/disqus-comment.pug
+++ b/layout/includes/third-party/newest-comments/disqus-comment.pug
@@ -3,9 +3,10 @@ script.
    const changeContent = (content) => {
      if (content === '') return content

+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<code>.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
      content = content.replace(/<[^>]+>/g,"") // remove html tag
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url

      if (content.length > 150) {
        content = content.substring(0,150) + '...'
@@ -13,45 +14,52 @@ script.
      return content
    }

-    const getDisqusComment = () => {
-      let disqusArray = []
-      $.getJSON('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}', function(data){
-        $.each(data.response, (i, item) => {
-          disqusArray.push({
-            'avatar': item.author.avatar.cache,
-            'content': changeContent(item.message),
-            'nick': item.author.name,
-            'url': item.url,
-            'date': item.createdAt
+    const getComment = () => {
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}')
+        .then(response => response.json())
+        .then(data => {
+          const disqusArray = data.response.map(item => {
+            return {
+              'avatar': item.author.avatar.cache,
+              'content': changeContent(item.message),
+              'nick': item.author.name,
+              'url': item.url,
+              'date': item.createdAt
+            }
          })
+
+          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(disqusArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
        })
-        // set expiry to 10 min
-        saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
-        generateHtml(disqusArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
    }

    const generateHtml = array => {
      let result = ''

-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'

-        if (!{theme.newest_comments.avatar}) {
-          result += `<a href='${array[i].url}' class='thumbnail'><img src='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+          
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
        }
-        
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
      }

      let $dom = document.querySelector('#card-newest-comments .aside-list')
      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
      window.pjax && window.pjax.refresh($dom)
    }

@@ -61,7 +69,7 @@ script.
        if (data) {
          generateHtml(JSON.parse(data))
        } else {
-          getDisqusComment()
+          getComment()
        }
      }
    }
--- a/layout/includes/third-party/newest-comments/github-issues.pug
+++ b/layout/includes/third-party/newest-comments/github-issues.pug
@@ -3,9 +3,10 @@ script.
    const changeContent = (content) => {
      if (content === '') return content

+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
      content = content.replace(/<[^>]+>/g,"") // remove html tag
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url

      if (content.length > 150) {
        content = content.substring(0,150) + '...'
@@ -13,44 +14,80 @@ script.
      return content
    }

-    const getGithubIssues = () => {
-      let githubArray = []
-      $.getJSON('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1', (data) => { 
-        $.each(data, (index, item) => {
-          githubArray.push({
-            'avatar': item.user.avatar_url,
-            'content': changeContent(item.body),
-            'nick': item.user.login,
-            'url': item.html_url,
-            'date': item.updated_at
-          })
+    const findTrueUrl = (array) => {
+      let url = ''
+      Promise.all(array.map(item =>
+        fetch(item.url).then(resp => resp.json()).then(data => {
+          if (data.user.login === 'utterances-bot') {
+            url = data.body.match(/https?\:\/\/[^\" ]+/ig).slice(-1)
+            return url[0]
+          } else {
+            url = data.body.match(/https?\:\/\/[^\" ]+/i)
+            return url[0]
+          }
        })
-        saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
-        generateHtml(githubArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+      )).then(res => {
+          array = array.map((i,index)=> {
+            return {
+              ...i,
+              url: res[index]
+            }
+          })
+
+          saveToLocal.set('github-newest-comments', JSON.stringify(array), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(array)
+      });
+    }
+
+    const getComment = () => {
+      fetch('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1',{
+        "headers": {
+          Accept: 'application/vnd.github.v3.html+json'
+        }
      })
+        .then(response => response.json())
+        .then(data => {
+          const githubArray = data.map(item => {
+            return {
+              'avatar': item.user.avatar_url,
+              'content': changeContent(item.body_html),
+              'nick': item.user.login,
+              'url': item.issue_url,
+              'date': item.updated_at,
+              'githubUrl': item.html_url
+            }
+          })
+          findTrueUrl(githubArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
    }

    const generateHtml = array => {
      let result = ''

-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'

-        if (!{theme.newest_comments.avatar}) {
-          result += `<a href='${array[i].url}' class="thumbnail"><img src='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
        }
-
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
      }

      let $dom = document.querySelector('#card-newest-comments .aside-list')
      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
      window.pjax && window.pjax.refresh($dom)
    }

@@ -60,7 +97,7 @@ script.
        if (data) {
          generateHtml(JSON.parse(data))
        } else {
-          getGithubIssues()
+          getComment()
        }
      }
    }
--- a/layout/includes/third-party/newest-comments/index.pug
+++ b/layout/includes/third-party/newest-comments/index.pug
@@ -1,6 +1,12 @@
-if theme.newest_comments.leancloud.enable
-  include ./leancloud.pug
-else if theme.newest_comments.github_issues.enable
+- let config = theme.newest_comments
+
+if config.valine
+  include ./valine.pug
+else if config.waline
+  include ./waline.pug
+else if config.github_issues.enable
  include ./github-issues.pug
-else if theme.newest_comments.disqus.enable
+else if config.disqus.enable
  include ./disqus-comment.pug
+else if config.twikoo
+  include ./twikoo-comment.pug
--- a/layout/includes/third-party/newest-comments/leancloud.pug
+++ b/layout/includes/third-party/newest-comments/leancloud.pug
@@ -1,99 +0,0 @@
-script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
-script.
-  window.addEventListener('load', () => {
-    const changeContent = (content) => {
-      if (content === '') return content
-
-      content = content.replace(/<[^>]+>/g,"") // remove html tag
-      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
-      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
-
-      if (content.length > 150) {
-        content = content.substring(0,150) + '...'
-      }
-      return content
-    }
-
-    const getIcon = (icon, mail) => {
-      if (icon) return icon 
-      let defaultIcon = '!{ theme.newest_comments.leancloud.default_avatar ? `?d=${theme.newest_comments.leancloud.default_avatar}` : ''}'
-      let iconUrl = `https://gravatar.loli.net/avatar/${md5(mail.toLowerCase()) + defaultIcon}`
-      return iconUrl
-    }
-
-    const generateHtml = array => {
-      let result = ''
-
-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
-
-        if (!{theme.newest_comments.avatar}) {
-          result += `<a href='${array[i].url}' class="thumbnail"><img src='${getIcon(array[i].avatar, array[i].mail)}' alt='${array[i].nick}'></a>`
-        }
-
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
-      }
-
-      let $dom = document.querySelector('#card-newest-comments .aside-list')
-      $dom.innerHTML= result
-      window.pjax && window.pjax.refresh($dom)
-    }
-
-    const getValineData = () => {
-        let serverURL = ''
-        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
-          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
-        } else {
-          serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com'
-        }
-
-      var settings = {
-        "url": `${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,
-        "method": "GET",
-        "timeout": 0,
-        "headers": {
-          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
-          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
-          "Content-Type": "application/json"
-        },
-      }
-
-      $.ajax(settings).done((response) => {
-        var valineArray = []
-        response.results.forEach((e)=>{
-          valineArray.push({
-            'avatar': e.QQAvatar,
-            'content': changeContent(e.comment),
-            'mail': e.mail,
-            'nick': e.nick,
-            'url': e.url,
-            'date': e.createdAt,
-          })
-        })
-        
-        saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
-        generateHtml(valineArray)
-
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('leancloud-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          getValineData()
-        }
-      }
-    }
-
-    newestCommentInit()
-    document.addEventListener('pjax:complete', newestCommentInit)
-  })
--- a/layout/includes/third-party/newest-comments/twikoo-comment.pug
+++ b/layout/includes/third-party/newest-comments/twikoo-comment.pug
@@ -0,0 +1,93 @@
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getComment = () => {
+      const runTwikoo = () => {
+        twikoo.getRecentComments({
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
+          pageSize: !{theme.newest_comments.limit},
+          includeReply: true
+        }).then(function (res) {
+          const twikooArray = res.map(e => {
+            return {
+              'content': changeContent(e.comment),
+              'avatar': e.avatar,
+              'nick': e.nick,
+              'url': e.url + '#' + e.id,
+              'date': new Date(e.created).toISOString()
+            }
+          })
+
+          saveToLocal.set('twikoo-newest-comments', JSON.stringify(twikooArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(twikooArray)
+        }).catch(function (err) {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
+      }
+
+      if (typeof twikoo === 'object') {
+        runTwikoo()
+      } else {
+        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+      }
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+          
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('twikoo-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+
--- a/layout/includes/third-party/newest-comments/valine.pug
+++ b/layout/includes/third-party/newest-comments/valine.pug
@@ -0,0 +1,99 @@
+- let default_avatar = theme.valine.avatar
+
+script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getIcon = (icon, mail) => {
+      if (icon) return icon
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
+      let iconUrl = `https://gravatar.loli.net/avatar/${md5(mail.toLowerCase()) + defaultIcon}`
+      return iconUrl
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getComment = () => {
+      const serverURL = '!{theme.valine.serverURLs || `https://${theme.valine.appId.substring(0,8)}.api.lncldglobal.com` }'
+
+      var settings = {
+        "method": "GET",
+        "headers": {
+          "X-LC-Id": '!{theme.valine.appId}',
+          "X-LC-Key": '!{theme.valine.appKey}',
+          "Content-Type": "application/json"
+        },
+      }
+
+      fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,settings)
+        .then(response => response.json())
+        .then(data => {
+          const valineArray = data.results.map(function (e) {
+            return {
+              'avatar': getIcon(e.QQAvatar, e.mail),
+              'content': changeContent(e.comment),
+              'nick': e.nick,
+              'url': e.url + '#' + e.objectId,
+              'date': e.updatedAt,
+            }
+          })
+          saveToLocal.set('valine-newest-comments', JSON.stringify(valineArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(valineArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('valine-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
--- a/layout/includes/third-party/newest-comments/waline.pug
+++ b/layout/includes/third-party/newest-comments/waline.pug
@@ -0,0 +1,94 @@
+- let default_avatar = theme.waline.avatar
+
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getIcon = (avatar,mail) => {
+      if (avatar) return avatar
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
+      let iconUrl = `https://gravatar.loli.net/avatar/${mail + defaultIcon}`
+      return iconUrl
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getComment = () => {
+      const loadWaline = () => {
+        Waline.Widget.RecentComments({
+          el: '#card-newest-comments .aside-list',
+          serverURL: '!{theme.waline.serverURL}',
+          count: !{theme.newest_comments.limit}
+        }).then(comments => {
+          const walineArray = comments.map(function (e) {
+            return {
+              'content': changeContent(e.comment),
+              'avatar': getIcon(e.QQAvatar,e.mail),
+              'nick': e.nick,
+              'url': e.url + '#' + e.objectId,
+              'date': e.updatedAt,
+            }
+          })
+          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(walineArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
+      }
+
+      if (typeof Waline === 'function') loadWaline() 
+      else getScript('!{url_for(theme.CDN.waline)}').then(loadWaline)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('waline-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
--- a/layout/includes/third-party/pangu.pug
+++ b/layout/includes/third-party/pangu.pug
@@ -1,10 +1,11 @@
 script.
  function panguFn () {
-    if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
+    if (typeof pangu === 'object') pangu.autoSpacingPage()
    else {
-      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
-        pangu.spacingElementById('content-inner')
-      })
+      getScript('!{url_for(theme.CDN.pangu)}')
+        .then(() => {
+          pangu.autoSpacingPage()
+        })
    }
  }

@@ -16,4 +17,4 @@ script.
    }
  }

-  document.addEventListener('DOMContentLoaded', panguFn)
+  document.addEventListener('DOMContentLoaded', panguInit)
--- a/layout/includes/third-party/pjax.pug
+++ b/layout/includes/third-party/pjax.pug
@@ -7,7 +7,7 @@ script(src=url_for(theme.CDN.pjax))
 script.
  let pjaxSelectors = [
    'title',
-    '#config_change',
+    '#config-diff',
    '#body-wrap',
    '#rightside-config-hide',
    '#rightside-config-show',
@@ -29,8 +29,12 @@ script.
  document.addEventListener('pjax:complete', function () {
    window.refreshFn()

-    $('script[data-pjax]').each(function () {
-      $(this).parent().append($(this).remove())
+    document.querySelectorAll('script[data-pjax]').forEach(item => {
+      const newScript = document.createElement('script')
+      const content = item.text || item.textContent || item.innerHTML || ""
+      Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
+      newScript.appendChild(document.createTextNode(content))
+      item.parentNode.replaceChild(newScript, item)
    })

    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
@@ -38,9 +42,11 @@ script.
    typeof chatBtnFn === 'function' && chatBtnFn()
    typeof panguInit === 'function' && panguInit()

-    if (typeof gtag === 'function') {
-      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
-    }
+    // google analytics
+    typeof gtag === 'function' && gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
+
+    // baidu analytics
+    typeof _hmt === 'object' && _hmt.push(['_trackPageview',window.location.pathname]);

    typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()

@@ -69,10 +75,14 @@ script.

    typeof typed === 'object' && typed.destroy()

-    $(window).off('scroll')
-
    //reset readmode
-    $('body').hasClass('read-mode') && $('body').removeClass('read-mode')
+    const $bodyClassList = document.body.classList
+    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')

  })

+  document.addEventListener('pjax:error', (e) => {
+    if (e.request.status === 404) {
+      pjax.loadUrl('/404.html')
+    }
+  })
--- a/layout/includes/third-party/search/local-search.pug
+++ b/layout/includes/third-party/search/local-search.pug
@@ -7,18 +7,6 @@
          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
    hr
    #local-search-results
-      #local-hits
-      #local-stats
-        #hr.local-search-stats__hr
-          case config.language
-            when "zh-CN"
-              span=_p("local_search.by")
-              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-              |  #[span=_p("local_search.powered")]
-            when "en"
-            default
-              span=_p("local_search.powered_by")
-              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
    span.search-close-button
      i.fas.fa-times
  #search-mask
--- a/layout/includes/third-party/share/index.pug
+++ b/layout/includes/third-party/share/index.pug
@@ -1,7 +1,7 @@
 .post_share
  if theme.addThis.enable
-    !=partial('includes/third-party/share/add-this', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/share/add-this', {}, {cache: true})
  else if theme.sharejs.enable
    include ./share-js.pug
  else if theme.addtoany.enable
-    !=partial('includes/third-party/share/addtoany', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/share/addtoany', {}, {cache: true})
--- a/layout/includes/third-party/share/share-js.pug
+++ b/layout/includes/third-party/share/share-js.pug
@@ -1,3 +1,3 @@
 .social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites)
-link(rel="stylesheet" href=url_for(theme.CDN.sharejs_css))
+link(rel='stylesheet' href=url_for(theme.CDN.sharejs_css) media="print" onload="this.media='all'")
 script(src=url_for(theme.CDN.sharejs) defer)
--- a/layout/includes/third-party/subtitle.pug
+++ b/layout/includes/third-party/subtitle.pug
@@ -1,28 +1,34 @@
- var source = theme.subtitle.source
+- let source = theme.subtitle.source
+
 case source
  when 1
    script.
      function subtitleType () {
-        $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
-          if (!{theme.subtitle.effect}) {
-            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var both = sub.unshift(data.text)
-            typed = new Typed('#subtitle', {
-              strings: sub,
-              startDelay: 300,
-              typeSpeed: 150,
-              loop: !{theme.subtitle.loop},
-              backSpeed: 50,
-            })
-          } else {
-            document.getElementById('subtitle').innerHTML = data.text
-          }
-        })
+        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json')
+          .then(response => response.json())
+          .then(data => {
+            if (!{theme.subtitle.effect}) {
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var both = sub.unshift(data.text)
+              typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.text
+            }
+          })
      }

      if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
      } else {
        subtitleType()
      }
@@ -30,27 +36,32 @@ case source
  when 2
    script.
      function subtitleType () {
-        $.getJSON('https://v1.hitokoto.cn', function (data) {
-          if (!{theme.subtitle.effect}) {
-            var from = '出自 ' + data.from
-            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var both = sub.unshift(data.hitokoto, from)
-            var typed = new Typed('#subtitle', {
-              strings: sub,
-              startDelay: 300,
-              typeSpeed: 150,
-              loop: !{theme.subtitle.loop},
-              backSpeed: 50,
-            })
-          } else {
-            document.getElementById('subtitle').innerHTML = data.hitokoto
-          }
-        })
+        fetch('https://v1.hitokoto.cn')
+          .then(response => response.json())
+          .then(data => {
+            if (!{theme.subtitle.effect}) {
+              var from = '出自 ' + data.from
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var both = sub.unshift(data.hitokoto, from)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.hitokoto
+            }
+          })
      }

      if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
      } else {
        subtitleType()
      }
@@ -58,7 +69,7 @@ case source
  when 3
    script.
      function subtitleType () {
-        $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
+        getScript('https://yijuzhan.com/api/word.php?m=js').then(() => {
          var con = str[0]
          if (!{theme.subtitle.effect}) {
            var from = '出自 ' + str[1]
@@ -78,8 +89,11 @@ case source
      }

      if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
      } else {
        subtitleType()
      }
@@ -87,7 +101,7 @@ case source
  when 4
    script.
      function subtitleType () {
-        $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+        getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => {
          jinrishici.load(function (result) {
            if (!{theme.subtitle.effect}) {
              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
@@ -108,8 +122,11 @@ case source
      }

      if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
      } else {
        subtitleType()
      }
@@ -131,8 +148,11 @@ case source
      }

      if (!{theme.subtitle.effect}) {
-        if (typeof Typed === 'function') subtitleType()
-        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
      } else {
        subtitleType()
      }
--- a/layout/includes/widget/card_ad.pug
+++ b/layout/includes/widget/card_ad.pug
@@ -1,2 +1,3 @@
-.card-widget.card-ad
-  != theme.ad.aside
+if theme.ad && theme.ad.aside
+  .card-widget.ads-wrap
+    != theme.ad.aside
--- a/layout/includes/widget/card_announcement.pug
+++ b/layout/includes/widget/card_announcement.pug
@@ -1,5 +1,5 @@
-.card-widget.card-announcement
-  .card-content
+if theme.aside.card_announcement.enable
+  .card-widget.card-announcement
    .item-headline
      i.fas.fa-bullhorn.card-announcement-animation
      span= _p('aside.card_announcement')
--- a/layout/includes/widget/card_archives.pug
+++ b/layout/includes/widget/card_archives.pug
@@ -1,9 +1,5 @@
-.card-widget.card-archives
-  .card-content
-    .item-headline
-      i.fas.fa-archive
-      span= _p('aside.card_archives')
-    
+if theme.aside.card_archives.enable
+  .card-widget.card-archives
    - let type = theme.aside.card_archives.type || 'monthly'
    - let format = theme.aside.card_archives.format || 'MMMM YYYY'
    - let order = theme.aside.card_archives.order || -1
--- a/layout/includes/widget/card_author.pug
+++ b/layout/includes/widget/card_author.pug
@@ -1,5 +1,5 @@
-.card-widget.card-info
-  .card-content
+if theme.aside.card_author.enable
+  .card-widget.card-info
    .card-info-avatar.is-center
      if theme.lazyload.enable
        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
@@ -27,9 +27,10 @@
            .headline= _p('aside.categories') 
            .length-num= site.categories.length

-    a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
-      i(class=theme.aside.card_author.button.icon)
-      span=theme.aside.card_author.button.text
+    if theme.aside.card_author.button.enable
+      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+        i(class=theme.aside.card_author.button.icon)
+        span=theme.aside.card_author.button.text
  
    if(theme.social)
        .card-info-social-icons.is-center
--- a/layout/includes/widget/card_categories.pug
+++ b/layout/includes/widget/card_categories.pug
@@ -1,9 +1,4 @@
-if site.categories.length
-  .card-widget.card-categories
-      .card-content
-        .item-headline
-          i.fas.fa-folder-open
-          span= _p('aside.card_categories')
-        !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })
-
-  
+if theme.aside.card_categories.enable
+  if site.categories.length
+    .card-widget.card-categories
+      !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })
--- a/layout/includes/widget/card_newest_comment.pug
+++ b/layout/includes/widget/card_newest_comment.pug
@@ -1,5 +1,5 @@
-.card-widget#card-newest-comments
-  .card-content
+if theme.newest_comments.enable
+  .card-widget#card-newest-comments
    .item-headline
      i.fas.fa-bolt
      span= _p('aside.card_newest_comments.headline')
--- a/layout/includes/widget/card_post_toc.pug
+++ b/layout/includes/widget/card_post_toc.pug
@@ -1,13 +1,12 @@
 - let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number

 #card-toc.card-widget
-  .card-content
-    .item-headline
-      i.fas.fa-stream
-      span= _p('aside.card_toc')
+  .item-headline
+    i.fas.fa-stream
+    span= _p('aside.card_toc')

-    if (page.encrypt == true)
-      .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
-    else 
-      .toc-content!=toc(page.content, {list_number: tocNumber})
+  if (page.encrypt == true)
+    .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
+  else 
+    .toc-content!=toc(page.content, {list_number: tocNumber})
      
--- a/layout/includes/widget/card_recent_post.pug
+++ b/layout/includes/widget/card_recent_post.pug
@@ -1,5 +1,5 @@
-.card-widget.card-recent-post
-  .card-content
+if theme.aside.card_recent_post.enable
+  .card-widget.card-recent-post
    .item-headline
      i.fas.fa-history
      span= _p('aside.card_recent_post')
--- a/layout/includes/widget/card_self.pug
+++ b/layout/includes/widget/card_self.pug
@@ -0,0 +1,9 @@
+if site.data.widget
+  each item in site.data.widget
+    .card-widget(class=item.class_name id=item.id_name style=item.order ? `order: ${item.order}` : '')
+      .item-headline
+        i(class=item.icon)
+        span=item.name
+      .item-content
+        !=item.html
+
--- a/layout/includes/widget/card_tags.pug
+++ b/layout/includes/widget/card_tags.pug
@@ -1,12 +1,12 @@
-if site.tags.length
-  .card-widget.card-tags
-    .card-content
+if theme.aside.card_tags.enable
+  if site.tags.length
+    .card-widget.card-tags
      .item-headline
        i.fas.fa-tags
        span= _p('aside.card_tags')

      - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
      if theme.aside.card_tags.color
-        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
+        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.15, maxfontsize: 1.45, limit: tagLimit, unit: 'em'})
      else
        .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})
--- a/layout/includes/widget/card_webinfo.pug
+++ b/layout/includes/widget/card_webinfo.pug
@@ -1,5 +1,5 @@
-.card-widget.card-webinfo
-  .card-content
+if theme.aside.card_webinfo.enable
+  .card-widget.card-webinfo
    .item-headline
      i.fas.fa-chart-line
      span= _p('aside.card_webinfo.headline')
--- a/layout/includes/widget/index.pug
+++ b/layout/includes/widget/index.pug
@@ -1,28 +1,27 @@
-#aside_content.aside_content
-  if theme.aside.card_author.enable
-    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
-  if theme.aside.card_announcement.enable
-    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
-  .sticky_layout
-    if is_post()
-      if showToc
+#aside-content.aside-content
+  //- post
+  if is_post()
+    if showToc && theme.toc.style_simple
+      .sticky_layout
        include ./card_post_toc.pug
-      if theme.aside.card_recent_post.enable
-        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      if theme.ad && theme.ad.aside
-        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
    else
-      if theme.aside.card_recent_post.enable
-        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      if theme.ad && theme.ad.aside
-        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-      if theme.newest_comments.enable
-        !=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_categories.enable
-        !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_tags.enable
-        !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_archives.enable
-        !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_webinfo.enable
-        !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_author', {}, {cache: true})
+      !=partial('includes/widget/card_announcement', {}, {cache: true})
+      .sticky_layout
+        if showToc
+          include ./card_post_toc.pug
+        !=partial('includes/widget/card_recent_post', {}, {cache: true})
+        !=partial('includes/widget/card_ad', {}, {cache: true})
+  else
+    //- page
+    !=partial('includes/widget/card_author', {}, {cache: true})
+    !=partial('includes/widget/card_announcement', {}, {cache: true})
+    .sticky_layout
+      !=partial('includes/widget/card_recent_post', {}, {cache: true})
+      !=partial('includes/widget/card_ad', {}, {cache: true})
+      !=partial('includes/widget/card_newest_comment', {}, {cache: true})
+      !=partial('includes/widget/card_categories', {}, {cache: true})
+      !=partial('includes/widget/card_tags', {}, {cache: true})
+      !=partial('includes/widget/card_archives', {}, {cache: true})
+      !=partial('includes/widget/card_webinfo', {}, {cache: true})
+      !=partial('includes/widget/card_self', {}, {cache: true})
--- a/layout/page.pug
+++ b/layout/page.pug
@@ -9,11 +9,9 @@ block content
        include includes/page/flink.pug
      when 'categories'
        include includes/page/categories.pug
-      when 'artitalk'
-        include includes/page/artitalk.pug
      default
        include includes/page/default-page.pug

    if page.comments !== false && theme.comments && theme.comments.use
      - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})
--- a/layout/post.pug
+++ b/layout/post.pug
@@ -15,17 +15,18 @@ block content
      include includes/third-party/share/index.pug
        
    if theme.reward.enable
-      !=partial('includes/post/reward', {}, {cache:theme.fragment_cache})
+      !=partial('includes/post/reward', {}, {cache: true})

    //- ad
    if theme.ad && theme.ad.post
-      .post-ad!=theme.ad.post
+      .ads-wrap!=theme.ad.post

-    include includes/pagination.pug
+    if theme.post_pagination
+      include includes/pagination.pug
    if theme.related_post && theme.related_post.enable
      != related_posts(page,site.posts)

    if page.comments !== false && theme.comments && theme.comments.use
      - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})
      
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hexo-theme-butterfly",
-  "version": "3.3.0",
+  "version": "3.7.0",
  "description": "A Simple and Card UI Design theme for Hexo",
  "main": "package.json",
  "scripts": {
@@ -20,13 +20,13 @@
  },
  "bugs": {
    "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues",
-    "email": "wong@jerryc.me"
+    "email": "btf@immyw.com"
  },
  "dependencies": {
    "hexo-renderer-stylus": "^2.0.1",
    "hexo-renderer-pug": "^1.0.0"
  },
-  "homepage": "https://demo.jerryc.me/",
-  "author": "Jerry <wong@jerryc.me>",
+  "homepage": "https://butterfly.js.org/",
+  "author": "Jerry <btf@immyw.com>",
  "license": "Apache-2.0"
 }
--- a/scripts/filters/random_cover.js
+++ b/scripts/filters/random_cover.js
@@ -39,7 +39,7 @@ function randomCover () {
      return cover
    }
  } else {
-    cover = 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/img/default.jpg'
+    cover = theme.default_top_img || 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/img/default.jpg'
    return cover
  }
 }
--- a/scripts/helpers/aside_archives.js
+++ b/scripts/helpers/aside_archives.js
@@ -19,7 +19,6 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
    ? (yearA, monthA, yearB, monthB) => yearA === yearB && monthA === monthB
    : (yearA, monthA, yearB, monthB) => yearA === yearB
  const limit = options.limit
-  const moreButton = this._p('aside.more_button')
  let result = ''

  if (!format) {
@@ -67,11 +66,18 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
    return this.url_for(url)
  }

-  result += '<ul class="card-archive-list">'
-
  const len = data.length
  const Judge = limit === 0 ? len : Math.min(len, limit)

+  result += `<div class="item-headline"><i class="fas fa-archive"></i><span>${this._p('aside.card_archives')}</span>`
+
+  if (len > Judge) {
+    result += `<a class="card-more-btn" href="${this.url_for(archiveDir)}/" title="${this._p('aside.more_button')}">
+    <i class="fas fa-angle-right"></i></a>`
+  }
+
+  result += '</div><ul class="card-archive-list">'
+
  for (let i = 0; i < Judge; i++) {
    const item = data[i]

@@ -89,11 +95,6 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
    result += '</li>'
  }

-  if (len > Judge) {
-    result += '<li class="card-archive-list-item more is-center">'
-    result += `<a class="card-archive-list-link-more" href="${this.url_for(archiveDir)}/">
-              <span>${moreButton}</span><i class="fas fa-angle-right"  ></i></a></li>`
-  }
  result += '</ul>'
  return result
 })
--- a/scripts/helpers/aside_categories.js
+++ b/scripts/helpers/aside_categories.js
@@ -25,7 +25,6 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
  const limit = options.limit === 0 ? categories.length : options.limit
  const isExpand = options.expand !== 'none'
  const expandClass = isExpand && options.expand === true ? 'expand' : ''
-
  const buttonLabel = this._p('aside.more_button')
  const prepareQuery = (parent) => {
    const query = {}
@@ -65,11 +64,11 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {

          result += '</a>'

-          result += '</li>'
-
          if (child) {
            result += `<ul class="card-category-list child">${child}</ul>`
          }
+
+          result += '</li>'
        }
      })
    }
@@ -80,17 +79,19 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
  const list = hierarchicalList(limit, 0)

  const moreButton = function () {
-    let moreHtml = ''
    if (categories.length <= limit) return ''
-    moreHtml += '<li class="card-category-list-item more is-center">'
-    moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}/">
-                <span>${buttonLabel}</span><i class="fas fa-angle-right"></i></a></li>`
+    const moreHtml = `<a class="card-more-btn" href="${categoryDir}/" title="${buttonLabel}">
+    <i class="fas fa-angle-right"></i></a>`

    return moreHtml
  }

-  return `<ul class="card-category-list" id="aside-cat-list">
-            ${list[0]}
+  return `<div class="item-headline">
+            <i class="fas fa-folder-open"></i>
+            <span>${this._p('aside.card_categories')}</span>
            ${moreButton()}
+            </div>
+            <ul class="card-category-list" id="aside-cat-list">
+            ${list[0]}
            </ul>`
 })
--- a/scripts/helpers/inject_head_js.js
+++ b/scripts/helpers/inject_head_js.js
@@ -0,0 +1,145 @@
+/**
+ * Butterfly
+ * inject js to head
+ */
+
+'use strict'
+
+hexo.extend.helper.register('inject_head_js', function () {
+  const { darkmode, aside, change_font_size } = this.theme
+
+  const localStore = `
+    win.saveToLocal = {
+      set: function setWithExpiry(key, value, ttl) {
+        if (ttl === 0) return
+        const now = new Date()
+        const expiryDay = ttl * 86400000
+        const item = {
+          value: value,
+          expiry: now.getTime() + expiryDay,
+        }
+        localStorage.setItem(key, JSON.stringify(item))
+      },
+
+      get: function getWithExpiry(key) {
+        const itemStr = localStorage.getItem(key)
+
+        if (!itemStr) {
+          return undefined
+        }
+        const item = JSON.parse(itemStr)
+        const now = new Date()
+
+        if (now.getTime() > item.expiry) {
+          localStorage.removeItem(key)
+          return undefined
+        }
+        return item.value
+      }
+    }
+  `
+
+  // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
+  const getScript = `
+    win.getScript = url => new Promise((resolve, reject) => {
+      const script = document.createElement('script')
+      script.src = url
+      script.async = true
+      script.onerror = reject
+      script.onload = script.onreadystatechange = function() {
+        const loadState = this.readyState
+        if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+        script.onload = script.onreadystatechange = null
+        resolve()
+      }
+      document.head.appendChild(script)
+    })
+  `
+
+  let darkmodeJs = ''
+  if (darkmode.enable) {
+    darkmodeJs = `
+      win.activateDarkMode = function () {
+        document.documentElement.setAttribute('data-theme', 'dark')
+        if (document.querySelector('meta[name="theme-color"]') !== null) {
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
+        }
+      }
+      win.activateLightMode = function () {
+        document.documentElement.setAttribute('data-theme', 'light')
+        if (document.querySelector('meta[name="theme-color"]') !== null) {
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
+        }
+      }
+      const t = saveToLocal.get('theme')
+    `
+
+    const autoChangeMode = darkmode.autoChangeMode
+
+    if (autoChangeMode === 1) {
+      darkmodeJs += `
+          const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
+          const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
+          const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
+          const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
+
+          if (t === undefined) {
+            if (isLightMode) activateLightMode()
+            else if (isDarkMode) activateDarkMode()
+            else if (isNotSpecified || hasNoSupport) {
+              const now = new Date()
+              const hour = now.getHours()
+              const isNight = hour <= 6 || hour >= 18
+              isNight ? activateDarkMode() : activateLightMode()
+            }
+            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+              if (saveToLocal.get('theme') === undefined) {
+                e.matches ? activateDarkMode() : activateLightMode()
+              }
+            })
+          } else if (t === 'light') activateLightMode()
+          else activateDarkMode()
+        `
+    } else if (autoChangeMode === 2) {
+      darkmodeJs += `
+          const now = new Date()
+          const hour = now.getHours()
+          const isNight = hour <= 6 || hour >= 18
+          if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
+          else if (t === 'light') activateLightMode()
+          else activateDarkMode()
+        `
+    } else {
+      darkmodeJs += `
+          if (t === 'dark') activateDarkMode()
+          else if (t === 'light') activateLightMode()
+        `
+    }
+  }
+
+  let asideStatus = ''
+  if (aside.enable && aside.button) {
+    asideStatus = `
+      const asideStatus = saveToLocal.get('aside-status')
+      if (asideStatus !== undefined) {
+        if (asideStatus === 'hide') {
+          document.documentElement.classList.add('hide-aside')
+        } else {
+          document.documentElement.classList.remove('hide-aside')
+        }
+      }
+    `
+  }
+
+  let changFontAside = ''
+  if (change_font_size) {
+    changFontAside = `
+    const fontSizeVal = saveToLocal.get('global-font-size')
+    if (fontSizeVal !== undefined) {
+      document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
+    }
+    `
+  }
+
+  return `<script>(win=>{${localStore + getScript + darkmodeJs + asideStatus + changFontAside}})(window)</script>`
+})
--- a/scripts/helpers/page.js
+++ b/scripts/helpers/page.js
@@ -15,7 +15,7 @@ hexo.extend.helper.register('page_description', function () {
  let description = page.description || page.content || page.title || config.description

  if (description) {
-    description = escapeHTML(stripHTML(description).substring(0, 200)
+    description = escapeHTML(stripHTML(description).substring(0, 150)
      .trim()
    ).replace(/\n/g, ' ')
    return description
@@ -54,8 +54,8 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
  return result
 })

-hexo.extend.helper.register('urlNoIndex', function () {
-  return prettyUrls(this.url, { trailing_index: false, trailing_html: false })
+hexo.extend.helper.register('urlNoIndex', function (url = null) {
+  return prettyUrls(url || this.url, { trailing_index: false, trailing_html: false })
 })

 hexo.extend.helper.register('md5', function (path) {
--- a/scripts/tag/gallery.js
+++ b/scripts/tag/gallery.js
@@ -20,7 +20,7 @@ function galleryGroup (args) {

  return `
  <figure class="gallery-group">
-  <img class="gallery-group-img" src='${img}'>
+  <img class="gallery-group-img" src='${img}' alt="Group Image Gallery">
  <figcaption>
  <div class="gallery-group-name">${name}</div>
  <p>${desrc}</p>
--- a/scripts/tag/hide.js
+++ b/scripts/tag/hide.js
@@ -44,7 +44,7 @@ function hideBlock (args, content) {
  group += '"'

  return `<div class="hide-block"><button type="button" class="hide-button button--animated" ${group}>${display}
-    </button><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</span></div>`
+    </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }

 function hideToggle (args, content) {
--- a/scripts/tag/inlineImg.js
+++ b/scripts/tag/inlineImg.js
@@ -0,0 +1,17 @@
+/**
+ * inlineImg 圖片
+ * {% inlineImg src height %}
+ */
+
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+function inlineImg (args) {
+  const img = args[0]
+  const height = args[1] ? `style="height:${args[1]}"` : ''
+
+  return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
+}
+
+hexo.extend.tag.register('inlineImg', inlineImg, { ends: false })
--- a/scripts/tag/tabs.js
+++ b/scripts/tag/tabs.js
@@ -44,7 +44,7 @@ function postTabs (args, content) {
    const icon = tabIcon.trim()
    tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)

-    const toTop = '<button type="button" class="tab-to-top"><i class="fas fa-arrow-up"></i></button>'
+    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button>'

    const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
    tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
--- a/source/css/_global/function.styl
+++ b/source/css/_global/function.styl
@@ -37,6 +37,10 @@ maxWidth900()
  @media screen and (max-width: 900px)
    {block}

+minWidth901()
+  @media screen and (min-width: 901px)
+    {block}
+
 minWidth900()
  @media screen and (min-width: 900px)
    {block}
@@ -49,7 +53,7 @@ minWidth2000()
 if hexo-config('enter_transitions')
  #content-inner,
  #footer
-    animation: main 1s
+    animation: bottom-top 1s

  #page-header
    animation: header-effect 1s
@@ -117,14 +121,14 @@ if hexo-config('avatar.effect') == true
  100%
    transform: translateY(0)

-@keyframes main
+@keyframes bottom-top
  0%
    opacity: 0
-    transform: translateY(50px)
+    margin-top: 50px

  100%
    opacity: 1
-    transform: translateY(0)
+    margin-top: 0

@keyframes titlescale
  0%
@@ -151,6 +155,13 @@ if hexo-config('avatar.effect') == true
  100%
    opacity: 1

+@keyframes to_hide
+  0%
+    opacity: 1
+
+  100%
+    opacity: 0
+
@keyframes ribbon_to_show
  0%
    opacity: 0
--- a/source/css/_global/index.styl
+++ b/source/css/_global/index.styl
@@ -1,4 +1,5 @@
-[data-theme='light']
+:root
+  --global-font-size: $font-size
  --global-bg: $body-bg
  --font-color: $font-black
  --hr-border: lighten($theme-hr-color, 50%)
@@ -26,6 +27,8 @@
  --blockquote-bg: $blockquote-background-color
  --reward-pop: $reward-pop-up-bg
  --toc-link-color: $toc-link-color
+  --card-box-shadow: 0 3px 8px 6px rgba(7, 17, 27, .06)
+  --card-hover-box-shadow: 0 3px 8px 6px rgba(7, 17, 27, .15)

 html
  height: 100%
@@ -36,7 +39,7 @@ body
  min-height: 100%
  background: var(--global-bg)
  color: var(--font-color)
-  font-size: $font-size
+  font-size: var(--global-font-size)
  font-family: $font-family
  line-height: $text-line-height
  -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
@@ -57,16 +60,17 @@ body
 input::placeholder
  color: var(--font-color)

-#web_bg
-  position: fixed
-  z-index: -999
-  width: 100%
-  height: 100%
-  background: $web-bg
-  background-attachment: local
-  background-position: center
-  background-size: cover
-  background-repeat: no-repeat
+if $web-bg
+  #web_bg
+    position: fixed
+    z-index: -999
+    width: 100%
+    height: 100%
+    background: $web-bg
+    background-attachment: local
+    background-position: center
+    background-size: cover
+    background-repeat: no-repeat

 h1,
 h2,
@@ -155,8 +159,8 @@ if $site-name-font
  #site-title,
  #site-subtitle,
  #site-name,
-  #aside_content .author-info__name,
-  #aside_content .author-info__description
+  #aside-content .author-info__name,
+  #aside-content .author-info__description
    font-family: $site-name-font

 .is-center
@@ -198,9 +202,9 @@ img
  max-width: 100%
  transition: all .2s

-img[src=''],
-img:not([src])
-  opacity: 0
+  &[src=''],
+  &:not([src])
+    opacity: 0

 .img-alt
  margin: -.5rem 0 .5rem
@@ -208,10 +212,3 @@ img:not([src])

  &:hover
    text-decoration: none !important
-
-.post-ad
-  margin: 2rem 0
-
-.ad-height
-  display: block !important
-  height: auto !important
--- a/source/css/_highlight/highlight.styl
+++ b/source/css/_highlight/highlight.styl
@@ -1,4 +1,3 @@
-// https://github.com/equinusocio/vsc-material-theme
 $highlight_theme = hexo-config('highlight_theme')
 $highlighEnable = hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
 $prismjsEnable = hexo-config('prismjs_settings') && hexo-config('prismjs_settings.enable')
@@ -6,6 +5,16 @@ wordWrap = !hexo-config('highlight_settings.line_number') && hexo-config('code_w

@require 'theme'

+:root
+  --hl-color: $highlight-foreground
+  --hl-bg: $highlight-background
+  --hltools-bg: $highlight-tools.bg-color
+  --hltools-color: $highlight-tools.color
+  --hlnumber-bg: $highlight-gutter.bg-color
+  --hlnumber-color: $highlight-gutter.color
+  --hlscrollbar-bg: $highlight-scrollbar
+  --hlexpand-bg: linear-gradient(180deg, rgba($highlight-background, .6), rgba($highlight-background, .9))
+
 if $highlighEnable
  @require 'highlight/index'

@@ -16,8 +25,8 @@ $code-block
  overflow: auto
  margin: 0 0 1rem
  padding: 0
-  background: $highlight-background
-  color: $highlight-foreground
+  background: var(--hl-bg)
+  color: var(--hl-color)
  line-height: $line-height-code-block

  if wordWrap
@@ -56,9 +65,6 @@ blockquote
    padding: .1rem .2rem
    background: $code-background
    color: $code-foreground
-    word-wrap: break-word
-    word-break: break-word
-    overflow-wrap: break-word

  pre
    @extend $code-block
@@ -67,7 +73,7 @@ blockquote
    code
      padding: 0
      background: none
-      color: $highlight-foreground
+      color: var(--hl-color)
      text-shadow: none

  figure.highlight
@@ -88,10 +94,10 @@ blockquote
      a
        float: right
        padding-right: 10px
-        color: $highlight-foreground
+        color: var(--hl-color)

        &:hover
-          border-bottom-color: $highlight-foreground
+          border-bottom-color: var(--hl-color)

  .highlight-tools
    position: relative
@@ -100,8 +106,8 @@ blockquote
    overflow: hidden
    min-height: 1.2rem
    height: 2.15em
-    background: $highlight-tools.bg-color
-    color: $highlight-tools.color
+    background: var(--hltools-bg)
+    color: var(--hltools-color)
    font-size: $code-font-size

    &.closed + table
@@ -132,6 +138,7 @@ blockquote
      position: absolute
      right: 1.7rem
      opacity: 0
+      transition: opacity .4s

    .copy-button
      position: absolute
@@ -184,3 +191,38 @@ blockquote

        .code-lang
          left: 3.8rem !important
+
+  if hexo-config('highlight_height_limit')
+    .code-expand-btn
+      position: absolute
+      bottom: 0
+      z-index: 10
+      width: 100%
+      background: var(--hlexpand-bg)
+      text-align: center
+      font-size: $code-font-size
+      cursor: pointer
+
+      i
+        padding: .3rem 0
+        color: var(--hlnumber-color)
+        animation: code-expand-key 1.2s infinite
+
+      &.expand-done
+        display: none !important
+
+      &:not(.expand-done)
+        & ~ table,
+        & ~ pre
+          overflow: hidden
+          height: unit(hexo-config('highlight_height_limit'), px)
+
+@keyframes code-expand-key
+  0%
+    opacity: .6
+
+  50%
+    opacity: .1
+
+  100%
+    opacity: .6
--- a/source/css/_highlight/highlight/diff.styl
+++ b/source/css/_highlight/highlight/diff.styl
@@ -1,7 +1,7 @@
 figure.highlight
  table
    &::-webkit-scrollbar-thumb
-      background: $highlight-scrollbar
+      background: var(--hlscrollbar-bg)

  pre .deletion
    color: $highlight-deletion
--- a/source/css/_highlight/highlight/index.styl
+++ b/source/css/_highlight/highlight/index.styl
@@ -9,7 +9,7 @@ if $highlight_theme != false
          display: inline-block
          padding: 0 .3rem 0 0
          min-width: 1.6rem
-          color: $highlight-gutter.color
+          color: var(--hlnumber-color)
          content: counter(line)
          counter-increment: line
          text-align: left
@@ -29,8 +29,8 @@ if $highlight_theme != false
    .gutter pre
      padding-right: .5rem
      padding-left: .5rem
-      background-color: $highlight-gutter.bg-color
-      color: $highlight-gutter.color
+      background-color: var(--hlnumber-bg)
+      color: var(--hlnumber-color)
      text-align: right

    .code pre
--- a/source/css/_highlight/prismjs/index.styl
+++ b/source/css/_highlight/prismjs/index.styl
@@ -7,7 +7,7 @@ if $highlight_theme != false
 #article-container
  pre[class*='language-']
    &::-webkit-scrollbar-thumb
-      background: $highlight-scrollbar
+      background: var(--hlscrollbar-bg)

    &:not(.line-numbers)
      padding: 10px 20px
--- a/source/css/_highlight/prismjs/line-number.styl
+++ b/source/css/_highlight/prismjs/line-number.styl
@@ -8,9 +8,16 @@

      > code
        position: relative
-        white-space: inherit
        line-height: $line-height-code-block

+        if hexo-config('code_word_wrap')
+          white-space: pre-wrap
+        else
+          white-space: inherit
+          word-wrap: normal
+          word-break: normal
+          overflow-wrap: normal
+
      .line-numbers-rows
        position: absolute
        top: 0
@@ -29,6 +36,6 @@
          &:before
            display: block
            padding-right: .8em
-            color: $highlight-gutter.color
+            color: var(--hlnumber-color)
            content: counter(linenumber)
            text-align: right
--- a/source/css/_layout/404.styl
+++ b/source/css/_layout/404.styl
@@ -18,7 +18,11 @@ if hexo-config('error_404.enable')
      height: 18rem
      border-radius: 8px
      background: var(--card-bg)
-      box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+      box-shadow: var(--card-box-shadow)
+      transition: all .3s
+
+      &:hover
+        box-shadow: var(--card-hover-box-shadow)

      +maxWidth768()
        flex-direction: column
@@ -45,6 +49,7 @@ if hexo-config('error_404.enable')
        padding: .5rem
        text-align: center
        font-size: 14px
+
        if $site-name-font
          font-family: $site-name-font

--- a/source/css/_layout/aside.styl
+++ b/source/css/_layout/aside.styl
@@ -1,4 +1,4 @@
-#aside_content
+#aside-content
  width: 25%

  +minWidth900()
@@ -10,10 +10,6 @@
  +maxWidth900()
    width: 100%

-  if hexo-config('aside.mobile') == false
-    +maxWidth768()
-      display: none
-
  > .card-widget:first-child
    margin-top: 0

@@ -24,13 +20,19 @@
    position: relative
    overflow: hidden
    margin-top: 1rem
+    padding: 1rem 1.2rem
    border-radius: 8px
    background: var(--card-bg)
-    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
-    transition: all .3s
+    box-shadow: var(--card-box-shadow)
+    transition: box-shadow .3s

    &:hover
-      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+      box-shadow: var(--card-hover-box-shadow)
+
+    if hexo-config('aside.mobile') == false
+      +maxWidth768()
+        &:not(#card-toc)
+          display: none

  .card-info
    img
@@ -52,7 +54,7 @@

    .card-info-data
      display: table
-      padding: .7rem 0
+      margin: .7rem 0 .2rem
      width: 100%
      table-layout: fixed

@@ -87,6 +89,7 @@

    #card-info-btn
      display: block
+      margin-top: .7rem
      background-color: var(--btn-bg)
      color: var(--btn-color)
      text-align: center
@@ -95,9 +98,6 @@
      span
        padding-left: .5rem

-  .card-content
-    padding: 1rem 1.2rem
-
  .item-headline
    padding-bottom: .3rem
    font-size: 1.2em
@@ -110,11 +110,12 @@
      position: sticky
      position: -webkit-sticky
      top: 20px
+      transition: top .3s

  .card-tag-cloud
    a
      display: inline-block
-      padding: 0 .1rem
+      padding: 0 .2rem

      &:hover
        color: $text-hover !important
@@ -213,29 +214,20 @@
          width: 20%
          text-align: right

-    &.more
-      span
-        padding-right: .3rem
-        width: auto !important
-        transition: .5s
-
-      &:hover
-        span
-          padding-right: .6rem
-
  .card-categories
    .card-category-list
      &.child
        padding: 0 0 0 .8rem

      > .parent
-        .card-category-list
-          &-name
-            width: 70% !important
+        > a
+          .card-category-list
+            &-name
+              width: 70% !important

-          &-count
-            width: calc(100% - 70% - 20px)
-            text-align: right
+            &-count
+              width: calc(100% - 70% - 20px)
+              text-align: right

        i
          float: right
@@ -248,7 +240,7 @@
            transform: rotate(-90deg)

        if hexo-config('aside.card_categories.expand') == false
-          + .child
+          > .child
            display: none

  .card-webinfo
@@ -265,23 +257,37 @@

  // toc
  #card-toc
+    +minWidth901()
+      right: 0 !important
+
    +maxWidth900()
      position: fixed
-      right: 45px
+      right: -100%
      bottom: 30px
      z-index: 100
-      display: none
+      max-height: calc(100% - 60px)
      width: $toc-mobile-width
+      opacity: 0
      transform-origin: right bottom
-      animation: toc-open .3s
-
-      .toc-child
-        display: block !important

    .toc-content
      overflow-y: auto
      max-height: calc(100vh - 120px)

+      +maxWidth900()
+        max-height: calc(100vh - 140px)
+
+      .toc-child
+        display: none
+
+        +maxWidth900()
+          display: block !important
+
+      .toc-item
+        &.active
+          .toc-child
+            display: block
+
      ol,
      li
        list-style: none
@@ -314,6 +320,25 @@
        font-style: italic
        font-size: 1.2rem

+  :only-child
+    > .card-widget
+      margin-top: 0
+
+  .card-more-btn
+    float: right
+    color: inherit
+
+    &:hover
+      animation: more-btn-move 1s infinite
+
+@keyframes more-btn-move
+  0%,
+  100%
+    transform: translateX(0)
+
+  50%
+    transform: translateX(3px)
+
@keyframes toc-open
  0%
    transform: scale(.7)
@@ -333,8 +358,37 @@
    .layout
      justify-content: center

-      > .aside_content
+      > .aside-content
        display: none

      > div:first-child
        width: 80%
+
+.page
+  .sticky_layout
+    display: flex
+    flex-direction: column
+
+  if hexo-config('aside.card_recent_post.sort_order')
+    .card-recent-post
+      order: hexo-config('aside.card_recent_post.sort_order')
+
+  if hexo-config('newest_comments.sort_order')
+    #card-newest-comments
+      order: hexo-config('newest_comments.sort_order')
+
+  if hexo-config('aside.card_categories.sort_order')
+    .card-categories
+      order: hexo-config('aside.card_categories.sort_order')
+
+  if hexo-config('aside.card_tags.sort_order')
+    .card-tags
+      order: hexo-config('aside.card_tags.sort_order')
+
+  if hexo-config('aside.card_archives.sort_order')
+    .card-archives
+      order: hexo-config('aside.card-archives.sort_order')
+
+  if hexo-config('aside.card_webinfo.sort_order')
+    .card-webinfo
+      order: hexo-config('aside.card_webinfo.sort_order')
--- a/source/css/_layout/footer.styl
+++ b/source/css/_layout/footer.styl
@@ -31,3 +31,5 @@
  .icp-icon
    padding: 0 4px
    vertical-align: text-bottom
+    max-height: 1.4em
+    width auto
--- a/Show More
+++ b/Show More