fix: Waline 評論系統設置 avatarCDN 無效的 bug

improvement: 修改配置文件註釋
fix: 修復 footer 在部分瀏覽器沒有顯示在底部的 bug close #616
2026-04-10 21:17:07 +08:00 · 2021-07-30 01:00:32 +08:00 · 2021-07-20 23:19:14 +08:00 · 2021-07-20 23:09:57 +08:00 · 2021-07-10 22:32:24 +08:00 · 2021-07-10 22:29:20 +08:00
170 changed files with 4355 additions and 4034 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,22 @@
+<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/)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)

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

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

@@ -16,6 +24,8 @@ Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) t

 ### GIT

+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)
+
 Stable branch [recommend]:

 ```
@@ -69,12 +79,12 @@ 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)
+- [x] Web analytics
 - [x] Google AdSense
- [x] Webmaster Verification (google/Bing/Baidu/360/Yandex)
+- [x] Webmaster Verification
 - [x] Change website colour scheme
 - [x] Typewriter Effect: activate_power_mode
 - [x] Background effects (Canvas ribbon/canvas_ribbon_piao/canvas_nest)
@@ -89,8 +99,9 @@ npm i hexo-theme-butterfly

 ## Screenshots

+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-1.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg)
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,15 +1,22 @@
+<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)

+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)

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

-文檔: 📖 [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)修改的主題

@@ -17,6 +24,8 @@

 ### Git 安裝

+> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+
 在博客根目錄裡安裝穩定版【推薦】

 ```powershell
@@ -69,10 +78,10 @@ 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分析）
+- [x] 多種分析系統
 - [x] 谷歌廣告/手動廣告位置
 - [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
 - [x] 修改網站配色
@@ -89,8 +98,9 @@ theme: butterfly

 ## 截圖

+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-1.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg)
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
--- a/_config.yml
+++ b/_config.yml
@@ -4,7 +4,7 @@
 # format: name: link || icon
 # sub-menu
 # name || icon:
-#   name || link || icon
+#   name: link || icon

 menu:
  # Home: / || fas fa-home
@@ -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
@@ -53,17 +54,9 @@ algolia_search:
  hits:
    per_page: 6

-  labels:
-    input_placeholder: Search for Posts
-    hits_empty: "We didn't find any results for the search: ${query}" # if there are no result
-    hits_stats: '${hits} results found in ${time} ms'
-
 # Local search
 local_search:
  enable: false
-  labels:
-    input_placeholder: Search for Posts
-    hits_empty: "We didn't find any results for the search: ${query}" # if there are no result

 # Math (數學)
 # --------------------------------------
@@ -91,32 +84,38 @@ favicon: /img/favicon.png

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

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

-# if the banner of page not setting, it will show the top_img
+# If the banner of page not setting, it will show the top_img
 default_top_img:

-# the banner image of archive page
+# The banner image of archive page
 archive_img:

-# the banner image of tag page
+# If the banner of tag page not setting, it will show the top_img
 # note: tag page, not tags page (子標籤頁面的 top_img)
 tag_img:

-# the banner image of category page
+# The banner image of tag page
+# format:
+#  - tag name: xxxxx
+tag_per_img:
+
+# If the banner of category page not setting, it will show the top_img
 # note: category page, not categories page (子分類頁面的 top_img)
 category_img:

-# If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
-# douban:
-#   meta: false
-#   movies_img:
-#   books_img:
-#   games_img:
+# The banner image of category page
+# format:
+#  - category name: xxxxx
+category_per_img:

 cover:
  # display the cover or not (是否顯示文章封面)
@@ -144,11 +143,13 @@ error_404:
 post_meta:
  page: # Home Page
    date_type: created # created or updated or both 主頁文章日期是創建日或者更新日或都顯示
+    date_format: date # date/relative 顯示日期還是相對日期
    categories: true # true or false 主頁是否顯示分類
    tags: false # true or false 主頁是否顯示標籤
    label: true # true or false 顯示描述性文字
  post:
    date_type: both # created or updated or both 文章頁日期是創建日或者更新日或都顯示
+    date_format: date # date/relative 顯示日期還是相對日期
    categories: true # true or false 文章頁是否顯示分類
    tags: true # true or false 文章頁是否顯示標籤
    label: true # true or false 顯示描述性文字
@@ -164,6 +165,7 @@ wordcount:
 # 1: description
 # 2: both (if the description exists, it will show description, or show the auto_excerpt)
 # 3: auto_excerpt (default)
+# false: do not show the article introduction
 index_post_content:
  method: 3
  length: 500 # if you set method to 2 or 3, the length need to config
@@ -175,7 +177,7 @@ index_post_content:
 toc:
  enable: true
  number: true
-  auto_open: true # auto open the sidebar
+  style_simple: false

 post_copyright:
  enable: true
@@ -194,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
@@ -203,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
@@ -242,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
@@ -250,12 +267,14 @@ 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/
 disqus:
  shortname:
+  apikey: # For newest comments widget

 # Alternative Disqus - Render comments with Disqus API
 # DisqusJS 評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版
@@ -287,6 +306,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
@@ -304,6 +324,18 @@ 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
+  avatarCDN: # Gravatar CDN baseURL
+  bg: # waline background
+  visitor: false
+  option:

 # utterances
 # https://utteranc.es/
@@ -324,6 +356,14 @@ facebook_comments:
  order_by: social # social/time/reverse_time
  lang: en_US # Language en_US/zh_CN/zh_TW and so on

+# Twikoo
+# https://github.com/imaegoo/twikoo
+twikoo:
+  envId:
+  region:
+  visitor: false
+  option:
+
 # Chat Services
 # --------------------------------------

@@ -372,11 +412,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
 # --------------------------------------
@@ -397,6 +432,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
 # --------------------------------------

@@ -417,25 +460,11 @@ google_adsense:
 # Verification (站長驗證)
 # --------------------------------------

-# Google Webmaster tools verification setting
-# See: https://www.google.com/webmasters/
-google_site_verification:
-
-# Bing Webmaster tools verification setting
-# See: https://www.bing.com/webmaster/
-bing_site_verification:
-
-# Baidu Webmaster tools verification setting
-# See: https://ziyuan.baidu.com/site/
-baidu_site_verification:
-
-# 360 Webmaster tools verification setting
-# see http://zhanzhang.so.com/
-qihu_site_verification:
-
-# Yandex Webmaster tools verification setting
-# see https://webmaster.yandex.com/
-yandex_site_verification:
+site_verification:
+  # - name: google-site-verification
+  #   content: xxxxxx
+  # - name: baidu-site-verification
+  #   content: xxxxxxx

 # Beautify/Effect (美化/效果)
 # --------------------------------------
@@ -473,17 +502,18 @@ tag_ui: # 留空或 index

 # Website Background (設置網站背景)
 # can set it to color or image (可設置圖片 或者 顔色)
-# The formal of color: '#49B202'
 # The formal of image: url(http://xxxxxx.com/xxx.jpg)
-# White color will be shown as default
 background:

-# Show the footer background image (same as top_img)
+# Footer Background
 footer_bg: false

 # the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
 rightside-bottom:

+# Enter transitions (開啓網頁進入效果)
+enter_transitions: true
+
 # Background effects (背景特效)
 # --------------------------------------

@@ -497,8 +527,8 @@ canvas_ribbon:
  click_to_change: false
  mobile: false

-# Dynamic ribbon (動態彩帶)
-canvas_ribbon_piao:
+# Fluttering Ribbon (動態彩帶)
+canvas_fluttering_ribbon:
  enable: false
  mobile: false

@@ -518,14 +548,18 @@ activate_power_mode:
  enable: false
  colorful: true # open particle animation (冒光特效)
  shake: true #  open shake (抖動特效)
+  mobile: false

 # Mouse click effects: fireworks (鼠標點擊效果: 煙火特效)
 fireworks:
  enable: false
  zIndex: 9999 # -1 or 9999
+  mobile: false

 # Mouse click effects: Heart symbol (鼠標點擊效果: 愛心)
-click_heart: false
+click_heart:
+  enable: false
+  mobile: false

 # Mouse click effects: words (鼠標點擊效果: 文字)
 ClickShowText:
@@ -535,6 +569,8 @@ ClickShowText:
    # - LOVE
    # - YOU
  fontSize: 15px
+  random: false
+  mobile: false

 # Default display mode (網站默認的顯示模式)
 # light (default) / dark
@@ -557,9 +593,9 @@ font:

 # Font settings for the site title and site subtitle
 # 左上角網站名字 主頁居中網站名字
-# blog_title_font:
-  # font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap
-  # font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif
+blog_title_font:
+  font_link:
+  font-family:

 # The setting of divider icon (水平分隔線圖標設置)
 hr_icon:
@@ -576,10 +612,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;
@@ -596,12 +632,15 @@ preloader: false

 aside:
  enable: true
+  hide: false
+  button: true
  mobile: true # display on mobile
  position: right # left or right
  card_author:
    enable: true
    description:
    button:
+      enable: true
      icon: fab fa-github
      text: Follow Me
      link: https://github.com/xxxxxx
@@ -612,24 +651,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
 # 訪問人數
@@ -647,25 +691,17 @@ 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
-  github_issues:
-    enable: false
-    repo:
-  disqus:
-    enable: false
-    forum:
-    api_key:

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

+# Change font size
+change_font_size: false
+
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
  enable: false
@@ -710,7 +746,7 @@ fancybox: true
 # --------------------------------------

 # mermaid
-# see https://github.com/knsv/mermaid
+# see https://github.com/mermaid-js/mermaid
 mermaid:
  enable: false
  # built-in themes: default/forest/dark/neutral
@@ -733,7 +769,7 @@ note:
 # other
 # --------------------------------------

-# Pjax [Beta]
+# Pjax
 # It may contain bugs and unstable, give feedback when you find the bugs.
 # https://github.com/MoOx/pjax
 pjax:
@@ -757,9 +793,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
@@ -771,38 +804,37 @@ pangu:
  field: site # site/post

 # Lazyload (圖片懶加載)
-# https://github.com/verlok/lazyload
+# https://github.com/verlok/vanilla-lazyload
 lazyload:
  enable: false
-  post: /img/loading.gif
+  field: site # site/post
+  placeholder:
+  blur: false

 # PWA
 # See https://github.com/JLHwung/hexo-offline
 # ---------------
 # 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)
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 inject:
  head:
-  # - <link rel="stylesheet" href="/xxx.css">
+    # - <link rel="stylesheet" href="/xxx.css">
  bottom:
    # - <script src="xxxx"></script>

@@ -826,6 +858,8 @@ CDN:
  disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js
  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
@@ -841,17 +875,17 @@ 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
  busuanzi: //busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js

  # background effect
-  canvas_ribbon: /js/third-party/canvas-ribbon.js
-  canvas_ribbon_piao: /js/third-party/piao.js
-  canvas_nest: /js/third-party/canvas-nest.js
+  canvas_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js
+  canvas_fluttering_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js
+  canvas_nest: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js

  lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
  instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
@@ -868,11 +902,10 @@ CDN:
  snackbar: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js

  # effect
-  anime: https://cdn.jsdelivr.net/npm/animejs@latest/anime.min.js
-  activate_power_mode: /js/third-party/activate-power-mode.js
-  fireworks: /js/third-party/fireworks.js
-  click_heart: /js/third-party/click_heart.js
-  ClickShowText: /js/third-party/ClickShowText.js
+  activate_power_mode: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js
+  fireworks: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js
+  click_heart: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js
+  ClickShowText: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js

  # fontawesome
  fontawesome: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css
@@ -892,4 +925,4 @@ CDN:
  # Prism.js
  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
+  prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
  framework: Framework
  theme: Theme
@@ -17,6 +13,8 @@ page:
  category: Category
  archives: Archives

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

@@ -34,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:
@@ -45,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
@@ -75,31 +73,36 @@ aside:
    site_pv_name: PV
  more_button: More
  card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
    loading_text: loading...
-    zero_day: Today
-    day: days ago
+    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:
-  one_hour: Just
-  hours: hours ago
+  just: Just
+  min: minutes ago
+  hour: hours ago
  day: days ago
+  month: months ago

 donate: Donate
 share: Share
-bookmark:
-  title: Bookmark

 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
+  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
@@ -108,9 +111,6 @@ copy_copyright:
  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.

 Snackbar:
-  bookmark:
-    message_prev: Press
-    message_next: to bookmark this page
  chs_to_cht: Traditional Chinese Activated Manually
  cht_to_chs: Simplified Chinese Activated Manually
  day_to_night: Dark Mode Activated Manually
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
  framework: Framework
  theme: Theme
@@ -17,6 +13,8 @@ page:
  category: Category
  archives: Archives

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

@@ -34,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:
@@ -45,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
@@ -75,31 +73,36 @@ aside:
    site_pv_name: PV
  more_button: More
  card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
    loading_text: loading...
-    zero_day: Today
-    day: days ago
+    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:
-  one_hour: Just
-  hours: hours ago
+  just: Just
+  min: minutes ago
+  hour: hours ago
  day: days ago
+  month: months ago

 donate: Donate
 share: Share
-bookmark:
-  title: Bookmark

 rightside:
  readmode_title: Read Mode
-  font_plus_title: Increase Font Size
-  font_minus_title: Decrease Font Size
+  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
@@ -108,9 +111,6 @@ copy_copyright:
  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.

 Snackbar:
-  bookmark:
-    message_prev: Press
-    message_next: to bookmark this page
  chs_to_cht: Traditional Chinese Activated Manually
  cht_to_chs: Simplified Chinese Activated Manually
  day_to_night: Dark Mode Activated Manually
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目录
-  have_read: 你已经读了
-
 footer:
  framework: 框架
  theme: 主题
@@ -17,6 +13,8 @@ page:
  category: 分类
  archives: 归档

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

@@ -35,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:
@@ -46,8 +45,6 @@ local_search:
  label: 本地搜索
  input_placeholder: 搜索文章
  hits_empty: '找不到您查询的内容：${query}'
-  powered: '提供支持'
-  by: 由

 pagination:
  prev: 上一篇
@@ -77,20 +74,24 @@ aside:
    site_pv_name: 本站总访问量
  more_button: 查看更多
  card_newest_comments:
-    heading: 最新评论
+    headline: 最新评论
    loading_text: 正在加载中...
-    zero_day: 今天
-    day: 天前
+    error: 无法获取评论，请确认相关配置是否正确
+    zero: 没有评论
+    image: 图片
+    link: 链接
+    code: 代码
+  card_toc: 目录

 date_suffix:
-  one_hour: 刚刚
-  hours: 小时前
+  just: 刚刚
+  min: 分钟前
+  hour: 小时前
  day: 天前
+  month: 个月前

 donate: 打赏
 share: 分享
-bookmark:
-  title: 添加书签

 rightside:
  readmode_title: 阅读模式
@@ -102,6 +103,7 @@ rightside:
  toc: 目录
  scroll_to_comment: 直达评论
  setting: 设置
+  aside: 单栏和双栏切换

 copy_copyright:
  author: 作者
@@ -110,9 +112,6 @@ copy_copyright:
  info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。

 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 键将本页加入书签
  chs_to_cht: 你已切换为繁体
  cht_to_chs: 你已切换为简体
  day_to_night: 你已切换为深色模式
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目錄
-  have_read: 你已經讀了
-
 footer:
  framework: 框架
  theme: 主題
@@ -17,6 +13,8 @@ page:
  category: 分類
  archives: 歸檔

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

@@ -24,7 +22,7 @@ post:
  created: 發表於
  updated: 更新於
  wordcount: 字數總計
-  min2read: 閲讀時長
+  min2read: 閱讀時長
  min2read_unit: 分鐘
  page_pv: 閱讀量
  comments: 評論數
@@ -35,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:
@@ -46,8 +45,6 @@ local_search:
  label: 本地搜尋
  input_placeholder: 搜尋文章
  hits_empty: '找不到您查詢的內容：${query}'
-  powered: '提供支援'
-  by: 由

 pagination:
  prev: 上一篇
@@ -77,20 +74,24 @@ aside:
    site_pv_name: 本站總訪問量
  more_button: 檢視更多
  card_newest_comments:
-    heading: 最新評論
-    loading_text: 正在加載中...
-    zero_day: 今天
-    day: 天前
+    headline: 最新評論
+    loading_text: 正在載入中...
+    error: 無法獲取評論，請確認相關配置是否正確
+    zero: 沒有評論
+    image: 圖片
+    link: 連結
+    code: 代碼
+  card_toc: 目錄

 date_suffix:
-  one_hour: 剛剛
-  hours: 小時前
+  just: 剛剛
+  min: 分鐘前
+  hour: 小時前
  day: 天前
+  month: 個月前

 donate: 打賞
 share: 分享
-bookmark:
-  title: 新增書籤

 rightside:
  readmode_title: 閱讀模式
@@ -102,6 +103,7 @@ rightside:
  toc: 目錄
  scroll_to_comment: 直達評論
  setting: 設定
+  aside: 單欄和雙欄切換

 copy_copyright:
  author: 作者
@@ -110,9 +112,6 @@ copy_copyright:
  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。

 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 鍵將本頁加入書籤
  chs_to_cht: 你已切換為繁體
  cht_to_chs: 你已切換為簡體
  day_to_night: 你已切換為深色模式
--- a/layout/404.pug
+++ b/layout/404.pug
@@ -1,30 +0,0 @@
- var top_img = theme.error_404.background || theme.default_top_img
- var bg_img = `background-image: url(${url_for(top_img)})`
-
-doctype html
-html(lang=config.language data-theme=theme.display_mode)
-  head
-    include includes/head.pug
-  body
-    if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
-
-    if theme.fireworks && theme.fireworks.enable
-      canvas.fireworks
-    
-    if theme.background
-      - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
-      #web_bg(data-type=is_photo)
-
-    #error-wrap
-      .error-content
-        .error-img(style=bg_img)
-        .error-info
-          h1.error_title= '404'
-          .error_subtitle= theme.error_404.subtitle
-          a.button--animated(href=config.root)
-            i.fas.fa-rocket
-            = _p('error404.back_button')
-          
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
-    include includes/additional-js.pug
--- a/layout/category.pug
+++ b/layout/category.pug
@@ -11,4 +11,4 @@ block content
    #category
      .article-sort-title= _p('page.category') + ' - ' + page.category
      +articleSort(page.posts)
-      include includes/pagination.pug    
+      include includes/pagination.pug
--- a/layout/flink.pug
+++ b/layout/flink.pug
@@ -1,24 +0,0 @@
-#page
-  .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
-  if page.comments !== false && theme.comments && theme.comments.use
-    - var commentsJsLoad = true
-    !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
-
-
--- a/layout/includes/404.pug
+++ b/layout/includes/404.pug
@@ -0,0 +1,17 @@
+- var top_img = theme.error_404.background || theme.default_top_img
+- var bg_img = `background-image: url('${url_for(top_img)}')`
+
+#body-wrap.error404
+  div(style='display: none')
+    include ./header/index.pug
+
+  #error-wrap
+    .error-content
+      .error-img(style=bg_img)
+      .error-info
+        h1.error_title= '404'
+        .error_subtitle= theme.error_404.subtitle
+        a.button--animated(href=config.root)
+          i.fas.fa-rocket
+          = _p('error404.back_button')
+          
--- 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,10 +27,13 @@ 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 is_home() && theme.subtitle.enable
+    if needLoadCountJs
+      !=partial('includes/third-party/card-post-count/index', {}, {cache: true})
+    
+    if loadSubJs
      include ./third-party/subtitle.pug

    include ./third-party/math/index.pug
@@ -41,28 +41,28 @@ div
    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/chat/index', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/effect', {}, {cache: true})

+  !=partial('includes/third-party/chat/index', {}, {cache: true})
+  
  if theme.aplayerInject && theme.aplayerInject.enable
    if theme.pjax.enable || theme.aplayerInject.per_page
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug
    else if page.aplayer
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug

  if theme.pjax.enable
-    !=partial('includes/third-party/pjax', {}, {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
@@ -14,10 +14,4 @@
      span= _p('footer.theme') + ' '
      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))
-        span=theme.footer.ICP.text
+    .footer_custom_text!=`${theme.footer.custom_text}`
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -1,5 +1,5 @@
 - var pageTitle
- if (is_archive()) pageTitle = _p('page.archives')
+- if (is_archive()) pageTitle = fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);})
 - else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
 - else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
 - else if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
@@ -10,7 +10,6 @@
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title

- var pageDescription = page_description()
 - var pageKeywords
 - if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
 - else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
@@ -23,7 +22,6 @@ meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
 meta(name="viewport" content="width=device-width,initial-scale=1")
 title= tabTitle
-meta(name="description" content!=pageDescription)
 if pageKeywords
  meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
@@ -31,62 +29,49 @@ 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

 !=favicon_tag(theme.favicon || config.favicon)
 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})
-
-//- Open_Graph
-include ./head/Open_Graph.pug
-
-if theme.facebook_comments.app_id
-  meta(property="fb:app_id" content=theme.facebook_comments.app_id )
-if theme.facebook_comments.user_id
-  meta(property="fb:admins" content=theme.facebook_comments.user_id)
+!=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/darkmode', {}, {cache:theme.fragment_cache})
-
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=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,12 +1,11 @@
- var contentType = is_post() ? 'article' : 'website'
-
 if theme.Open_Graph_meta
-  meta(property="og:type" content=contentType)
-  meta(property="og:title" content=pageTitle)
-  meta(property="og:url" content=urlNoIndex())
-  meta(property="og:site_name" content=config.title)
-  meta(property="og:description" content!=pageDescription)
-  meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
-  meta(property="article:published_time" content=date_xml(page.date))
-  meta(property="article:modified_time" content=date_xml(page.updated))
-  meta(name="twitter:card" content="summary")
+  - let contentType = is_post() ? 'article' : 'website'
+  - 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 || ''
+
+  != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
+
+else
+  meta(name="description" content=page_description())
+
--- 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/aplayer.pug
+++ b/layout/includes/head/aplayer.pug
@@ -1,3 +0,0 @@
-link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css))
-script(src=url_for(theme.CDN.aplayer_js))
-script(src=url_for(theme.CDN.meting_js))
--- a/layout/includes/head/config.pug
+++ b/layout/includes/head/config.pug
@@ -14,8 +14,8 @@
        hits_stats: _p("algolia_search.hits_stats")
      }
    })
-  } 
-  
+  }
+
  let localSearch = 'undefined';
  if (theme.local_search && theme.local_search.enable) {
    localSearch = JSON.stringify({
@@ -50,22 +50,9 @@
    })
  }

-  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({
-      bookmark: {
-        message_prev: _p("Snackbar.bookmark.message_prev"),
-        message_next: _p("Snackbar.bookmark.message_next")
-      },
      chs_to_cht: _p("Snackbar.chs_to_cht"),
      cht_to_chs: _p("Snackbar.cht_to_chs"),
      day_to_night: _p("Snackbar.day_to_night"),
@@ -91,24 +78,14 @@
    highlight = JSON.stringify({
      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
      highlightCopy: theme.highlight_copy,
-      highlightLang: theme.highlight_lang
-    })
-  }
-
-  let date_suffix = 'undefined';
-  if (theme.aside.card_webinfo.last_push_date) {
-    date_suffix = JSON.stringify({
-      one_hour: _p("date_suffix.one_hour"),
-      hours: _p("date_suffix.hours"),
-      day: _p('date_suffix.day')
-
+      highlightLang: theme.highlight_lang,
+      highlightHeightLimit: theme.highlight_height_limit
    })
  }

 script.
-  var GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = { 
    root: '!{config.root}',
-    hexoversion: '!{get_hexo_version()}',
    algolia: !{algolia},
    localSearch: !{localSearch},
    translate: !{translate},
@@ -119,54 +96,33 @@ script.
      error: '!{_p("copy.error")}',
      noSupport: '!{_p("copy.noSupport")}'
    },
-    bookmark: {
-      message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
-      message_next: '!{_p("Snackbar.bookmark.message_next")}'
+    relativeDate: {
+      homepage: !{theme.post_meta.page.date_format === 'relative'},
+      post: !{theme.post_meta.post.date_format === 'relative'}
    },
    runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
-    date_suffix: !{date_suffix},
-    copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
-    medium_zoom: !{theme.medium_zoom},
-    fancybox: !{theme.fancybox},
-    Snackbar: !{Snackbar},
-    justifiedGallery: {
-      js: '!{theme.CDN.justifiedGallery_js}',
-      css: '!{theme.CDN.justifiedGallery_css}'
+    date_suffix: {
+      just: '!{_p("date_suffix.just")}',
+      min: '!{_p("date_suffix.min")}',
+      hour: '!{_p("date_suffix.hour")}',
+      day: '!{_p("date_suffix.day")}',
+      month: '!{_p("date_suffix.month")}'
+    },
+    copyright: !{copyright},
+    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
+    Snackbar: !{Snackbar},
+    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)}'
+      }
    },
-    baiduPush: !{theme.baidu_push},
    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,16 +4,18 @@
  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() && 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 )
+
+  let titleVal = pageTitle.replace(/'/ig,"\\'")
 -

-script#config_change
-  .
-    var GLOBAL_CONFIG_SITE = { 
-      isPost: !{is_post()},
-      isHome: !{is_home()},
-      isHighlightShrink: !{isHighlightShrink},
-      isSidebar: !{showToc},
-      postUpdate: '!{full_date(page.updated)}'
-    }
+script#config-diff.
+  var GLOBAL_CONFIG_SITE = {
+    title: '!{titleVal}',
+    isPost: !{is_post()},
+    isHome: !{is_home()},
+    isHighlightShrink: !{isHighlightShrink},
+    isToc: !{showToc},
+    postUpdate: '!{full_date(page.updated)}'
+  }
--- a/layout/includes/head/darkmode.pug
+++ b/layout/includes/head/darkmode.pug
@@ -1,50 +0,0 @@
-if theme.darkmode.enable
-  script.
-    var 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')
-      }
-    }
-    var 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')
-      }
-    }
-
-    var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    var t = saveToLocal.get('theme')
-    if (autoChangeMode === '1') {
-      var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-      var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-      var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-      var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-      if (t === undefined) {
-        if (isLightMode) activateLightMode()
-        else if (isDarkMode) activateDarkMode()
-        else if (isNotSpecified || hasNoSupport) {
-          var now = new Date()
-          var hour = now.getHours()
-          var 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') {
-      now = new Date()
-      hour = now.getHours()
-      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()
-    }
--- a/layout/includes/head/noscript.pug
+++ b/layout/includes/head/noscript.pug
@@ -1,9 +1,14 @@
 noscript. 
  <style type="text/css">
-  #nav {
-    opacity: 1
-  }
-  .justified-gallery img {
-    opacity: 1
-  }
+    #nav {
+      opacity: 1
+    }
+    .justified-gallery img {
+      opacity: 1
+    }
+
+    #recent-posts time,
+    #post-meta time {
+      display: inline !important
+    }
  </style>
--- 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")
+  link(rel="preconnect" href="//busuanzi.ibruce.info")
--- a/layout/includes/head/site_verification.pug
+++ b/layout/includes/head/site_verification.pug
@@ -1,14 +1,3 @@
-if theme.google_site_verification
-  meta(name="google-site-verification" content=theme.google_site_verification)
-
-if theme.bing_site_verification
-  meta(name="msvalidate.01" content=theme.bing_site_verification)
-
-if theme.baidu_site_verification
-  meta(name="baidu-site-verification" content=theme.baidu_site_verification)
-
-if theme.qihu_site_verification
-  meta(name="360-site-verification" content=theme.qihu_site_verification)
-
-if theme.yandex_site_verification
-  meta(name="yandex-verification" content=theme.yandex_site_verification)
+if theme.site_verification
+  each item in theme.site_verification
+    meta(name=item.name content=item.content)
--- a/layout/includes/header/index.pug
+++ b/layout/includes/header/index.pug
@@ -1,43 +1,50 @@
-if is_home()
-  - var top_img = theme.index_img || theme.default_top_img
-else if is_post()
-  - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
-else if is_archive()
-  - var top_img = theme.archive_img || theme.default_top_img
-else if is_tag()
-  - var top_img = theme.tag_img || theme.default_top_img
-else if is_category()
-  - var top_img = theme.category_img || theme.default_top_img
+if !theme.disable_top_img && page.top_img !== false
+  if is_post()
+    - 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()
+    - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag] 
+    - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
+  else if is_category()
+    - var top_img = theme.category_per_img && theme.category_per_img[page.category]
+    - top_img = top_img ? top_img : (theme.category_img !== false ? theme.category_img || theme.default_top_img : false)
+  else if is_home()
+    - var top_img = theme.index_img !== false ? theme.index_img || theme.default_top_img : false
+  else if is_archive()
+    - var top_img = theme.archive_img !== false ? theme.archive_img || theme.default_top_img : false
+  else
+    - 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 bg_img = top_img ? imgSource : ''
+    - var site_title = is_archive() ? fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);}) : page.title || page.tag || page.category || config.title
+    - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
+    - is_post() ? isHomeClass = 'post-bg' : isHomeClass
+  else
+    - var isHomeClass = 'not-top-img'
 else
-  - var top_img = page.top_img || theme.default_top_img
-
-if theme.douban
-  if is_current('/movies/', [strict])
-    - var top_img = theme.douban.movies_img || theme.default_top_img
-  else if is_current('/books/', [strict])
-    - var top_img = theme.douban.books_img || theme.default_top_img
-  else if is_current('/games/', [strict])
-    - var top_img = theme.douban.games_img || theme.default_top_img
-
- var bg_img = top_img && top_img !== true ? `background-image: url(${url_for(top_img)})` : ''
- 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'
- is_post() ? isHomeClass = 'post-bg' : isHomeClass
+  - var top_img = false
+  - var isHomeClass = 'not-top-img'

 header#page-header(class=isHomeClass style=bg_img)
-  !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
-  if is_home()
-    #site-info
-      h1#site_title=site_title
-      #site_subtitle
-        span#subtitle
-      if(theme.social)
-        #site_social_icons
-          !=fragment_cache('social', function(){return partial('includes/header/social')})
-    #scroll_down
-      i.fas.fa-angle-down.scroll-down-effects
-  else if is_post()
-    include ./post-info.pug 
-  else
-    #page_site-info
-      h1#site_title=site_title
+  !=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
+        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')})
+      #scroll-down
+        i.fas.fa-angle-down.scroll-down-effects
+    else
+      #page-site-info
+        h1#site-title=site_title
--- 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,7 +1,10 @@
+- let comments = theme.comments
 #post-info
-  #post-title
-    .posttitle= page.title || _p('no_title')
-    
+  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
      if (theme.post_meta.post.date_type)
@@ -33,7 +36,7 @@
            if (index < page.categories.data.length - 1)
              i.fas.fa-angle-right.post-meta-separator

-    .meta-secondline  
+    .meta-secondline
      - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
      if (postWordcount)
        span.post-meta-separator |
@@ -49,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,43 +1,47 @@
+- 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)
+html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
  head
    include ./head.pug
  body
    if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})

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

-    #body-wrap
-      if theme.background
-        - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
-        #web_bg(data-type=is_photo)
+    if page.type !== '404'
+      #body-wrap(class=pageType)
+        include ./header/index.pug

-      include ./sidebar.pug
-      include ./header/index.pug
-
-      if (!is_post())
-        main#content-inner.layout_page(class=hideAside)
+        main#content-inner.layout(class=hideAside)
          if body
            div!= body
          else
            block content
            if theme.aside.enable && page.aside !== false
-              !=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
-      else
-        main#content-inner.layout_post
-          if body
-            div!= body
+              include widget/index.pug
+
+        - var footerBg = theme.footer_bg
+        if (footerBg)
+          if (footerBg === true)
+            - var footer_bg = bg_img
          else
-            block content
-      
-      - var footer_bg = theme.footer_bg == false ? '' : bg_img
-      - var is_bg = theme.footer_bg == false ? 'color' : 'photo'
-      footer#footer(style=footer_bg data-type=is_bg)
-        !=partial('includes/footer', {}, {cache:theme.fragment_cache})
+            - 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: true})
+
+    else
+      include ./404.pug

    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
@@ -1,6 +1,13 @@
 script.
-  var endLoading = function () {
-    document.body.style.overflow = 'auto';
-    document.getElementById('loading-box').classList.add("loaded")
+  var preloader = {
+    endLoading: () => {
+      document.body.style.overflow = 'auto';
+      document.getElementById('loading-box').classList.add("loaded")
+    },
+    initLoading: () => {
+      document.body.style.overflow = '';
+      document.getElementById('loading-box').classList.remove("loaded")
+
+    }
  }
-  window.addEventListener('load',endLoading)
+  window.addEventListener('load',preloader.endLoading())
--- a/layout/includes/mixins/article-sort.pug
+++ b/layout/includes/mixins/article-sort.pug
@@ -11,10 +11,7 @@ mixin articleSort(posts)
      .article-sort-item(class=no_cover)
        if article.cover && theme.cover.archives_enable
          a.article-sort-item-img(href=url_for(article.path) title=title)
-            if theme.lazyload.enable
-              img(data-lazy-src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
-            else
-              img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
+            img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
        .article-sort-item-info
          .article-sort-item-time
            i.far.fa-calendar-alt
--- a/layout/includes/mixins/post-ui.pug
+++ b/layout/includes/mixins/post-ui.pug
@@ -9,16 +9,13 @@ mixin postUI(posts)
      if post_cover && theme.cover.index_enable
        .post_cover(class=leftOrRight)
          a(href=url_for(link) title=title)      
-            if theme.lazyload.enable
-              img.post_bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
-            else
-              img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
+            img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
      .recent-post-info(class=no_cover)
        a.article-title(href=url_for(link) title=title)= title
        .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 +39,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,29 +47,63 @@ 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
-        if theme.index_post_content.method == 1
-          .content!= article.description
-        else if theme.index_post_content.method == 2
-          if article.description
+        case theme.index_post_content.method
+          when false
+            - break
+          when 1
            .content!= article.description
-          else
+          when 2
+            if article.description
+              .content!= article.description
+            else
+              - const content = strip_html(article.content)
+              - let expert = content.substring(0, theme.index_post_content.length) 
+              - content.length > theme.index_post_content.length ? expert += ' ...' : ''
+              .content!= expert
+          default
            - const content = strip_html(article.content)
            - let expert = content.substring(0, theme.index_post_content.length) 
            - content.length > theme.index_post_content.length ? expert += ' ...' : ''
            .content!= expert
-        else
-          - const content = strip_html(article.content)
-          - let expert = content.substring(0, theme.index_post_content.length) 
-          - content.length > theme.index_post_content.length ? expert += ' ...' : ''
-          .content!= expert

    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/mobile-sidebar/index.pug
+++ b/layout/includes/mobile-sidebar/index.pug
@@ -1,3 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-  include ../mobile-sidebar/mobile-menus.pug
--- a/layout/includes/mobile-sidebar/mobile-menus.pug
+++ b/layout/includes/mobile-sidebar/mobile-menus.pug
@@ -1,29 +0,0 @@
-#mobile-sidebar-menus
-  .mobile_author_icon
-    if theme.lazyload.enable
-      img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-    else
-      img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-  .mobile_post_data
-    if site.posts.length
-      .mobile_data_item.is-center
-        .mobile_data_link
-          a(href=url_for(config.archive_dir) + '/')
-            .headline= _p('aside.articles') 
-            .length_num= site.posts.length
-
-    if site.tags.length
-      .mobile_data_item.is-center       
-        .mobile_data_link
-          a(href=url_for(config.tag_dir) + '/' )
-            .headline= _p('aside.tags')
-            .length_num= site.tags.length
-
-    if site.categories.length
-      .mobile_data_item.is-center      
-        .mobile_data_link
-          a(href=url_for(config.category_dir) + '/')
-            .headline= _p('aside.categories') 
-            .length_num= site.categories.length
-  hr
-  !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
--- a/layout/includes/page/categories.pug
+++ b/layout/includes/page/categories.pug
@@ -0,0 +1,5 @@
+.category-lists
+  .category-title.is-center= _p('page.category')
+    |  - 
+    span.category-amount= site.categories.length
+  div!= list_categories()
--- a/layout/includes/page/default-page.pug
+++ b/layout/includes/page/default-page.pug
@@ -0,0 +1,4 @@
+#article-container
+  if top_img === false
+    h1.page-title= page.title
+  != page.content
--- a/layout/includes/page/flink.pug
+++ b/layout/includes/page/flink.pug
@@ -0,0 +1,21 @@
+#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")
+                .flink-item-icon
+                  img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                .flink-item-name= item.name 
+                .flink-item-desc(title=item.descr)= item.descr
+    != page.content
+
--- a/layout/includes/page/tags.pug
+++ b/layout/includes/page/tags.pug
@@ -0,0 +1,5 @@
+.tag-cloud-title.is-center= _p('page.tag')
+  |  - 
+  span.tag-cloud-amount= site.tags.length
+.tag-cloud-list.is-center
+  !=cloudTags({source: site.tags, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})
--- a/layout/includes/pagination.pug
+++ b/layout/includes/pagination.pug
@@ -6,34 +6,32 @@
    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))
-          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)}'` )
-          else
-            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
+        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
+        a(href=url_for(prev.path))
+          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))
-          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)}'`)
-          else
-            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
+        a(href=url_for(next.path))
+          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,13 @@
 .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')
+            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
@@ -1,28 +1,38 @@
-section#rightside
+#rightside
  #rightside-config-hide
-    if is_post()
-      if theme.readmode
-        button#readmode(type="button" title=_p('rightside.readmode_title'))
-          i.fas.fa-book-open
-    if theme.translate && theme.translate.enable
+    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" title=_p('rightside.aside'))
+        i.fas.fa-arrows-alt-h
  #rightside-config-show
-    button#rightside_config(type="button" title=_p("rightside.setting"))
-      i.fas.fa-cog
-    if is_post() && page.comments !== false && theme.comments.use
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.fas.fa-comments
-    if showToc
-      button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
-        i.fas.fa-list-ul
+    if is_post()
+      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.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) || theme.change_font_size
+      button#rightside_config(type="button" title=_p("rightside.setting"))
+        i.fas.fa-cog.fa-spin
+
    if theme.chat_btn
      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
        i.fas.fa-sms
-
+    if commentsJsLoad
+      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+        i.fas.fa-comments
    button#go-up(type="button" title=_p("rightside.back_to_top"))
-      i.fas.fa-arrow-up
-
-
+      i.fas.fa-arrow-up
--- a/layout/includes/sidebar.pug
+++ b/layout/includes/sidebar.pug
@@ -1,21 +1,28 @@
-
-  let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
-  let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
-  let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
-
+#sidebar
+  #menu-mask
+  #sidebar-menus
+    .avatar-img.is-center
+      img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    .site-data
+      if site.posts.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.archive_dir) + '/')
+              .headline= _p('aside.articles') 
+              .length-num= site.posts.length

-if(showToc)
-  #sidebar
-    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
-    .sidebar-toc
-      div.sidebar-toc__title= _p('sidebar.catalog')
-      div.sidebar-toc__progress
-        span.progress-notice= _p('sidebar.have_read')
-        span.progress-num 0
-        span.progress-percentage %
-        div.sidebar-toc__progress-bar      
-      if (page.encrypt == true)
-        div.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
-      else 
-        div.sidebar-toc__content!=toc(page.content, {list_number: tocNumber})
-        
+      if site.tags.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.tag_dir) + '/' )
+              .headline= _p('aside.tags')
+              .length-num= site.tags.length
+
+      if site.categories.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.category_dir) + '/')
+              .headline= _p('aside.categories') 
+              .length-num= site.categories.length
+    hr
+    !=partial('includes/header/menu_item', {}, {cache: true})
--- a/layout/includes/third-party/aplayer.pug
+++ b/layout/includes/third-party/aplayer.pug
@@ -0,0 +1,3 @@
+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/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,17 @@
+script.
+  (() => {
+    function loadWaline () {
+      function initWaline () {
+        let initData = {
+          el: null,
+          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/disqus.pug
+++ b/layout/includes/third-party/comments/disqus.pug
@@ -1,9 +1,11 @@
+- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
+
 script.
  function loadDisqus () {
    var disqus_config = function () {
      this.page.url = '!{ page.permalink }'
      this.page.identifier = '!{ page.path }'
-      this.page.title = '!{ page.title }'
+      this.page.title = '!{ disqusPageTitle }'
    };

    window.disqusReset = () => {
--- a/layout/includes/third-party/comments/disqusjs.pug
+++ b/layout/includes/third-party/comments/disqusjs.pug
@@ -1,3 +1,6 @@
+- let disqusjsApi = theme.disqusjs.api || 'https://disqus.skk.moe/disqus/'
+- let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+
 script.
  function loadDisqusjs () {
    function addDisqusjsCSS () {
@@ -14,8 +17,8 @@ script.
        siteName: '!{theme.disqusjs.siteName}',
        identifier: '!{ page.path }',
        url: '!{ page.permalink }',
-        title: '!{ page.title }',
-        api: '!{theme.disqusjs.api}',
+        title: '!{ disqusjsPageTitle }',
+        api: '!{disqusjsApi}',
        apikey: '!{theme.disqusjs.apikey}',
        nocomment: '!{theme.disqusjs.nocomment}',
        admin: '!{theme.disqusjs.admin}',
@@ -28,7 +31,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=v10.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
@@ -7,11 +7,9 @@ hr
      span= ' ' + _p('comment')
    
    if theme.comments.use.length > 1
-      .comment-switch
+      #comment-switch
        span.first-comment=defaultComment
-        label
-          input#switch-comments-btn(type="checkbox")
-          span.slider
+        span.switch-btn
        span.second-comment=theme.comments.use[1]


@@ -31,6 +29,10 @@ hr
            #gitalk-container
          when 'Utterances'
            #utterances-wrap
+          when '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,16 +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: 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
@@ -0,0 +1,45 @@
+script.
+  (()=>{
+    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)}))
+    }
+
+    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 {
+      window.loadOtherComment = () => {
+        loadTwikoo()
+      }
+    }
+  })()
--- a/layout/includes/third-party/comments/valine.pug
+++ b/layout/includes/third-party/comments/valine.pug
@@ -5,7 +5,7 @@ if site.data.valine
 script.
  function loadValine () {
    function initValine () {
-      window.valine = new Valine({
+      const valine = new Valine(Object.assign({
        el: '#vcomment',
        appId: '#{theme.valine.appId}',
        appKey: '#{theme.valine.appKey}',
@@ -20,17 +20,18 @@ script.
        emojiMaps: !{emojiMaps},
        enableQQ: #{theme.valine.enableQQ},
        path: window.location.pathname,
-      });
-      if ('#{theme.valine.requiredFields}') { valine.config.requiredFields= '#{theme.valine.requiredFields}'.split(',') }
+        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,30 @@
+- const { serverURL, avatar, avatarCDN, visitor, option } = theme.waline
+
+script.
+  function loadWaline () {
+    function initWaline () {
+      const waline = new Waline(Object.assign({
+        el: '#waline-wrap',
+        serverURL: '!{serverURL}',
+        avatar: '#{avatar}',
+        avatarCDN: '!{avatarCDN || "https://sdn.geekzu.org/avatar/"}',
+        path: location.pathname,
+        visitor: !{visitor},
+        dark: 'html[data-theme="dark"]'
+      }, !{JSON.stringify(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
@@ -1,14 +1,13 @@
 if theme.fireworks && theme.fireworks.enable
-  canvas.fireworks
-  script(src=url_for(theme.CDN.anime))
+  canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
  script(src=url_for(theme.CDN.fireworks))

 if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
  script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
  alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)

-if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
-  script(defer id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))
+if (theme.canvas_fluttering_ribbon && theme.canvas_fluttering_ribbon.enable)
+  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.CDN.canvas_fluttering_ribbon))

 if (theme.canvas_nest && theme.canvas_nest.enable)
  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))
@@ -18,11 +17,19 @@ if theme.activate_power_mode.enable
  script.
    POWERMODE.colorful = !{theme.activate_power_mode.colorful};
    POWERMODE.shake = !{theme.activate_power_mode.shake};
+    POWERMODE.mobile = !{theme.activate_power_mode.mobile};
    document.body.addEventListener('input', POWERMODE);

 //- 鼠標特效
-if theme.click_heart
-  script(src=url_for(theme.CDN.click_heart) async)
+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(src=url_for(theme.CDN.ClickShowText) async)
+  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', { class: 'katex-wrap'})
+    })
+  })()
+  
--- a/layout/includes/third-party/math/mathjax.pug
+++ b/layout/includes/third-party/math/mathjax.pug
@@ -1,21 +1,14 @@
 //- Mathjax 3
-//- http://docs.mathjax.org/en/latest/upgrading/v2.html#changes-in-the-mathjax-api
-//- https://github.com/mathjax/MathJax/issues/2209
-//- http://docs.mathjax.org/en/latest/options/input/tex.html#the-configuration-block
-//- http://docs.mathjax.org/en/latest/web/typeset.html#resetting-automatic-equation-numbering
-
 script.
  if (!window.MathJax) {
    window.MathJax = {
-      loader: {
-        source: {
-          '[tex]/amsCd': '[tex]/amscd'
-        }
-      },
      tex: {
        inlineMath: [ ['$','$'], ["\\(","\\)"]],
        tags: 'ams'
      },
+      chtml: {
+        scale: 1.2
+      },
      options: {
        renderActions: {
          findScript: [10, doc => {
@@ -29,19 +22,21 @@ script.
              doc.math.push(math)
            }
          }, ''],
-          addClass: [200,() => {
-            document.querySelectorAll('mjx-container:not([display=\'true\']').forEach( node => {
+          insertScript: [200, () => {
+            document.querySelectorAll('mjx-container:not\([display]\)').forEach(node => {
              const target = node.parentNode
-              if (!target.classList.contains('has-jax')) {
-                target.classList.add('mathjax-overflow')
+              if (target.nodeName.toLowerCase() === 'li') {
+                target.parentNode.classList.add('has-jax')
+              } else {
+                target.classList.add('has-jax')
              }
-            })
+            });
          }, '', false]
        }
      }
    }
    
-    var script = document.createElement('script')
+    const script = document.createElement('script')
    script.src = '!{theme.CDN.mathjax}'
    script.id = 'MathJax-script'
    script.async = true
--- 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,52 +14,62 @@ 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=!{forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{apiKey}')
+        .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)
-      })
    }

    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}'></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')
+      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')) {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
        const data = saveToLocal.get('disqus-newest-comments')
        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,51 +14,88 @@ 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) => {
+      Promise.all(array.map(item =>
+        fetch(item.url).then(resp => resp.json()).then(data => {
+          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
+          if (data.user.login === 'utterances-bot') {
+            return urlArray.pop()
+          } else {
+            return urlArray.shift()
+          }
        })
-        saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
-        generateHtml(githubArray)
+      )).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/!{userRepo}/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}'></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')
+      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')) {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
        const data = saveToLocal.get('github-newest-comments')
        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,26 @@
-if theme.newest_comments.leancloud.enable
-  include ./leancloud.pug
-else if theme.newest_comments.github_issues.enable
-  include ./github-issues.pug
-else if theme.newest_comments.disqus.enable
-  include ./disqus-comment.pug
+- let { use } = theme.comments
+
+if use
+  - let forum,apiKey,userRepo
+  case use[0]
+    when 'Valine'
+      include ./valine.pug
+    when 'Waline'
+      include ./waline.pug
+    when 'Twikoo'
+      include ./twikoo-comment.pug
+    when 'Disqus'
+      - forum = theme.disqus.shortname
+      - apiKey = theme.disqus.apikey
+      include ./disqus-comment.pug
+    when 'Disqusjs'
+      - forum = theme.disqusjs.shortname
+      - apiKey = theme.disqusjs.apikey
+      include ./disqus-comment.pug
+    when 'Gitalk'
+      - let { repo,owner } = theme.gitalk
+      - userRepo = owner + '/' + repo
+      include ./github-issues.pug
+    when 'Utterances'
+      - userRepo = theme.utterances.repo
+      include ./github-issues.pug
--- a/layout/includes/third-party/newest-comments/leancloud.pug
+++ b/layout/includes/third-party/newest-comments/leancloud.pug
@@ -1,98 +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)}'></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 = () => {
-
-      if (!(AV.applicationId && (AV.applicationKey || AV.masterKey))) {
-        const dataInit = {
-          appId: '!{theme.newest_comments.leancloud.appId}',
-          appKey: '!{theme.newest_comments.leancloud.appKey}'
-        }
-
-        if (!{theme.newest_comments.leancloud.serverURL ? true : false}) {
-          dataInit.serverURL= '!{theme.newest_comments.leancloud.serverURL}'
-        }
-
-        AV.init(dataInit)
-      }
-
-      const query = new AV.Query('Comment');
-      query.descending('createdAt').limit(!{theme.newest_comments.limit})
-
-      var valineArray = []
-      query.find().then(comments => {
-        comments.forEach(comment => {
-          valineArray.push({
-            'avatar': comment.get('QQAvatar'),
-            'content': changeContent(comment.get('comment')),
-            'mail': comment.get('mail'),
-            'nick': comment.get('nick'),
-            'url': comment.get('url'),
-            'date': comment.createdAt,
-          })
-        })
-      }).then(function() {
-        saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
-        generateHtml(valineArray)
-      })
-    }
-
-    const newestCommentInit = () => {
-      if (document.querySelector('.card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('leancloud-newest-comments')
-        if (data) {
-          generateHtml(JSON.parse(data))
-        } else {
-          if (typeof window.AV === 'object') {
-            getValineData()
-          } else {
-            $.getScript('https://cdn.jsdelivr.net/npm/leancloud-storage@4.6.1/dist/av-min.js', 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,93 @@
+- let { avatar,avatarCDN } = theme.waline
+
+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 = (ava,mail) => {
+      if (ava) return ava
+      let defaultIcon = '!{ avatar ? `?d=${avatar}` : ''}'
+      let iconUrl = "!{avatarCDN ? avatarCDN : '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({
+          serverURL: '!{theme.waline.serverURL}',
+          count: !{theme.newest_comments.limit}
+        }).then(res => {
+          const walineArray = res.comments.map(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,8 +7,7 @@ script(src=url_for(theme.CDN.pjax))
 script.
  let pjaxSelectors = [
    'title',
-    'meta[name=description]',
-    '#config_change',
+    '#config-diff',
    '#body-wrap',
    '#rightside-config-hide',
    '#rightside-config-show',
@@ -27,35 +26,14 @@ script.
    scrollRestoration: false
  })

-  document.addEventListener('pjax:complete', function () {
-    window.refreshFn()
-
-    $('script[data-pjax]').each(function () {
-      $(this).parent().append($(this).remove())
-    })
-
-    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
-
-    typeof chatBtnFn === 'function' && chatBtnFn()
-    typeof panguInit === 'function' && panguInit()
-
-    if (typeof gtag === 'function') {
-      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
-    }
-
-    typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
-
-    // Analytics
-    if (!{theme.tencent_analytics ? true : false}) {
-      MtaH5.pgv()
-    }
-
-    // prismjs
-    typeof Prism === 'object' && Prism.highlightAll()
-  })
-
-
  document.addEventListener('pjax:send', function () {
+
+    // removeEventListener scroll 
+    window.removeEventListener('scroll', window.tocScrollFn)
+    window.removeEventListener('scroll', scrollCollect)
+
+    typeof preloader === 'object' && preloader.initLoading()
+    
    if (window.aplayers) {
      for (let i = 0; i < window.aplayers.length; i++) {
        if (!window.aplayers[i].options.fixed) {
@@ -66,10 +44,49 @@ 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:complete', function () {
+    window.refreshFn()
+
+    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()
+
+    typeof chatBtnFn === 'function' && chatBtnFn()
+    typeof panguInit === 'function' && panguInit()
+
+    // 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()
+
+    // Analytics
+    if (!{theme.tencent_analytics ? true : false}) {
+      MtaH5.pgv()
+    }
+
+    // prismjs
+    typeof Prism === 'object' && Prism.highlightAll()
+
+    typeof preloader === 'object' && preloader.endLoading()
+  })
+
+  document.addEventListener('pjax:error', (e) => {
+    if (e.request.status === 404) {
+      pjax.loadUrl('/404.html')
+    }
+  })
--- a/layout/includes/third-party/search/algolia.pug
+++ b/layout/includes/third-party/search/algolia.pug
@@ -1,12 +1,13 @@
-#algolia-search.search-dialog
-  #algolia-search-title.search-dialog__title Algolia
-  #algolia-input-panel
-    #algolia-search-input
-  hr
-  #algolia-search-results
-    #algolia-hits
-    #algolia-pagination
-    #algolia-stats
-  span.search-close-button
-    i.fas.fa-times
-#search-mask
+#algolia-search
+  .search-dialog
+    #algolia-search-title.search-dialog__title Algolia
+    #algolia-input-panel
+      #algolia-search-input
+    hr
+    #algolia-search-results
+      #algolia-hits
+      #algolia-pagination
+      #algolia-stats
+    span.search-close-button
+      i.fas.fa-times
+  #search-mask
--- a/layout/includes/third-party/search/local-search.pug
+++ b/layout/includes/third-party/search/local-search.pug
@@ -1,23 +1,12 @@
-#local-search.search-dialog
-  #local-search-title.search-dialog__title=_p("local_search.label")
-  #local-input-panel
-    #local-search-input
-      .local-search-box
-        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
+#local-search
+  .search-dialog
+    #local-search-title.search-dialog__title=_p("local_search.label")
+    #local-input-panel
+      #local-search-input
+        .local-search-box
+          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
+    hr
+    #local-search-results
+    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,97 +1,80 @@
- var source = theme.subtitle.source
-if source == '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,
+- let source = theme.subtitle.source
+
+case source
+  when 1
+    script.
+      function subtitleType () {
+        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 {
-          document.getElementById('subtitle').innerHTML = data.text
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
        }
-      })
-    }
+      } else {
+        subtitleType()
+      }

-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '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,
+  when 2
+    script.
+      function subtitleType () {
+        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 {
-          document.getElementById('subtitle').innerHTML = data.hitokoto
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
        }
-      })
-    }
+      } else {
+        subtitleType()
+      }

-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '3'
-  script.
-    function subtitleType () {
-      $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
-        var con = str[0]
-        if (!{theme.subtitle.effect}) {
-          var from = '出自 ' + str[1]
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(con, from)
-          var typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
-          })
-        } else {
-          document.getElementById('subtitle').innerHTML = con
-        }
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '4'
-  script.
-    function subtitleType () {
-      $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
-        jinrishici.load(function (result) {
+  when 3
+    script.
+      function subtitleType () {
+        getScript('https://yijuzhan.com/api/word.php?m=js').then(() => {
+          var con = str[0]
          if (!{theme.subtitle.effect}) {
+            var from = '出自 ' + str[1]
            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var content = result.data.content
-            var both = sub.unshift(content)
+            var both = sub.unshift(con, from)
            var typed = new Typed('#subtitle', {
              strings: sub,
              startDelay: 300,
@@ -100,38 +83,76 @@ else if source == '4'
              backSpeed: 50,
            })
          } else {
-            document.getElementById('subtitle').innerHTML = result.data.content
+            document.getElementById('subtitle').innerHTML = con
          }
        })
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else
-  script.
-    function subtitleType () {
-      if (!{theme.subtitle.effect}) { 
-        var typed = new Typed("#subtitle", {
-          strings: "!{theme.subtitle.sub}".split(","),
-          startDelay: 300,
-          typeSpeed: 150,
-          loop: !{theme.subtitle.loop},
-          backSpeed: 50
-        })
-      } else {
-        document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
      }
-    }

-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
+
+  when 4
+    script.
+      function subtitleType () {
+        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(',')
+              var content = result.data.content
+              var both = sub.unshift(content)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = result.data.content
+            }
+          })
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
+
+  default
+    script.
+      function subtitleType () {
+        if (!{theme.subtitle.effect}) { 
+          var typed = new Typed("#subtitle", {
+            strings: "!{theme.subtitle.sub}".split(","),
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          })
+        } else {
+          document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
+        }
+      }
+
+      if (!{theme.subtitle.effect}) {
+        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,10 +1,8 @@
-.card-widget.card-info
-  .card-content
-    .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")
-      else
-        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
+if theme.aside.card_author.enable
+  .card-widget.card-info
+    .is-center
+      .avatar-img
+        img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
      .author-info__name= config.author
      .author-info__description!= theme.aside.card_author.description || config.description

@@ -13,23 +11,24 @@
        .card-info-data-item.is-center
          a(href=url_for(config.archive_dir) + '/')
            .headline= _p('aside.articles') 
-            .length_num= site.posts.length
+            .length-num= site.posts.length

      if site.tags.length
        .card-info-data-item.is-center
          a(href=url_for(config.tag_dir) + '/')
            .headline= _p('aside.tags')
-            .length_num= site.tags.length
+            .length-num= site.tags.length

      if site.categories.length
        .card-info-data-item.is-center
          a(href=url_for(config.category_dir) + '/')
            .headline= _p('aside.categories') 
-            .length_num= site.categories.length
+            .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_bottom_self.pug
+++ b/layout/includes/widget/card_bottom_self.pug
@@ -0,0 +1,9 @@
+if site.data.widget && site.data.widget.bottom
+  each item in site.data.widget.bottom
+    .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_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,7 +1,7 @@
-.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.heading')
+      i.fas.fa-comment-dots
+      span= _p('aside.card_newest_comments.headline')
    .aside-list
      span= _p('aside.card_newest_comments.loading_text')
--- a/layout/includes/widget/card_post_toc.pug
+++ b/layout/includes/widget/card_post_toc.pug
@@ -0,0 +1,12 @@
+- let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+
+#card-toc.card-widget
+  .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})
+      
--- 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')
@@ -7,21 +7,18 @@
      - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
      - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
      - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
-        .aside-list-item
-          - let link = article.link || article.path
-          - let title = article.title || _p('no_title')
-          - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : ''
-          - let post_cover = article.cover
+        - let link = article.link || article.path
+        - let title = article.title || _p('no_title')
+        - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        - let post_cover = article.cover
+        .aside-list-item(class=no_cover)
          if post_cover && theme.cover.aside_enable
            a.thumbnail(href=url_for(link) title=title)
-              if theme.lazyload.enable
-                img(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-              else
-                img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-          .content(class=no_cover)
+              img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+          .content
            a.title(href=url_for(link) title=title)= title
            if theme.aside.card_recent_post.sort === 'updated'
              time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
            else
              time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
-      - })
+      - })
--- 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_top_self.pug
+++ b/layout/includes/widget/card_top_self.pug
@@ -0,0 +1,8 @@
+if site.data.widget && site.data.widget.top
+  each item in site.data.widget.top
+    .card-widget(class=item.class_name id=item.id_name)
+      .item-headline
+        i(class=item.icon)
+        span=item.name
+      .item-content
+        !=item.html
--- 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,20 +1,30 @@
-#aside_content.aside_content
-  if theme.aside.card_author.enable
-    include ./card_author.pug
-  .sticky_layout
-    if theme.aside.card_announcement.enable
-      include ./card_announcement.pug
-    if theme.aside.card_recent_post.enable
-      include ./card_recent_post.pug
-    if theme.newest_comments.enable
-      include ./card_newest_comment.pug
-    if theme.ad && theme.ad.aside
-      include ./card_ad.pug
-    if theme.aside.card_categories.enable
-      include ./card_categories.pug
-    if theme.aside.card_tags.enable
-      include ./card_tags.pug
-    if theme.aside.card_archives.enable
-      include ./card_archives.pug
-    if theme.aside.card_webinfo.enable
-      include ./card_webinfo.pug
+#aside-content.aside-content
+  //- post
+  if is_post()
+    if showToc && theme.toc.style_simple
+      .sticky_layout
+        include ./card_post_toc.pug
+    else
+      !=partial('includes/widget/card_author', {}, {cache: true})
+      !=partial('includes/widget/card_announcement', {}, {cache: true})
+      !=partial('includes/widget/card_top_self', {}, {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})
+    !=partial('includes/widget/card_top_self', {}, {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_bottom_self', {}, {cache: true})
--- a/layout/page.pug
+++ b/layout/page.pug
@@ -1,34 +1,17 @@
 extends includes/layout.pug

 block content
-  if page.type === 'tags'
-    .tag-cloud
-      .tag-cloud__title= _p('page.tag')
-        |  - 
-        span.tag-cloud__amount= site.tags.length
-      .tag-cloud-tags
-        !=cloudTags({source: site.tags, minfontsize: 1, maxfontsize: 2.1, limit: 0, unit: 'em'})
-      if page.comments !== false && theme.comments && theme.comments.use
-        - var commentsJsLoad = true
-        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
-  else if page.type === 'link'
-    include flink.pug
-  else if page.type === 'categories'    
-    .category-content
-      .category-lists
-        .category__title= _p('page.category')
-          |  - 
-          span.category__amount= site.categories.length
-        div!= list_categories()
-      if page.comments !== false && theme.comments && theme.comments.use
-        - var commentsJsLoad = true
-        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
-  else
-    #page
-      if theme.douban && theme.douban.meta
-        if (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
-          meta(name="referrer" content="no-referrer")
-      #article-container!= page.content
-      if page.comments !== false && theme.comments && theme.comments.use
-        - var commentsJsLoad = true
-        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+  #page
+    case page.type
+      when 'tags'
+        include includes/page/tags.pug
+      when 'link'
+        include includes/page/flink.pug
+      when 'categories'
+        include includes/page/categories.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: true})
--- a/layout/post.pug
+++ b/layout/post.pug
@@ -1,8 +1,11 @@
 extends includes/layout.pug

 block content
-  article#post(class="")
-    #article-container.post-content!=page.content
+  #post
+    if top_img === false
+      include includes/header/post-info.pug
+
+    article#article-container.post-content!=page.content
    include includes/post/post-copyright.pug
    .tag_share
      if (theme.post_meta.post.tags)
@@ -12,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/layout/tag.pug
+++ b/layout/tag.pug
@@ -3,7 +3,7 @@ extends includes/layout.pug
 block content
  if theme.tag_ui == 'index'
    include ./includes/mixins/post-ui.pug
-    #recent-posts.recent-posts    
+    #recent-posts.recent-posts
      +postUI
      include includes/pagination.pug
  else
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hexo-theme-butterfly",
-  "version": "3.1.0",
+  "version": "3.8.3",
  "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.0",
-    "hexo-renderer-pug": "^1.0.0"
+    "hexo-renderer-stylus": "^2.0.1",
+    "hexo-renderer-pug": "^2.0.0"
  },
-  "homepage": "https://demo.jerryc.me/",
-  "author": "Jerry <wong@jerryc.me>",
+  "homepage": "https://butterfly.js.org/",
+  "author": "Jerry <i@immyw.com>",
  "license": "Apache-2.0"
 }
--- a/scripts/events/404.js
+++ b/scripts/events/404.js
@@ -9,7 +9,10 @@ hexo.extend.generator.register('404', function (locals) {
  if (!hexo.theme.config.error_404.enable) return
  return {
    path: '404.html',
-    data: locals.posts,
-    layout: ['404']
+    layout: ['page'],
+    data: {
+      type: '404',
+      top_img: false
+    }
  }
 })
--- a/scripts/events/check_hexo.js
+++ b/scripts/events/check_hexo.js
@@ -1,12 +0,0 @@
-const logger = require('hexo-log')()
-
-hexo.extend.filter.register('before_generate', () => {
-  // Get first two digits of the Hexo version number
-  var hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-
-  if (hexoVer < 4.2) {
-    logger.error('Please update Hexo to V4.2.0 or higher!')
-    logger.error('請把 Hexo 升級到 V4.2.0 或更高的版本！')
-    process.exit(-1)
-  }
-})
--- a/scripts/events/init.js
+++ b/scripts/events/init.js
@@ -0,0 +1,27 @@
+const logger = require('hexo-log')()
+
+hexo.extend.filter.register('before_generate', () => {
+  // Get first two digits of the Hexo version number
+  const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
+
+  if (hexoVer < 5) {
+    logger.error('Please update Hexo to V5.0.0 or higher!')
+    logger.error('請把 Hexo 升級到 V5.0.0 或更高的版本！')
+    process.exit(-1)
+  }
+
+  if (hexo.locals.get) {
+    const data = hexo.locals.get('data')
+    if (data && data.butterfly) {
+      logger.error(" 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' ")
+      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
+      process.exit(-1)
+    }
+  }
+
+  // let stylus to get the hexo highlight config
+  const themeConfig = hexo.theme.config
+  const hexoConfig = hexo.config
+  themeConfig.highlight_settings = hexoConfig.highlight
+  themeConfig.prismjs_settings = hexoConfig.prismjs
+})
--- a/scripts/events/replace_config.js
+++ b/scripts/events/replace_config.js
@@ -1,18 +0,0 @@
-/**
- * Note: configs in _data/butterfly.yml will merge configs with hexo.theme.config.
- */
-
-'use strict'
-
-const { deepMerge } = require('hexo-util')
-
-hexo.on('generateBefore', function () {
-  const rootConfig = hexo.config
-  if (hexo.locals.get) {
-    const data = hexo.locals.get('data')
-    if (data && data.butterfly) {
-      hexo.theme.config = deepMerge(hexo.theme.config, data.butterfly)
-    }
-  }
-  hexo.theme.config.rootConfig = rootConfig
-})
--- a/scripts/filters/post_lazyload.js
+++ b/scripts/filters/post_lazyload.js
@@ -8,9 +8,22 @@

 const urlFor = require('hexo-util').url_for.bind(hexo)

+function lazyload (htmlContent) {
+  const bg = hexo.theme.config.lazyload.placeholder ? urlFor(hexo.theme.config.lazyload.placeholder) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
+  return htmlContent.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
+}
+
+hexo.extend.filter.register('after_render:html', function (data) {
+  const config = hexo.theme.config.lazyload
+  if (!config.enable) return
+  if (config.field !== 'site') return
+  return lazyload.call(this, data)
+})
+
 hexo.extend.filter.register('after_post_render', data => {
-  if (!hexo.theme.config.lazyload.enable) return
-  const bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
-  data.content = data.content.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
+  const config = hexo.theme.config.lazyload
+  if (!config.enable) return
+  if (config.field !== 'post') return
+  data.content = lazyload.call(this, data.content)
  return data
 })
--- a/Show More
+++ b/Show More