fix: 文章頁分頁不顯示的 bug

improvement: 優化部分插件導致文章頁分頁樣式錯亂的 bug

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://buy.stripe.com/3cs6rP6YA91sbbG5kk','https://jsd.012700.xyz/gh/jerryc127/CDN/Photo/wechat.jpg'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE.md

@@ -1,52 +0,0 @@
-<!--
-IMPORTANT: Please follow the template to create a new issue.
-重要：請依照該模板來提交。
-
-If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
-如果你是由舊版本升級到新版，運行時出現報錯，請首先把config裏新的內容複製到舊的butterfly設置去
-
-If you are a problem when visit the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
-如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站
--->
-
-
-## I want to create a new issue <!-- 我想要建立一個新的issue --> 
-
-<!-- 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 [Hexo-theme-butterfly Documentation](https://jerryc.me/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
-
-<!-- Butterfly的版本 -->
-<!-- 檢視主題的package.json -->
-**Butterfly Version:**
-
-<!-- Windows/macOS/Linux/Android/iOS -->
-**Platform:**
-
-<!-- Chrome/Safari/FireFox/.. -->
-**Browser:**
-
-## Expected behavior <!-- (預期行為) -->
-
-## Actual behavior <!-- (實際行為) -->
-
-<!-- Please give me the screenshots to locate the issue -->
-<!-- 請儘量提供截圖來定位問題 -->
-
-## Steps to reproduce the behavior <!-- (重現步驟) -->
-
-## Feature Request
-
-<!-- If you have any ideas of theme-butterfly, please write down here and we can have a discussion. -->
-<!-- 如果你有任何關於Butterfly的功能方面的想法，可以在這個部分裡寫下來我們一起討論 -->
-
----
-
-<!--
-Love hexo-theme-butterfly? Please consider starring the repo to support it!
-喜歡 hexo-theme-butterfly嗎？ 考慮一下給它點個star來支援它吧！
--->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,83 @@
+name: Bug report
+description: Create a report to help us improve
+title: '[Bug]: '
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        重要：請依照該模板來提交 
+        Important: Please follow the template to create a new issue
+
+  - type: input
+    id: butterfly-ver
+    attributes:
+      label: 使用的 Butterfly 版本？ | What version of Butterfly are you using?
+      description: 檢視主題的 package.json | Check the theme's package.json
+    validations:
+      required: true
+
+  - type: dropdown
+    id: modify
+    attributes:
+      label: 是否修改過主題文件？ | Has the theme files been modified?
+      options:
+        - 是 (Yes)
+        - 否 (No)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: browser
+    attributes:
+      label: 使用的瀏覽器？ | What browser are you using?
+      options:
+        - Chrome
+        - Edge
+        - Safari
+        - Opera
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 使用的系統？ | What operating system are you using?
+      options:
+        - Windows
+        - macOS 
+        - Linux
+        - Android
+        - iOS
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: dependencies
+    attributes:
+      label: 依賴插件 | Package dependencies information
+      description: 在 Hexo 根目錄下執行 `npm ls --depth 0` | Run `npm ls --depth 0` in Hexo root directory
+      render: Text
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: 問題描述 | Describe the bug
+      description: 請描述你的問題現象 | A clear and concise description of what the bug is.
+      placeholder: 請儘量提供截圖來定位問題 | If applicable, add screenshots to help explain your problem
+      value:
+    validations:
+      required: true
+
+  - type: input
+    id: website
+    attributes:
+      label: 出現問題的網站 | Website with the issue
+      description: 請提供可復現問題的網站地址 | Please provide a website URL where the problem can be reproduced.
+      placeholder: 請填寫具體的網址，不要填寫 localhost 網站 | Please provide a specific URL, do not use localhost. 
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,18 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions about Butterfly
+    url: https://github.com/jerryc127/hexo-theme-butterfly/discussions
+    about: 一些使用問題請到 Discussion 詢問。 Please ask questions in Discussion.
+
+  - name: Butterfly Q&A
+    url: https://butterfly.js.org/posts/98d20436/
+    about: Butterfly Q&A
+
+  - name: Telegram
+    url: https://t.me/bu2fly
+    about: 'Official Telegram Group'
+
+  - name: QQ 群
+    url: https://jq.qq.com/?_wv=1027&k=KU9105XR
+    about: '群號 1070540070'
+

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,14 @@
+name: Feature request
+description: Suggest an idea for this project
+title: '[Feature]: '
+
+body:
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: 想要的功能 | What feature do you want?
+      description: 請描述你需要的新功能 | A clear and concise description of what the feature is.
+      placeholder:
+      value:
+    validations:
+      require: true

.github/stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - bug
-  - enhancement
-  - Solved
-  - documentation 
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.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 }}

.github/workflows/stale.yml

@@ -0,0 +1,19 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          days-before-issue-stale: 30
+          days-before-pr-stale: -1
+          days-before-close: 7
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          close-pr-message: 'This issue has not seen any activity since it was marked stale. Closing.'
+          stale-issue-label: 'Stale'
+          exempt-issue-labels: 'pinned,bug,enhancement,documentation,Plan'
+          operations-per-run: 1000

LICENSE

@@ -1,8 +1,202 @@
-MIT License
-Copyright (c) <year> <copyright holders>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,54 +1,117 @@
+<div align="right">
+<a title="Chinese" href="/README_CN.md">中文</a>
+</div>
+
+<div align="center">
+
+<img src="./source/img/butterfly-icon.png" width="150" height="150" />
+
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.5-blue"/></a>
-<a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
-<a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>
+![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-5.3.0+-0e83c)
+![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo:  👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+📢 Demo: [Butterfly](https://butterfly.js.org/) / [CrazyWong](https://blog.crazywong.com/)
 
-Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
+📖 Docs: [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/) / [Chinese](https://butterfly.js.org/posts/21cfbf15/)
 
-## Installation
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
+
+</div>
+
+---
+
+## 💻 Installation
+
+### GIT
+
+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)
 
 Stable branch [recommend]:
 
 ```
-git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 Dev branch:
 
 ```
-git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
-## Configuration
+### NPM
+
+> It supports Hexo 5.0.0 or later
+
+In Hexo site root directory 
+
+```powershell
+npm i hexo-theme-butterfly
+```
+
+## ⚙ Configuration
 
  Set theme in the hexo work folder's root config file `_config.yml`: 
 
-> theme: Butterfly
+> theme: butterfly
 
  If you don't have pug & stylus renderer, try this: 
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
-## Documentation
+## 🎉 Features
 
-Find in [hexo-theme-butterfly docs](https://docs.jerryc.me) and [JerryC](https://jerryc.me/posts/21cfbf15). it supports `zh-TW` and `zh-CN`
+- [x] Card UI Design
+- [x] Rounded Design/Squared Design
+- [X] Support sub-menu
+- [x] Two-column layout
+- [x] Responsive Web Design
+- [x] Dark Mode
+- [x] Pjax
+- [x] Read Mode
+- [x] Conversion between Traditional and Simplified Chinese
+- [X] TOC catalog is available for both computers and mobile phones
+- [X] Built-in Syntax Highlighting Themes (darker/pale night/light/ocean), also support customization
+- [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
+- [X] Disable copy/Add a Copyright Notice to the Copied Text
+- [X] Search (Algolia Search/Local Search)
+- [x] Mathjax and Katex
+- [x] Built-in 404 page
+- [x] WordCount
+- [x] Related articles
+- [x] Displays outdated notice for a post
+- [x] Share (Sharejs/Addtoany)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk)
+- [x] Multiple Comment System Support
+- [x] Online Chats (Chatra/Tidio/Crisp)
+- [x] Web analytics
+- [x] Google AdSense
+- [x] Webmaster Verification
+- [x] Change website colour scheme
+- [x] Typewriter Effect: activate_power_mode
+- [x] Background effects (Canvas ribbon/canvas_ribbon_piao/canvas_nest)
+- [x] Mouse click effects (Fireworks/Heart/Text)
+- [x] Preloader/Loading Animation/pace.js
+- [x] Busuanzi visitor counter
+- [x] Medium Zoom/Fancybox
+- [x] Mermaid
+- [x] Chart.js
+- [x] Justified Gallery
+- [x] Lazyload images
+- [x] Instantpage/Snackbar notification toast/PWA......
 
-You can also join the Chat Group.
+## ✨ Contributors
 
-[  💬 Join QQ Group [recommend]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb)
+<a href="https://github.com/jerryc127/hexo-theme-butterfly/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=jerryc127/hexo-theme-butterfly" />
+</a>
 
-[  💬 Join Telegram Group](https://t.me/hexo_butterfly)
+## 📷 Screenshots
 
-
-
-## Screenshots
-
-![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png)
-
-![](https://user-images.githubusercontent.com/16351105/58887457-3cc4b500-8718-11e9-9417-2bdea603c92e.png)
-
-![](https://user-images.githubusercontent.com/16351105/69338594-7d03f980-0c9e-11ea-8b64-7f165e6508e2.png)
+![](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)

README_CN.md

@@ -1,50 +1,117 @@
+<div align="right">
+  <a title="English" href="/README.md">English</a>
+</div>
+
+<div align="center">
+
+<img src="./source/img/butterfly-icon.png" width="150" height="150" />
+
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.5-blue"/></a>
-<a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
-<a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>
+![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-5.3.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/)
+📢 預覽: [Butterfly](https://butterfly.js.org/) / [CrazyWong](https://blog.crazywong.com/)
 
-一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
+📖 文檔: [中文](https://butterfly.js.org/posts/21cfbf15/) / [English](https://butterfly.js.org/en/posts/butterfly-docs-en-get-started/)
 
-## 安裝
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)
 
-在你的博客根目錄裡安裝穩定版【推薦】
+</div>
 
-```
-git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+---
+
+## 💻 安裝
+
+### Git 安裝
+
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/immyw/hexo-theme-butterfly.git)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+
+在博客根目錄裡安裝穩定版【推薦】
+
+```powershell
+git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 如果想要安裝比較新的dev分支，可以
 
-```
-git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+```powershell
+git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
-## 應用主題
+### npm 安裝
+
+> 此方法只支持Hexo 5.0.0以上版本
+
+在博客根目錄裡
+
+```powershell
+npm i hexo-theme-butterfly
+```
+
+## ⚙ 應用主題
+
 修改hexo配置文件`_config.yml`，把主題改為`Butterfly`
 
 ```
-theme: Butterfly
+theme: butterfly
 ```
 
->如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save or yarn add hexo-renderer-pug hexo-renderer-stylus
+>如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
-## 文檔
+## 🎉 特色
 
-可查看[hexo-theme-butterfly docs](https://docs.jerryc.me) 和 [JerryC](https://jerryc.me/posts/21cfbf15)
+- [x] 卡片化設計
+- [x] 圓角化設計/直角化設計
+- [X] 支持二級目錄
+- [x] 雙欄設計
+- [x] 響應式主題
+- [x] 夜間模式
+- [x] Pjax
+- [x] 文章閲讀模式
+- [x] 簡體和繁體轉換
+- [X] 電腦和手機都可查看TOC目錄
+- [X] 內置多種代碼配色（darker/pale night/light/ocean），可自定義代碼配色
+- [X] 代碼塊顯示代碼語言/關閉或展開代碼塊/代碼複製/代碼自動換行
+- [X] 可關閉文字複製/可開啟內容複製增加版權信息）
+- [X] 兩種搜索（ Algolia 搜索和本地搜索）
+- [x] Mathjax 和 Katex
+- [x] 內置404頁面
+- [x] 顯示字數統計
+- [x] 顯示相關文章
+- [x] 過期文章提醒
+- [x] 多種分享系統（Sharejs/Addtoany）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42/artalk）
+- [x] 支持雙評論部署
+- [x] 多種在線聊天（Chatra/Tidio/Crisp）
+- [x] 多種分析系統
+- [x] 谷歌廣告/手動廣告位置
+- [x] 各種站長驗證
+- [x] 修改網站配色
+- [x] 打字特效 activate_power_mode
+- [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
+- [x] 多種鼠標點擊特效（煙花/文字/愛心）
+- [x] 內置一種 Preloader 加載動畫和 pace.js 加載動畫條
+- [x] 不蒜子訪問統計
+- [x] 兩種大圖模式（Medium Zoom/Fancybox）
+- [x] Mermaid 圖表顯示
+- [x] Chart.js 圖表顯示
+- [x] 照片牆
+- [x] 圖片懶加載
+- [x] Instantpage/Snackbar彈窗/PWA......
 
-你也可以加入群組
+## ✨ 貢獻者
 
-[  💬 QQ群 [推薦]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb)
+<a href="https://github.com/jerryc127/hexo-theme-butterfly/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=jerryc127/hexo-theme-butterfly" />
+</a>
 
-[  💬Telegram群](https://t.me/hexo_butterfly)
+## 📷 截圖
 
-## 截圖
-
-![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png)
-![image](https://user-images.githubusercontent.com/16351105/58887457-3cc4b500-8718-11e9-9417-2bdea603c92e.png)
-
-![](https://user-images.githubusercontent.com/16351105/69338594-7d03f980-0c9e-11ea-8b64-7f165e6508e2.png)
+![](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)

languages/default.yml

@@ -1,56 +1,54 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
-  success: Copy successfully
-  error: Copy error
-  noSupport: The browser does not support
+  success: Copy Successful
+  error: Copy Failed
+  noSupport: Browser Not Supported
 
 page:
-  articles: Articles
+  articles: All Articles
   tag: Tag
   category: Category
   archives: Archives
 
-sticky: Sticky
-no_title: No title
+card_post_count: comments
+
+no_title: Untitled
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
-  min2read: "Reading time: %s min"
-  page_pv: Post View
+  wordcount: Word Count
+  min2read: Reading Time
+  min2read_unit: mins
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
     link: Link
     copyright_notice: Copyright Notice
-    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
-  recommend: Recommend
+    copyright_content: 'All articles on this blog are licensed under <a href="%s">%s</a> unless otherwise stated.'
+  recommend: Related Articles
+  edit: Edit
 
-search: Search
-algolia_search:
+search:
+  title: Search
+  load_data: Loading Database
   input_placeholder: Search for Posts
-  hits_empty: "We didn't find any results for the search: ${query}."
-  hits_stats: "${hits} results found in ${time} ms"
-
-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
+  algolia_search:
+    hits_empty: 'No results found for: ${query}'
+    hits_stats: '${hits} results found in ${time} ms'
+  local_search:
+    hits_empty: 'No results found for: ${query}'
+    hits_stats: '${hits} articles found'
 
 pagination:
-  prev: Previous Post
-  next: Next Post
+  prev: Previous
+  next: Next
 
-comment: Comment
+comment: Comments
 
 aside:
   articles: Articles
@@ -60,49 +58,64 @@ aside:
   card_categories: Categories
   card_tags: Tags
   card_archives: Archives
-  card_recent_post: Recent Post
-  card_bookmark: Bookmark
+  card_recent_post: Recent Posts
   card_webinfo:
-    headline: Info
-    article_name: Article
-    runtime_name: Run time
-    site_wordcount: Total Count
-    site_uv_name: UV
-    site_pv_name: PV
-  more_button: More
+    headline: Website Info
+    article_name: Article Count
+    runtime:
+      name: Runtime
+      unit: days
+    last_push_date:
+      name: Last Update
+    site_wordcount: Total Word Count
+    site_uv_name: Unique Visitors
+    site_pv_name: Page Views
+  more_button: View More
+  card_newest_comments:
+    headline: Latest Comments
+    loading_text: Loading...
+    error: Unable to retrieve comments, please check the configuration
+    zero: No comments
+    image: Image
+    link: Link
+    code: Code
+  card_toc: Contents
+  card_post_series: Post Series
 
-donate: Donate
+date_suffix:
+  just: Just now
+  min: minutes ago
+  hour: hours ago
+  day: days ago
+  month: months ago
+
+donate: Sponsor
 share: Share
-bookmark:
-  title: Bookmark
 
 rightside:
-  readmode_title: Read Mode
-  font_plus_title: Increase font size
-  font_minus_title: Decrease font size
-  translate_title: Traditional Chinese and Simplified Chinese Conversion
-  night_mode_title: Dark Mode
-  back_to_top: Back to top
+  readmode_title: Reading Mode
+  translate_title: Toggle Between Traditional 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 comment
-  setting: Setting
-
-runtime_unit: days
+  scroll_to_comment: Scroll to Comments
+  setting: Settings
+  aside: Toggle Between Single-column and Double-column
+  chat: Chat
 
 copy_copyright:
   author: Author
   link: Link
   source: Source
-  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
+  info: Copyright belongs to the author. For commercial use, please contact the author for authorization. For non-commercial use, 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
-  night_to_day: Light Mode Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
+  cht_to_chs: You have switched to Simplified Chinese
+  day_to_night: You have switched to Dark Mode
+  night_to_day: You have switched to Light Mode
 
-error_title: Page not found
 loading: Loading...
+load_more: Load More
+
+error404: Page Not Found

languages/en.yml

@@ -1,56 +1,54 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
-  success: Copy successfully
-  error: Copy error
-  noSupport: The browser does not support
+  success: Copy Successful
+  error: Copy Failed
+  noSupport: Browser Not Supported
 
 page:
-  articles: Articles
+  articles: All Articles
   tag: Tag
   category: Category
   archives: Archives
 
-sticky: Sticky
-no_title: No title
+card_post_count: comments
+
+no_title: Untitled
 
 post:
   created: Created
   updated: Updated
-  wordcount: Word count
-  min2read: "Reading time: %s min"
-  page_pv: Post View
+  wordcount: Word Count
+  min2read: Reading Time
+  min2read_unit: mins
+  page_pv: Post Views
   comments: Comments
   copyright:
     author: Author
     link: Link
     copyright_notice: Copyright Notice
-    copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
-  recommend: Recommend
+    copyright_content: 'All articles on this blog are licensed under <a href="%s">%s</a> unless otherwise stated.'
+  recommend: Related Articles
+  edit: Edit
 
-search: Search
-algolia_search:
+search:
+  title: Search
+  load_data: Loading Database
   input_placeholder: Search for Posts
-  hits_empty: "We didn't find any results for the search: ${query}."
-  hits_stats: "${hits} results found in ${time} ms"
-
-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
+  algolia_search:
+    hits_empty: 'No results found for: ${query}'
+    hits_stats: '${hits} results found in ${time} ms'
+  local_search:
+    hits_empty: 'No results found for: ${query}'
+    hits_stats: '${hits} articles found'
 
 pagination:
-  prev: Previous Post
-  next: Next Post
+  prev: Previous
+  next: Next
 
-comment: Comment
+comment: Comments
 
 aside:
   articles: Articles
@@ -60,49 +58,64 @@ aside:
   card_categories: Categories
   card_tags: Tags
   card_archives: Archives
-  card_recent_post: Recent Post
-  card_bookmark: Bookmark
+  card_recent_post: Recent Posts
   card_webinfo:
-    headline: Info
-    article_name: Article
-    runtime_name: Run time
-    site_wordcount: Total Count
-    site_uv_name: UV
-    site_pv_name: PV
-  more_button: More
+    headline: Website Info
+    article_name: Article Count
+    runtime:
+      name: Runtime
+      unit: days
+    last_push_date:
+      name: Last Update
+    site_wordcount: Total Word Count
+    site_uv_name: Unique Visitors
+    site_pv_name: Page Views
+  more_button: View More
+  card_newest_comments:
+    headline: Latest Comments
+    loading_text: Loading...
+    error: Unable to retrieve comments, please check the configuration
+    zero: No comments
+    image: Image
+    link: Link
+    code: Code
+  card_toc: Contents
+  card_post_series: Post Series
 
-donate: Donate
+date_suffix:
+  just: Just now
+  min: minutes ago
+  hour: hours ago
+  day: days ago
+  month: months ago
+
+donate: Sponsor
 share: Share
-bookmark:
-  title: Bookmark
 
 rightside:
-  readmode_title: Read Mode
-  font_plus_title: Increase font size
-  font_minus_title: Decrease font size
-  translate_title: Traditional Chinese and Simplified Chinese Conversion
-  night_mode_title: Dark Mode
-  back_to_top: Back to top
+  readmode_title: Reading Mode
+  translate_title: Toggle Between Traditional 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 comment
-  setting: Setting
-
-runtime_unit: days
+  scroll_to_comment: Scroll to Comments
+  setting: Settings
+  aside: Toggle Between Single-column and Double-column
+  chat: Chat
 
 copy_copyright:
   author: Author
   link: Link
   source: Source
-  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
+  info: Copyright belongs to the author. For commercial use, please contact the author for authorization. For non-commercial use, 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
-  night_to_day: Light Mode Activated Manually
+  chs_to_cht: You have switched to Traditional Chinese
+  cht_to_chs: You have switched to Simplified Chinese
+  day_to_night: You have switched to Dark Mode
+  night_to_day: You have switched to Light Mode
 
-error_title: Page not found
 loading: Loading...
+load_more: Load More
+
+error404: Page Not Found

languages/ja.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: フレームワーク
+  theme: テーマ
+
+copy:
+  success: コピー成功
+  error: コピー失敗
+  noSupport: ブラウザが対応していません
+
+page:
+  articles: 記事一覧
+  tag: タグ
+  category: カテゴリ
+  archives: アーカイブ
+
+card_post_count: コメント数
+
+no_title: タイトルなし
+
+post:
+  created: 作成日
+  updated: 更新日
+  wordcount: 総文字数
+  min2read: 読む時間
+  min2read_unit: 分
+  page_pv: 閲覧数
+  comments: コメント数
+  copyright:
+    author: 著者
+    link: リンク
+    copyright_notice: 著作権表示
+    copyright_content: 'このブログのすべての記事は、<a href="%s">%s</a> ライセンスの下で提供されており、特に明記されていない限り、すべての権利を留保します。転載時には出典を明記してください: <a href="%s">%s</a>。'
+  recommend: 関連記事
+  edit: 編集
+
+search:
+  title: 検索
+  load_data: データベースを読み込んでいます
+  input_placeholder: 記事を検索
+  algolia_search:
+    hits_empty: '${query} の検索結果が見つかりませんでした。'
+    hits_stats: '${hits} 件の結果が ${time}ms で見つかりました'
+  local_search:
+    hits_empty: '${query} の検索結果が見つかりませんでした。'
+    hits_stats: '${hits} 件の記事が見つかりました'
+
+pagination:
+  prev: 前へ
+  next: 次へ
+
+comment: コメント
+
+aside:
+  articles: 記事
+  tags: タグ
+  categories: カテゴリ
+  card_announcement: お知らせ
+  card_categories: カテゴリ
+  card_tags: タグ
+  card_archives: アーカイブ
+  card_recent_post: 最近の記事
+  card_webinfo:
+    headline: サイト情報
+    article_name: 記事数
+    runtime:
+      name: 稼働時間
+      unit: 日
+    last_push_date:
+      name: 最終更新日
+    site_wordcount: 総文字数
+    site_uv_name: ユーザー数
+    site_pv_name: ページビュー数
+  more_button: もっと見る
+  card_newest_comments:
+    headline: 最新コメント
+    loading_text: ローディング中...
+    error: コメントを取得できませんでした。設定を確認してください。
+    zero: コメントがありません
+    image: 画像
+    link: リンク
+    code: コード
+  card_toc: 目次
+  card_post_series: シリーズ記事
+
+date_suffix:
+  just: たった今
+  min: 分前
+  hour: 時間前
+  day: 日前
+  month: ヶ月前
+
+donate: 寄付
+share: 共有
+
+rightside:
+  readmode_title: 読書モード
+  translate_title: 簡体字と繁体字の切り替え
+  night_mode_title: ライトモード/ダークモード切り替え
+  back_to_top: トップに戻る
+  toc: 目次
+  scroll_to_comment: コメントへ移動
+  setting: 設定
+  aside: シングルカラムとダブルカラムの切り替え
+  chat: チャット
+
+copy_copyright:
+  author: 著者
+  link: リンク
+  source: ソース
+  info: 著作権は著者に帰属します。商業的利用の場合は著者に連絡して許可を得てください。非商業的利用の場合は出典を明記してください。
+
+Snackbar:
+  chs_to_cht: 繁体字に切り替えました
+  cht_to_chs: 簡体字に切り替えました
+  day_to_night: ダークモードに切り替えました
+  night_to_day: ライトモードに切り替えました
+
+loading: ローディング中...
+load_more: もっと見る
+
+error404: ページが見つかりません

languages/ko.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: 프레임워크
+  theme: 테마
+
+copy:
+  success: 복사 성공
+  error: 복사 실패
+  noSupport: 브라우저가 지원되지 않음
+
+page:
+  articles: 모든 글
+  tag: 태그
+  category: 카테고리
+  archives: 아카이브
+
+card_post_count: 댓글 수
+
+no_title: 제목 없음
+
+post:
+  created: 작성일
+  updated: 수정일
+  wordcount: 총 글자 수
+  min2read: 읽기 시간
+  min2read_unit: 분
+  page_pv: 조회수
+  comments: 댓글
+  copyright:
+    author: 작성자
+    link: 링크
+    copyright_notice: 저작권 고지
+    copyright_content: '이 블로그의 모든 글은 <a href="%s">%s</a> 라이선스를 따르며, 별도로 명시되지 않는 한 모든 권리를 보유합니다. 재배포 시 출처를 명시해 주세요: <a href="%s">%s</a>.'
+  recommend: 관련 글
+  edit: 편집
+
+search:
+  title: 검색
+  load_data: 데이터베이스 로드 중
+  input_placeholder: 글 검색
+  algolia_search:
+    hits_empty: '${query}에 대한 결과를 찾을 수 없습니다.'
+    hits_stats: '${hits}개의 결과를 ${time}ms 만에 찾음'
+  local_search:
+    hits_empty: '${query}에 대한 결과를 찾을 수 없습니다.'
+    hits_stats: '${hits}개의 글을 찾음'
+
+pagination:
+  prev: 이전
+  next: 다음
+
+comment: 댓글
+
+aside:
+  articles: 글
+  tags: 태그
+  categories: 카테고리
+  card_announcement: 공지
+  card_categories: 카테고리
+  card_tags: 태그
+  card_archives: 아카이브
+  card_recent_post: 최근 글
+  card_webinfo:
+    headline: 사이트 정보
+    article_name: 글 수
+    runtime:
+      name: 운영 시간
+      unit: 일
+    last_push_date:
+      name: 마지막 업데이트
+    site_wordcount: 총 글자 수
+    site_uv_name: 방문자 수
+    site_pv_name: 총 조회수
+  more_button: 더 보기
+  card_newest_comments:
+    headline: 최신 댓글
+    loading_text: 로딩 중...
+    error: 댓글을 가져올 수 없습니다. 설정을 확인해 주세요.
+    zero: 댓글 없음
+    image: 이미지
+    link: 링크
+    code: 코드
+  card_toc: 목차
+  card_post_series: 시리즈 글
+
+date_suffix:
+  just: 방금
+  min: 분 전
+  hour: 시간 전
+  day: 일 전
+  month: 달 전
+
+donate: 후원
+share: 공유
+
+rightside:
+  readmode_title: 읽기 모드
+  translate_title: 번체와 간체 전환
+  night_mode_title: 라이트/다크 모드 전환
+  back_to_top: 맨 위로
+  toc: 목차
+  scroll_to_comment: 댓글로 이동
+  setting: 설정
+  aside: 단일/이중 열 전환
+  chat: 채팅
+
+copy_copyright:
+  author: 작성자
+  link: 링크
+  source: 출처
+  info: 저작권은 작성자에게 있습니다. 상업적 사용을 위해서는 작성자의 허가를 받아야 하며, 비상업적 사용 시에는 출처를 명시해 주세요.
+
+Snackbar:
+  chs_to_cht: 번체로 전환되었습니다.
+  cht_to_chs: 간체로 전환되었습니다.
+  day_to_night: 다크 모드로 전환되었습니다.
+  night_to_day: 라이트 모드로 전환되었습니다.
+
+loading: 로딩 중...
+load_more: 더 보기
+
+error404: 페이지를 찾을 수 없습니다.

languages/zh-CN.yml

@@ -1,52 +1,49 @@
-sidebar:
-  catalog: 目录
-  have_read: 你已经读了
-
 footer:
-  driven: 驱动
+  framework: 框架
   theme: 主题
 
 copy:
   success: 复制成功
-  error: 复制错误
+  error: 复制失败
   noSupport: 浏览器不支持
 
 page:
-  articles: 文章总览
+  articles: 全部文章
   tag: 标签
   category: 分类
   archives: 归档
 
-sticky: 置顶
-no_title: 无题
+card_post_count: 条评论
+
+no_title: 无标题
 
 post:
   created: 发表于
   updated: 更新于
-  wordcount: 字数总计
-  min2read: "阅读时长: %s 分钟"
-  page_pv: 阅读量
+  wordcount: 总字数
+  min2read: 阅读时长
+  min2read_unit: 分钟
+  page_pv: 浏览量
   comments: 评论数
   copyright:
     author: 文章作者
     link: 文章链接
     copyright_notice: 版权声明
     copyright_content: '本博客所有文章除特别声明外，均采用
-      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
+      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来源 <a href="%s" target="_blank">%s</a>！'
   recommend: 相关推荐
+  edit: 编辑
 
-search: 搜索
-algolia_search:
+search:
+  title: 搜索
+  load_data: 数据加载中
   input_placeholder: 搜索文章
-  hits_empty: "找不到您查询的内容:${query}"
-  hits_stats: "找到 ${hits} 条结果，用时 ${time} 毫秒"
-
-local_search:
-  label: 本地搜索
-  input_placeholder: 搜索文章
-  hits_empty: "找不到您查询的内容:${query}"
-  powered: "提供支持"
-  by: 由
+  algolia_search:
+    hits_empty: '未找到符合您查询的内容：${query}'
+    hits_stats: '找到 ${hits} 条结果，耗时 ${time} 毫秒'
+  local_search:
+    hits_empty: '未找到符合您查询的内容：${query}'
+    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -63,33 +60,49 @@ aside:
   card_tags: 标签
   card_archives: 归档
   card_recent_post: 最新文章
-  card_bookmark: 加入书签
   card_webinfo:
-    headline: 网站资讯
+    headline: 网站信息
     article_name: 文章数目
-    runtime_name: 已运行时间
+    runtime:
+      name: 运行时间
+      unit: 天
+    last_push_date:
+      name: 最后更新时间
     site_wordcount: 本站总字数
     site_uv_name: 本站访客数
-    site_pv_name: 本站总访问量
+    site_pv_name: 本站总浏览量
   more_button: 查看更多
+  card_newest_comments:
+    headline: 最新评论
+    loading_text: 加载中...
+    error: 无法获取评论，请确认相关配置是否正确
+    zero: 暂无评论
+    image: 图片
+    link: 链接
+    code: 代码
+  card_toc: 目录
+  card_post_series: 系列文章
 
-donate: 打赏
+date_suffix:
+  just: 刚刚
+  min: 分钟前
+  hour: 小时前
+  day: 天前
+  month: 个月前
+
+donate: 赞助
 share: 分享
-bookmark:
-  title: 添加书签
 
 rightside:
   readmode_title: 阅读模式
-  font_plus_title: 放大字体
-  font_minus_title: 缩小字体
   translate_title: 简繁转换
-  night_mode_title: 夜间模式
+  night_mode_title: 日间和夜间模式切换
   back_to_top: 回到顶部
   toc: 目录
-  scroll_to_comment: 直达评论
+  scroll_to_comment: 前往评论
   setting: 设置
-
-runtime_unit: 天
+  aside: 单栏和双栏切换
+  chat: 聊天
 
 copy_copyright:
   author: 作者
@@ -98,13 +111,12 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 键将本页加入书签
-  chs_to_cht: 你已切换为繁体
-  cht_to_chs: 你已切换为简体
-  day_to_night: 你已切换为深色模式
-  night_to_day: 你已切换为浅色模式
+  chs_to_cht: 已切换为繁体中文
+  cht_to_chs: 已切换为简体中文
+  day_to_night: 已切换为深色模式
+  night_to_day: 已切换为浅色模式
 
-error_title: 页面没有找到
-loading: 加载中...
+loading: 加载中...
+load_more: 加载更多
+
+error404: 页面未找到

languages/zh-HK.yml

@@ -0,0 +1,121 @@
+footer:
+  framework: 框架
+  theme: 主題
+
+copy:
+  success: 複製成功
+  error: 複製失敗
+  noSupport: 瀏覽器不支援
+
+page:
+  articles: 全部文章
+  tag: 標籤
+  category: 分類
+  archives: 歸檔
+
+card_post_count: 條評論
+
+no_title: 無標題
+
+post:
+  created: 發表於
+  updated: 更新於
+  wordcount: 字數統計
+  min2read: 閱讀時間
+  min2read_unit: 分鐘
+  page_pv: 瀏覽量
+  comments: 評論數
+  copyright:
+    author: 文章作者
+    link: 文章連結
+    copyright_notice: 版權聲明
+    copyright_content: '除特別聲明外，本博客所有文章均採用<a href="%s">%s</a> 授權協議。轉載請註明出處：<a href="%s">%s</a>。'
+  recommend: 相關文章
+  edit: 編輯
+
+search:
+  title: 搜尋
+  load_data: 正在加載數據庫
+  input_placeholder: 搜尋文章
+  algolia_search:
+    hits_empty: '未找到相關內容：${query}'
+    hits_stats: '找到 ${hits} 條結果，耗時 ${time} 毫秒'
+  local_search:
+    hits_empty: '未找到相關內容：${query}'
+    hits_stats: '找到 ${hits} 篇文章'
+
+pagination:
+  prev: 上一頁
+  next: 下一頁
+
+comment: 評論
+
+aside:
+  articles: 文章
+  tags: 標籤
+  categories: 分類
+  card_announcement: 公告
+  card_categories: 分類
+  card_tags: 標籤
+  card_archives: 歸檔
+  card_recent_post: 最新文章
+  card_webinfo:
+    headline: 網站資訊
+    article_name: 文章數目
+    runtime:
+      name: 運行時間
+      unit: 天
+    last_push_date:
+      name: 最後更新時間
+    site_wordcount: 總字數
+    site_uv_name: 訪客數
+    site_pv_name: 總瀏覽量
+  more_button: 查看更多
+  card_newest_comments:
+    headline: 最新評論
+    loading_text: 正在加載...
+    error: 無法取得評論，請確認配置是否正確
+    zero: 暫無評論
+    image: 圖片
+    link: 連結
+    code: 代碼
+  card_toc: 目錄
+  card_post_series: 系列文章
+
+date_suffix:
+  just: 剛剛
+  min: 分鐘前
+  hour: 小時前
+  day: 天前
+  month: 個月前
+
+donate: 贊助
+share: 分享
+
+rightside:
+  readmode_title: 閱讀模式
+  translate_title: 簡繁轉換
+  night_mode_title: 切換日夜模式
+  back_to_top: 回到頂部
+  toc: 目錄
+  scroll_to_comment: 前往評論
+  setting: 設定
+  aside: 單欄與雙欄切換
+  chat: 聊天
+
+copy_copyright:
+  author: 作者
+  link: 連結
+  source: 來源
+  info: 版權屬於作者所有。商業用途請聯絡作者獲得授權，非商業用途請註明出處。
+
+Snackbar:
+  chs_to_cht: 已切換為繁體中文
+  cht_to_chs: 已切換為簡體中文
+  day_to_night: 已切換為深色模式
+  night_to_day: 已切換為淺色模式
+
+loading: 正在加載...
+load_more: 加載更多
+
+error404: 未找到頁面

languages/zh-TW.yml

@@ -1,52 +1,48 @@
-sidebar:
-  catalog: 目錄
-  have_read: 你已經讀了
-
 footer:
-  driven: Power by
-  theme: Theme
+  framework: 框架
+  theme: 主題
 
 copy:
   success: 複製成功
-  error: 複製錯誤
+  error: 複製失敗
   noSupport: 瀏覽器不支援
 
 page:
-  articles: 文章總覽
+  articles: 所有文章
   tag: 標籤
   category: 分類
   archives: 歸檔
 
-sticky: 置頂
-no_title: 無題
+card_post_count: 則評論
+
+no_title: 無標題
 
 post:
   created: 發表於
   updated: 更新於
-  wordcount: 字數總計
-  min2read: "閱讀時長: %s 分鐘"
-  page_pv: 閱讀量
+  wordcount: 總字數
+  min2read: 閱讀時間
+  min2read_unit: 分鐘
+  page_pv: 瀏覽量
   comments: 評論數
   copyright:
     author: 文章作者
     link: 文章連結
     copyright_notice: 版權聲明
-    copyright_content: '本部落格所有文章除特別聲明外，均採用
-      <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
+    copyright_content: '本部落格所有文章除特別聲明外，均採用<a href="%s" target="_blank">%s</a> 授權協議。轉載請註明來源 <a href="%s" target="_blank">%s</a>！'
   recommend: 相關推薦
+  edit: 編輯
 
-search: 搜尋
-algolia_search:
+search:
+  title: 搜尋
+  load_data: 資料載入中
   input_placeholder: 搜尋文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  hits_stats: "找到 ${hits} 條結果，用時 ${time} 毫秒"
-
-local_search:
-  label: 本地搜尋
-  input_placeholder: 搜尋文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  powered: "提供支援"
-  by: 由
+  algolia_search:
+    hits_empty: '找不到符合您查詢的內容：${query}'
+    hits_stats: '找到 ${hits} 筆結果，耗時 ${time} 毫秒'
+  local_search:
+    hits_empty: '找不到符合您查詢的內容：${query}'
+    hits_stats: '共找到 ${hits} 篇文章'
 
 pagination:
   prev: 上一篇
@@ -63,49 +59,63 @@ aside:
   card_tags: 標籤
   card_archives: 歸檔
   card_recent_post: 最新文章
-  card_bookmark: 加入書籤
   card_webinfo:
     headline: 網站資訊
-    article_name: 文章數目
-    runtime_name: 已執行時間
-    site_wordcount: 本站總字數
-    site_uv_name: 本站訪客數
-    site_pv_name: 本站總訪問量
+    article_name: 文章數量
+    runtime:
+      name: 運行時間
+      unit: 天
+    last_push_date:
+      name: 最後更新時間
+    site_wordcount: 總字數
+    site_uv_name: 訪客數
+    site_pv_name: 總瀏覽量
   more_button: 檢視更多
+  card_newest_comments:
+    headline: 最新評論
+    loading_text: 載入中...
+    error: 無法獲取評論，請確認相關配置是否正確
+    zero: 尚無評論
+    image: 圖片
+    link: 連結
+    code: 程式碼
+  card_toc: 目錄
+  card_post_series: 系列文章
 
-donate: 打賞
+date_suffix:
+  just: 剛剛
+  min: 分鐘前
+  hour: 小時前
+  day: 天前
+  month: 個月前
+
+donate: 贊助
 share: 分享
-bookmark:
-  title: 新增書籤
 
 rightside:
   readmode_title: 閱讀模式
-  font_plus_title: 放大字型
-  font_minus_title: 縮小字型
-  translate_title: 簡繁轉換
-  night_mode_title: 夜間模式
-  back_to_top: 回到頂部
+  translate_title: 繁簡轉換
+  night_mode_title: 日夜模式切換
+  back_to_top: 回到頂端
   toc: 目錄
-  scroll_to_comment: 直達評論
+  scroll_to_comment: 前往評論
   setting: 設定
-
-runtime_unit: 天
+  aside: 單欄和雙欄切換
+  chat: 聊天
 
 copy_copyright:
   author: 作者
   link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。如需商業轉載，請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 鍵將本頁加入書籤
-  chs_to_cht: 你已切換為繁體
-  cht_to_chs: 你已切換為簡體
-  day_to_night: 你已切換為深色模式
-  night_to_day: 你已切換為淺色模式
+  chs_to_cht: 已切換為繁體中文
+  cht_to_chs: 已切換為簡體中文
+  day_to_night: 已切換為深色模式
+  night_to_day: 已切換為淺色模式
 
-error_title: 頁面沒有找到
 loading: 載入中...
+load_more: 載入更多
 
+error404: 找不到頁面

layout/404.pug

@@ -1,24 +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
-
-    include includes/mobile-sidebar/index.pug
-
-    nav#nav.error-no-found(style=bg_img)
-      include includes/header/header.pug
-      #error_info.is-center
-        h1#error_title= '404'
-        #error_subtitle= theme.error_404.subtitle
-    include includes/rightside.pug
-    !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
-    include includes/additional-js.pug

layout/archive.pug

@@ -3,6 +3,6 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    .article-sort-title= _p('page.articles') + ' - ' + site.posts.length
+    .article-sort-title= `${_p('page.articles')} - ${getArchiveLength()}`
     +articleSort(page.posts)
     include includes/pagination.pug

layout/category.pug

@@ -2,13 +2,11 @@ extends includes/layout.pug
 
 block content
   if theme.category_ui == 'index'
-    include ./includes/mixins/post-ui.pug
-    #recent-posts.recent-posts.category_ui   
-      +postUI
-      include includes/pagination.pug    
+    include ./includes/mixins/indexPostUI.pug
+    +indexPostUI
   else
     include ./includes/mixins/article-sort.pug
     #category
       .article-sort-title= _p('page.category') + ' - ' + page.category
       +articleSort(page.posts)
-      include includes/pagination.pug    
+      include includes/pagination.pug

layout/flink.pug

@@ -1,21 +0,0 @@
-#page
-  .flink#article-container
-    if site.data.link
-      each i in site.data.link
-        h2= i.class_name
-        .post-cards
-          .md-links
-            each item in i.link_list
-              .md-links-item
-                a(href=url_for(item.link)  title=item.name target="_blank")
-                  if theme.lazyload
-                    img(data-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt=item.name )
-                  else
-                    img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt=item.name )
-                  .md-links-title= item.name 
-                  .md-links-des= item.descr
-    != page.content
-  if page.comments !== false
-    include includes/comments/index.pug
-
-

layout/includes/additional-js.pug

@@ -1,74 +1,57 @@
-script(src=url_for(theme.CDN.jquery))
-script(src=url_for(theme.CDN.utils))
-script(src=url_for(theme.CDN.main))
+div
+  script(src=url_for(theme.asset.utils))
+  script(src=url_for(theme.asset.main))
 
-if theme.translate && theme.translate.enable
-  script(src=url_for(theme.CDN.translate))
+  if theme.translate.enable
+    script(src=url_for(theme.asset.translate))
 
-if (theme.medium_zoom && theme.medium_zoom.enable)
-  script(src=url_for(theme.CDN.medium_zoom))
+  if theme.lightbox
+    script(src=url_for(theme.asset[theme.lightbox]))
 
-if (theme.fancybox && theme.fancybox.enable)
-  script(src=url_for(theme.CDN.fancybox))
+  if theme.instantpage
+    script(src=url_for(theme.asset.instantpage), type='module')
 
-include ./math/index.pug 
+  if theme.lazyload.enable && !theme.lazyload.native
+    script(src=url_for(theme.asset.lazyload))
 
-if theme.fireworks && theme.fireworks.enable
-  script(src=url_for(theme.CDN.anime))
-  script(src=url_for(theme.CDN.fireworks))
+  if theme.snackbar.enable
+    script(src=url_for(theme.asset.snackbar))
 
-if (theme.snackbar && theme.snackbar.enable)
-  script(src=url_for(theme.CDN.snackbar))
+  .js-pjax
+    if needLoadCountJs
+      != partial("includes/third-party/card-post-count/index", {}, { cache: true })
 
-if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  include ./third-party/canvas-ribbon.pug
+    if loadSubJs
+      include ./third-party/subtitle.pug
 
-if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
-  include ./third-party/canvas-ribbon-piao.pug
+    include ./third-party/math/index.pug
+    include ./third-party/abcjs/index.pug
 
-if (theme.canvas_nest && theme.canvas_nest.enable)
-  include ./third-party/canvas-nest.pug 
+    if commentsJsLoad
+      include ./third-party/comments/js.pug
 
-if theme.activate_power_mode.enable
-  script(src=url_for(theme.CDN.activate_power_mode))
-  script.
-    POWERMODE.colorful = #{theme.activate_power_mode.colorful};
-    POWERMODE.shake = #{theme.activate_power_mode.shake};
-    document.body.addEventListener('input', POWERMODE);
+  != partial("includes/third-party/prismjs", {}, { cache: true })
 
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  script(async src=url_for(theme.CDN.busuanzi))
+  if theme.aside.enable && theme.aside.card_newest_comments.enable
+    if theme.pjax.enable || (globalPageType !== 'post' && page.aside !== false)
+      != partial("includes/third-party/newest-comments/index", {}, { cache: true })
 
-if theme.instantpage.enable
-  script(src=url_for(theme.CDN.instantpage) type="module")
+  != fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-if theme.lazyload
-  script(src=url_for(theme.CDN.lazyload))
+  != partial("includes/third-party/effect", {}, { cache: true })
+  != partial("includes/third-party/chat/index", {}, { cache: true })
 
-//- 鼠標特效
-if theme.click_heart && theme.click_heart.enable
-  script(src=url_for(theme.CDN.click_heart))
+  if theme.aplayerInject && theme.aplayerInject.enable
+    if theme.pjax.enable || theme.aplayerInject.per_page || page.aplayer
+      include ./third-party/aplayer.pug
 
-if theme.ClickShowText && theme.ClickShowText.enable
-  script(src=url_for(theme.CDN.ClickShowText))
+  if theme.pjax.enable
+    != partial("includes/third-party/pjax", {}, { cache: true })
 
-if theme.pangu && theme.pangu.enable
-  include ./third-party/pangu.pug
+  if theme.umami_analytics.enable
+    != partial("includes/third-party/umami_analytics", {}, { cache: true })
 
-//- search
-if theme.algolia_search && theme.algolia_search.enable
-  script(src=url_for(theme.CDN.algolia_js))
-else if theme.local_search && theme.local_search.enable
-  script(src=url_for(theme.CDN.local_search))
+  if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+    script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
 
-//- mermaid
-if theme.mermaid.enable
-  include ./math/mermaid.pug
-
-if is_home()
-  include ./head/subtitle.pug
-
-!=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
-
-if theme.preloader
-  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
+  != partial('includes/third-party/search/index', {}, { cache: true })

layout/includes/comments/disqus.pug

@@ -1,24 +0,0 @@
-#disqus_thread
-script.
-  var disqus_config = function () {
-    this.page.url = '!{ page.permalink }';
-    this.page.identifier = '!{ page.path }';
-    this.page.title = '!{ page.title }';
-  };
-  (function() { 
-    var d = document, s = d.createElement('script');
-    s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
-    s.setAttribute('data-timestamp', +new Date());
-    (d.head || d.body).appendChild(s);
-  })();
-
-if is_post() && theme.disqus.count
-  script.
-    function getDisqusCount() {
-      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);
-    }
-
-    window.addEventListener('load', getDisqusCount, false);

layout/includes/comments/disqusjs.pug

@@ -1,24 +0,0 @@
-#disqus_thread
-script(src=url_for(theme.CDN.disqusjs))
-script.
-  var dsqjs = new DisqusJS({
-    shortname: '!{theme.disqusjs.shortname}',
-    siteName: "!{theme.disqusjs.siteName}",
-    identifier: '!{ page.path }',
-    url: '!{ page.permalink }',
-    title: '!{ page.title }',
-    api: '!{theme.disqusjs.api}',
-    apikey: '!{theme.disqusjs.apikey}',
-    admin: '!{theme.disqusjs.admin}',
-    adminLabel: '!{theme.disqusjs.adminLabel}'
-  });
-
-if is_post() && theme.disqusjs.count
-  script.
-    function getDisqusCount() {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqusjs.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
-    }
-    window.addEventListener('load', getDisqusCount, false);

layout/includes/comments/facebook_comments.pug

@@ -1,12 +0,0 @@
-#fb-root
-script(async defer crossorigin="anonymous" src=`https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v6.0`)
-.fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
-            data-href=urlNoIndex() 
-            data-numposts= theme.facebook_comments.pageSize || 10
-            data-order-by= theme.facebook_comments.order_by || 'social'
-            data-width="100%")
-
-if theme.darkmode.enable
-  script.
-    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-    document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow)

layout/includes/comments/gitalk.pug

@@ -1,27 +0,0 @@
-#gitalk-container
-script.
-  var gitalk = new Gitalk({
-    clientID: '!{theme.gitalk.client_id}',
-    clientSecret: '!{theme.gitalk.client_secret}',
-    repo: '!{theme.gitalk.repo}',
-    owner: '!{theme.gitalk.owner}',
-    admin: ['!{theme.gitalk.admin}'],
-    id: md5(decodeURI(location.pathname)),
-    language: '!{theme.gitalk.language}',
-    perPage: !{theme.gitalk.perPage},
-    distractionFreeMode: !{theme.gitalk.distractionFreeMode},
-    pagerDirection: '!{theme.gitalk.pagerDirection}',
-    createIssueManually: !{theme.gitalk.createIssueManually},
-    updateCountCallback: commentCount
-  })
-  gitalk.render('gitalk-container')
-
-  function commentCount(n){
-    try {
-      document.getElementsByClassName('gitalk-comment-count')[0].innerHTML= n
-    } catch (e) {
-      return false
-    }
-  }
-
-

layout/includes/comments/index.pug

@@ -1,29 +0,0 @@
-- var d = theme.disqus && theme.disqus.enable
-- var dj = theme.disqusjs && theme.disqusjs.enable
-- var l = theme.laibili && theme.laibili.enable
-- var gt = theme.gitalk && theme.gitalk.enable
-- var v = theme.valine && theme.valine.enable
-- var u = theme.utterances && theme.utterances.enable
-- var fb = theme.facebook_comments && theme.facebook_comments.enable
-- var isComment = d || dj || l || gt || v || u || fb
-
-if isComment
-  hr
-  #post-comment
-    .comment_headling
-      i.fa.fa-comments.fa-fw(aria-hidden="true")
-      span= ' ' + _p('comment')
-    if d
-      include ./disqus.pug
-    else if dj
-      include ./disqusjs.pug
-    else if l
-      include ./laibili.pug
-    else if gt
-      include ./gitalk.pug
-    else if v
-      include ./valine.pug
-    else if u
-      include ./utterances.pug
-    else if fb
-      include ./facebook_comments.pug

layout/includes/comments/laibili.pug

@@ -1,10 +0,0 @@
-#lv-container(data-id="city" data-uid=theme.laibili.uid)
-  script.
-    (function(d, s) {
-        var j, e = d.getElementsByTagName(s)[0];
-        if (typeof LivereTower === 'function') { return; }
-        j = d.createElement(s);
-        j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-        j.async = true;
-        e.parentNode.insertBefore(j, e);
-    })(document, 'script');

layout/includes/comments/utterances.pug

@@ -1,21 +0,0 @@
-script#utterances_comment(src=theme.CDN.utterances
-        repo=theme.utterances.repo
-        issue-term=theme.utterances.issue_term
-        theme= theme.display_mode === 'dark' ? theme.utterances.dark_theme : theme.utterances.light_theme
-        crossorigin="anonymous"
-        async)
-
-if theme.darkmode.enable
-  script.
-    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-    document.getElementById('utterances_comment').setAttribute('theme',themeNow)
-
-    function utterancesTheme () {
-    var theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-    const message = {
-      type: 'set-theme',
-      theme: theme
-    };
-    const iframe = document.querySelector('.utterances-frame');
-    iframe.contentWindow.postMessage(message, 'https://utteranc.es');
-    }

layout/includes/comments/valine.pug

@@ -1,37 +0,0 @@
-- let emojiMaps = '""'
-if site.data.valine
-  - emojiMaps = JSON.stringify(site.data.valine)
-
-#vcomment.vcomment
-script(src=url_for(theme.CDN.valine))
-script.
-  var requestSetting = function (from,set) {
-    var from = from
-    var setting = set.split(',').filter(function(item){
-    return from.indexOf(item) > -1
-    });
-    setting = setting.length == 0 ? from :setting;
-    return setting
-  }
-
-  var guestInfo = requestSetting(['nick','mail','link'],'#{ theme.valine.guest_info }')
-  var requiredFields = requestSetting(['nick','mail','link'],'#{ theme.valine.requiredFields }')
-
-  window.valine = new Valine({
-    el:'#vcomment',
-    appId: '#{theme.valine.appId}',
-    appKey: '#{theme.valine.appKey}',
-    notify: #{theme.valine.notify},
-    verify: #{theme.valine.verify},
-    placeholder: '#{theme.valine.placeholder}',
-    avatar: '#{theme.valine.avatar}',
-    meta: guestInfo,
-    pageSize: '#{theme.valine.pageSize}',
-    lang: '#{theme.valine.lang}',
-    recordIP: #{theme.valine.recordIP},
-    serverURLs: '#{theme.valine.serverURLs}',
-    emojiCDN: '#{theme.valine.emojiCDN}',
-    emojiMaps: !{emojiMaps},
-    enableQQ: #{theme.valine.enableQQ},
-    requiredFields: requiredFields
-  });

layout/includes/footer.pug

@@ -1,24 +1,18 @@
 #footer-wrap
-  - var now = new Date()
-  - var nowYear = now.getFullYear()
-  if theme.since && theme.since != nowYear
-    .copyright!= `©${theme.since} - ${nowYear} By ${config.author}`
-  else
-    .copyright!= `©${nowYear} By ${config.author}`
-  if theme.footer_copyright.enable
+  if theme.footer.owner.enable
+    - const currentYear = new Date().getFullYear()
+    - const sinceYear = theme.footer.owner.since
+    .copyright
+      if sinceYear && sinceYear != currentYear
+        != `©${sinceYear} - ${currentYear} By ${config.author}`
+      else
+        != `©${currentYear} By ${config.author}`
+  if theme.footer.copyright
     .framework-info
-      span= _p('footer.driven') + ' '
-      a(href='https://hexo.io')
-        span Hexo
+      span= _p('footer.framework') + ' '
+      a(href='https://hexo.io')= 'Hexo'
       span.footer-separator |
       span= _p('footer.theme') + ' '
-      a(href='https://github.com/jerryc127/hexo-theme-butterfly')
-        span Butterfly
-  if theme.footer_custom_text
-    .footer_custom_text!=`${theme.footer_custom_text}`   
-  if theme.ICP.enable
-    .icp
-      a(href=theme.ICP.url)
-        if theme.ICP.icon
-          img.icp-icon(src=url_for(theme.ICP.icon))
-        span=theme.ICP.text
+      a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly'
+  if theme.footer.custom_text
+    .footer_custom_text!= theme.footer.custom_text

layout/includes/head.pug

@@ -1,104 +1,77 @@
 - var pageTitle
-- if (is_archive()) pageTitle = _p('page.archives')
-- 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
-- else if (is_year()) pageTitle += ': ' + page.year
-- else if (is_current('/404.html', [strict])) pageTitle = _p('error_title')
-- else pageTitle = page.title || config.title || ''
+- globalPageType === 'archive' ? page.title = findArchivesTitle(page, theme.menu, date) : ''
+case globalPageType
+  when 'tag'
+    - pageTitle = _p('page.tag') + ': ' + page.tag
+  when 'category'
+    - pageTitle = _p('page.category') + ': ' + page.category
+  when '404'
+    - pageTitle = _p('error404')
+  default
+    - pageTitle = page.title || config.title || ''
+
 
 - 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(',')
-- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
+- var tabTitle = globalPageType === 'home' || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
+- var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#ffffff'
+- var themeColorDark = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_dark || '#0d0d0d'
+- var themeColor = theme.display_mode === 'dark' ? themeColorDark : themeColorLight
 
 meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
-meta(name="viewport" content="width=device-width,initial-scale=1")
+meta(name="viewport" content="width=device-width, initial-scale=1.0,viewport-fit=cover")
 title= tabTitle
-meta(name="description" content!=pageDescription)
-if pageKeywords
-  meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
-!=favicon_tag(theme.favicon || config.favicon)
-
-if theme.disable_baidu_transformation
-  meta(http-equiv="Cache-Control" content="no-transform")
-  meta(http-equiv="Cache-Control" content="no-siteapp")
-
-if theme.douban
-  if theme.douban.meta && (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
-    meta(name="referrer" content="no-referrer")
-
-//- 預解析
-!=partial('includes/head/dns_prefetch', {}, {cache:theme.fragment_cache})
-
-//- 網站驗證
-!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
+meta(name="theme-color" content=themeColor)
 
 //- Open_Graph
 include ./head/Open_Graph.pug
 
+//- Structured Data
+include ./head/structured_data.pug
+
+!=favicon_tag(theme.favicon || config.favicon)
+link(rel="canonical" href=urlNoIndex(null,config.pretty_urls.trailing_index,config.pretty_urls.trailing_html))
+
+//- 預解析
+!=partial('includes/head/preconnect', {}, {cache: true})
+
+//- 網站驗證
+!=partial('includes/head/site_verification', {}, {cache: true})
+
 //- PWA
 if (theme.pwa && theme.pwa.enable)
-  !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
-
-script(src=url_for(theme.CDN.js_cookies))
-
-if theme.darkmode.enable
-  !=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
+  !=partial('includes/head/pwa', {}, {cache: true})
 
 //- main css
-link(rel='stylesheet', href=url_for(theme.CDN.main_css))
-
-if theme.fontawesome_v5 && theme.fontawesome_v5.enable
-  link(rel='stylesheet', href=url_for(theme.CDN.fontawesome_v5))
-else
-  link(rel='stylesheet', href=url_for(theme.CDN.fontawesome_v4))
-
-if (theme.fancybox && theme.fancybox.enable)
-  link(rel='stylesheet', href=url_for(theme.CDN.fancybox_css))
+link(rel='stylesheet', href=url_for(theme.asset.main_css))
+link(rel='stylesheet', href=url_for(theme.asset.fontawesome))
 
 if (theme.snackbar && theme.snackbar.enable)
-  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css))
+  link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")
 
-if theme.canonical
-  link(rel="canonical" href=urlNoIndex())
+if theme.lightbox === 'fancybox'
+  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css) media="print" onload="this.media='all'")
 
-if is_post()
-  if(page.prev)
-    link(rel="prev" title=page.prev.title href=url_for(page.prev.permalink) )
-  if(page.next)
-    link(rel="next" title=page.next.title  href=url_for(page.next.permalink) )
-
-if theme.algolia_search.enable
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.algolia_search_css))
-  script(src=url_for(theme.CDN.algolia_search) defer)
-
-//- comment css
-include ./head/comment.pug
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
 //- 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})
 
-if theme.blog_title_font.font_link
-  link(rel='stylesheet', href=url_for(theme.blog_title_font.font_link))
+//- font
+if theme.blog_title_font && 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
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

@@ -1,19 +1,16 @@
-- var contentType = is_post() ? 'article' : 'website'
+if theme.Open_Graph_meta.enable
+  -
+    const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
+    let ogOption = Object.assign({
+      type: globalPageType === 'post' ? 'article' : 'website',
+      image: coverVal ? full_url_for(coverVal) : '',
+      fb_admins: theme.facebook_comments.user_id || '',
+      fb_app_id: theme.facebook_comments.app_id || '',
+    }, theme.Open_Graph_meta.option)
+  -
+  != open_graph(ogOption)
+else
+  - const description = page.description || page.content || page.title || config.description
+  if description
+    meta(name="description" content=truncate(description, 150))
 
-//- twitter meta
-if theme.twitter_meta
-  meta(name="twitter:card" content="summary")
-  meta(name="twitter:title" content=pageTitle)
-  meta(name="twitter:description" content!=pageDescription)
-  meta(name="twitter:image" content=full_url_for(page.cover || theme.avatar.img))
-
-//- Open_Graph
-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))

layout/includes/head/analytics.pug

@@ -4,19 +4,31 @@ if theme.baidu_analytics
     (function() {
       var hm = document.createElement("script");
       hm.src = "https://hm.baidu.com/hm.js?!{theme.baidu_analytics}";
-      var s = document.getElementsByTagName("script")[0]; 
+      var s = document.getElementsByTagName("script")[0];
       s.parentNode.insertBefore(hm, s);
     })();
+    btf.addGlobalFn('pjaxComplete', () => {
+      _hmt.push(['_trackPageview',window.location.pathname])
+    }, 'baidu_analytics')
 
 if theme.google_analytics
+  script(async src=`https://www.googletagmanager.com/gtag/js?id=${theme.google_analytics}`)
   script.
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    window.dataLayer = window.dataLayer || []
+    function gtag(){dataLayer.push(arguments)}
+    gtag('js', new Date())
+    gtag('config', '!{theme.google_analytics}')
+    btf.addGlobalFn('pjaxComplete', () => {
+      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname})
+    }, 'google_analytics')
 
-    ga('create', '!{theme.google_analytics}', 'auto');
-    ga('send', 'pageview');
+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.tencent_analytics
-  script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8")
+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}");

layout/includes/head/comment.pug

@@ -1,14 +0,0 @@
-if (theme.facebook_comments.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  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)
-
-if (theme.disqusjs && theme.disqusjs.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.disqusjs_css))
-
-if (theme.gitalk && theme.gitalk.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css))
-  script(src=url_for(theme.CDN.gitalk))
-  script(src=url_for(theme.CDN.blueimp_md5))
-

layout/includes/head/config.pug

@@ -1,110 +1,126 @@
 -
-  var algolia = 'undefined';
-  var env = process.env;
-  if (theme.algolia_search.enable) {
+  let algolia = 'undefined'
+  if (theme.search.use === 'algolia_search') {
+    const { ALGOLIA_APP_ID, ALGOLIA_API_KEY, ALGOLIA_INDEX_NAME } = process.env
+    const { appId, applicationID, apiKey, indexName } = config.algolia
     algolia = JSON.stringify({
-      appId: env.ALGOLIA_APP_ID || config.algolia.appId || config.algolia.applicationID,
-      apiKey: env.ALGOLIA_API_KEY || config.algolia.apiKey,
-      indexName: env.ALGOLIA_INDEX_NAME || config.algolia.indexName,
-      hits: theme.algolia_search.hits,
+      appId: ALGOLIA_APP_ID || appId || applicationID,
+      apiKey: ALGOLIA_API_KEY || apiKey,
+      indexName: ALGOLIA_INDEX_NAME || indexName,
+      hitsPerPage: theme.search.algolia_search.hitsPerPage,
       // search languages
       languages: {
-        input_placeholder: _p("algolia_search.input_placeholder"),
-        hits_empty: _p("algolia_search.hits_empty"),
-        hits_stats: _p("algolia_search.hits_stats")
-      }
-    })
-  } 
-  
-  var localSearch = 'undefined';
-  if (theme.local_search && theme.local_search.enable) {
-    localSearch = JSON.stringify({
-      path: config.search.path,
-      languages: {
-        // search languages
-        hits_empty: _p("local_search.hits_empty")
+        input_placeholder: theme.search.placeholder || _p("search.input_placeholder"),
+        hits_empty: _p("search.algolia_search.hits_empty"),
+        hits_stats: _p("search.algolia_search.hits_stats"),
       }
     })
   }
-  var translate = 'undefined';
+
+  let localSearch = 'undefined'
+  if (theme.search.use === 'local_search') {
+    const { CDN, preload, top_n_per_article, unescape } = theme.search.local_search
+    localSearch = JSON.stringify({
+      path: CDN || config.root + config.search.path,
+      preload,
+      top_n_per_article,
+      unescape,
+      languages: {
+        // search languages
+        hits_empty: _p("search.local_search.hits_empty"),
+        hits_stats: _p("search.local_search.hits_stats"),
+      }
+    })
+  }
+
+  let translate = 'undefined'
   if (theme.translate && theme.translate.enable){
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
       translateDelay: theme.translate.translateDelay,
-      cookieDomain: theme.translate.cookieDomain,
       msgToTraditionalChinese: theme.translate.msgToTraditionalChinese,
       msgToSimplifiedChinese: theme.translate.msgToSimplifiedChinese
     })
   }
 
-  var copyright = 'undefined' ;
-  if (theme.copy.enable && theme.copy.copyright){
-    copyright = JSON.stringify({      
+  let copyright = 'undefined'
+  if (theme.copy.enable && theme.copy.copyright.enable){
+    copyright = JSON.stringify({
+      limitCount: theme.copy.copyright.limit_count,
       languages: {
-      author: _p("copy_copyright.author") + ': ' + config.author,
-      link: _p("copy_copyright.link") + ': ',
-      source: _p("copy_copyright.source") + ': ' + config.title,
-      info: _p("copy_copyright.info")
+        author: _p("copy_copyright.author") + ': ' + config.author,
+        link: _p("copy_copyright.link") + ': ',
+        source: _p("copy_copyright.source") + ': ' + config.title,
+        info: _p("copy_copyright.info")
       }
     })
   }
 
-  var 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({
+      chs_to_cht: _p("Snackbar.chs_to_cht"),
+      cht_to_chs: _p("Snackbar.cht_to_chs"),
+      day_to_night: _p("Snackbar.day_to_night"),
+      night_to_day: _p("Snackbar.night_to_day"),
+      bgLight: theme.snackbar.bg_light,
+      bgDark: theme.snackbar.bg_dark,
+      position: theme.snackbar.position,
     })
   }
 
-  
-  var 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"),
-    night_to_day: _p("Snackbar.night_to_day"),
-    bgLight: theme.snackbar.bg_light,
-    bgDark: theme.snackbar.bg_dark,
-    position: theme.snackbar.position,
+  let highlight = 'undefined'
+  let syntaxHighlighter = config.syntax_highlighter
+  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable)
+  if (highlightEnable) {
+    const { copy, language, height_limit, fullpage, macStyle } = theme.code_blocks
+    highlight = JSON.stringify({
+      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
+      highlightCopy: copy,
+      highlightLang: language,
+      highlightHeightLimit: height_limit,
+      highlightFullpage: fullpage,
+      highlightMacStyle: macStyle
     })
   }
 
 script.
-  var GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = {
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},
+    highlight: !{highlight},
     copy: {
       success: '!{_p("copy.success")}',
       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.aside.card_webinfo.runtime_date ? _p("aside.card_webinfo.runtime.unit") : ""}',
+    dateSuffix: {
+      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")}'
     },
-    runtime_unit: '!{_p("runtime_unit")}',
-    runtime: !{theme.runtimeshow.enable},
     copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
-    medium_zoom: !{theme.medium_zoom.enable},
-    fancybox: !{theme.fancybox.enable},
+    lightbox: '!{ theme.lightbox || 'null' }',
     Snackbar: !{Snackbar},
-    baiduPush: !{theme.baidu_push && theme.baidu_push.enable},
-    highlightCopy: !{theme.highlight_copy},
-    highlightLang: !{theme.highlight_lang},
-    highlightShrink: '!{theme.highlight_shrink}',
-    isFontAwesomeV5: !{theme.fontawesome_v5 && theme.fontawesome_v5.enable},
+    infinitegrid: {
+      js: '!{url_for(theme.asset.egjs_infinitegrid)}',
+      buttonText: '!{_p("load_more")}'
+    },
     isPhotoFigcaption: !{theme.photofigcaption},
-    islazyload: !{theme.lazyload},
-    isanchor: !{theme.anchor}
-    
+    islazyloadPlugin: !{theme.lazyload.enable && !theme.lazyload.native},
+    isAnchor: !{theme.anchor.auto_update || false},
+    percent: {
+      toc: !{theme.toc.scroll_percent},
+      rightside: !{theme.rightside_scroll_percent},
+    },
+    autoDarkmode: !{theme.darkmode.enable && theme.darkmode.autoChangeMode === 1}
   }
-

layout/includes/head/config_site.pug

@@ -1,7 +1,25 @@
-script.
-  var GLOBAL_CONFIG_SITE = { 
-    isPost: !{is_post()},
-    isHome: !{is_home()},
-    isSidebar: !{is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )}  
-    }
+-
+  const titleVal = pageTitle.replace(/'/ig,"\\'")
 
+  let isHighlightShrink
+  if (theme.code_blocks.shrink == 'none') isHighlightShrink = 'undefined'
+  else if (typeof page.highlight_shrink == 'boolean') isHighlightShrink = page.highlight_shrink
+  else isHighlightShrink = theme.code_blocks.shrink
+
+  var showToc = false
+  if (theme.aside.enable && page.aside !== false) {
+    let tocEnable = false
+    if (globalPageType === 'post' && theme.toc.post) tocEnable = true
+    else if (globalPageType === 'page' && theme.toc.page) tocEnable = true
+    const pageToc = typeof page.toc === 'boolean' ? page.toc : tocEnable
+    showToc = pageToc && (toc(page.content) !== '' || page.encrypt === true)
+  }
+-
+
+script#config-diff.
+  var GLOBAL_CONFIG_SITE = {
+    title: '!{titleVal}',
+    isHighlightShrink: !{isHighlightShrink},
+    isToc: !{showToc},
+    pageType: '!{page.type == 'shuoshuo' ? 'shuoshuo' : globalPageType}'
+  }

layout/includes/head/darkmode.pug

@@ -1,47 +0,0 @@
-script.
-  var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-  var t = Cookies.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){
-        console.log('You specified no preference for a color scheme or your browser does not support it. I Schedule dark mode during night time.')
-        var now = new Date()
-        var hour = now.getHours()
-        var isNight = hour < 6 || hour >= 18
-        isNight ? 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()
-  }
-
-  function activateDarkMode(){
-    document.documentElement.setAttribute('data-theme', 'dark')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-      document.querySelector('meta[name="theme-color"]').setAttribute('content','#000')
-    }
-  }
-  function activateLightMode(){
-    document.documentElement.setAttribute('data-theme', 'light')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-    document.querySelector('meta[name="theme-color"]').setAttribute('content','#fff')
-    }
-  }
-

layout/includes/head/dns_prefetch.pug

@@ -1,22 +0,0 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
-link(rel="dns-prefetch" href="//cdn.jsdelivr.net")
-
-if theme.google_analytics
-  link(rel="preconnect" href="https://www.google-analytics.com" crossorigin)
-  link(rel="dns-prefetch" href="https://www.google-analytics.com")
-
-if theme.baidu_analytics
-  link(rel="preconnect" href="https://hm.baidu.com")
-  link(rel="dns-prefetch" href="https://hm.baidu.com")
-
-if theme.tencent_analytics
-  link(rel="preconnect" href="http://ta.qq.com")
-  link(rel="dns-prefetch" href="http://ta.qq.com")
-
-if theme.blog_title_font.font_link
-  link(rel="preconnect" href="https://fonts.googleapis.com" crossorigin)
-  link(rel="dns-prefetch" href="https://fonts.googleapis.com")
-
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  link(rel="preconnect" href="//busuanzi.ibruce.info")
-  link(rel="dns-prefetch" href="//busuanzi.ibruce.info")

layout/includes/head/google_adsense.pug

@@ -1,7 +1,9 @@
 if (theme.google_adsense && theme.google_adsense.enable)
   script(async src=theme.google_adsense.js)
-  script.
-    (adsbygoogle = window.adsbygoogle || []).push({
-      google_ad_client: '!{theme.google_adsense.client}',
-      enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}'
-    });
+
+  if theme.google_adsense.auto_ads
+    script.
+      (adsbygoogle = window.adsbygoogle || []).push({
+        google_ad_client: '!{theme.google_adsense.client}',
+        enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}'
+      });

layout/includes/head/noscript.pug

@@ -1,9 +0,0 @@
-noscript. 
-  <style>
-  #page-header {
-    opacity: 1
-  }
-  .justified-gallery img{
-    opacity: 1
-  }
-  </style>

layout/includes/head/preconnect.pug

@@ -0,0 +1,35 @@
+-
+  const { internal_provider, third_party_provider, custom_format } = theme.CDN
+  const providers = {
+    'jsdelivr': '//cdn.jsdelivr.net',
+    'cdnjs': '//cdnjs.cloudflare.com',
+    'unpkg': '//unpkg.com',
+    'custom': custom_format && custom_format.match(/^((https?:)?(\/\/[^/]+)|([^/]+))(\/|$)/)[1]
+  }
+-
+
+if internal_provider === third_party_provider && internal_provider !== 'local'
+  link(rel="preconnect" href=providers[internal_provider])
+else
+  if internal_provider !== 'local'
+    link(rel="preconnect" href=providers[internal_provider])
+  if third_party_provider !== 'local'
+  link(rel="preconnect" href=providers[third_party_provider])
+
+if theme.google_analytics
+  link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')
+
+if theme.baidu_analytics
+  link(rel="preconnect" href="//hm.baidu.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='')
+
+if !theme.asset.busuanzi && (theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv)
+  link(rel="preconnect" href="//busuanzi.ibruce.info")

layout/includes/head/pwa.pug

@@ -1,13 +1,13 @@
-link(rel="manifest" href=theme.pwa.manifest)
-if(theme.pwa.theme_color) 
-  meta(name="theme-color" content=theme.pwa.theme_color)
-if(theme.pwa.theme_color) 
-  meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
-if(theme.pwa.apple_touch_icon) 
-  link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon)
-if(theme.pwa.favicon_32_32) 
-  link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32)
-if(theme.pwa.favicon_16_16)
-  link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16)
-if(theme.pwa.mask_icon)
-  link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5")
+- const { manifest, theme_color, apple_touch_icon, favicon_32_32, favicon_16_16, mask_icon } = theme.pwa
+
+link(rel="manifest" href=url_for(manifest))
+if theme_color
+  meta(name="msapplication-TileColor" content=theme_color)
+if apple_touch_icon
+  link(rel="apple-touch-icon" sizes="180x180" href=url_for(apple_touch_icon))
+if favicon_32_32
+  link(rel="icon" type="image/png" sizes="32x32" href=url_for(favicon_32_32))
+if favicon_16_16
+  link(rel="icon" type="image/png" sizes="16x16" href=url_for(favicon_16_16))
+if mask_icon
+  link(rel="mask-icon" href=url_for(mask_icon) color="#5bbad5")

layout/includes/head/site_verification.pug

@@ -1,11 +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.site_verification
+  each item in theme.site_verification
+    meta(name=item.name content=item.content)

layout/includes/head/structured_data.pug

@@ -0,0 +1,34 @@
+if theme.structured_data && page.layout === 'post'
+  -
+    // use json-ld to add structured data
+
+    const title = page.title
+    const url = page.permalink
+    const imageVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
+    const image = imageVal ? full_url_for(imageVal) : ''
+    const datePublished = page.date.toISOString()
+    const dateModified = (page.updated || page.date).toISOString()
+    const author = page.copyright_author || config.author
+    const authorHrefVal = page.copyright_author_href || theme.post_copyright.author_href || site.url;
+    const authorHref = full_url_for(authorHrefVal);
+
+    const jsonLd = {
+      "@context": "https://schema.org",
+      "@type": "BlogPosting",
+      "headline": title,
+      "url": url,
+      "image": image,
+      "datePublished": datePublished,
+      "dateModified": dateModified,
+      "author": [{
+        "@type": "Person",
+        "name": author,
+        "url": authorHref
+      }]
+    };
+
+    jsonLdScript = JSON.stringify(jsonLd, null, 2);
+  -
+
+  script(type="application/ld+json").
+    !{jsonLdScript}

layout/includes/head/subtitle.pug

@@ -1,130 +0,0 @@
-if theme.subtitle.enable
-  - var source = theme.subtitle.source
-  - var subtitleEffect = theme.subtitle.effect
-
-  if subtitleEffect
-    script(src=url_for(theme.CDN.typed))
-
-  if source == '1'
-    script.
-      var subtitleType = function () {
-        var subtitleEffect = !{ subtitleEffect }
-        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',)
-          .then(function (res) {
-            return res.json()
-          })
-          .then(function (data) {
-            if (subtitleEffect) {
-              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
-              var both = sub.unshift(data.text)
-              var typed = new Typed('#subtitle', {
-                strings: sub,
-                startDelay: 300,
-                typeSpeed: 150,
-                loop: !{theme.subtitle.loop},
-                backSpeed: 50,
-              })
-            } else {
-              document.getElementById('subtitle').innerHTML = data.text
-            }
-          })
-          .catch(function (err) {
-            console.error(err)
-          })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '2'
-    script.
-      var subtitleType = function () {
-        var subtitleEffect = !{ subtitleEffect }
-        fetch('https://v1.hitokoto.cn')
-          .then(function (res) {
-            return res.json()
-          })
-          .then(function (data) {
-            if (subtitleEffect) {
-              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
-            }
-          })
-          .catch(function (err) {
-            console.error(err)
-          })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '3'
-    script.
-      var subtitleType = function () {
-        loadScript('http://yijuzhan.com/api/word.php?m=js', function () {
-          var subtitleEffect = !{ subtitleEffect }
-          var con = str[0]
-          if (subtitleEffect) {
-            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
-          }
-        })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '4'
-    script.
-      var subtitleType = function () {
-        loadScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
-            var subtitleEffect = !{ subtitleEffect }
-            jinrishici.load(function (result) {
-              if (subtitleEffect) {
-                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
-              }
-            })
-          }
-        )
-      }
-      window.addEventListener('load', subtitleType)
-
-  else
-    script.
-      var subtitleEffect = !{subtitleEffect}
-      if (subtitleEffect) { 
-        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]}'
-      }

layout/includes/header/header.pug

@@ -1,17 +0,0 @@
-#page-header
-  span#blog_name.pull_left
-    a#site-name.blog_title(href=url_for('/')) #[=config.title]
-    
-  span.pull_right.menus
-    if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
-      #search_button
-        a.site-page.social-icon.search
-          i.fa.fa-search.fa-fw
-          span=' '+_p('search')
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
-
-    span.toggle-menu.close
-      a.site-page
-        i.fa.fa-bars.fa-fw(aria-hidden="true")
-
-

layout/includes/header/index.pug

@@ -1,43 +1,52 @@
-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
-else
-  - var top_img = page.top_img || theme.default_top_img
+-
+  const returnTopImg = img => img !== false ? img || theme.default_top_img : false
+  const isFixedClass = theme.nav.fixed ? ' fixed' : ''
+  var top_img = false
+  let headerClassName = 'not-top-img'
+  var bg_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
+if !theme.disable_top_img && page.top_img !== false
+  case globalPageType
+    when 'post'
+      - top_img = page.top_img || page.cover || theme.default_top_img
+    when 'page'
+      - top_img = page.top_img || theme.default_top_img
+    when 'tag'
+      - top_img = theme.tag_per_img && theme.tag_per_img[page.tag] || returnTopImg(theme.tag_img)
+    when 'category'
+      - top_img = theme.category_per_img && theme.category_per_img[page.category] || returnTopImg(theme.category_img)
+    when 'home'
+      - top_img = returnTopImg(theme.index_img)
+    when 'archive'
+      - top_img = returnTopImg(theme.archive_img)
+    default
+      - top_img = page.top_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
+  if top_img !== false
+    - bg_img = getBgPath(top_img)
+    - headerClassName = globalPageType === 'home' ? 'full_page' : globalPageType === 'post' ? 'post-bg' : 'not-home-page'
 
-#nav(class=isHomeClass style=bg_img)
-  !=partial('includes/header/header', {}, {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.fa.fa-angle-down.scroll-down-effects
-  else if is_post()
-    include ./post-info.pug 
+header#page-header(class=`${headerClassName + isFixedClass}` style=bg_img)
+  include ./nav.pug
+  if top_img !== false
+    if globalPageType === 'post'
+      include ./post-info.pug
+    else if globalPageType === 'home'
+      #site-info
+        h1#site-title=config.title
+        if theme.subtitle.enable
+          - var loadSubJs = true
+          #site-subtitle
+            span#subtitle
+        if theme.social
+          #site_social_icons
+            !=partial('includes/header/social', {}, {cache: true})
+      #scroll-down
+        i.fas.fa-angle-down.scroll-down-effects
+    else
+      #page-site-info
+        h1#site-title=page.title || page.tag || page.category
   else
-    #page_site-info
-      h1#site_title=site_title
+    //- improve seo
+    if globalPageType !== 'post'
+      h1.title-seo=page.title || page.tag || page.category || config.title

layout/includes/header/menu_item.pug

@@ -1,22 +1,27 @@
-.menus_items
-  each value, label in theme.menu
-    if !Array.isArray(value)
-      .menus_item
-        a.site-page(href=url_for(trim(value.split('||')[0])))
-          if value.split('||')[1]
-            i.fa-fw(class=trim(value.split('||')[1]))
-          span=' '+label
-    else
-      .menus_item
-        a.site-page
-          if label.split('||')[1]
-            i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
-          span=' '+ trim(label.split('||')[0])
-          i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
-        ul.menus_item_child
-          each i 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])
+if theme.menu
+  .menus_items
+    each value, label in theme.menu
+      if typeof value !== 'object'
+        .menus_item
+          - const [link, icon] = value.split('||').map(part => trim(part))
+          a.site-page(href=url_for(link))
+            if icon
+              i.fa-fw(class=icon)
+            span= ' ' + label
+      else
+        .menus_item
+          - const [groupLabel, groupIcon, groupClass] = label.split('||').map(part => trim(part))
+          - const hideClass = groupClass === 'hide' ? 'hide' : ''
+          span.site-page.group(class=hideClass)
+            if groupIcon
+              i.fa-fw(class=groupIcon)
+            span= ' ' + groupLabel
+            i.fas.fa-chevron-down
+          ul.menus_item_child
+            each val, lab in value
+              - const [childLink, childIcon] = val.split('||').map(part => trim(part))
+              li
+                a.site-page.child(href=url_for(childLink))
+                  if childIcon
+                    i.fa-fw(class=childIcon)
+                  span= ' ' + lab

layout/includes/header/nav.pug

@@ -0,0 +1,22 @@
+nav#nav
+  span#blog-info
+    a.nav-site-title(href=url_for('/'))
+      if theme.nav.logo
+        img.site-icon(src=url_for(theme.nav.logo) alt='Logo')
+      if theme.nav.display_title
+        span.site-name=config.title
+    if globalPageType === 'post'
+      a.nav-page-title(href=url_for('/'))
+        span.site-name=(page.title || config.title)
+  #menus
+    if theme.search.use
+      #search-button
+        span.site-page.social-icon.search
+          i.fas.fa-search.fa-fw
+          span= ' ' + _p('search.title')
+    if theme.menu
+      != partial('includes/header/menu_item', {}, {cache: true})
+
+      #toggle-menu
+        span.site-page
+          i.fas.fa-bars.fa-fw

layout/includes/header/post-info.pug

@@ -1,91 +1,149 @@
+- 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)
-        if (theme.post_meta.post.date_type === 'both')
-          time.post-meta__date
-            span.post-meta__date-created(title= _p('post.created')+' '+full_date(page.date))
-              i.fa.fa-calendar(aria-hidden="true")
-              =' '+_p('post.created')+' '+date(page.date, config.date_format)
-            span.post-meta__separator |
-            span.post-meta__date-updated(title= _p('post.updated')+' '+full_date(page.updated))
-              i.fa.fa-history(aria-hidden="true")
-              =' '+_p('post.updated')+' '+date(page.updated, config.date_format)
-        else
-          - var data_type_update = theme.post_meta.post.date_type === 'updated'
-          - var date_type = data_type_update ? 'updated' : 'date'
-          - var date_icon = data_type_update ? 'fa-history' :'fa-calendar'
-          - var data_info = data_type_update ? _p('post.updated') : _p('post.created')
-          time.post-meta__date(title=data_info + ' ' + full_date(page[date_type]))
-            i.fa(class=date_icon aria-hidden="true")
-            =' ' + data_info + ' ' + date(page[date_type], config.date_format)
-                
-      if (theme.post_meta.post.categories && page.categories.data.length > 0)
-        span.post-meta__categories
-          if (theme.post_meta.post.date_type)
-            span.post-meta__separator |
-
+      if theme.post_meta.post.date_type
+        span.post-meta-date
+          if theme.post_meta.post.date_type === 'both'
+            i.far.fa-calendar-alt.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.created')
+            time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))= date(page.date, config.date_format)
+            span.post-meta-separator |
+            i.fas.fa-history.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.updated')
+            time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))= date(page.updated, config.date_format)
+          else
+            - let data_type_update = theme.post_meta.post.date_type === 'updated'
+            - let date_type = data_type_update ? 'updated' : 'date'
+            - let date_icon = data_type_update ? 'fas fa-history' : 'far fa-calendar-alt'
+            - let date_title = data_type_update ? _p('post.updated') : _p('post.created')
+            i.fa-fw.post-meta-icon(class=date_icon)
+            span.post-meta-label= date_title
+            time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))= date(page[date_type], config.date_format)
+      if theme.post_meta.post.categories && page.categories.data.length > 0
+        span.post-meta-categories
+          if theme.post_meta.post.date_type
+            span.post-meta-separator |
           each item, index in page.categories.data
-            i.fa.fa-inbox.post-meta__icon(aria-hidden="true")
-            a(href=url_for(item.path)).post-meta__categories #[=item.name]
-            if (index < page.categories.data.length - 1)
-              i.fa.fa-angle-right.post-meta__separator(aria-hidden="true")
+            i.fas.fa-inbox.fa-fw.post-meta-icon
+            a(href=url_for(item.path)).post-meta-categories #[=item.name]
+            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)
+      if postWordcount
+        span.post-meta-separator |
         span.post-meta-wordcount
           if theme.wordcount.post_wordcount
-            - var wordCountIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-file-word' : 'fa fa-file-word-o'
-            i.post-meta__icon(class=wordCountIcon aria-hidden="true")
-            span= _p('post.wordcount') + ':'
+            i.far.fa-file-word.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.wordcount') + ':'
             span.word-count= wordcount(page.content)
             if theme.wordcount.min2read
-              span.post-meta__separator |
+              span.post-meta-separator |
           if theme.wordcount.min2read
-            - var readCountIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-clock' : 'fa fa-clock-o'
-            i.post-meta__icon(class=readCountIcon aria-hidden="true")
-            span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160}))
-    
-    .meta-thirdline
-      span.post-meta-pv-cv
-        if (postWordcount && theme.busuanzi.page_pv)
-          span.post-meta__separator |
-        if theme.busuanzi.page_pv
-          i.fa.fa-eye.post-meta__icon(aria-hidden="true") 
-          span=_p('post.page_pv') + ':'
-          span#busuanzi_value_page_pv
+            i.far.fa-clock.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.min2read') + ':'
+            span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
 
-      span.post-meta-commentcount
-        - var commentCount = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-comments' : 'fa fa-comment-o'
-        if ((theme.disqus && theme.disqus.enable && theme.disqus.count && page.comments !== false) || (theme.disqusjs && theme.disqusjs.enable && theme.disqusjs.count && page.comments !== false))
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          span.disqus-comment-count.comment-count
-            a(href=full_url_for(page.path) + '#disqus_thread')
-        else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false)
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          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 (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false)
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          a(href=url_for(page.path) + '#post-comment')
-            span.gitalk-comment-count.comment-count
-        else if theme.facebook_comments.enable && theme.facebook_comments.count && page.comments !== false
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          a.comment-count(href=url_for(page.path) + '#post-comment')
-            span.fb-comments-count(data-href=urlNoIndex())
+      //- for pv and count
+      mixin pvBlock(parent_id, parent_class, parent_title)
+        span.post-meta-separator |
+        span(class=parent_class id=parent_id data-flag-title=parent_title)
+          i.far.fa-eye.fa-fw.post-meta-icon
+          span.post-meta-label= _p('post.page_pv') + ':'
+          if block
+            block
+
+      mixin otherPV()
+        if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
+          +pvBlock('', '', '')
+            span#umamiPV(data-path=url_for(page.path))
+              i.fa-solid.fa-spinner.fa-spin
+        else if theme.busuanzi.page_pv
+          +pvBlock('', 'post-meta-pv-cv', '')
+            span#busuanzi_value_page_pv
+              i.fa-solid.fa-spinner.fa-spin
+
+      - const commentUse = comments.use && comments.use[0]
+      if page.comments !== false && commentUse && !comments.lazyload
+        if commentUse === 'Valine' && theme.valine.visitor
+          +pvBlock(url_for(page.path), 'leancloud_visitors', page.title)
+            span.leancloud-visitors-count
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse === 'Waline' && theme.waline.pageview
+          +pvBlock('', '', '')
+            span.waline-pageview-count(data-path=url_for(page.path))
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse === 'Twikoo' && theme.twikoo.visitor
+          +pvBlock('', '', '')
+            span#twikoo_visitors
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse === 'Artalk' && theme.artalk.visitor
+          +pvBlock('', '', '')
+            span#ArtalkPV
+              i.fa-solid.fa-spinner.fa-spin
+        else
+          +otherPV()
+      else
+        +otherPV()
+
+      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
+            i.far.fa-comments.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.comments') + ':'
+            if block
+              block
+
+        case whichCount
+          when 'Disqus'
+            +countBlock
+              a.disqus-comment-count(href=full_url_for(page.path) + '#post-comment')
+                i.fa-solid.fa-spinner.fa-spin
+          when 'Disqusjs'
+            +countBlock
+              a.disqusjs-comment-count(href=full_url_for(page.path) + '#post-comment')
+                i.fa-solid.fa-spinner.fa-spin
+          when 'Valine'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
+                span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Waline'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.waline-comment-count(data-path=url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Gitalk'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.gitalk-comment-count
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Twikoo'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span#twikoo-count
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Facebook Comments'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.fb-comments-count(data-href=urlNoIndex())
+          when 'Remark42'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.remark42__counter(data-url=urlNoIndex())
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Artalk'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span#ArtalkCount
+                  i.fa-solid.fa-spinner.fa-spin

layout/includes/header/social.pug

@@ -1,4 +1,8 @@
 each url, icon in theme.social
-  a.social-icon(href=trim(url.split('||')[0]) target="_blank" 
-  title=url.split('||')[1] === undefined ? '' : trim(url.split('||')[1]))
-    i(class=icon aria-hidden="true")
+  -
+    const [link, title, color] = url.split('||').map(i => trim(i))
+    const href = url_for(link)
+    const iconStyle = color ? `color: ${color.replace(/[\'\"]/g, '')};` : ''
+    const iconTitle = title || ''
+  a.social-icon(href=href target="_blank" title=iconTitle)
+    i(class=icon style=iconStyle)

layout/includes/layout.pug

@@ -1,45 +1,37 @@
+- var globalPageType = getPageType(page, is_home)
+- var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
+- page.aside = globalPageType === 'archive' ? theme.aside.display.archive: globalPageType === 'category' ? theme.aside.display.category : globalPageType === 'tag' ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
+- var pageType = globalPageType === 'post' ? 'post' : 'page'
+- pageType = page.type ? pageType + ' type-' + page.type : pageType
 
 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/index', {}, {cache: true})
 
-    if theme.fireworks && theme.fireworks.enable
-      canvas.fireworks
+    if theme.background
+      #web_bg(style=getBgPath(theme.background))
 
-    !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
+    !=partial('includes/sidebar', {}, {cache: true})
 
-    include ./sidebar.pug
-
-    #body-wrap
-      if theme.background
-        - var is_photo = theme.background.substring(3,0) === 'url' ? 'photo':'color'
-        #web_bg(data-type=is_photo)
+    #body-wrap(class=pageType)
       include ./header/index.pug
 
-      if (!is_post())
-        main#content-inner.layout_page(class=hideAside)
-          if body
-            div!= body
-          else
-            block content
+      main#content-inner.layout(class=hideAside)
+        if body
+          div!= body
+        else
+          block content
+          if theme.aside.enable && page.aside !== false
             include widget/index.pug
-      else
-        main#content-inner.layout_post
-          if body
-            div!= body
-          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})
+
+      - const footerBg = theme.footer_img
+      - const footer_bg = footerBg ? footerBg === true ? bg_img : getBgPath(footerBg) : ''
+      footer#footer(style=footer_bg)
+        !=partial('includes/footer', {}, {cache: true})
 
     include ./rightside.pug
-    !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
     include ./additional-js.pug

layout/includes/loading/fullpage-loading.pug

@@ -0,0 +1,33 @@
+#loading-box
+  .loading-left-bg
+  .loading-right-bg
+  .spinner-box
+    .configure-border-1
+      .configure-core
+    .configure-border-2
+      .configure-core
+    .loading-word= _p('loading')
+
+script.
+  (()=>{
+    const $loadingBox = document.getElementById('loading-box')
+    const $body = document.body
+    const preloader = {
+      endLoading: () => {
+        $body.style.overflow = ''
+        $loadingBox.classList.add('loaded')
+      },
+      initLoading: () => {
+        $body.style.overflow = 'hidden'
+        $loadingBox.classList.remove('loaded')
+      }
+    }
+
+    preloader.initLoading()
+    window.addEventListener('load', preloader.endLoading)
+
+    if (!{theme.pjax && theme.pjax.enable}) {
+      btf.addGlobalFn('pjaxSend', preloader.initLoading, 'preloader_init')
+      btf.addGlobalFn('pjaxComplete', preloader.endLoading, 'preloader_end')
+    }
+  })()

layout/includes/loading/index.pug

@@ -0,0 +1,5 @@
+if theme.preloader.enable
+  if theme.preloader.source === 1
+    include ./fullpage-loading.pug
+  else
+    include ./pace.pug

layout/includes/loading/loading-js.pug

@@ -1,6 +0,0 @@
-script.
-  var endLoading = function () {
-    document.body.style.overflow = 'auto';
-    document.getElementById('loading-box').classList.add("loaded")
-  }
-  window.addEventListener('load',endLoading)

layout/includes/loading/loading.pug

@@ -1,9 +0,0 @@
-#loading-box
-  .loading-left-bg
-  .loading-right-bg
-  .spinner-box
-    .configure-border-1
-      .configure-core
-    .configure-border-2
-      .configure-core
-    .loading-word= _p('loading')

layout/includes/loading/pace.pug

@@ -0,0 +1,12 @@
+script.
+  window.paceOptions = {
+    restartOnPushState: false
+  }
+
+  btf.addGlobalFn('pjaxSend', () => {
+    Pace.restart()
+  }, 'pace_restart')
+
+
+link(rel="stylesheet", href=url_for(theme.preloader.pace_css_url || theme.asset.pace_default_css))
+script(src=url_for(theme.asset.pace_js))

layout/includes/math/index.pug

@@ -1,15 +0,0 @@
-if theme.mathjax && theme.mathjax.enable
-  if theme.mathjax.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
-      include ./mathjax.pug
-  else
-    if page.mathjax
-      include ./mathjax.pug
-
-if theme.katex && theme.katex.enable
-  if theme.katex.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
-      include ./katex.pug
-  else
-    if page.katex
-      include ./katex.pug

layout/includes/math/katex.pug

@@ -1,7 +0,0 @@
-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>')
-  })

layout/includes/math/mathjax.pug

@@ -1,27 +0,0 @@
-script(type="text/x-mathjax-config").
-  MathJax.Hub.Config({
-    tex2jax: {
-      inlineMath: [ ['$','$'], ["\\(","\\)"]  ],
-      processEscapes: true,
-      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
-    },
-    CommonHTML: {
-      linebreaks: { automatic: true, width: "90% container" }
-    },
-    "HTML-CSS": { 
-      linebreaks: { automatic: true, width: "90% container" }
-    },
-    "SVG": { 
-      linebreaks: { automatic: true, width: "90% container" }
-    }
-  });
-
-script(type="text/x-mathjax-config").
-  MathJax.Hub.Queue(function() {
-    var all = MathJax.Hub.getAllJax(), i;
-    for (i=0; i < all.length; i += 1) {
-      all[i].SourceElement().parentNode.className += ' has-jax';
-    }
-  });
-
-script(src=theme.CDN.mathjax)

layout/includes/math/mermaid.pug

@@ -1,8 +0,0 @@
-script.
-  if (document.getElementsByClassName('mermaid').length) {
-    loadScript('!{theme.CDN.mermaid}',function () {
-      mermaid.initialize({
-        theme: '!{theme.mermaid.theme}',
-    })
-  })
-  }

layout/includes/mixins/article-sort.pug

@@ -1,20 +1,23 @@
 mixin articleSort(posts)
   .article-sort
-    - var year
-    - posts.each(function (article) {
-      - var tempYear = date(article.date, 'YYYY')
-      - var no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
+    - let year
+    - posts.forEach(article => {
+      - const tempYear = date(article.date, 'YYYY')
+      - const noCoverClass = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
+      - const title = article.title || _p('no_title')
       if tempYear !== year
         - year = tempYear
         .article-sort-item.year= year
-      .article-sort-item(class=no_cover)
+      .article-sort-item(class=noCoverClass)
         if article.cover && theme.cover.archives_enable
-          .article-sort-img
-            a.article-sort-item__img(href=url_for(article.path))
-              img(src=url_for(article.cover) alt=article.title || 'No Title' onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'`)
-        .article-sort-post
-          a.article-sort-item__post(href=url_for(article.path))
-            i.fa.fa-clock-o(aria-hidden="true")
-            time.article-sort-item__time(title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
-            .article-sort-item__title= article.title || 'No Title'
+          a.article-sort-item-img(href=url_for(article.path) title=title)
+            if article.cover_type === 'img'
+              img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
+            else
+              div(style=`background: ${article.cover}`)
+        .article-sort-item-info
+          .article-sort-item-time
+            i.far.fa-calendar-alt
+            time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
+          a.article-sort-item-title(href=url_for(article.path) title=title)= title
     - })

layout/includes/mixins/indexPostUI.pug

@@ -0,0 +1,116 @@
+mixin indexPostUI()
+  - const indexLayout = theme.index_layout
+  - const masonryLayoutClass = (indexLayout === 6 || indexLayout === 7) ? 'masonry' : ''
+  #recent-posts.recent-posts.nc(class=masonryLayoutClass)
+    .recent-post-items
+      each article, index in page.posts.data
+        .recent-post-item
+          - const link = article.link || article.path
+          - const title = article.title || _p('no_title')
+          - const leftOrRight = indexLayout === 3 ? (index % 2 === 0 ? 'left' : 'right') : (indexLayout === 2 ? 'right' : '')
+          - const post_cover = article.cover
+          - const no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
+
+          if post_cover && theme.cover.index_enable
+            .post_cover(class=leftOrRight)
+              a(href=url_for(link) title=title)
+                if article.cover_type === 'img'
+                  img.post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+                else
+                  div.post-bg(style=`background: ${post_cover}`)
+          .recent-post-info(class=no_cover)
+            a.article-title(href=url_for(link) title=title)
+              if globalPageType === 'home' && (article.top || article.sticky > 0)
+                i.fas.fa-thumbtack.sticky
+              = title
+            .article-meta-wrap
+              if theme.post_meta.page.date_type
+                span.post-meta-date
+                  if theme.post_meta.page.date_type === 'both'
+                    i.far.fa-calendar-alt
+                    span.article-meta-label=_p('post.created')
+                    time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
+                    span.article-meta-separator |
+                    i.fas.fa-history
+                    span.article-meta-label=_p('post.updated')
+                    time.post-meta-date-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated))= date(article.updated, config.date_format)
+                  else
+                    - const data_type_updated = theme.post_meta.page.date_type === 'updated'
+                    - const date_type = data_type_updated ? 'updated' : 'date'
+                    - const date_icon = data_type_updated ? 'fas fa-history' : 'far fa-calendar-alt'
+                    - const date_title = data_type_updated ? _p('post.updated') : _p('post.created')
+                    i(class=date_icon)
+                    span.article-meta-label= date_title
+                    time(datetime=date_xml(article[date_type]) title=date_title + ' ' + full_date(article[date_type]))= date(article[date_type], config.date_format)
+              if theme.post_meta.page.categories && article.categories.data.length > 0
+                span.article-meta
+                  span.article-meta-separator |
+                  each item, index in article.categories.data
+                    i.fas.fa-inbox
+                    a(href=url_for(item.path)).article-meta__categories #[=item.name]
+                    if index < article.categories.data.length - 1
+                      i.fas.fa-angle-right.article-meta-link
+              if theme.post_meta.page.tags && article.tags.length > 0
+                span.article-meta.tags
+                  span.article-meta-separator |
+                  each item, index in article.tags.data
+                    i.fas.fa-tag
+                    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 && theme.comments.use
+                case theme.comments.use[0]
+                  when 'Disqus'
+                  when 'Disqusjs'
+                    +countBlockInIndex
+                      a.disqus-count(href=full_url_for(link) + '#post-comment')
+                        i.fa-solid.fa-spinner.fa-spin
+                  when 'Valine'
+                    +countBlockInIndex
+                      a(href=url_for(link) + '#post-comment')
+                        span.valine-comment-count(data-xid=url_for(link))
+                          i.fa-solid.fa-spinner.fa-spin
+                  when 'Waline'
+                    +countBlockInIndex
+                      a(href=url_for(link) + '#post-comment')
+                        span.waline-comment-count(data-path=url_for(link))
+                          i.fa-solid.fa-spinner.fa-spin
+                  when 'Twikoo'
+                    +countBlockInIndex
+                      a.twikoo-count(href=url_for(link) + '#post-comment')
+                        i.fa-solid.fa-spinner.fa-spin
+                  when 'Facebook Comments'
+                    +countBlockInIndex
+                      a(href=url_for(link) + '#post-comment')
+                        span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+                  when 'Remark42'
+                    +countBlockInIndex
+                      a(href=url_for(link) + '#post-comment')
+                        span.remark42__counter(data-url=urlNoIndex(article.permalink))
+                          i.fa-solid.fa-spinner.fa-spin
+                  when 'Artalk'
+                    +countBlockInIndex
+                      a(href=url_for(link) + '#post-comment')
+                        span.artalk-count(data-page-key=url_for(link))
+                          i.fa-solid.fa-spinner.fa-spin
+
+            //- Display the article introduction on homepage
+            - const content = postDesc(article)
+            if content
+              .content!=content
+
+        if theme.ad && theme.ad.index
+          if (index + 1) % 3 === 0
+            .recent-post-item.ads-wrap!= theme.ad.index
+
+    include ../pagination.pug

layout/includes/mixins/post-ui.pug

@@ -1,68 +0,0 @@
-mixin postUI(posts)
-  each article , index in page.posts.data
-    .recent-post-item
-      - var link = article.link || article.path
-      - var title = article.title || _p('no_title')
-      - var leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
-      - var post_cover = article.cover
-      - var no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
-      if post_cover && theme.cover.index_enable
-        .post_cover(class=leftOrRight)
-          a(href=url_for(link) title=title)      
-            if theme.lazyload
-              img.post_bg(data-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-            else
-              img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.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.fa.fa-thumb-tack.article-meta__icon.sticky
-              span.sticky= _p('sticky')
-              span.article-meta__separator |
-          if (theme.post_meta.page.date_type)
-            if (theme.post_meta.page.date_type === 'both')
-              time.post-meta__date
-                span.post-meta__date-created(title=_p('post.created') + ' ' + full_date(article.date))
-                  i.fa.fa-calendar(aria-hidden="true")
-                  =date(article.date, config.date_format)
-                span.article-meta__separator |
-                span.post-meta__date-updated(title=_p('post.updated') + ' ' + full_date(article.updated))
-                  i.fa.fa-history(aria-hidden="true")
-                  =date(article.updated, config.date_format)
-            else
-              - var data_type_updated = theme.post_meta.page.date_type === 'updated'
-              - var date_type = data_type_updated ? 'updated' : 'date'
-              - var date_icon = data_type_updated ? 'fa-history' :'fa-calendar'
-              - var date_title = data_type_updated ? _p('post.updated') : _p('post.created')
-              time.post-meta__date(title=date_title + ' ' + full_date(article[date_type]))
-                i.fa(class=date_icon aria-hidden="true")
-                =date(article[date_type], config.date_format)
-          if (theme.post_meta.page.categories && article.categories.data.length > 0)
-            span.article-meta
-              span.article-meta__separator |
-              each item, index in article.categories.data
-                i.fa.fa-inbox.article-meta__icon(aria-hidden="true")
-                a(href=url_for(item.path)).article-meta__categories #[=item.name]
-                if (index < article.categories.data.length - 1)
-                    i.fa.fa-angle-right(aria-hidden="true")
-          if (theme.post_meta.page.tags && article.tags.data.length > 0)
-            span.article-meta.tags
-              span.article-meta__separator |
-              each item, index in article.tags.data
-                i.fa.fa-tag.article-meta__icon(aria-hidden="true")
-                a(href=url_for(item.path)).article-meta__tags #[=item.name]
-                if (index < article.tags.data.length - 1)
-                  span.article-meta__link -
-        if theme.auto_excerpt && theme.auto_excerpt.enable
-          - const content = strip_html(article.content)
-          - let expert = content.substring(0, theme.auto_excerpt.length) 
-          - content.length > theme.auto_excerpt.length ? expert += ' ...' : ''
-          .content!= expert
-        else
-          .content!= article.description
-
-    if theme.ad && theme.ad.index
-      if (index + 1) % 3 == 0
-        .recent-post-item.ad_height!=theme.ad.index

layout/includes/mobile-sidebar/index.pug

@@ -1,3 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-  include ../mobile-sidebar/mobile-menus.pug

layout/includes/mobile-sidebar/mobile-menus.pug

@@ -1,26 +0,0 @@
-#mobile-sidebar-menus
-  .mobile_author_icon
-    img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.lodding_bg.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')})

layout/includes/page/404.pug

@@ -0,0 +1,8 @@
+- var top_img_404 = theme.error_404.background || theme.default_top_img
+
+.error-content
+  .error-img
+    img(src=url_for(top_img_404) alt='Page not found')
+  .error-info
+    h1.error_title= '404'
+    .error_subtitle= theme.error_404.subtitle || _p('error404')

layout/includes/page/categories.pug

@@ -0,0 +1 @@
+.category-lists!= list_categories()

layout/includes/page/default-page.pug

@@ -0,0 +1,2 @@
+#article-container.container
+  != page.content

layout/includes/page/flink.pug

@@ -0,0 +1,82 @@
+#article-container.container
+  .flink
+    - let { content, random, flink_url } = page
+    - let pageContent = content
+
+    if flink_url || random
+      - const linkData = flink_url ? false : site.data.link || false
+      script.
+        (()=>{
+          const replaceSymbol = (str) => {
+            return str.replace(/[\p{P}\p{S}]/gu, "-")
+          }
+
+          let result = ""
+          const add = (str) => {
+            for(let i = 0; i < str.length; i++){
+              const replaceClassName = replaceSymbol(str[i].class_name)
+              const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
+              const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
+
+              let listResult = ""
+              const lists = str[i].link_list
+              if (!{random === true}) {
+                lists.sort(() => Math.random() - 0.5)
+              }
+              for(let j = 0; j < lists.length; j++){
+                listResult += `
+                  <div class="flink-list-item">
+                    <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
+                      <div class="flink-item-icon">
+                        <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
+                      </div>
+                      <div class="flink-item-name">${lists[j].name}</div>
+                      <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
+                    </a>
+                  </div>`
+              }
+
+              result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+            }
+
+            document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+          }
+
+          const linkData = !{JSON.stringify(linkData)}
+          if (!{Boolean(flink_url)}) {
+            fetch("!{url_for(flink_url)}")
+              .then(response => response.json())
+              .then(add)
+          } else if (linkData) {
+            add(linkData)
+          }
+        })()
+
+    else
+      if site.data.link
+        - let result = ""
+        each i in site.data.link
+          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ""
+          - let classDesc = i.class_desc ? `<div class="flink-desc">${i.class_desc}</div>` : ""
+
+          - let listResult = ""
+
+          each j in i.link_list
+            -
+              listResult += `
+                <div class="flink-list-item">
+                  <a href="${j.link}" title="${j.name}" target="_blank">
+                    <div class="flink-item-icon">
+                      <img class="no-lightbox" src="${j.avatar}" onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt="${j.name}" />
+                    </div>
+                    <div class="flink-item-name">${j.name}</div>
+                    <div class="flink-item-desc" title="${j.descr}">${j.descr}</div>
+                  </a>
+                </div>`
+            -
+
+          - result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+
+        - pageContent = result + pageContent
+    != pageContent

layout/includes/page/shuoshuo.pug

@@ -0,0 +1,188 @@
+//- - author:
+//-   avatar:
+//-   date:
+//-   content:
+//-   tags:
+//-     - tag1
+//-     - tag2
+
+- page.toc = false
+
+#article-container
+  if page.comments !== false && theme.comments.use
+    - commentsJsLoad = true
+
+    script.
+      (() => {
+        const commentDiv = `!{partial('includes/third-party/comments/index', {}, {cache: true})}`
+
+        const runDestroy = (shuoshuoComment) => {
+          if (!shuoshuoComment) return
+
+          for (const [key, fn] of Object.entries(shuoshuoComment)) {
+            if (key.startsWith('destroy')) fn()
+          }
+        }
+
+        window.addCommentToShuoshuo = e => {
+          const btn = e.target.closest('.shuoshuo-comment-btn')
+          if (!btn) return
+
+          const ele = btn.closest('.container').nextElementSibling
+          const { shuoshuoComment } = window
+          const isInclude = ele.classList.contains('no-comment')
+          runDestroy(shuoshuoComment)
+          if (isInclude) {
+            ele.classList.remove('no-comment')
+            ele.innerHTML = commentDiv
+            const key = `${location.pathname.replace(/\/$/, '')}?key=${ele.getAttribute('data-key')}`
+            btf.switchComments(ele, key)
+            shuoshuoComment.loadComment && shuoshuoComment.loadComment(ele, key)
+          }
+        }
+      })()
+
+  if page.shuoshuo_url
+    script.
+      (() => {
+        const limitConfig = !{ JSON.stringify(page.limit || {}) }
+
+        const sortDataByDate = data => data.sort((a, b) => new Date(b.date) - new Date(a.date))
+
+        const filterDataByLimit = (data, limit) => {
+          if (!limit || !limit.type) return data
+          if (limit.type === 'num') return data.slice(0, limit.value)
+          if (limit.type === 'date') {
+            const limitDate = new Date(limit.value)
+            return data.filter(item => new Date(item.date) >= limitDate)
+          }
+          return data
+        };
+
+        const formatToTimeZone = (date) => {
+          const fullDate = date.length === 10 ? `${date} 00:00:00` : date
+          const visitorTimeZone = '#{config.timezone}' || Intl.DateTimeFormat().resolvedOptions().timeZone
+          const options = {
+            timeZone: visitorTimeZone,
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+            hour12: false
+          }
+          const [day, month, year, hour, minute, second] = new Intl.DateTimeFormat('en-GB', options)
+            .format(new Date(fullDate))
+            .match(/\d+/g)
+          return `${year}-${month}-${day} ${hour}:${minute}:${second}`
+        }
+
+        const loadShuoshuo = async () => {
+          try {
+            const response = await fetch('!{url_for(page.shuoshuo_url)}')
+            let data = await response.json()
+
+            data = filterDataByLimit(sortDataByDate(data), limitConfig)
+
+            const container = document.getElementById('article-container')
+            let start = 0
+
+            const renderData = (dataSlice) => {
+              const content = dataSlice.map(item => {
+                const formattedDate = formatToTimeZone(item.date)
+                const tags = item.tags && item.tags.map(tag => `<span class="shuoshuo-tag">${tag}</span>`).join('') || ''
+                const commentButton = item.key && !{commentsJsLoad}
+                  ? `<div class="shuoshuo-comment-btn" onclick="addCommentToShuoshuo(event)">
+                      <i class="fa-solid fa-comments"></i>
+                    </div>`
+                  : ''
+                const commentContainer = item.key
+                  ? `<div class="shuoshuo-comment no-comment" data-key="${item.key}"></div>`
+                  : ''
+
+                return `
+                  <div class="shuoshuo-item">
+                    <div class="container">
+                      <div class="shuoshuo-item-header">
+                        <div class="shuoshuo-avatar">
+                          <img class="no-lightbox" src="${item.avatar || '!{url_for(theme.avatar.img)}'}">
+                        </div>
+                        <div class="shuoshuo-info">
+                          <div class="shuoshuo-author">${item.author || '!{config.author}'}</div>
+                          <time class="shuoshuo-date" title="${formattedDate}">
+                            ${btf.diffDate(formattedDate, true)}
+                          </time>
+                        </div>
+                      </div>
+                      <div class="shuoshuo-content">${item.content}</div>
+                      <div class="shuoshuo-footer ${tags ? 'flex-between' : 'flex-end'}">
+                        ${tags ? `<div class="shuoshuo-tags">${tags}</div>` : ''}
+                        ${commentButton}
+                      </div>
+                    </div>
+                    ${commentContainer}
+                  </div>`
+              }).join('')
+
+              container.insertAdjacentHTML('beforeend', content)
+
+              window.lazyLoadInstance.update()
+              btf.loadLightbox(document.querySelectorAll('#article-container img:not(.no-lightbox)'))
+            }
+
+            const handleIntersection = (entries) => {
+              if (!entries[0].isIntersecting) return
+              observer.unobserve(entries[0].target)
+
+              const slice = data.slice(start, start + 10)
+              renderData(slice)
+              start += 10
+
+              if (start < data.length) {
+                setTimeout(() => observer.observe(container.lastElementChild), 100)
+              } else {
+                observer.disconnect()
+              }
+            };
+
+            const observer = new IntersectionObserver(handleIntersection, {
+              root: null,
+              rootMargin: '0px',
+              threshold: 1.0
+            })
+
+            renderData(data.slice(start, 10))
+            start += 10
+
+            if (container.lastElementChild) observer.observe(container.lastElementChild)
+          } catch (error) {
+            console.error(error)
+          }
+        };
+
+        window.pjax ? loadShuoshuo() : window.addEventListener('load', loadShuoshuo)
+      })()
+  else
+    if site.data.shuoshuo
+      each i in shuoshuoFN(site.data.shuoshuo, page)
+        .shuoshuo-item
+          .container
+            .shuoshuo-item-header
+              .shuoshuo-avatar
+                img.no-lightbox(src=i.avatar || url_for(theme.avatar.img))
+              .shuoshuo-info
+                .shuoshuo-author=i.author || config.author
+                time.shuoshuo-date(title=i.date)=i.date
+            .shuoshuo-content
+              !=markdown(i.content)
+            .shuoshuo-footer(class=i.tags && i.tags.length ? 'flex-between' : 'flex-end')
+              if i.tags
+                .shuoshuo-tags
+                  each tag in i.tags
+                    span.shuoshuo-tag=tag
+              if i.key && commentsJsLoad
+                .shuoshuo-comment-btn(onclick='addCommentToShuoshuo(event)')
+                  i.fa-solid.fa-comments
+          if i.key && commentsJsLoad
+            .shuoshuo-comment.no-comment(data-key=i.key)

layout/includes/page/tags.pug

@@ -0,0 +1,2 @@
+.tag-cloud-list.text-center
+  !=cloudTags({source: site.tags, orderby: page.orderby || 'random', order: page.order || 1, minfontsize: 1.2, maxfontsize: 1.5, limit: 0, unit: 'em'})

layout/includes/pagination.pug

@@ -1,39 +1,37 @@
 -
   var options = {
-    prev_text: '<i class="fa fa-fw fa-chevron-left" aria-hidden="true"></i>',
-    next_text: '<i class="fa fa-fw fa-chevron-right" aria-hidden="true"></i>',
+    prev_text: '<i class="fas fa-chevron-left fa-fw"></i>',
+    next_text: '<i class="fas fa-chevron-right fa-fw"></i>',
     mid_size: 1,
     escape: false
   }
 
-if(!is_post())
-  nav#pagination
-    div.pagination
-      !=paginator(options)
+if globalPageType === 'post'
+  - let paginationOrder = theme.post_pagination === 1 ? { prev: page.prev, next: page.next } : { prev: page.next, next: page.prev }
+
+  nav#pagination.pagination-post
+    each direction, key in paginationOrder
+      if direction
+        - const getPostDesc = direction.postDesc || postDesc(direction)
+        - let className = key === 'prev' ? (paginationOrder.next ? '' : 'full-width') : (paginationOrder.prev ? '' : 'full-width')
+        - className = getPostDesc ? className : className + ' no-desc'
+
+        a.pagination-related(class=className href=url_for(direction.path) title=direction.title)
+          if direction.cover_type === 'img'
+            img.cover(src=url_for(direction.cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt=`cover of ${key === 'prev' ? 'previous' : 'next'} post`)
+          else
+            .cover(style=`background: ${direction.cover || 'var(--default-bg-color)'}`)
+
+          .info(class=key === 'prev' ? '' : 'text-right')
+            .info-1
+              .info-item-1=_p(`pagination.${key}`)
+              .info-item-2!=direction.title
+            if getPostDesc
+              .info-2
+                .info-item-1!=getPostDesc
 else
-  nav#pagination.pagination_post
-    if(page.prev)
-      - var hasPageNext = page.prev ? '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
-            img.prev_cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'` )
-          else
-            img.prev_cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'` )
-          .pagination-info
-            .label=_p('pagination.prev')
-            .prev_info=page.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
-      .next-post(class=hasPagePrev)
-        a(href=url_for(page.next.path))
-          if theme.lazyload
-            img.next_cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'`)
-          else
-            img.next_cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'`)
-          .pagination-info
-            .label=_p('pagination.next')
-            .next_info=page.next.title 
+  nav#pagination
+    .pagination
+      if globalPageType === 'home'
+        - options.format = 'page/%d/#content-inner'
+      !=paginator(options)

layout/includes/post/outdate-notice.pug

@@ -0,0 +1,8 @@
+- const { limit_day, message_prev, message_next, position} = theme.noticeOutdate
+- const notice_data = { limitDay: limit_day, messagePrev: message_prev, messageNext: message_next, postUpdate: full_date(page.updated)}
+if position === 'top'
+  #post-outdate-notice(data=notice_data hidden)
+  !=page.content
+else
+  !=page.content
+  #post-outdate-notice(data=notice_data hidden)

layout/includes/post/post-copyright.pug

@@ -1,13 +1,23 @@
-if (theme.post_copyright && theme.post_copyright.enable && page.copyright != false)
+if theme.post_copyright.enable && page.copyright !== false
+  - const author = page.copyright_author || config.author
+  - const authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
+  - const url = page.copyright_url || page.permalink
+  - const info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
-      span.post-copyright-meta= _p('post.copyright.author') + ": "
+      span.post-copyright-meta
+        i.fas.fa-circle-user.fa-fw
+        = _p('post.copyright.author') + ": "
       span.post-copyright-info
-        a(href=`mailto:${config.email}`) #[=config.author]
+        a(href=authorHref)= author
     .post-copyright__type
-      span.post-copyright-meta= _p('post.copyright.link') + ": "
+      span.post-copyright-meta
+        i.fas.fa-square-arrow-up-right.fa-fw
+        = _p('post.copyright.link') + ": "
       span.post-copyright-info
-        a(href=url_for(page.permalink))= theme.post_copyright.decode ? decodeURI(page.permalink) : page.permalink
+        a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
-      span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
-      span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
+      span.post-copyright-meta
+        i.fas.fa-circle-exclamation.fa-fw
+        = _p('post.copyright.copyright_notice') + ": "
+      span.post-copyright-info!= info

layout/includes/post/reward.pug

@@ -1,11 +1,12 @@
 .post-reward
-  a.reward-button.button--primary.button--animated 
-    i.fa.fa-qrcode
-    = ' ' + _p('donate')
-    .reward-main
-      ul.reward-all
-        each item in theme.reward.QR_code
-          li.reward-item
-            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-button
+    i.fas.fa-qrcode
+    = theme.reward.text || _p('donate')
+  .reward-main
+    ul.reward-all
+      each item in theme.reward.QR_code
+        - const clickTo = 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

layout/includes/rightside.pug

@@ -1,23 +1,61 @@
-section#rightside.rightside
+- const { readmode, translate, darkmode, aside, chat } = theme
+mixin rightsideItem(array)
+  each item in array
+    case item
+      when 'readmode'
+        if globalPageType === 'post' && readmode
+          button#readmode(type="button" title=_p('rightside.readmode_title'))
+            i.fas.fa-book-open
+      when 'translate'
+        if translate.enable
+          button#translateLink(type="button" title=_p('rightside.translate_title'))= translate.default
+      when 'darkmode'
+        if darkmode.enable && darkmode.button
+          button#darkmode(type="button" title=_p('rightside.night_mode_title'))
+            i.fas.fa-adjust
+      when 'hideAside'
+        if aside.enable && aside.button && page.aside !== false
+          button#hide-aside-btn(type="button" title=_p('rightside.aside'))
+            i.fas.fa-arrows-alt-h
+      when 'toc'
+        if showToc
+          button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+            i.fas.fa-list-ul
+      when 'chat'
+        if chat.rightside_button && chat.use
+          button#chat-btn(type="button" title=_p("rightside.chat") style="display:none")
+            i.fas.fa-message
+      when 'comment'
+        if commentsJsLoad
+          a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+            i.fas.fa-comments
+
+#rightside
+  - const { enable, hide, show } = theme.rightside_item_order
+  - const hideArray = enable ? hide && hide.split(',') : ['readmode','translate','darkmode','hideAside']
+  - const showArray = enable ? show && show.split(',') : ['toc','chat','comment']
+
+
   #rightside-config-hide
-    if theme.readmode.enable && is_post()
-      i#readmode.fa.fa-book(title=_p('rightside.readmode_title'))
-    if is_post()
-      i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
-      i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
-    if theme.translate && theme.translate.enable
-      a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title') target="_self")= theme.translate.default
-    if theme.darkmode.enable && theme.darkmode.button
-      - var lightModeIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-sun' : 'fa fa-sun-o'
-      - var darkModeIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-moon' : 'fa fa-moon-o'
-      - var display_mode = theme.display_mode == 'dark' ? lightModeIcon : darkModeIcon
-      i#darkmode.darkmode(class=display_mode title=_p('rightside.night_mode_title'))
+    if hideArray
+      +rightsideItem(hideArray)
   #rightside-config-show
-    #rightside_config(title=_p("rightside.setting"))
-      i.fa.fa-cog(aria-hidden="true")
-    if is_post() && page.comments !== false && isComment
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.scroll_to_comment.fa.fa-comments   
-    if is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )
-      i#mobile-toc-button.fa.fa-list-ul.close(title=_p("rightside.toc") aria-hidden="true")
-    i.fa.fa-arrow-up#go-up(title=_p("rightside.back_to_top") aria-hidden="true")
+    if enable
+      if hide
+        button#rightside-config(type="button" title=_p("rightside.setting"))
+          i.fas.fa-cog.fa-spin
+    else
+      if globalPageType === 'post'
+        if (readmode || translate.enable || (darkmode.enable && darkmode.button))
+          button#rightside-config(type="button" title=_p("rightside.setting"))
+            i.fas.fa-cog.fa-spin
+      else if translate.enable || (darkmode.enable && darkmode.button)
+        button#rightside-config(type="button" title=_p("rightside.setting"))
+          i.fas.fa-cog.fa-spin
+
+    if showArray
+      +rightsideItem(showArray)
+
+    button#go-up(type="button" title=_p("rightside.back_to_top"))
+      span.scroll-percent
+      i.fas.fa-arrow-up

layout/includes/search/algolia.pug

@@ -1,12 +0,0 @@
-#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.fa.fa-times
-.search-mask

layout/includes/search/index.pug

@@ -1,5 +0,0 @@
-if (theme.algolia_search.enable)
-  include ./algolia.pug
-if (theme.local_search)
-  if (!theme.algolia_search.enable && theme.local_search.enable)
-    include ./local-search.pug

layout/includes/search/local-search.pug

@@ -1,23 +0,0 @@
-#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.fa.fa-times
-.search-mask

layout/includes/share/add-this.pug

@@ -1,2 +0,0 @@
-.addthis_inline_share_toolbox
-script(src=`//s7.addthis.com/js/300/addthis_widget.js#pubid=${theme.addThis.pubid}` async)

layout/includes/share/addtoany.pug

@@ -1,9 +0,0 @@
-.addtoany
-  .a2a_kit.a2a_kit_size_32.a2a_default_style
-    each name in theme.addtoany.item
-      a(class="a2a_button_" + name)
-
-    a.a2a_dd(href="https://www.addtoany.com/share")
-script(async src=url_for(theme.CDN.addtoany))
-
-

layout/includes/share/index.pug

@@ -1,7 +0,0 @@
-.post_share
-  if theme.addThis.enable
-    include ./add-this.pug
-  else if theme.sharejs && theme.sharejs.enable
-    include ./share-js.pug
-  else if theme.addtoany.enable
-    include ./addtoany.pug

layout/includes/share/share-js.pug

@@ -1,4 +0,0 @@
-if (theme.sharejs && theme.sharejs.enable)
-  .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))
-  script(src=url_for(theme.CDN.sharejs))

layout/includes/sidebar.pug

@@ -1,25 +1,18 @@
-- let showToc = is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )
-- let autoOpenSidebar = theme.auto_open_sidebar.enable === true ? 'on' : ''
-
--
-  let tocNumber
-  if (page.toc_number !== undefined) tocNumber = page.toc_number
-  else if (theme.toc.number !== undefined) tocNumber = theme.toc.number
-  else tocNumber = true
--
-
-if(showToc)
-  i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true" class=autoOpenSidebar)      
+if theme.menu
   #sidebar
-    .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})
-        
+    #menu-mask
+    #sidebar-menus
+      .avatar-img.text-center
+        img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.flink)}'` alt="avatar")
+      .site-data.text-center
+        a(href=`${url_for(config.archive_dir)}/`)
+          .headline= _p('aside.articles')
+          .length-num= site.posts.length
+        a(href=`${url_for(config.tag_dir)}/`)
+          .headline= _p('aside.tags')
+          .length-num= site.tags.length
+        a(href=`${url_for(config.category_dir)}/`)
+          .headline= _p('aside.categories')
+          .length-num= site.categories.length
+
+      != partial('includes/header/menu_item', {}, { cache: true })

layout/includes/third-party/abcjs/abcjs.pug

@@ -0,0 +1,17 @@
+script.
+  (() => {
+    const abcjsInit = () => {
+      const abcjsFn = () => setTimeout(() => {
+        document.querySelectorAll(".abc-music-sheet").forEach(ele => {
+          if (ele.children.length > 0) return
+          ABCJS.renderAbc(ele, ele.innerHTML, {responsive: 'resize'})
+        })
+      }, 100)
+      
+      typeof ABCJS === 'object' ? abcjsFn()
+        : btf.getScript('!{url_for(theme.asset.abcjs_basic_js)}').then(abcjsFn)
+    }
+
+    window.pjax ? abcjsInit() : window.addEventListener('load', abcjsInit)
+    btf.addGlobalFn('encrypt', abcjsInit, 'abcjs')
+  })()

layout/includes/third-party/abcjs/index.pug

@@ -0,0 +1,3 @@
+if theme.abcjs.enable
+  if theme.abcjs.per_page && (['post','page'].includes(globalPageType)) || page.abcjs
+    include ./abcjs.pug

layout/includes/third-party/aplayer.pug

@@ -0,0 +1,23 @@
+link(rel='stylesheet' href=url_for(theme.asset.aplayer_css) media="print" onload="this.media='all'")
+script(src=url_for(theme.asset.aplayer_js))
+script(src=url_for(theme.asset.meting_js))
+if theme.pjax.enable
+  script.
+    (() => {
+      const destroyAplayer = () => {
+        if (window.aplayers) {
+          for (let i = 0; i < window.aplayers.length; i++) {
+            if (!window.aplayers[i].options.fixed) {
+              window.aplayers[i].destroy()
+            }
+          }
+        }
+      }
+
+      const runMetingJS = () => {
+        typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
+      }
+
+      btf.addGlobalFn('pjaxSend', destroyAplayer, 'destroyAplayer')
+      btf.addGlobalFn('pjaxComplete', loadMeting, 'runMetingJS')
+    })()

layout/includes/third-party/canvas-nest.pug

@@ -1 +0,0 @@
-script#canvas_nest(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))

layout/includes/third-party/canvas-ribbon-piao.pug

@@ -1 +0,0 @@
-script(id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))

layout/includes/third-party/canvas-ribbon.pug

@@ -1,3 +0,0 @@
-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}`)
-

layout/includes/third-party/card-post-count/artalk.pug

@@ -0,0 +1,31 @@
+- const { server, site } = theme.artalk
+
+script.
+  (() => {
+    const getArtalkCount = async() => {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .artalk-count')
+        const keyArray = Array.from(eleGroup).map(i => i.getAttribute('data-page-key'))
+
+        const headerList = {
+          method: 'GET',
+        }
+
+        const searchParams = new URLSearchParams({
+          'site_name': '!{site}',
+          'page_keys': keyArray
+        })
+
+        const res = await fetch(`!{server}/api/v2/stats/page_comment?${searchParams}`, headerList)
+        const result = await res.json()
+
+        keyArray.forEach((key, index) => {
+          eleGroup[index].textContent = result.data[key] || 0
+        })
+      } catch (err) {
+        console.error(err)
+      }
+    }
+
+    window.pjax ? getArtalkCount() : window.addEventListener('load', getArtalkCount)
+  })()

layout/includes/third-party/card-post-count/disqus.pug

@@ -0,0 +1,25 @@
+- const { shortname, apikey } = theme.disqus
+script.
+  (() => {
+    const getCount = async () => {
+      try {
+        const eleGroup = document.querySelectorAll('#recent-posts .disqus-count')
+        const cleanedLinks = Array.from(eleGroup).map(i => `thread:link=${i.href.replace(/#post-comment$/, '')}`);
+
+        const res = await fetch(`https://disqus.com/api/3.0/threads/set.json?forum=!{shortname}&api_key=!{apikey}&${cleanedLinks.join('&')}`,{
+          method: 'GET'
+        })
+        const result = await res.json()
+
+        eleGroup.forEach(i => {
+          const cleanedLink = i.href.replace(/#post-comment$/, '')
+          const urlData = result.response.find(data => data.link === cleanedLink) || { posts: 0 }
+          i.textContent = urlData.posts
+        })
+      } catch (err) {
+        console.error(err)
+      }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+  })()

layout/includes/third-party/card-post-count/fb.pug

@@ -0,0 +1,18 @@
+- const fbSDKVer = 'v20.0'
+- const fbSDK = `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
+
+script.
+  (()=>{
+    function loadFBComment () {
+      if (typeof FB === 'object') FB.XFBML.parse(document.getElementById('recent-posts'))
+      else {
+        let ele = document.createElement('script')
+        ele.setAttribute('src','!{fbSDK}')
+        ele.setAttribute('async', 'true')
+        ele.setAttribute('defer', 'true')
+        ele.setAttribute('crossorigin', 'anonymous')
+        document.body.appendChild(ele)
+      }
+    }
+    window.pjax ? loadFBComment() : window.addEventListener('load', loadFBComment)
+  })()

layout/includes/third-party/card-post-count/index.pug

@@ -0,0 +1,16 @@
+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
+  when 'Remark42'
+    include ./remark42.pug
+  when 'Artalk'
+    include ./artalk.pug

layout/includes/third-party/card-post-count/remark42.pug

@@ -0,0 +1,18 @@
+- const { host, siteId, option } = theme.remark42
+
+script.
+  (()=>{
+    window.remark_config = Object.assign({
+      host: '!{host}',
+      site_id: '!{siteId}',
+    },!{JSON.stringify(option)})
+
+    function getCount () {
+      const s = document.createElement('script')
+      s.src = remark_config.host + '/web/counter.js'
+      s.defer = true
+      document.head.appendChild(s)
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+  })()

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.textContent = res[index].count
+          })
+        }).catch(function (err) {
+          console.log(err)
+        })
+      }
+
+        if (typeof twikoo === 'object') {
+          runTwikoo()
+        } else {
+          btf.getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
+        }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()