From 53ed40ea16ddff53f7420910b203071b933b5d21 Mon Sep 17 00:00:00 2001
From: wehaox <wehaox@gmail.com>
Date: Thu, 30 Nov 2023 22:36:15 +0800
Subject: [PATCH] update1.7.8

---
 404.php                  |   46 +-
 archive_header.php       |   34 +-
 config/custom_config.php |  860 +++++++++++++++++++++++++++++
 css/custom.css           |    8 +-
 css/style.css            |  907 +++++++++++++++++--------------
 footer.php               |  514 +++++++++---------
 functions.php            | 1100 ++++----------------------------------
 header_com.php           |  770 +++++++++++++-------------
 index.php                |    4 +-
 post.php                 |  445 ++++++++-------
 public/rightside.php     |   45 ++
 11 files changed, 2383 insertions(+), 2350 deletions(-)
 create mode 100644 config/custom_config.php
 create mode 100644 public/rightside.php

diff --git a/404.php b/404.php
index 6d7968f..bc65cd2 100644
--- a/404.php
+++ b/404.php
@@ -7,49 +7,7 @@
      <?php  $this->need('public/nav.php'); ?>
 </header>
     <div id="error-wrap"><div class="error-content"><div class="error-img"><img src="https://i.loli.net/2020/05/19/aKOcLiyPl2JQdFD.png" alt="Page not found" class="entered"></div><div class="error-info"><h1 class="error_title">404</h1><div class="error_subtitle">頁面沒有找到</div></div></div></div></div>
-<div id="rightside">
-	<div id="rightside-config-hide" class="">
-	    <?php if ($this->is('post')): ?>
-	    <button id="readmode" type="button" title="阅读模式">
-	        <i class="fas fa-book-open"></i>
-	    </button>
-	    <?php endif ?>
-		<button id="translateLink" type="button" title="简繁转换">
-			繁
-		</button>
-		<button id="darkmode" type="button" title="浅色和深色模式转换">
-			<i class="fas fa-adjust">
-			</i>
-		</button>
-		<button id="hide-aside-btn" type="button" title="单栏和双栏切换">
-			<i class="fas fa-arrows-alt-h">
-			</i>
-		</button>
-	</div>
-	<div id="rightside-config-show">
-		<button id="rightside_config" type="button" title="设置">
-			<i class="fas fa-cog fa-spin">
-			</i>
-		</button>
-		<?php if ($this->is('post')): ?>
-		<button class="close" id="mobile-toc-button" type="button" title="目录">
-			<i class="fas fa-list-ul">
-			</i>
-		</button>
-		<?php endif ?>
-		<?php if(!$this->is('index') && $this->allow('comment')): ?>
-		<a id="to_comment" href="#comments" title="直达评论">
-			<i class="fas fa-comments">
-			</i>
-		</a>
-		<?php endif ?>
-		<button id="go-up" type="button" title="回到顶部">
-			<i class="fas fa-arrow-up">
-			</i>
-		</button>
-	</div>
-</div>
-
+    <?php require_once('public/rightside.php');?>
 <?php if ($this->options->showFramework == 'off'): ?>
 <style>.framework-info{display:none}</style>
 <?php endif; ?>
@@ -145,7 +103,7 @@ function subtitleType(){
 <?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
 <link rel="stylesheet" href="https://lib.baomitu.com/nprogress/0.2.0/nprogress.css">
 <script src="https://lib.baomitu.com/nprogress/0.2.0/nprogress.js"></script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/pjax.min.js"></script>
+<script src="<?php $this->options->CDNURL() ?>/js/pjax.min.js"></script>
 <?php else: ?>
 <link rel="stylesheet" href="<?php $this->options->themeUrl('static/css/nprogress.css'); ?>">
 <script src="<?php $this->options->themeUrl('static/js/nprogress.js'); ?>"></script>
diff --git a/archive_header.php b/archive_header.php
index 68ff959..9709603 100644
--- a/archive_header.php
+++ b/archive_header.php
@@ -1,39 +1,7 @@
 <?php  $this->need('header_com.php'); ?>
 <style>#body-wrap {min-height: 0;}</style>
 <div id="web_bg"></div>
-<div id="rightside">
-	<div id="rightside-config-hide" class="">
-		<button id="font-plus" type="button" title="放大字体">
-			<i class="fas fa-plus">
-			</i>
-		</button>
-		<button id="font-minus" type="button" title="缩小字体">
-			<i class="fas fa-minus">
-			</i>
-		</button>
-		<button id="translateLink" type="button" title="简繁转换">
-			簡
-		</button>
-		<button id="darkmode" type="button" title="浅色和深色模式转换">
-			<i class="fas fa-adjust">
-			</i>
-		</button>
-		<button id="hide-aside-btn" type="button" title="单栏和双栏切换">
-			<i class="fas fa-arrows-alt-h">
-			</i>
-		</button>
-	</div>
-	<div id="rightside-config-show">
-		<button id="rightside_config" type="button" title="设置">
-			<i class="fas fa-cog fa-spin">
-			</i>
-		</button>
-		<button id="go-up" type="button" title="回到顶部">
-			<i class="fas fa-arrow-up">
-			</i>
-		</button>
-	</div>
-</div>
+<?php require_once('public/rightside.php');?>
 <div class="page" id="body-wrap">
 <header class="not-home-page" id="page-header"  style="background-image: url(<?php if ($this->is('page')){GetRandomThumbnailPost($this);}?>)">
          <div id="page-site-info"><h1 id="site-title"><?php $this->archiveTitle(array(
diff --git a/config/custom_config.php b/config/custom_config.php
new file mode 100644
index 0000000..a3b20f9
--- /dev/null
+++ b/config/custom_config.php
@@ -0,0 +1,860 @@
+<?php
+function themeConfig($form)
+{
+    ?>
+    <link rel="stylesheet" href="<?php Helper::options()->themeUrl('css/themedash.css?v1.5.3'); ?>">
+    <div class='set_toc'>
+        <div class='mtoc'>
+            <a href='#themeBackup'>主题备份与还原</a>
+            <a href='#cids'>文章置顶及公共部分</a>
+            <a href='#pjax'>pjax设置</a>
+            <a href='#friends'>友情链接设置</a>
+            <a href='#reward'>打赏功能</a>
+            <a href='#aside'>侧边栏显示设置</a>
+            <a href='#beautifyBlock'>美化选项</a>
+            <a href='#ShowLive2D'>Live2D设置</a>
+            <a href='#otherCustom'>其他自定义内容</a>
+            <a href='#CustomColor'>自定义颜色</a>
+            <a href='#NULL' id='point'>返回上次保存设置时的锚点</a>
+        </div>
+    </div>
+    <form class="protected" action="?butterflybf" method="post" id="themeBackup">
+        <input type="submit" name="type" class="btn btn-s" value="备份主题数据" />&nbsp;&nbsp;<input type="submit" name="type"
+            class="btn btn-s" value="还原主题数据" />&nbsp;&nbsp;<input type="submit" name="type" class="btn btn-s"
+            value="删除备份数据" />
+    </form>
+    <script src='https://cdn.staticfile.org/jquery/1.10.2/jquery.min.js'></script>
+    <script src="<?php Helper::options()->themeUrl('js/themecustom.js?v1.5.3'); ?>"></script>
+    <script src='https://static.wehao.org/postdomai.js'></script>
+    <?php
+    $sticky_cids = new Typecho_Widget_Helper_Form_Element_Text('sticky_cids', NULL, NULL, '置顶文章的 cid', '<div style="font-family:arial; background:#E8EFD1; padding:8px">按照排序输入, 请以半角逗号或空格分隔 cid</div>');
+    $sticky_cids->setAttribute('id', 'cids');
+    $form->addInput($sticky_cids);
+
+    $slide_cids = new Typecho_Widget_Helper_Form_Element_Text('slide_cids', NULL, NULL, '主页轮播图文章的 cid', '填入自动开启，填入方式同上，<b style="color:red">注意：填入错误cid会导致页面出错</b>');
+    $form->addInput($slide_cids);
+
+    $StaticFile = new Typecho_Widget_Helper_Form_Element_Select(
+        'StaticFile',
+        array(
+            'CDN' => 'CDN加载(默认)',
+            'local' => '本地加载',
+        ),
+        'CDN',
+        '博客静态资源加载方式',
+        '介绍：无网络服务器或者CDN炸了可开启此项<br>
+         将博客静态资源，如js、css、图片从服务器加载(会稍微增加服务器流量消耗)<br>
+         注意：你需要额外<a href="https://github.com/wehaox/Typecho-Butterfly/releases/download/1.7.7/static-23.11.zip">下载</a>对应版本的静态资源放进主题根目录直接解压即可<br>
+         此文件与下方的自定义CDN文件通用'
+    );
+    $form->addInput($StaticFile->multiMode());
+
+    $CDNURL = new Typecho_Widget_Helper_Form_Element_Text(
+        'CDNURL',
+        NULL,
+        NULL,
+        '自定义CDNURL(由@origami-tech提供)',
+        '需要选择博客静态资源加载方式为CDN加载 此项才会生效 且<b>本地加载>自定义CDNURL>jsdelivr源</b><br>
+    注意：你需要额外<a href="https://github.com/wehaox/Typecho-Butterfly/releases/download/1.7.7/static-23.11.zip">下载</a>静态资源放CDN解压<br>
+    链接填写规则：填写static文件夹的父文件夹 无需最后的/ 例如 https://pub-gcdn.starsdust.cn/libs/butterfly '
+    );
+    $form->addInput($CDNURL);
+
+    $jsdelivrLink = new Typecho_Widget_Helper_Form_Element_Select(
+        'jsdelivrLink',
+        array(
+            'cdn.jsdelivr.net' => '官方默认源',
+            'gcore.jsdelivr.net' => 'gcore源',
+            'fastly.jsdelivr.net' => 'fastly源',
+            'raw.fastgit.org' => 'fastgit源',
+        ),
+        'gcore.jsdelivr.net',
+        'jsdelivr提供的cdn源切换(默认采用gcore源)',
+        '需要开启上方的CDN加载'
+    );
+    $form->addInput($jsdelivrLink->multiMode());
+
+    $NewTabLink = new Typecho_Widget_Helper_Form_Element_Select(
+        'NewTabLink',
+        array(
+            'on' => '开启（默认）',
+            'off' => '关闭',
+        ),
+        'on',
+        '是否开启新标签打开外部链接',
+        '介绍：非站内链接在新标签打开'
+    );
+    $form->addInput($NewTabLink->multiMode());
+
+    $showFramework = new Typecho_Widget_Helper_Form_Element_Select(
+        'showFramework',
+        array(
+            'on' => '开启（默认）',
+            'off' => '关闭',
+        ),
+        'on',
+        '是否显示底部博客框架和主题',
+        '介绍：如果你是小白自行修改主题名会导致侵权提示，你可以在这里关闭同时希望你可以<b>尊重本主题</b>'
+    );
+    $form->addInput($showFramework->multiMode());
+
+    $Defend = new Typecho_Widget_Helper_Form_Element_Select(
+        'Defend',
+        array('off' => '关闭（默认）', 'on' => '开启'),
+        'off',
+        '是否开启网站维护或密码访问',
+        '介绍： 下方密码留空则显示网站维护否则显示输入密码访问，登录用户不受限制'
+    );
+    $form->addInput($Defend->multiMode());
+
+    $ThemePassword = new Typecho_Widget_Helper_Form_Element_Text('ThemePassword', NULL, NULL, _t('全站密码访问(非必填)'), _t('输入访问网站的密码，<b>需要在上方开启网站维护或密码访问</b>'));
+    $form->addInput($ThemePassword);
+
+    $NoQQ = new Typecho_Widget_Helper_Form_Element_Select(
+        'NoQQ',
+        array('off' => '关闭（默认）', 'on' => '开启'),
+        'off',
+        '是否开启网站禁止手机QQ访问',
+        '介绍：烦人的QQ'
+    );
+    $form->addInput($NoQQ->multiMode());
+
+    $SiteLogo = new Typecho_Widget_Helper_Form_Element_Text('SiteLogo', NULL, NULL, _t('站点名称设置为图片logo(非必填)'), _t('当设置此项时站点名称将不会在导航栏左上角显示,使用png格式'));
+    $form->addInput($SiteLogo);
+
+    $Sitefavicon = new Typecho_Widget_Helper_Form_Element_Text('Sitefavicon', NULL, NULL, _t('网站图标'), _t('网站图标，使用png格式，大小建议不超过64x64'));
+    $form->addInput($Sitefavicon);
+
+    $logoUrl = new Typecho_Widget_Helper_Form_Element_Text('logoUrl', NULL, _t('#null'), _t('作者头像'), _t('在这里填入图片地址，它会显示在右侧栏的作者头像'));
+    $form->addInput($logoUrl);
+
+    $author_description = new Typecho_Widget_Helper_Form_Element_Text('author_description', NULL, _t('作者描述'), _t('作者描述'), _t('在这里填入站点描述，它会显示在右侧栏的作者信息'));
+    $form->addInput($author_description);
+
+    $author_site_description = new Typecho_Widget_Helper_Form_Element_Text('author_site_description', NULL, _t('个人网站'), _t('作者链接描述'), _t('作者链接描述'));
+    $form->addInput($author_site_description);
+
+    $author_site = new Typecho_Widget_Helper_Form_Element_Text('author_site', NULL, _t('#null'), _t('作者链接'), _t('在这里填入作者链接，它会显示在右侧栏的作者信息的个人网站上'));
+    $form->addInput($author_site);
+
+    $author_bottom = new Typecho_Widget_Helper_Form_Element_Textarea('author_bottom', NULL, _t(''), _t('侧栏作者信息最底部内容（非必填）'), _t('这里填入html代码,不会勿填'));
+    $form->addInput($author_bottom);
+
+    $announcement = new Typecho_Widget_Helper_Form_Element_Textarea('announcement', NULL, _t('这里是公告<br>'), _t('公告'), _t('在这里填入公告，它会显示在右侧栏的公告上,采用html写法'));
+    $form->addInput($announcement);
+
+    $AD = new Typecho_Widget_Helper_Form_Element_Textarea('AD', NULL, NULL, _t('广告(由@yzl3014提供)'), _t('在这里填入广告，填入后自动显示在侧栏中公告栏的下方，支持html'));
+    $form->addInput($AD);
+
+    $headerimg = new Typecho_Widget_Helper_Form_Element_Text('headerimg', NULL, _t('https://s2.loli.net/2023/01/18/bIJTVaR3MLPzcZ7.jpg'), _t('主页顶图(banner image)'), _t('填入主页头图链接'));
+    $form->addInput($headerimg);
+
+    $buildtime = new Typecho_Widget_Helper_Form_Element_Text('buildtime', NULL, _t('2021/04/05'), _t('建站时间'), _t('按照输入框内格式填写'));
+    $form->addInput($buildtime);
+
+    $outoftime = new Typecho_Widget_Helper_Form_Element_Text('outoftime', NULL, _t('15'), _t('文章过时提醒'), _t('设置文章过时提醒最大天数，默认15天，可在文章管理单独设置是否显示过期提醒'));
+    $form->addInput($outoftime);
+
+    $archivelink = new Typecho_Widget_Helper_Form_Element_Text('archivelink', NULL, _t('#null'), _t('侧栏文章(归档)链接'), _t('需在独立页面创建并手动填入链接'));
+    $form->addInput($archivelink);
+
+    $tagslink = new Typecho_Widget_Helper_Form_Element_Text('tagslink', NULL, _t('#null'), _t('侧栏标签链接'), _t('需在独立页面创建并手动填入链接'));
+    $form->addInput($tagslink);
+
+    $categorylink = new Typecho_Widget_Helper_Form_Element_Text('categorylink', NULL, _t('#null'), _t('侧栏分类链接'), _t('需在独立页面创建并手动填入链接'));
+    $form->addInput($categorylink);
+
+    $CloseComments = new Typecho_Widget_Helper_Form_Element_Select(
+        'CloseComments',
+        array(
+            'off' => '关闭（默认）',
+            "on" => '开启'
+        ),
+        'off',
+        '全站关闭评论',
+        '介绍：开启后所有文章不能评论'
+    );
+    $form->addInput($CloseComments->multiMode());
+
+    $EnableCommentsLogin = new Typecho_Widget_Helper_Form_Element_Select(
+        'EnableCommentsLogin',
+        array(
+            'off' => '关闭（默认）',
+            "on" => '开启'
+        ),
+        'off',
+        '开启用户评论区登录',
+        '介绍：开启后在评论区会显示登录按钮
+        '
+    );
+    $form->addInput($EnableCommentsLogin->multiMode());
+
+    $ShowRelatedPosts = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowRelatedPosts',
+        array(
+            'off' => '关闭（默认）',
+            'on' => '开启',
+        ),
+        'off',
+        '是否显示文章内相关推荐',
+        '介绍：开启后文章结束后会显示相关的推荐文章(根据文章标签推荐，不一定每篇文章都会显示)'
+    );
+    $form->addInput($ShowRelatedPosts->multiMode());
+
+    $RelatedPostsNum = new Typecho_Widget_Helper_Form_Element_Select(
+        'RelatedPostsNum',
+        array(
+            '3' => '3篇（默认）',
+            '6' => '6篇',
+        ),
+        '3',
+        '相关推荐显示数量',
+        '介绍：最多显示3篇或者6篇相关推荐文章'
+    );
+    $form->addInput($RelatedPostsNum->multiMode());
+
+    $DefaultEncoding = new Typecho_Widget_Helper_Form_Element_Select(
+        'DefaultEncoding',
+        array(
+            '2' => '简体（默认）',
+            '1' => '繁体',
+        ),
+        '2',
+        '博客默认字体',
+        '介绍：如果你使用繁体写文章请选择繁体'
+    );
+    $form->addInput($DefaultEncoding->multiMode());
+
+    $themeFontSize = new Typecho_Widget_Helper_Form_Element_Text('themeFontSize', NULL, _t(''), _t('默认字体大小'), _t('填入像素值，例如14px'));
+    $form->addInput($themeFontSize);
+
+    $GravatarSelect = new Typecho_Widget_Helper_Form_Element_Select(
+        'GravatarSelect',
+        array(
+            "https://gravatar.loli.net/avatar/" => 'loli（默认）',
+            'https://gravatar.helingqi.com/wavatar/' => '禾令奇',
+            "https://sdn.geekzu.org/avatar/" => '极客族',
+            "https://cdn.sep.cc/avatar/" => '九月的风',
+            "https://gravatar.com/avatar/" => '官方源(被墙)',
+            "https://cravatar.cn/avatar/" => '中国官方源(推荐)',
+        ),
+        'loli',
+        'gravatar源选择',
+        '介绍：评论区头像gravatar源'
+    );
+    $GravatarSelect->setAttribute('id', 'gravatarlist');
+    $form->addInput($GravatarSelect->multiMode());
+
+    $baidustatistics = new Typecho_Widget_Helper_Form_Element_Text('baidustatistics', NULL, _t(''), _t('百度统计'), _t('仅需要https://hm.baidu.com/hm.js?xxxxxxxxxxxxxxxxxx部分即可'));
+    $form->addInput($baidustatistics);
+
+    $googleadsense = new Typecho_Widget_Helper_Form_Element_Text('googleadsense', NULL, _t(''), _t('谷歌广告(实验性功能)'), _t('填入client后的部分,如ca-pub-xxxxx'));
+    $form->addInput($googleadsense);
+
+    $EnablePjax = new Typecho_Widget_Helper_Form_Element_Select(
+        'EnablePjax',
+        array(
+            'off' => '关闭（默认）',
+            "on" => '开启'
+        ),
+        'off',
+        '开启PJAX',
+        '介绍：页面无刷新加载,有效提高页面加载速度<br>
+         请先查看<a href="https://blog.wehaox.com/archives/typecho-butterfly.html#cl-13">使用文档</a>'
+    );
+    $EnablePjax->setAttribute('id', 'pjax');
+    $form->addInput($EnablePjax->multiMode());
+
+    $PjaxCallBack = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'PjaxCallBack',
+        NULL,
+        NULL,
+        'PJAX回调函数（非必填）',
+        '用于解决开启pjax导致某些js失效问题(填入js代码)'
+    );
+    $form->addInput($PjaxCallBack);
+
+    /* 友链设置 */
+    $friendset = new Typecho_Widget_Helper_Form_Element_Select(
+        'friendset',
+        array(
+            '0' => '主题模式',
+            '1' => '插件模式',
+        ),
+        '0',
+        '是否使用Link插件进行友链(需点击<a href="https://static.wehao.org/Links.zip">这里</a>下载)',
+        '介绍：新手和手残党极其友好,默认从主题读取防止报错'
+    );
+    $friendset->setAttribute('id', 'friends');
+    $form->addInput($friendset);
+
+    $Friends = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'Friends',
+        NULL,
+        NULL,
+        '友情链接（非必填）',
+        '介绍：用于填写友情链接 <br />
+         注意：需在独立页面创建友链，该项才会生效 <br />
+         格式：博客名称 || 博客地址 || 博客头像 || 博客简介 <br />
+         其他：一行一个，一行代表一个友链'
+    );
+    $form->addInput($Friends);
+
+    $LazyLoad = new Typecho_Widget_Helper_Form_Element_Text(
+        'LazyLoad',
+        NULL,
+        NULL,
+        '全局懒加载图（非必填）',
+        '介绍：用于修改懒加载图片 格式：base64 或者 图片url'
+    );
+    $form->addInput($LazyLoad);
+
+
+    $ShowGlobalReward = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowGlobalReward',
+        array(
+            'off' => '关闭（默认）',
+            'show' => '开启打赏',
+        ),
+        'off',
+        '是否开启全局文章打赏',
+        '介绍：开启此功能所有文章将显示打赏'
+    );
+    $ShowGlobalReward->setAttribute('id', 'reward');
+    $form->addInput($ShowGlobalReward->multiMode());
+
+    /* 打赏设置 */
+    $RewardInfo = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'RewardInfo',
+        NULL,
+        _t('微信 || https://cdn.jsdelivr.net/gh/wehaox/CDN@main/reward/wechat.jpg
+    支付宝 || https://cdn.jsdelivr.net/gh/wehaox/CDN@main/reward/alipay.jpg'),
+        '打赏信息（非必填）',
+        '注意：需在开启打赏功能，该项才会显示 <br />
+         格式：打赏名称 || 图片地址 <br />一行一个'
+    );
+    $form->addInput($RewardInfo);
+
+    $sidebarBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
+        'sidebarBlock',
+        array(
+            'ShowAuthorInfo' => _t('显示作者信息'),
+            'ShowAnnounce' => _t('显示公告'),
+            'ShowRecentPosts' => _t('显示最新文章'),
+            'ShowRecentComments' => _t('显示最近回复'),
+            'ShowCategory' => _t('显示分类'),
+            'ShowTag' => _t('显示标签'),
+            'ShowArchive' => _t('显示归档'),
+            'ShowWebinfo' => _t('显示网站资讯'),
+            'ShowOther' => _t('显示其它杂项'),
+            'ShowMobileSide' => _t('手机端显示侧栏'),
+            'ShowWeiboHot' => _t('显示微博热搜')
+        ),
+        array('ShowAuthorInfo', 'ShowAnnounce', 'ShowRecentPosts', 'ShowRecentComments', 'ShowCategory', 'ShowTag', 'ShowArchive', 'ShowWebinfo', 'ShowMobileSide'),
+        _t('侧边栏显示')
+    );
+    $sidebarBlock->setAttribute('id', 'aside');
+    $form->addInput($sidebarBlock->multiMode());
+    // 在线人数显示
+    $ShowOnlinePeople = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowOnlinePeople',
+        array(
+            'on' => '开启',
+            'off' => '关闭（默认）',
+        ),
+        'off',
+        '是否显示在线人数',
+        '介绍：侧栏网站咨询模块在线人数统计,防止某些虚拟主机无法开启导致500错误'
+    );
+    $form->addInput($ShowOnlinePeople->multiMode());
+
+    $sidderArchiveNum = new Typecho_Widget_Helper_Form_Element_Text('sidderArchiveNum', NULL, _t('5'), _t('侧栏归档显示行数'), _t('默认为5'));
+    $form->addInput($sidderArchiveNum);
+
+    // 文章侧边栏设置
+    $PostSidebarBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
+        'PostSidebarBlock',
+        array(
+            'ShowAuthorInfo' => _t('显示作者信息'),
+            'ShowAnnounce' => _t('显示公告'),
+            'ShowRecentPosts' => _t('显示最新文章'),
+            'ShowWebinfo' => _t('显示网站咨询'),
+            'ShowOther' => _t('显示其它杂项'),
+            'ShowWeiboHot' => _t('显示微博热搜')
+        ),
+        array('ShowAuthorInfo', 'ShowAnnounce', 'ShowRecentPosts', 'ShowWebinfo'),
+        _t('文章侧边栏显示'),
+        _t('说明:单独设置文章内侧栏')
+    );
+    $form->addInput($PostSidebarBlock->multiMode());
+
+    // 美化选项
+    $beautifyBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
+        'beautifyBlock',
+        array(
+            'ShowBeautifyChange' => _t('是否开启美化(基于butterfly小康的魔改)'),
+            'ShowColorTags' => _t('是否开启彩色标签云'),
+            'ShowTopimg' => _t('是否显示主页顶图'),
+            'PostShowTopimg' => _t('是否显示文章示顶图'),
+            'PageShowTopimg' => _t('是否显示独立页面顶图'),
+            'showLineNumber' => _t('是否显示代码块行号'),
+            'showSnackbar' => _t('是否显示主题以及简繁切换弹窗'),
+            'showLazyloadBlur' => _t('是否开启懒加载模糊效果'),
+            'showButterflyClock' => _t('是否开启侧栏显示时钟(需要在下方填写和风和高德key)'),
+            'showNoAlertSearch' => _t('是否开启无弹窗搜索框'),
+        ),
+        array('ShowTopimg', 'PostShowTopimg', 'PageShowTopimg', 'showLineNumber', 'showSnackbar', 'showLazyloadBlur', 'showNoAlertSearch'),
+        _t('美化选项')
+    );
+    $beautifyBlock->setAttribute('id', 'beautifyBlock');
+    $form->addInput($beautifyBlock->multiMode());
+
+    // 封面位置
+    $coverPosition = new Typecho_Widget_Helper_Form_Element_Select(
+        'coverPosition',
+        array(
+            'left' => '靠左',
+            'cross' => '交叉(默认)',
+            'right' => '靠右',
+        ),
+        'cross',
+        '主页文章列表封面显示位置',
+        '个人还是还是觉得交叉好看'
+    );
+    $form->addInput($coverPosition->multiMode());
+
+    $qweather_key = new Typecho_Widget_Helper_Form_Element_Text('qweather_key', NULL, null, _t('时钟和风天气key'), _t('<a href="https://github.com/anzhiyu-c/hexo-butterfly-clock-anzhiyu/#安装">按照教程获取key</a>'));
+    $gaud_map_key = new Typecho_Widget_Helper_Form_Element_Text('gaud_map_key', NULL, null, _t('时钟高德地图web服务key'), _t('侧栏显示时钟用到的key，同上'));
+    $form->addInput($qweather_key);
+    $form->addInput($gaud_map_key);
+
+    $ShowLive2D = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowLive2D',
+        array(
+            'off' => '关闭（默认）',
+            "on" => '开启（GitHub默认）'
+        ),
+        'off',
+        '开启Live2D人物模型（仅通过GitHub默认样式且不会在手机显示）',
+        '介绍：开启后会在右下角显示一个小人，该功能采用远程调用不会消耗性能'
+    );
+    $ShowLive2D->setAttribute('id', 'ShowLive2D');
+    $form->addInput($ShowLive2D->multiMode());
+
+    // 弹窗提示
+    $SnackbarPosition = new Typecho_Widget_Helper_Form_Element_Select(
+        'SnackbarPosition',
+        array(
+            'top-left' => '左上(默认)',
+            'top-center' => '中上',
+            'top-right' => '右上',
+            'bottom-left' => '左下',
+            'bottom-center' => '中下',
+            'bottom-right' => '右下',
+        ),
+        'top-left',
+        '主题以及简繁切换弹窗位置',
+        '选择其中一个,需要开启是否显示主题以及简繁切换弹窗 '
+    );
+    $form->addInput($SnackbarPosition->multiMode());
+
+    $CursorEffects = new Typecho_Widget_Helper_Form_Element_Select(
+        'CursorEffects',
+        array(
+            'off' => '关闭（默认）',
+            'heart' => '鼠标点击效果:爱心',
+            'fireworks' => '烟火效果',
+        ),
+        'off',
+        '选择鼠标点击特效',
+        '介绍：用于切换鼠标点击特效 '
+    );
+    $form->addInput($CursorEffects->multiMode());
+    // 自定义subtitle
+    $CustomSubtitle = new Typecho_Widget_Helper_Form_Element_Text(
+        'CustomSubtitle',
+        NULL,
+        NULL,
+        '自定义主页副标题/subtitle（非必填）',
+        '介绍：不填则使用默认的一言api。'
+    );
+    $form->addInput($CustomSubtitle);
+
+    $SubtitleLoop = new Typecho_Widget_Helper_Form_Element_Select(
+        'SubtitleLoop',
+        array(
+            'true' => '开启循环打字（默认）',
+            "false" => '关闭循环打字'
+        ),
+        'true',
+        '副标题循环打字',
+        '介绍：开启后主页副标题循环打字'
+    );
+    $form->addInput($SubtitleLoop->multiMode());
+
+
+    $EnableAutoHeaderLink = new Typecho_Widget_Helper_Form_Element_Select(
+        'EnableAutoHeaderLink',
+        array(
+            'on' => '开启（默认）',
+            "off" => '关闭'
+        ),
+        'on',
+        '自动生成导航栏独立页面链接',
+        '介绍：如果你要自定义导航栏链接部分,你可以选择关闭此项'
+    );
+    $form->addInput($EnableAutoHeaderLink->multiMode());
+
+    // 自定义导航栏链接
+    $CustomHeaderLink = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomHeaderLink',
+        NULL,
+        NULL,
+        '自定义导航栏链接',
+        '介绍：目前使用html写法 <b style="color:red">完全自定义链接记得关闭上方选项</b>'
+    );
+    $CustomHeaderLink->setAttribute('id', 'otherCustom');
+    $form->addInput($CustomHeaderLink);
+
+    // 自定义认证用户
+    $CustomAuthenticated = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomAuthenticated',
+        NULL,
+        NULL,
+        '自定义认证用户',
+        '介绍：评论区认证用户专属头衔<br>
+         格式：邮箱||认证头衔 如:<br> xxx@xxx.com||xxx认证<br>
+        (一行一个)'
+    );
+    $form->addInput($CustomAuthenticated);
+
+    // 自定义css和js
+    $CustomCSS = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomCSS',
+        NULL,
+        NULL,
+        '自定义CSS样式（非必填）',
+        '介绍：请填写自定义CSS内容，填写时无需填写style标签。'
+    );
+    $form->addInput($CustomCSS);
+
+    $CustomScript = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomScript',
+        NULL,
+        NULL,
+        '自定义JS代码（非必填，请看下方介绍）',
+        '介绍：请填写自定义JS内容，填写时无需填写script标签。<br />
+         非专业人士请勿填写！'
+    );
+    $form->addInput($CustomScript);
+
+    $CustomHead = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomHead',
+        NULL,
+        NULL,
+        '自定义head标签内位置内容',
+        '介绍：填写如cdn的&lt;link&gt;标签、百度统计代码等等'
+    );
+    $form->addInput($CustomHead);
+
+    $CustomBodyEnd = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'CustomBodyEnd',
+        NULL,
+        NULL,
+        '自定义body标签末尾位置内容',
+        '介绍：填写如cdn的&lt;script&gt;&lt;/script&gt;标签等等'
+    );
+    $form->addInput($CustomBodyEnd);
+
+    $Customfooter = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'Customfooter',
+        NULL,
+        NULL,
+        '自定义Footer内容',
+        '介绍：网页底部的信息，如备案号等等(可使用html)'
+    );
+    $form->addInput($Customfooter);
+
+    $themeColor = new Typecho_Widget_Helper_Form_Element_Text('themeColor', NULL, 
+    _t('#eee'), _t('主题色'), _t('主要用于支持沉浸式状态栏的浏览器,默认为#eee'));
+    $themeColor->setAttribute('id', 'CustomColor');
+    $form->addInput($themeColor);
+    //暗色模式选项
+    $darkModeSelect = new Typecho_Widget_Helper_Form_Element_Select(
+        'darkModeSelect',
+        array(
+            "1" => '始终亮色模式',
+            '2' => '跟随系统（默认）',
+            '3' => '跟随系统且按时间自动深色',
+            '4' => '始终深色',
+        ),
+        '2',
+        '暗色模式相关',
+        '介绍：如果用户在左下角设置了颜色模式这里将不会生效'
+    );
+    $form->addInput($darkModeSelect->multiMode());
+
+    $darkTime = new Typecho_Widget_Helper_Form_Element_Text('darkTime', NULL, 
+    _t('7-20'), _t('自动暗色时间段'), _t('默认为7-20,24小时格式,按照格式(7-20)填写'));
+    $form->addInput($darkTime);
+
+    //自定义颜色    
+    $EnableCustomColor = new Typecho_Widget_Helper_Form_Element_Select(
+        'EnableCustomColor',
+        array(
+            "false" => '关闭（默认）',
+            'true' => '开启'
+        ),
+        'false',
+        '开启主题自定义颜色(实验性功能)',
+        '介绍：需要开启此选项下面的自定义颜色才能生效，且下面关于颜色的必填'
+    );
+    $form->addInput($EnableCustomColor->multiMode());
+
+    $CustomColorMain = new Typecho_Widget_Helper_Form_Element_Text(
+        'CustomColorMain',
+        NULL,
+        _t('#49b1f5'),
+        '自定主题主要颜色',
+        '介绍：使用hex格式或者颜色英文，如#fff、white'
+    );
+    $form->addInput($CustomColorMain);
+
+    $CustomColorButtonBG = new Typecho_Widget_Helper_Form_Element_Text(
+        'CustomColorButtonBG',
+        NULL,
+        _t('#49b1f5'),
+        '自定按钮颜色',
+        '介绍：同上'
+    );
+    $form->addInput($CustomColorButtonBG);
+
+    $CustomColorButtonHover = new Typecho_Widget_Helper_Form_Element_Text(
+        'CustomColorButtonHover',
+        NULL,
+        _t('#ff7242'),
+        '自定按钮悬停色',
+        '介绍：同上'
+    );
+    $form->addInput($CustomColorButtonHover);
+
+    $CustomColorSelection = new Typecho_Widget_Helper_Form_Element_Text(
+        'CustomColorSelection',
+        NULL,
+        _t('#00c4b6'),
+        '自定文本选择色',
+        '介绍：同上'
+    );
+    $form->addInput($CustomColorSelection);
+    //自定义颜色end
+
+    $siteKey = new Typecho_Widget_Helper_Form_Element_Text(
+        'siteKey',
+        NULL,
+        null,
+        '评论区谷歌验证码 <br> Site Key for reCAPTCHAv2:',
+        '<a href="https://www.google.com/recaptcha/admin/create">点击获取密钥</a>'
+    );
+
+    $secretKey = new Typecho_Widget_Helper_Form_Element_Text('secretKey', NULL, null, _t('Serect Key for reCAPTCHAv2:'), _t('填写两处密钥评论区自动开启谷歌验证码'));
+    $form->addInput($siteKey);
+    $form->addInput($secretKey);
+
+
+    $hcaptchaSecretKey = new Typecho_Widget_Helper_Form_Element_Text(
+        'hcaptchaSecretKey',
+        NULL,
+        null,
+        '<hr> 评论区hcaptch人机验证 <br> 密钥(sietkey)- 使用它作为 secret 来检查用户令牌:',
+        '<a href="https://dashboard.hcaptcha.com/welcome">点击获取密钥</a>'
+    );
+
+    $hcaptchaAPIKey = new Typecho_Widget_Helper_Form_Element_Text('hcaptchaAPIKey', NULL, null, _t('API 密钥:'), _t('填写两处密钥评论区自动开启hcaptch人机验证'));
+
+    $form->addInput($hcaptchaSecretKey);
+    $form->addInput($hcaptchaAPIKey);
+
+
+
+
+    $db = Typecho_Db::get();
+    $sjdq = $db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterfly'));
+    $ysj = $sjdq['value'];
+    if (isset($_POST['type'])) {
+        if ($_POST["type"] == "备份主题数据") {
+            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
+                $update = $db->update('table.options')->rows(array('value' => $ysj))->where('name = ?', 'theme:butterflybf');
+                $updateRows = $db->query($update);
+                echo '<div class="tongzhi">备份已更新，请等待自动刷新！如果等不到请点击';
+                ?>
+                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
+                <script
+                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
+                <?php
+            } else {
+                if ($ysj) {
+                    $insert = $db->insert('table.options')->rows(array('name' => 'theme:butterflybf', 'user' => '0', 'value' => $ysj));
+                    $insertId = $db->query($insert);
+                    echo '<div class="tongzhi">备份完成，请等待自动刷新！如果等不到请点击';
+                    ?>
+                    <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
+                    <script
+                        language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
+                    <?php
+                }
+            }
+        }
+        if ($_POST["type"] == "还原主题数据") {
+            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
+                $sjdub = $db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'));
+                $bsj = $sjdub['value'];
+                $update = $db->update('table.options')->rows(array('value' => $bsj))->where('name = ?', 'theme:butterfly');
+                $updateRows = $db->query($update);
+                echo '<div class="tongzhi">检测到主题备份数据，恢复完成，请等待自动刷新！如果等不到请点击';
+                ?>
+                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
+                <script
+                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2000);</script>
+                <?php
+            } else {
+                echo '<div class="tongzhi">没有主题备份数据，恢复不了哦！</div>';
+            }
+        }
+        if ($_POST["type"] == "删除备份数据") {
+            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
+                $delete = $db->delete('table.options')->where('name = ?', 'theme:butterflybf');
+                $deletedRows = $db->query($delete);
+                echo '<div class="tongzhi">删除成功，请等待自动刷新，如果等不到请点击';
+                ?>
+                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
+                <script
+                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
+                <?php
+            } else {
+                echo '<div class="tongzhi">不用删了！备份不存在！！！</div>';
+            }
+        }
+    }
+    // 结束
+}
+
+function themeFields($layout)
+{
+    $thumb = new Typecho_Widget_Helper_Form_Element_Text(
+        'thumb',
+        NULL,
+        NULL,
+        '自定义文章缩略图',
+        '填写时：将会显示填写的文章缩略图 <br>不填写时采用默认图片'
+    );
+    $layout->addItem($thumb);
+
+    $summaryContent = new Typecho_Widget_Helper_Form_Element_Textarea(
+        'summaryContent',
+        NULL,
+        NULL,
+        '自定义文章摘要',
+        '不喜欢自动生成的摘要？那就来自定义吧！'
+    );
+    $layout->addItem($summaryContent);
+
+    $desc = new Typecho_Widget_Helper_Form_Element_Text(
+        'desc',
+        NULL,
+        NULL,
+        'SEO描述',
+        '用于填写文章或独立页面的SEO描述，如果不填写则没有'
+    );
+    $layout->addItem($desc);
+
+    $keywords = new Typecho_Widget_Helper_Form_Element_Text(
+        'keywords',
+        NULL,
+        NULL,
+        'SEO关键词',
+        '用于填写文章或独立页面的SEO关键词，如果不填写则没有'
+    );
+    $layout->addItem($keywords);
+
+
+    $showTimeWarning = new Typecho_Widget_Helper_Form_Element_Select(
+        'showTimeWarning',
+        array(
+            'on' => '开启（默认）',
+            'off' => '关闭'
+        ),
+        'on',
+        '是否开启当前页面的文章过期警告',
+        '用于单独设置当前文章的过期警告 <br /> <b>仅在文章内作用,独立页面无需改动</b> <br />'
+    );
+    $layout->addItem($showTimeWarning);
+
+    $ShowReward = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowReward',
+        array(
+            'off' => '关闭（默认）',
+            'show' => '开启打赏',
+        ),
+        'off',
+        '是否开启文章打赏',
+        '介绍：开启此功能需要在主题设置中添加二维码图片'
+    );
+    $layout->addItem($ShowReward);
+    $ShowToc = new Typecho_Widget_Helper_Form_Element_Select(
+        'ShowToc',
+        array(
+            'show' => '开启（默认）',
+            'off' => '关闭',
+        ),
+        'show',
+        '是否显示文章目录',
+        '介绍：或许有的文章不需要目录功能,默认是开启的,一般不需要设置'
+    );
+    $layout->addItem($ShowToc);
+
+    $CopyRight = new Typecho_Widget_Helper_Form_Element_Select(
+        'CopyRight',
+        array(
+            'on' => ' CC BY-NC-SA 4.0（默认）',
+            'off' => '禁止转载',
+        ),
+        'on',
+        '文章版权说明',
+        '介绍：默认为CC BY-NC-SA 4.0'
+    );
+    $layout->addItem($CopyRight);
+
+    $NoCover = new Typecho_Widget_Helper_Form_Element_Select(
+        'NoCover',
+        array(
+            'on' => '显示封面',
+            'off' => '不显示封面',
+        ),
+        'on',
+        '主页是否显示封面',
+        '介绍：这篇文章看来不需要封面'
+    );
+    $layout->addItem($NoCover);
+}
+
+function themeInit($archive)
+{
+    if (Helper::options()->EnablePjax == "on") {
+        Helper::options()->commentsAntiSpam = false;
+    }
+    if ($archive->is('single')) {
+        $archive->content = createCatalog($archive->content);
+        $archive->content = ParseCode($archive->content);
+    }
+    $loginStatus = $archive->widget('Widget_User')->hasLogin();
+    if (Helper::options()->siteKey !== "" && Helper::options()->secretKey !== "" && !$loginStatus) {
+        comments_filter($archive);
+    }
+    if (Helper::options()->hcaptchaSecretKey !== "" && Helper::options()->hcaptchaAPIKey !== "" && !$loginStatus) {
+        hcaptcha_filter($archive);
+    }
+    if ($archive->is('index')) {
+        // echo '<script src="'..'"></script>';        
+    }
+}
+?>
\ No newline at end of file
diff --git a/css/custom.css b/css/custom.css
index 354a8cc..b26c3d0 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -85,12 +85,12 @@ audio {
 .recent-post-info {
 	padding: 0 40px;
 	margin-top: 1em;
-	width: 100%
+	width: 100%;
 }
 
-@media screen and (max-width:768px) {
-	width:100%
-}
+/* @media screen and (max-width:768px) {
+	width: 100%;
+} */
 
 #recent-posts>.recent-post-item,.layout>div:first-child:not(.recent-posts),.layout_post>#page,.layout_post>#post,.read-mode .layout_post>#post {
 	background: var(--light_page_color)
diff --git a/css/style.css b/css/style.css
index 3666e4a..4947ec6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,566 +1,641 @@
 /*
 此css用于适配移植
 */
-.vmaster{
-    background: #ffa51e;
-    font-size: 12px;
-    color: white;
-    padding: 1px 5px;
-    border-radius: 4px;
-}
-.vvisitor{
-    background: #828282;
-    font-size: 12px;
-    color: white;
-    padding: 1px 5px;
-    border-radius: 4px;
-}
-.vauth{
-    background: #00A2D8;
-    font-size: 12px;
-    color: white;
-    padding: 1px 5px;
-    border-radius: 4px;
-}
-.vimg{
-    float: left;
-    margin: 8px 10px 0px 0px;
-    width: 45px;
-    height: 45px;
-    transition: filter 375ms ease-in .2s,transform .3s;
+:root{
+  --btn-comm-bg: #fff;
+}
+[data-theme=dark]{
+  --btn-comm-bg: #1f1f1f;
+}
+.vmaster,
+.vvisitor,
+.vauth {
+  background: #ffa51e;
+  font-size: 12px;
+  color: white;
+  padding: 1px 5px;
+  border-radius: 4px;
+  line-height: 16px;
+  white-space: nowrap;
+}
+
+.vvisitor {
+  background: #828282 !important;
 }
 
+.vauth {
+  background: #00a2d8 !important;
+}
+
+.vimg {
+  float: left;
+  margin: 8px 10px 0px 0px;
+  width: 45px;
+  height: 45px;
+  transition: filter 375ms ease-in 0.2s, transform 0.3s;
+}
 
 .vimg:hover {
-    -webkit-transform: rotate(360deg);
-    -moz-transform: rotate(360deg);
-    -o-transform: rotate(360deg);
-    -ms-transform: rotate(360deg);
-    transform: rotate(360deg);
-}
-.vhead{
-    line-height: 1.5;
-}
-
-.vnick,.vnick a{
-    display: inline-block;
-    margin-right: .5em;
-    font-weight: bold;
-    font-size: .875em;
-    line-height: 1;
-    text-decoration: none;
-    cursor: pointer;
-    color: #1abc9c;
-    font-style: normal;
-}
-.comment-reply{
-    float: right;
-    background-color: var(--btn-bg);
-    border-radius: 4px;
-    color: var(--btn-color);
-    width: 40px;
-    text-align: center;
-}
-.comment-reply:hover{
-    background-color: var(--btn-hover-color);
-}
-.comment-reply a{
-    color: var(--btn-color);
-}
-.commentsFormArea{
-    margin-top: 10px;
-}
-#cancel-comment-reply-link{
-    position: absolute;
-    margin-top: 5px;
-    right: 5px;
+  -webkit-transform: rotate(360deg);
+  -moz-transform: rotate(360deg);
+  -o-transform: rotate(360deg);
+  -ms-transform: rotate(360deg);
+  transform: rotate(360deg);
+}
+.vhead {
+  line-height: 1.5;
+}
+
+.vnick,
+.vnick a {
+  display: inline-block;
+  margin-right: 0.5em;
+  font-weight: bold;
+  font-size: 0.875em;
+  line-height: 1;
+  text-decoration: none;
+  cursor: pointer;
+  color: #1abc9c;
+  font-style: normal;
+  line-height: 1.5;
+}
+
+.vuser {
+  display: flex;
+  align-items: center;
+}
+
+.comment-reply {
+  /* display: none; */
+  float: right;
+  background-color: var(--btn-bg);
+  border-radius: 4px;
+  color: var(--btn-color);
+  width: 40px;
+  text-align: center;
+}
+.comment-reply:hover {
+  background-color: var(--btn-hover-color);
+}
+.comment-reply a {
+  color: var(--btn-color);
+}
+.commentsFormArea {
+  margin-top: 10px;
+}
+#cancel-comment-reply-link {
+  position: absolute;
+  margin-top: 5px;
+  right: 5px;
 }
 
-.cancel-comment-reply{
-    position: relative;
-    text-align: right;
+.cancel-comment-reply {
+  position: relative;
+  text-align: right;
 }
 #post-comment {
-    padding-left: 5px;
+  padding-left: 5px;
 }
-.comment-list{
-    padding-left: 0px;
+.comment-list {
+  padding-left: 0px;
 }
-.comment-children{
-    padding-left: 30px;
+.comment-children {
+  padding-left: 30px;
+  margin-top: 10px;
 }
-.comment-content{
-    margin-left: 56px;
+.comment-content {
+  margin-left: 56px;
 }
-.comment-content p{
-    word-break: break-all;
+.comment-content p {
+  word-break: break-all;
 }
-.comment-parent{border-bottom: 1px solid #f0f0f0;}
 .comment-list li {
-    list-style: none;
-    margin-bottom: 20px;
+  list-style: none;
+  margin-bottom: 20px;
 }
-.comment-body >div> p{
-    color: var(--font-color);;
-    padding-left: 50px;
+.comment-body > div > p {
+  color: var(--font-color);
+  padding-left: 50px;
 }
+
+/* .comment-children:hover > ol > li > div > .vhead > .comment-reply {
+  display: block;
+} */
+
 .comment-content img {
-    width: 100%;
-}
-.text{
-    border: none;
-    resize: none;
-    outline: none;
-    padding: 10px 5px;
-    max-width: 100%;
-    font-size: .775em;
-    background: transparent;
-    width: 32.33%;
-    border-bottom: 1px dashed #dedede;
-    color: var(--text-highlight-color);
-}
-.text:focus{
-    border-bottom-color: #eb5055
-}
-.textarea{
-    margin-top: 10px;
-    width: 100%;
-    min-height: 8.75em;
-    font-size: .875em;
-    background: transparent;
-    resize: vertical;
-    transition: all .5s ease;
-    border: none;
-    height: 150px;
-    padding: 0px 6px 8px 13px;
-    background: url(../img/comment.png) 100% 100% no-repeat!important;
-    color: var(--text-highlight-color);
-    font-size: inherit;
-}
-.textarea:focus{
-     outline: none;
-     background-position-x:860px!important;
-}
-
-.submit{
-    -webkit-transition-duration: .4s;
-    transition-duration: .4s;
-    text-align: center;
-    color: #555;
-    border: 1px solid #ededed;
-    border-radius: .3em;
-    display: inline-block;
-    background: transparent;
-    font-weight: 400;
-    vertical-align: middle;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    cursor: pointer;
-    white-space: nowrap;
-    padding: .5em 1.25em;
-    font-size: .875em;
-    line-height: 1.42857143;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    outline: none;
-    border: none;
-    background: var(--btn-bg);
-    color: var(--btn-color);
+  width: 100%;
+}
+.text {
+  border: none;
+  resize: none;
+  outline: none;
+  padding: 10px 5px;
+  max-width: 100%;
+  font-size: 0.775em;
+  background: transparent;
+  width: 32.33%;
+  border-bottom: 1px dashed #dedede;
+  color: var(--text-highlight-color);
+}
+.text:focus {
+  border-bottom-color: #eb5055;
+}
+.textarea {
+  margin-top: 10px;
+  width: 100%;
+  min-height: 8.75em;
+  font-size: 0.875em;
+  background: transparent;
+  resize: vertical;
+  transition: all 0.5s ease;
+  border: none;
+  height: 150px;
+  padding: 0px 6px 8px 13px;
+  background: url(../img/comment.png) 100% 100% no-repeat !important;
+  color: var(--text-highlight-color);
+  font-size: inherit;
+}
+.textarea:focus {
+  outline: none;
+  background-position-x: 860px !important;
+}
+
+.submit {
+  -webkit-transition-duration: 0.4s;
+  transition-duration: 0.4s;
+  text-align: center;
+  color: #555;
+  border: 1px solid #ededed;
+  border-radius: 0.3em;
+  display: inline-block;
+  background: transparent;
+  font-weight: 400;
+  vertical-align: middle;
+  -ms-touch-action: manipulation;
+  touch-action: manipulation;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 0.5em 1.25em;
+  font-size: 0.875em;
+  line-height: 1.42857143;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  outline: none;
+  border: none;
+  background: var(--btn-bg);
+  color: var(--btn-color);
 }
 
 .submit:hover {
-    background: var(--btn-hover-color);
+  background: var(--btn-hover-color);
 }
 
 @media screen and (max-width: 520px) {
-    .submit{
-        margin-top: 5px;
-    }
-}
-
-.page-number{
-    background: #00c4b6!important;
-    cursor: default;
-    display: inline-block;
-    margin: 0 0.2rem;
-    min-width: 2.5em;
-    height: 2.5em;
-    border-radius: 8px;
-    text-align: center;
-    line-height: 2.2rem;
-    color: var(--white);
-}
-.extend{
-    color: #99a9bf;
-    cursor: default;
-    display: inline-block;
-    margin: 0 0.2rem;
-    min-width: 2.5em;
-    height: 2.5em;
-    border-radius: 8px;
-    text-align: center;
-    line-height: 2.2rem;
-    cursor: pointer;
-}
-
-.extend:hover{
-    background: var(--btn-hover-color);
-    color: var(--btn-color);
-}
-
-.current:hover{
-    background: #00c4b6!important;
-}
-
-.required{
-    display: none;
+  .submit {
+    margin-top: 5px;
+  }
 }
 
-.commments-info{
-    padding: 10px;
+.page-number {
+  background: #00c4b6 !important;
+  cursor: default;
+  display: inline-block;
+  margin: 0 0.2rem;
+  min-width: 2.5em;
+  height: 2.5em;
+  border-radius: 8px;
+  text-align: center;
+  line-height: 2.2rem;
+  color: var(--white);
 }
-.commments-info>input{
-    color: var(--text-highlight-color);
+.extend {
+  color: #99a9bf;
+  cursor: default;
+  display: inline-block;
+  margin: 0 0.2rem;
+  min-width: 2.5em;
+  height: 2.5em;
+  border-radius: 8px;
+  text-align: center;
+  line-height: 2.2rem;
+  cursor: pointer;
 }
 
-.commments-area{
-    border: 1px solid #f0f0f0;
-    border-radius: 5px;
+.extend:hover {
+  background: var(--btn-hover-color);
+  color: var(--btn-color);
 }
-/*end*/
-.page-navigator{
-    text-align: center;
-    padding-left: 0px;
-}
-.page-navigator > *{
-    list-style-type: none;
-    display: inline-block;
-    min-width: 2rem;
-    height: 2rem;
-    line-height: 2rem;
-    cursor: pointer;
-    border-radius: 8px;
-    margin: 0 6px;
-    background: var(--white);
+
+.current:hover {
+  background: #00c4b6 !important;
 }
 
-.page-navigator > *:hover{
-    background: var(--btn-hover-color);
-    color: var(--btn-color);
+.required {
+  display: none;
 }
 
-.page-navigator > .current{
-    background: #00c4b6;
-    color: white;
+.commments-info {
+  padding: 10px;
 }
-.post-content p img {
-    display: none;
+.commments-info > input {
+  color: var(--text-highlight-color);
+}
+
+.commments-area {
+  border: 1px solid #f0f0f0;
+  border-radius: 5px;
 }
-.post-meta{
-    list-style:none;
-    margin:0;
+/*end*/
+.page-navigator {
+  text-align: center;
+  padding-left: 0px;
 }
-.post-meta li{
-    display:inline;
+.page-navigator > * {
+  list-style-type: none;
+  display: inline-block;
+  min-width: 2rem;
+  height: 2rem;
+  line-height: 2rem;
+  cursor: pointer;
+  border-radius: 8px;
+  margin: 0 6px;
+  background: var(--btn-comm-bg);
+  box-shadow: var(--card-box-shadow);
 }
 
-#aside-content .card-archives ul.card-archive-list>.card-archive-list-item a span:last-child, #aside-content .card-categories ul.card-category-list>.card-category-list-item a span:last-child {
-    width: 15%!important;
-    text-align: right;
+.page-navigator > *:hover {
+  background: var(--btn-hover-color);
+  color: var(--btn-color);
 }
 
-.need-reply{
-    display: block;
-    background: repeating-linear-gradient(145deg, var(--search-bg), var(--search-bg) 15px, var(--global-bg) 0, 
-    var(--global-bg) 25px);
-    padding: 15px 0;
-    text-align: center;
-    position: relative;
-    user-select: none;
-    line-height: normal;
+.page-navigator > .current {
+  background: #00c4b6;
+  color: white;
+}
+.post-content p img {
+  display: none;
+}
+.post-meta {
+  list-style: none;
+  margin: 0;
+}
+.post-meta li {
+  display: inline;
+}
+
+#aside-content
+  .card-archives
+  ul.card-archive-list
+  > .card-archive-list-item
+  a
+  span:last-child,
+#aside-content
+  .card-categories
+  ul.card-category-list
+  > .card-category-list-item
+  a
+  span:last-child {
+  width: 15% !important;
+  text-align: right;
+}
+
+.need-reply {
+  display: block;
+  background: repeating-linear-gradient(
+    145deg,
+    var(--search-bg),
+    var(--search-bg) 15px,
+    var(--global-bg) 0,
+    var(--global-bg) 25px
+  );
+  padding: 15px 0;
+  text-align: center;
+  position: relative;
+  user-select: none;
+  line-height: normal;
 }
 /*视频挂载*/
 .iframe_video {
-    position: relative;
-    width: 100%;
+  position: relative;
+  width: 100%;
 }
 @media only screen and (max-width: 400px) {
-    .textarea:focus{
-       background-position-x:400px!important;
-    }
+  .textarea:focus {
+    background-position-x: 400px !important;
+  }
 }
 
 @media only screen and (max-width: 767px) {
-    .iframe_video {
-        height: 15em;
-    }
-    .textarea:focus{
-       background-position-x:760px!important;
-    }
-    #nav .menus_items .menus_item,#search-button>a>i>span{
-        display: none;
-    }
+  .iframe_video {
+    height: 15em;
+  }
+  .textarea:focus {
+    background-position-x: 760px !important;
+  }
+  #nav .menus_items .menus_item,
+  #search-button > a > i > span {
+    display: none;
+  }
 }
 
 @media only screen and (min-width: 768px) and (max-width: 991px) {
-    .iframe_video {
-        height: 20em;
-    }
+  .iframe_video {
+    height: 20em;
+  }
 }
 
 @media only screen and (min-width: 992px) and (max-width: 1199px) {
-    .iframe_video {
-        height: 30em;
-    }
+  .iframe_video {
+    height: 30em;
+  }
 }
 
 @media only screen and (min-width: 1200px) {
-    .iframe_video {
-        height: 40em;
-    }
-    .artplayer{
-        height: 30em!important;
-    }
+  .iframe_video {
+    height: 40em;
+  }
+  .artplayer {
+    height: 30em !important;
+  }
 }
 
-@media screen and (max-width: 520px){
-    .text{
-        width: 100%;
-    }
-    
+@media screen and (max-width: 520px) {
+  .text {
+    width: 100%;
+  }
 }
 
-
 .iframe_cross {
-    position: relative;
-    width: 100%;
-    height: 0;
-    padding-bottom: 75%
+  position: relative;
+  width: 100%;
+  height: 0;
+  padding-bottom: 75%;
 }
 
 .iframe_cross iframe {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
 }
 /*视频结束*/
 pre code {
-    position:relative;
-    display:block;
-    overflow-x:auto;
-    margin:4.4px 0.px .4px 1px;
-    padding:0;
-    max-height:200px;
-    padding:8px 8px 8px 42px!important;
-    visibility:visible;
-}
-.expand-bcode{
-    max-height:100%!important;
+  position: relative;
+  display: block;
+  overflow-x: auto;
+  margin: 4.4px 0px 0.4px 1px;
+  padding: 0;
+  max-height: 200px;
+  padding: 8px 8px 8px 42px !important;
+  visibility: visible;
+}
+.expand-bcode {
+  max-height: 100% !important;
 }
 .code-expand-btn i {
-    color: white!important;
+  color: white !important;
 }
 div.code-toolbar {
-    box-shadow: 0 5px 10px 0 rgb(144 164 174 / 40%);    
+  box-shadow: 0 5px 10px 0 rgb(144 164 174 / 40%);
 }
-.expand-done + code{
-    margin-bottom: 1.8em;
+.expand-done + code {
+  margin-bottom: 1.8em;
 }
 
 #article-container .code-expand-btn {
-    background: linear-gradient(180deg, rgb(33 34 34 / 60%), rgb(0 0 0 / 90%))!important;
-    border-radius: 7px;
+  background: linear-gradient(
+    180deg,
+    rgb(33 34 34 / 60%),
+    rgb(0 0 0 / 90%)
+  ) !important;
+  border-radius: 7px;
 }
 #post-content pre code {
-    display:block;
-    overflow-x:auto;
-    position:relative;
-    margin:0;
+  display: block;
+  overflow-x: auto;
+  position: relative;
+  margin: 0;
 }
 
 #article-container pre {
-    padding: 0!important;
+  padding: 0 !important;
 }
-#article-container figure.highlight, #article-container pre {
-     margin: 0 0 1rem;
-     background: #1c1c1c; 
+#article-container figure.highlight,
+#article-container pre {
+  margin: 0 0 1rem;
+  background: #1c1c1c;
 }
 
-code[class*="language-"], pre[class*="language-"] {
-    color: #f8f8f2!important;
+code[class*="language-"],
+pre[class*="language-"] {
+  color: #f8f8f2 !important;
 }
 
-code::-webkit-scrollbar-thumb{
-    background-image: none;
+code::-webkit-scrollbar-thumb {
+  background-image: none;
 }
-.toolbar-item>span{
-    opacity: 1!important;
-    position: absolute;
-    left: 4.8rem!important;
-    top: -1px;
-    text-transform: uppercase;
-    font-weight: 700!important;
-    font-size: 1.15em!important;
-    color: #eff!important;
+.toolbar-item > span {
+  opacity: 1 !important;
+  position: absolute;
+  left: 4.8rem !important;
+  top: -1px;
+  text-transform: uppercase;
+  font-weight: 700 !important;
+  font-size: 1.15em !important;
+  color: #eff !important;
 }
-.toolbar-item>button{
-    opacity: 1!important;
-    border: none!important;
+.toolbar-item > button {
+  opacity: 1 !important;
+  border: none !important;
 }
 
-
-.line-numbers-rows>span:before {
-    background: none!important;
+.line-numbers-rows > span:before {
+  background: none !important;
 }
-.shelter{
-    display: none;
+.shelter {
+  display: none;
 }
 div.code-toolbar {
-    background-color: #1c1c1c!important;
+  background-color: #1c1c1c !important;
 }
-:not(pre)>code[class*="language-"], pre[class*="language-"] {
-    background: #212121!important;
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+  background: #212121 !important;
 }
-div.code-toolbar, .code-toolbar>pre{
-    border-radius: 7px;
+div.code-toolbar,
+.code-toolbar > pre {
+  border-radius: 7px;
 }
-code.language-yaml{
-    color: #c3e88d!important;
+code.language-yaml {
+  color: #c3e88d !important;
 }
 .code-toolbar:before {
-    width: 12px!important;
-    height: 12px!important;
-    left: .7rem!important;
+  width: 12px !important;
+  height: 12px !important;
+  left: 0.7rem !important;
 }
 .line-numbers .line-numbers-rows {
-    left: -8px!important;
-    top: 10px!important;
+  left: -8px !important;
+  top: 10px !important;
 }
-code[class*="language-"], pre[class*="language-"] {
-    line-height: 1.5!important;
+code[class*="language-"],
+pre[class*="language-"] {
+  line-height: 1.5 !important;
 }
 
 .widget-list a {
-    color: var(--font-color);
+  color: var(--font-color);
 }
 .widget-list a:hover {
-    color: var(--text-bg-hover);
+  color: var(--text-bg-hover);
 }
 
-.last{
-    padding: .1rem .5rem 0;
+.last {
+  padding: 0.1rem 0.5rem 0;
 }
 #footer:before {
-    content: none;
+  content: none;
 }
 
-#web_bg:before{
-    position: absolute!important;
+#web_bg:before {
+  position: absolute !important;
 }
 #web_bg {
-    position: fixed;
-    z-index: -999;
-    width: 100%;
-    height: 100%;
+  position: fixed;
+  z-index: -999;
+  width: 100%;
+  height: 100%;
 }
 
-.card-tag-cloud a:first-child{
-    font-size: 1.5em!important;
+.card-tag-cloud a:first-child {
+  font-size: 1.5em !important;
 }
-.card-tag-cloud a{
-    font-size: 1.1em;
+.card-tag-cloud a {
+  font-size: 1.1em;
 }
-.card-tag-cloud a:nth-child(2n){
-    font-size: 1.2em;
+.card-tag-cloud a:nth-child(2n) {
+  font-size: 1.2em;
 }
-#card-newest-comments > .aside-list>.aside-list-item .thumbnail>img{
-    border-radius: 50%;
-    width: 50px!important;
-    height: 50px!important;
+#card-newest-comments > .aside-list > .aside-list-item .thumbnail > img {
+  border-radius: 50%;
+  width: 50px !important;
+  height: 50px !important;
 }
 
-#card-newest-comments > .aside-list>.aside-list-item .thumbnail>img:hover {
-    transform: rotate(360deg)!important;
+#card-newest-comments > .aside-list > .aside-list-item .thumbnail > img:hover {
+  transform: rotate(360deg) !important;
+}
+#page h1.page-title,
+#post > #post-info {
+  text-align: center;
+}
+.comment-ua {
+  font-size: 0.875em;
+  color: #999999;
+  margin-left: 50px;
 }
-#page h1.page-title, #post>#post-info {
-    text-align: center;
+#aside-content .aside-list > .aside-list-item .thumbnail {
+  border-radius: 4px;
 }
-.comment-ua{
-    font-size: .875em;
-    color: #999999;
-    margin-left: 50px;
+#close-outdate {
+  position: absolute;
+  top: 50%;
+  left: 96%;
+  transform: translateY(-50%) translateX(-90%);
+  cursor: pointer;
 }
-#aside-content .aside-list>.aside-list-item .thumbnail {
-    border-radius: 4px;
+#close-outdate:hover {
+  color: #ff8080;
 }
-#close-outdate{position: absolute;top: 50%;left: 96%;transform: translateY(-50%) translateX(-90%);cursor:pointer; }
-#close-outdate:hover{color:#ff8080;}
-.expand{    
-    position: absolute;
-    right: 8px;
-    top: 7px;
-    cursor: pointer;
-    color: #eff;
-    transition: transform .3s;
+.expand {
+  position: absolute;
+  right: 8px;
+  top: 7px;
+  cursor: pointer;
+  color: #eff;
+  transition: transform 0.3s;
 }
-.toolbar > .toolbar-item:nth-child(2) > button{
-    position: absolute;
-    right: 25px;
+.toolbar > .toolbar-item:nth-child(2) > button {
+  position: absolute;
+  right: 25px;
 }
-.bclose{
-    transition: all .3s;
-    transform: rotate(90deg)!important;
+.bclose {
+  transition: all 0.3s;
+  transform: rotate(90deg) !important;
 }
-#btn-copy-code{
-    font-size: 14px!important;
-    color: #eff;
-    
+#btn-copy-code {
+  font-size: 14px !important;
+  color: #eff;
 }
-#btn-copy-code:hover{
-    color: var(--text-bg-hover);
-    transition: color .2s;
+#btn-copy-code:hover {
+  color: var(--text-bg-hover);
+  transition: color 0.2s;
 }
-.copy-notices{color: rgba(238,255,255,.8);font-size: 14px;display:inline-block;}
-.checkbox{margin: -4px 0 -20px 0px;}
-#comment_login{
-    margin-bottom: 10px;
+.copy-notices {
+  color: rgba(238, 255, 255, 0.8);
+  font-size: 14px;
+  display: inline-block;
+}
+.checkbox {
+  margin: -4px 0 -20px 0px;
+}
+#comment_login {
+  margin-bottom: 10px;
 }
 /*懒加载结束*/
-.comment-ua .iconfont{font-size: 14px!important;}
-.g-recaptcha,.h-captcha {transform:scale(0.77);transform-origin:0 0;margin-top:10px;}
-.OwO-logo{border:none!important;background:none!important}
-.OwO-logo span .iconfont{font-size:25px}
+.comment-ua .iconfont {
+  font-size: 14px !important;
+}
+.g-recaptcha,
+.h-captcha {
+  transform: scale(0.77);
+  transform-origin: 0 0;
+  margin-top: 10px;
+}
+.OwO-logo {
+  border: none !important;
+  background: none !important;
+}
+.OwO-logo span .iconfont {
+  font-size: 25px;
+}
 
 /*下面是owo自定义样式，注释下面代码使用原版样式*/
-.OwO .OwO-body .OwO-items .OwO-item,.OwO .OwO-body .OwO-bar{background:none!important}
-.OwO .OwO-body{
-    position: unset!important;
-    background:none!important;
-    border: none!important;
+.OwO .OwO-body .OwO-items .OwO-item,
+.OwO .OwO-body .OwO-bar {
+  background: none !important;
 }
-.OwO .OwO-body .OwO-items{
-    overflow: auto!important;
+.OwO .OwO-body {
+  position: unset !important;
+  background: none !important;
+  border: none !important;
+}
+.OwO .OwO-body .OwO-items {
+  overflow: auto !important;
+}
+.OwO .OwO-body .OwO-bar {
+  border: none !important;
 }
-.OwO .OwO-body .OwO-bar{border:none!important}
-
 
 .read-fa {
-    visibility:hidden;
-    display: inline;
+  visibility: hidden;
+  display: inline;
 }
 
 #page-header.post-bg:before {
-    background-color: rgba(0,0,0,.5);
+  background-color: rgba(0, 0, 0, 0.5);
 }
 
-[data-theme=dark] #page-header:before{
-    background-color: rgba(0,0,0,.7);
+[data-theme="dark"] #page-header:before {
+  background-color: rgba(0, 0, 0, 0.7);
 }
 
+.ads-wrap{
+    overflow: hidden;
+}
 /*已移除内容*/
 /*#article-container.post-content ul>li:not(.tab):before {*/
 /*    top: 0.78em;*/
@@ -631,4 +706,4 @@ code[class*="language-"], pre[class*="language-"] {
 /*    -o-transform-origin: 0 50%;*/
 /*    -ms-transform-origin: 0 50%;*/
 /*    transform-origin: 0 50%;*/
-/*}*/
\ No newline at end of file
+/*}*/
diff --git a/footer.php b/footer.php
index 4d95e11..e1cd444 100644
--- a/footer.php
+++ b/footer.php
@@ -1,73 +1,74 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<?php if(!$this->page404()): ?>
-<footer id="footer">
-    <div id="footer-wrap"><div class="copyright">   
-    <div class="copyright">©<?php echo date('Y'); ?> By <?php $this->author(); ?></div>
-    <div class="framework-info">
-        <span>由</span>
-        <a target="_blank" href="http://www.typecho.org">Typecho</a><span> 强力驱动</span>
-        <span class="footer-separator">|</span>
-        <span>主题</span>
-        <a id="btheme" target="_blank" href="https://github.com/wehaox/Typecho-Butterfly">Butterfly</a>
-    </div>
+<?php if (!$this->page404()) : ?>
+  <footer id="footer">
+    <div id="footer-wrap">
+      <div class="copyright">
+        <div class="copyright">©<?php echo date('Y'); ?> By <?php $this->author(); ?></div>
+        <div class="framework-info">
+          <span>由</span>
+          <a target="_blank" href="http://www.typecho.org">Typecho</a><span> 强力驱动</span>
+          <span class="footer-separator">|</span>
+          <span>主题</span>
+          <a id="btheme" target="_blank" href="https://github.com/wehaox/Typecho-Butterfly">Butterfly</a>
+        </div>
         <div class="footer_custom_text"><?php $this->options->Customfooter() ?></div>
+      </div>
     </div>
-</div>
-</footer>
+  </footer>
 <?php endif ?>
 <?php $this->footer(); ?>
 <style type="text/css" data-typed-js-css="true">
-        .typed-cursor{
-          opacity: 1;
-        }
-        .typed-cursor.typed-cursor--blink{
-          animation: typedjsBlink 0.7s infinite;
-          -webkit-animation: typedjsBlink 0.7s infinite;
-                  animation: typedjsBlink 0.7s infinite;
-        }
-        @keyframes typedjsBlink{
-          50% { opacity: 0.0; }
-        }
-        @-webkit-keyframes typedjsBlink{
-          0% { opacity: 1; }
-          50% { opacity: 0.0; }
-          100% { opacity: 1; }
-        }
- </style>
-<?php if ($this->options->showFramework == 'off'): ?>
-<style>.framework-info{display:none}</style>
-<?php endif; ?>
-<?php if ($this->options->CursorEffects !== 'off' &&$this->options->CursorEffects == 'heart') : ?>
-    <?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-    <script id="click-heart" src="https://<?php $this->options->jsdelivrLink() ?>/npm/butterfly-extsrc@1/dist/click-heart.min.js" async="async" mobile="false"></script>
-    <?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
-     <script id="click-heart" src="<?php $this->options->CDNURL() ?>/static/js/click-heart.min.js" async="async" mobile="false"></script>
-    <?php else : ?> 
-        <script id="click-heart" src="<?php $this->options->themeUrl('/static/js/click-heart.min.js'); ?>" async="async" mobile="false"></script>
-    <?php endif; ?>
-<?php elseif ($this->options->CursorEffects !== 'off' &&$this->options->CursorEffects == 'fireworks') : ?>
-<canvas class="fireworks"></canvas>
+  .typed-cursor {
+    opacity: 1;
+  }
+
+  .typed-cursor.typed-cursor--blink {
+    animation: typedjsBlink 0.7s infinite;
+    -webkit-animation: typedjsBlink 0.7s infinite;
+    animation: typedjsBlink 0.7s infinite;
+  }
 
-    <?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-        <script id="fireworks" src="https://<?php $this->options->jsdelivrLink() ?>/npm/butterfly-extsrc@1.1.0/dist/fireworks.min.js" async="async" mobile="false"></script>
-    <?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
-        <script id="fireworks" src="<?php $this->options->CDNURL() ?>/static/js/fireworks.min.js" async="async" mobile="false"></script>
-    <?php else : ?> 
-        <script id="fireworks" src="<?php $this->options->themeUrl('/static/js/fireworks.min.js'); ?>" async="async" mobile="false"></script>
-    <?php endif; ?>
+  @keyframes typedjsBlink {
+    50% {
+      opacity: 0.0;
+    }
+  }
+
+  @-webkit-keyframes typedjsBlink {
+    0% {
+      opacity: 1;
+    }
+
+    50% {
+      opacity: 0.0;
+    }
+
+    100% {
+      opacity: 1;
+    }
+  }
+</style>
+<?php if ($this->options->showFramework == 'off') : ?>
+  <style>
+    .framework-info {
+      display: none
+    }
+  </style>
+<?php endif; ?>
+<?php if ($this->options->CursorEffects !== 'off' && $this->options->CursorEffects == 'heart') : ?>
+  <script id="click-heart" src="<?php cdnBaseUrl() ?>/js/click-heart.min.js" async="async" mobile="false"></script>
+<?php elseif ($this->options->CursorEffects !== 'off' && $this->options->CursorEffects == 'fireworks') : ?>
+  <canvas class="fireworks"></canvas>
+  <script id="fireworks" src="<?php cdnBaseUrl() ?>/js/fireworks.min.js" async="async" mobile="false"></script>
 <?php endif; ?>
 <?php if ($this->options->ShowLive2D !== 'off' && !isMobile()) : ?>
-    <?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-        <script src="https://<?php $this->options->jsdelivrLink() ?>/gh/stevenjoezhang/live2d-widget@latest/autoload.js"></script>
-    <?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>    
-        <script src="<?php $this->options->CDNURL() ?>/static/js/autoload.js"></script>
-   <?php else : ?> 
-        <script src="<?php $this->options->themeUrl('/static/js/autoload.js'); ?>"></script>
-       <?php endif; ?>    
+  <script src="<?php cdnBaseUrl() ?>/js/autoload.js"></script>
 <?php endif; ?>
 <script type="text/javascript" src="<?php $this->options->themeUrl('js/custom.main.js'); ?>"></script>
-<script><?php $this->options->CustomScript() ?></script>
- <?php $this->options->CustomBodyEnd() ?>
+<script>
+  <?php $this->options->CustomScript() ?>
+</script>
+<?php $this->options->CustomBodyEnd() ?>
 <!--搜索  -->
 <div id="local-search">
   <div class="search-dialog">
@@ -82,7 +83,8 @@
       <div id="local-search-input">
         <form class="local-search-box" method="post" action="<?php $this->options->siteUrl(); ?>" role="search" id="search">
           <label for="s" class="sr-only"><?php _e('搜索关键字'); ?></label>
-          <input type="text"  name="s"  placeholder="回车查询" required="required"></div>
+          <input type="text" name="s" placeholder="回车查询" required="required">
+      </div>
       </form>
       <hr>
       <div id="local-search-results"></div>
@@ -93,223 +95,195 @@
 </div>
 <!--搜索end  -->
 <div class="js-pjax">
-<?php if (is_array($this->options->beautifyBlock) && in_array('showNoAlertSearch',$this->options->beautifyBlock)): ?>
-<script>
-(function() {
-const searchButton = document.getElementById('search-button');
-const input = document.getElementById('dSearchIn');
-searchButton.addEventListener('click', function() {
-  input.style.width = '150px';
-  input.focus();
-});
-input.addEventListener('blur', function() {
-  input.style.width = '35px';
-});
-})()
-</script>
-<?php endif ?>
-<?php if ($this->options->hcaptchaSecretKey !== "" && $this->options->hcaptchaAPIKey !== ""): ?> 
-<script src="https://hcaptcha.com/1/api.js" async defer></script>
-<?php endif ?> 
-<?php if ($this->is('post') || $this->is('page')): ?>
-<script src="<?php $this->options->themeUrl('js/comjs.js?v1.4.3'); ?>"></script>
-<?php endif ?>
-<?php if (!empty($this->options->beautifyBlock) && in_array('showButterflyClock',$this->options->beautifyBlock)): ?>
-<script data-pjax>function butterfly_clock_anzhiyu_injector_config() {
-var a = document.getElementsByClassName("sticky_layout")[0];
-a && a.insertAdjacentHTML("afterbegin", '<div class="card-widget card-clock"><div class="card-glass"><div class="card-background"><div class="card-content"><div id="hexo_electric_clock"><img class="entered loading" id="card-clock-loading" src= "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-lazy-src="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/loading.gif" style="height: 120px; width: 100%;" data-ll-status="loading"/></div></div></div></div></div>')}
-for (var elist = "null".split(","), cpage = location.pathname, epage = "all", 
-qweather_key = "<?php $this->options->qweather_key() ?>", 
-gaud_map_key = "<?php $this->options->gaud_map_key() ?>", 
-baidu_ak_key = "undefined", flag = 0,
-clock_rectangle = "112.6534116,27.96920845", clock_default_rectangle_enable = "false", i = 0; i < elist.length; i++) cpage.includes(elist[i]) && flag++;
-      "all" === epage && 0 == flag ? butterfly_clock_anzhiyu_injector_config() : epage === cpage && butterfly_clock_anzhiyu_injector_config()</script>
-<script src="https://widget.qweather.net/simple/static/js/he-simple-common.js?v=2.0"></script>
-<script data-pjax src="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/clock.min.js"></script>
-<link rel="stylesheet" href="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/clock.min.css">
-<?php endif ?>
-<?php $this->header('commentReply=1&description=0&keywords=0&generator=0&template=0&pingback=0&xmlrpc=0&wlw=0&rss2=0&rss1=0&antiSpam=0&atom'); ?>
-<?php if ($this->options->NewTabLink == 'on'): ?>
-<script>$(document).ready(function(){var a=document.getElementsByTagName("a");for(let i=0;i<a.length;i++){let domain=document.domain;let url=a[i].href;if(typeof(url)!="undefined"&&url.length!=0&&url.match(domain)==null&&url!="javascript:void(0);"){a[i].setAttribute("target","_BLANK")}}});</script>
-<?php endif; ?>        
-<?php if($this->is('index')): ?>
-<script type="text/javascript" src="<?php $this->options->themeUrl('js/wehao.js?v1.7.6'); ?>"></script>
-<style>#page-header:not(.not-top-img):before {background-color: rgba(0,0,0,0);}</style>
-<!--打字-->
-<?php if (is_array($this->options->beautifyBlock) && in_array('ShowTopimg',$this->options->beautifyBlock)): ?>
-   <?php if(!empty($this->options->CustomSubtitle)): ?>
-      <script>
- function subtitleType() {
-if (true) {
-var typed = new Typed("#subtitle", {
-strings: "<?php $this->options->CustomSubtitle()?>".split(","),
-startDelay: 300,
-typeSpeed: 150,
-loop: <?php $this->options->SubtitleLoop() ?>,
-backSpeed: 50
-})
-}
-}
-"function"==typeof Typed?subtitleType():getScript("/usr/themes/butterfly/js/typed.min.js")
-.then(subtitleType)
-</script>
-   <?php else: ?>
-      <script>
-function subtitleType(){
-fetch("https://v1.hitokoto.cn").then(t=>t.json()).then(t=>{
-o=0=="".length?new Array:" ".split(",");
-o.unshift(t.hitokoto),
-new Typed("#subtitle",{
-    strings:o,
-    startDelay:300,
-    typeSpeed:150,
-    loop: <?php $this->options->SubtitleLoop() ?>,
-    backSpeed:50
+  <?php if (is_array($this->options->beautifyBlock) && in_array('showNoAlertSearch', $this->options->beautifyBlock)) : ?>
+    <script>
+      (function() {
+        const searchButton = document.getElementById('search-button');
+        const input = document.getElementById('dSearchIn');
+        searchButton.addEventListener('click', function() {
+          input.style.width = '150px';
+          input.focus();
+        });
+        input.addEventListener('blur', function() {
+          input.style.width = '35px';
+        });
+      })()
+    </script>
+  <?php endif ?>
+  <?php if ($this->options->hcaptchaSecretKey !== "" && $this->options->hcaptchaAPIKey !== "") : ?>
+    <script src="https://hcaptcha.com/1/api.js" async defer></script>
+  <?php endif ?>
+  <?php if ($this->is('post') || $this->is('page')) : ?>
+    <script src="<?php $this->options->themeUrl('js/comjs.js?v1.4.3'); ?>"></script>
+  <?php endif ?>
+  <?php if (!empty($this->options->beautifyBlock) && in_array('showButterflyClock', $this->options->beautifyBlock)) : ?>
+    <script data-pjax>
+      function butterfly_clock_anzhiyu_injector_config() {
+        var a = document.getElementsByClassName("sticky_layout")[0];
+        a && a.insertAdjacentHTML("afterbegin", '<div class="card-widget card-clock"><div class="card-glass"><div class="card-background"><div class="card-content"><div id="hexo_electric_clock"><img class="entered loading" id="card-clock-loading" src= "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-lazy-src="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/loading.gif" style="height: 120px; width: 100%;" data-ll-status="loading"/></div></div></div></div></div>')
       }
-  )}
-)}
-"function"==typeof Typed?subtitleType():getScript("/usr/themes/butterfly/js/typed.min.js")
-.then(subtitleType)
-</script>
+      for (var elist = "null".split(","), cpage = location.pathname, epage = "all",
+          qweather_key = "<?php $this->options->qweather_key() ?>",
+          gaud_map_key = "<?php $this->options->gaud_map_key() ?>",
+          baidu_ak_key = "undefined", flag = 0,
+          clock_rectangle = "112.6534116,27.96920845", clock_default_rectangle_enable = "false", i = 0; i < elist.length; i++) cpage.includes(elist[i]) && flag++;
+      "all" === epage && 0 == flag ? butterfly_clock_anzhiyu_injector_config() : epage === cpage && butterfly_clock_anzhiyu_injector_config()
+    </script>
+    <script src="https://widget.qweather.net/simple/static/js/he-simple-common.js?v=2.0"></script>
+    <script data-pjax src="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/clock.min.js"></script>
+    <link rel="stylesheet" href="https://cdn.cbd.int/hexo-butterfly-clock-anzhiyu/lib/clock.min.css">
+  <?php endif ?>
+  <?php $this->header('commentReply=1&description=0&keywords=0&generator=0&template=0&pingback=0&xmlrpc=0&wlw=0&rss2=0&rss1=0&antiSpam=0&atom'); ?>
+  <?php if ($this->options->NewTabLink == 'on') : ?>
+    <script>
+      $(document).ready(function() {
+        var a = document.getElementsByTagName("a");
+        for (let i = 0; i < a.length; i++) {
+          let domain = document.domain;
+          let url = a[i].href;
+          if (typeof(url) != "undefined" && url.length != 0 && url.match(domain) == null && url != "javascript:void(0);") {
+            a[i].setAttribute("target", "_BLANK")
+          }
+        }
+      });
+    </script>
+  <?php endif; ?>
+  <?php if ($this->is('index')) : ?>
+    <script type="text/javascript" src="<?php $this->options->themeUrl('js/wehao.js?v1.7.6'); ?>"></script>
+    <style>
+      #page-header:not(.not-top-img):before {
+        background-color: rgba(0, 0, 0, 0);
+      }
+    </style>
+    <!--打字-->
+    <?php if (is_array($this->options->beautifyBlock) && in_array('ShowTopimg', $this->options->beautifyBlock)) : ?>
+      <?php if (!empty($this->options->CustomSubtitle)) : ?>
+        <script>
+          function subtitleType() {
+            if (true) {
+              var typed = new Typed("#subtitle", {
+                strings: "<?php $this->options->CustomSubtitle() ?>".split(","),
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: <?php $this->options->SubtitleLoop() ?>,
+                backSpeed: 50
+              })
+            }
+          }
+          "function" == typeof Typed ? subtitleType() : getScript("/usr/themes/butterfly/js/typed.min.js")
+            .then(subtitleType)
+        </script>
+      <?php else : ?>
+        <script>
+          function subtitleType() {
+            fetch("https://v1.hitokoto.cn").then(t => t.json()).then(t => {
+              o = 0 == "".length ? new Array : " ".split(",");
+              o.unshift(t.hitokoto),
+                new Typed("#subtitle", {
+                  strings: o,
+                  startDelay: 300,
+                  typeSpeed: 150,
+                  loop: <?php $this->options->SubtitleLoop() ?>,
+                  backSpeed: 50
+                })
+            })
+          }
+          "function" == typeof Typed ? subtitleType() : getScript("/usr/themes/butterfly/js/typed.min.js")
+            .then(subtitleType)
+        </script>
+      <?php endif ?>
     <?php endif ?>
-    <?php endif?>
-<!--打字end-->
-<!--判断主页end-->
-<?php endif?>
-<?php if(!empty($this->options->slide_cids) && $this->is('index')):?>
-<script data-pjax>
-function butterfly_swiper_injector_config() {
-var parent_div_git = document.getElementById('recent-posts');
-var item_html = `<div class="recent-post-item" style="height: auto;width: 100%"><div class="blog-slider swiper-container-fade swiper-container-horizontal" id="swiper_container"><div class="blog-slider__wrp swiper-wrapper" style="transition-duration: 0ms;">
-<?php 
-$slide_cids=$this->options->slide_cids;
-$cid = explode(',', strtr($slide_cids, ' ', ','));
-$num=count($cid);
-$html="";
-for($i=0;$i<$num;$i++){
-$this->widget('Widget_Archive@post'.$i, 'pageSize=1&type=post', 'cid='.$cid[$i])->to($ji);
-$html=$html.'<div class="blog-slider__item swiper-slide" style="width: 750px; opacity: 1; transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;"><a class="blog-slider__img" href="'.$ji->permalink.'" alt=""><img width="48" height="48" src="'.get_ArticleThumbnail($ji).'" alt="" /></a><div class="blog-slider__content"><span class="blog-slider__code">'.date('Y-m-d', $ji->modified).'</span><a class="blog-slider__title" href="'.$ji->permalink.'" alt="'.$ji->title.'">'.$ji->title.'</a><div class="blog-slider__text">'.$ji->title.'</div><a class="blog-slider__button" href="'.$ji->permalink.'" alt="">详情</a></div></div>';}echo $html;
+    <!--打字end-->
+    <!--判断主页end-->
+  <?php endif ?>
+  <?php if (!empty($this->options->slide_cids) && $this->is('index')) : ?>
+    <script data-pjax>
+      function butterfly_swiper_injector_config() {
+        var parent_div_git = document.getElementById('recent-posts');
+        var item_html = `<div class="recent-post-item" style="height: auto;width: 100%"><div class="blog-slider swiper-container-fade swiper-container-horizontal" id="swiper_container"><div class="blog-slider__wrp swiper-wrapper" style="transition-duration: 0ms;">
+<?php
+    $slide_cids = $this->options->slide_cids;
+    $cid = explode(',', strtr($slide_cids, ' ', ','));
+    $num = count($cid);
+    $html = "";
+    for ($i = 0; $i < $num; $i++) {
+      $this->widget('Widget_Archive@post' . $i, 'pageSize=1&type=post', 'cid=' . $cid[$i])->to($ji);
+      $html = $html . '<div class="blog-slider__item swiper-slide" style="width: 750px; opacity: 1; transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;"><a class="blog-slider__img" href="' . $ji->permalink . '" alt=""><img width="48" height="48" src="' . get_ArticleThumbnail($ji) . '" alt="" /></a><div class="blog-slider__content"><span class="blog-slider__code">' . date('Y-m-d', $ji->modified) . '</span><a class="blog-slider__title" href="' . $ji->permalink . '" alt="' . $ji->title . '">' . $ji->title . '</a><div class="blog-slider__text">' . $ji->title . '</div><a class="blog-slider__button" href="' . $ji->permalink . '" alt="">详情</a></div></div>';
+    }
+    echo $html;
 ?>
 </div><div class="blog-slider__pagination swiper-pagination-clickable swiper-pagination-bullets"></div></div></div>`;
-parent_div_git.innerHTML=item_html+parent_div_git.innerHTML // 无报错，但不影响使用(支持pjax跳转)
-// parent_div_git.insertAdjacentHTML("afterbegin", item_html) // 有报错，但不影响使用(支持pjax跳转)
-}
-if (document.getElementById('recent-posts') && (location.pathname === 'all' || 'all' === 'all')) {
-butterfly_swiper_injector_config()}
-</script>
-<script  src="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper.min.js"></script>
-<script data-pjax src="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper_init.js"></script>
-<link rel="stylesheet" href="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiperstyle.css">
-<link rel="stylesheet" href="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper.min.css">
-<?php endif?>
+        parent_div_git.innerHTML = item_html + parent_div_git.innerHTML // 无报错，但不影响使用(支持pjax跳转)
+        // parent_div_git.insertAdjacentHTML("afterbegin", item_html) // 有报错，但不影响使用(支持pjax跳转)
+      }
+      if (document.getElementById('recent-posts') && (location.pathname === 'all' || 'all' === 'all')) {
+        butterfly_swiper_injector_config()
+      }
+    </script>
+    <script src="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper.min.js"></script>
+    <script data-pjax src="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper_init.js"></script>
+    <link rel="stylesheet" href="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiperstyle.css">
+    <link rel="stylesheet" href="https://npm.elemecdn.com/hexo-butterfly-swiper/lib/swiper.min.css">
+  <?php endif ?>
 </div>
 <!--js-pjax end-->
-<div id="rightside" style="">
-	<div id="rightside-config-hide" class="">
-	    <button id="font-plus" type="button" title="放大字体"><i class="fas fa-plus"></i></button>	    
-	    <button id="font-minus" type="button" title="缩小字体"><i class="fas fa-minus"></i></button>	    
-	    <?php if ($this->is('post')): ?>
-	    <button id="readmode" type="button" title="阅读模式">
-	        <i class="fas fa-book-open"></i>
-	    </button>
-	    <?php endif ?>
-		<button id="translateLink" type="button" title="简繁转换">
-			繁
-		</button>
-		<button id="darkmode" type="button" title="浅色和深色模式转换">
-			<i class="fas fa-adjust">
-			</i>
-		</button>
-		<button id="hide-aside-btn" type="button" title="单栏和双栏切换">
-			<i class="fas fa-arrows-alt-h">
-			</i>
-		</button>
-	</div>
-	<div id="rightside-config-show">
-		<button id="rightside_config" type="button" title="设置">
-			<i class="fas fa-cog fa-spin">
-			</i>
-		</button>
-		<?php if ($this->is('post')): ?>
-		<button class="close" id="mobile-toc-button" type="button" title="目录">
-			<i class="fas fa-list-ul">
-			</i>
-		</button>
-		<?php endif ?>
-		<?php if($this->is('post') && $this->allow('comment') || $this->is('page') && $this->allow('comment')): ?>
-		<a id="to_comment" href="#comments" title="直达评论">
-			<i class="fas fa-comments">
-			</i>
-		</a>
-		<?php endif ?>
-		<button id="go-up" type="button" title="回到頂部" class="show-percent">
-			<span class="scroll-percent"></span>
-			<i class="fas fa-arrow-up">
-			</i>
-		</button>
-	</div>
-</div>
+<?php require_once('public/rightside.php');?>
 <!--pjax-->
-<?php if($this->options->EnablePjax === 'on') : ?>
-<?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-<link rel="stylesheet" href="https://<?php $this->options->jsdelivrLink() ?>/gh/rstacruz/nprogress@master/nprogress.css">
-<script src="https://<?php $this->options->jsdelivrLink() ?>/gh/rstacruz/nprogress@master/nprogress.js"></script>
-<script src="https://<?php $this->options->jsdelivrLink() ?>/npm/pjax/pjax.min.js"></script>
-<?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
-<link rel="stylesheet" href="https://lib.baomitu.com/nprogress/0.2.0/nprogress.css">
-<script src="https://lib.baomitu.com/nprogress/0.2.0/nprogress.js"></script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/pjax.min.js"></script>
-<?php else: ?>
-<link rel="stylesheet" href="<?php $this->options->themeUrl('static/css/nprogress.css'); ?>">
-<script src="<?php $this->options->themeUrl('static/js/nprogress.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('static/js/pjax.min.js'); ?>"></script>
-<?php endif; ?>
-<script>
-let pjaxSelectors = ["title", "#body-wrap", "#rightside-config-hide", "#rightside-config-show", ".js-pjax"];
-var pjax = new Pjax({
-    elements: 'a:not([target="_blank"])',
-    selectors: pjaxSelectors,
-    cacheBust: !1,
-    analytics: !1,
-    scrollRestoration: !1});
-document.addEventListener("pjax:send", (function() {
-if (window.removeEventListener("scroll", window.tocScrollFn), window.removeEventListener("scroll", scrollCollect), "object" == typeof preloader && preloader.initLoading(), window.aplayers)
-for (let e = 0; e < window.aplayers.length; e++) window.aplayers[e].options.fixed || window.aplayers[e].destroy();"object" == typeof typed && typed.destroy();
-const e = document.body.classList;
-e.contains("read-mode") && e.remove("read-mode")
-NProgress.start();
-})),
-document.addEventListener("pjax:complete", (function() {
-    <?php if ($this->options->hcaptchaSecretKey !== "" && $this->options->hcaptchaAPIKey !== ""): ?> 
-    hcaptcha.render('h-captcha', {
-        sitekey: '<?php $this->options->hcaptchaSecretKey() ?>'
+<?php if ($this->options->EnablePjax === 'on') : ?>
+  <link rel="stylesheet" href="<?php cdnBaseUrl() ?>/css/nprogress.css">
+  <script src="<?php cdnBaseUrl() ?>/js/pjax.min.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/nprogress.js"></script>
+  <script>
+    let pjaxSelectors = ["title", "#body-wrap", "#rightside-config-hide", "#rightside-config-show", ".js-pjax"];
+    var pjax = new Pjax({
+      elements: 'a:not([target="_blank"])',
+      selectors: pjaxSelectors,
+      cacheBust: !1,
+      analytics: !1,
+      scrollRestoration: !1
     });
-    <?php endif ?> 
-    <?php $this->options->PjaxCallBack() ?>
-    NProgress.done();
-    window.refreshFn(), 
-    document.querySelectorAll("script[data-pjax]").forEach(e => {
-        const t = document.createElement("script"),
-        o = e.text || e.textContent || e.innerHTML || "";
-        Array.from(e.attributes).forEach(e => t.setAttribute(e.name, e.value)), t.appendChild(document.createTextNode(o)), e.parentNode.replaceChild(t, e)}),
-    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update(), "function" == typeof chatBtnFn && chatBtnFn(), "function" == typeof panguInit && panguInit(), "function" == typeof gtag && gtag("config", "", 
-    {page_path: window.location.pathname}),
-    "object" == typeof _hmt && _hmt.push(["_trackPageview", window.location.pathname]), 
-    "function" == typeof loadMeting && document.getElementsByClassName("aplayer").length && loadMeting(),
-    "object" == typeof Prism && Prism.highlightAll(), "object" == typeof preloader && preloader.endLoading()
-    coverShow()
-})),
-document.addEventListener("pjax:error", e => {
-    // 404 === e.request.status && pjax.loadUrl("/404");
-    if(e.request.status === 404){
-        window.location="/404";
-    }
-    if(e.request.status === 403){
-        window.location=e.request.responseURL
-    }
-})
-</script>
-<?php endif?>
- <!--pjax end-->
+    document.addEventListener("pjax:send", (function() {
+        if (window.removeEventListener("scroll", window.tocScrollFn), window.removeEventListener("scroll", scrollCollect), "object" == typeof preloader && preloader.initLoading(), window.aplayers)
+          for (let e = 0; e < window.aplayers.length; e++) window.aplayers[e].options.fixed || window.aplayers[e].destroy();
+        "object" == typeof typed && typed.destroy();
+        const e = document.body.classList;
+        e.contains("read-mode") && e.remove("read-mode")
+        NProgress.start();
+      })),
+      document.addEventListener("pjax:complete", (function() {
+        <?php if ($this->options->hcaptchaSecretKey !== "" && $this->options->hcaptchaAPIKey !== "") : ?>
+          hcaptcha.render('h-captcha', {
+            sitekey: '<?php $this->options->hcaptchaSecretKey() ?>'
+          });
+        <?php endif ?>
+        <?php $this->options->PjaxCallBack() ?>
+        NProgress.done();
+        window.refreshFn(),
+          document.querySelectorAll("script[data-pjax]").forEach(e => {
+            const t = document.createElement("script"),
+              o = e.text || e.textContent || e.innerHTML || "";
+            Array.from(e.attributes).forEach(e => t.setAttribute(e.name, e.value)), t.appendChild(document.createTextNode(o)), e.parentNode.replaceChild(t, e)
+          }),
+          GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update(), "function" == typeof chatBtnFn && chatBtnFn(), "function" == typeof panguInit && panguInit(), "function" == typeof gtag && gtag("config", "", {
+            page_path: window.location.pathname
+          }),
+          "object" == typeof _hmt && _hmt.push(["_trackPageview", window.location.pathname]),
+          "function" == typeof loadMeting && document.getElementsByClassName("aplayer").length && loadMeting(),
+          "object" == typeof Prism && Prism.highlightAll(), "object" == typeof preloader && preloader.endLoading()
+        coverShow()
+      })),
+      document.addEventListener("pjax:error", e => {
+        // 404 === e.request.status && pjax.loadUrl("/404");
+        if (e.request.status === 404) {
+          window.location = "/404";
+        }
+        if (e.request.status === 403) {
+          window.location = e.request.responseURL
+        }
+      })
+  </script>
+<?php endif ?>
+<!--pjax end-->
 </body>
+
 </html>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 72ee8a7..73755db 100644
--- a/functions.php
+++ b/functions.php
@@ -1,822 +1,9 @@
 <?php
 if (!defined('__TYPECHO_ROOT_DIR__'))
     exit;
-function themeConfig($form)
-{
-    ?>
-    <link rel="stylesheet" href="<?php Helper::options()->themeUrl('css/themedash.css?v1.5.3'); ?>">
-    <div class='set_toc'>
-        <div class='mtoc'>
-            <a href='#themeBackup'>主题备份与还原</a>
-            <a href='#cids'>文章置顶及公共部分</a>
-            <a href='#pjax'>pjax设置</a>
-            <a href='#friends'>友情链接设置</a>
-            <a href='#reward'>打赏功能</a>
-            <a href='#aside'>侧边栏显示设置</a>
-            <a href='#beautifyBlock'>美化选项</a>
-            <a href='#ShowLive2D'>Live2D设置</a>
-            <a href='#otherCustom'>其他自定义内容</a>
-            <a href='#CustomColor'>自定义颜色</a>
-            <a href='#NULL' id='point'>返回上次保存设置时的锚点</a>
-        </div>
-    </div>
-    <form class="protected" action="?butterflybf" method="post" id="themeBackup">
-        <input type="submit" name="type" class="btn btn-s" value="备份主题数据" />&nbsp;&nbsp;<input type="submit" name="type"
-            class="btn btn-s" value="还原主题数据" />&nbsp;&nbsp;<input type="submit" name="type" class="btn btn-s"
-            value="删除备份数据" />
-    </form>
-    <script src='https://cdn.staticfile.org/jquery/1.10.2/jquery.min.js'></script>
-    <script src="<?php Helper::options()->themeUrl('js/themecustom.js?v1.5.3'); ?>"></script>
-    <script src='https://cdn.staticaly.com/gh/wehaox/CDN/main/postdomai.js'></script>
-    <?php
-    $sticky_cids = new Typecho_Widget_Helper_Form_Element_Text('sticky_cids', NULL, NULL, '置顶文章的 cid', '<div style="font-family:arial; background:#E8EFD1; padding:8px">按照排序输入, 请以半角逗号或空格分隔 cid</div>');
-    $sticky_cids->setAttribute('id', 'cids');
-    $form->addInput($sticky_cids);
-
-    $slide_cids = new Typecho_Widget_Helper_Form_Element_Text('slide_cids', NULL, NULL, '主页轮播图文章的 cid', '填入自动开启，填入方式同上，<b style="color:red">注意：填入错误cid会导致页面出错</b>');
-    $form->addInput($slide_cids);
-
-    $StaticFile = new Typecho_Widget_Helper_Form_Element_Select(
-        'StaticFile',
-        array(
-            'CDN' => 'CDN加载(默认)',
-            'local' => '本地加载',
-        ),
-        'CDN',
-        '博客静态资源加载方式',
-        '介绍：无网络服务器或者CDN炸了可开启此项<br>
-         将博客静态资源，如js、css、图片从服务器加载(会稍微增加服务器流量消耗)<br>
-         注意：你需要额外<a href="https://github.com/wehaox/Typecho-Butterfly/releases">下载</a>对应版本的静态资源放进主题根目录直接解压即可<br>
-         此文件与下方的自定义CDN文件通用'
-    );
-    $form->addInput($StaticFile->multiMode());
-
-    $CDNURL = new Typecho_Widget_Helper_Form_Element_Text(
-        'CDNURL',
-        NULL,
-        NULL,
-        '自定义CDNURL(由@origami-tech提供)',
-        '需要选择博客静态资源加载方式为CDN加载 此项才会生效 且<b>本地加载>自定义CDNURL>jsdelivr源</b><br>
-    注意：你需要额外<a href="https://github.com/wehaox/Typecho-Butterfly/releases">下载</a>静态资源放CDN解压<br>
-    链接填写规则：填写static文件夹的父文件夹 无需最后的/ 例如 https://pub-gcdn.starsdust.cn/libs/butterfly '
-    );
-    $form->addInput($CDNURL);
-
-    $jsdelivrLink = new Typecho_Widget_Helper_Form_Element_Select(
-        'jsdelivrLink',
-        array(
-            'cdn.jsdelivr.net' => '官方默认源',
-            'gcore.jsdelivr.net' => 'gcore源',
-            'fastly.jsdelivr.net' => 'fastly源',
-            'raw.fastgit.org' => 'fastgit源',
-        ),
-        'gcore.jsdelivr.net',
-        'jsdelivr提供的cdn源切换(默认采用gcore源)',
-        '需要开启上方的CDN加载'
-    );
-    $form->addInput($jsdelivrLink->multiMode());
-
-    $NewTabLink = new Typecho_Widget_Helper_Form_Element_Select(
-        'NewTabLink',
-        array(
-            'on' => '开启（默认）',
-            'off' => '关闭',
-        ),
-        'on',
-        '是否开启新标签打开外部链接',
-        '介绍：非站内链接在新标签打开'
-    );
-    $form->addInput($NewTabLink->multiMode());
-
-    $showFramework = new Typecho_Widget_Helper_Form_Element_Select(
-        'showFramework',
-        array(
-            'on' => '开启（默认）',
-            'off' => '关闭',
-        ),
-        'on',
-        '是否显示底部博客框架和主题',
-        '介绍：如果你是小白自行修改主题名会导致侵权提示，你可以在这里关闭同时希望你可以<b>尊重本主题</b>'
-    );
-    $form->addInput($showFramework->multiMode());
-
-    $Defend = new Typecho_Widget_Helper_Form_Element_Select(
-        'Defend',
-        array('off' => '关闭（默认）', 'on' => '开启'),
-        'off',
-        '是否开启网站维护或密码访问',
-        '介绍： 下方密码留空则显示网站维护否则显示输入密码访问，登录用户不受限制'
-    );
-    $form->addInput($Defend->multiMode());
-
-    $ThemePassword = new Typecho_Widget_Helper_Form_Element_Text('ThemePassword', NULL, NULL, _t('全站密码访问(非必填)'), _t('输入访问网站的密码，<b>需要在上方开启网站维护或密码访问</b>'));
-    $form->addInput($ThemePassword);
-
-    $NoQQ = new Typecho_Widget_Helper_Form_Element_Select(
-        'NoQQ',
-        array('off' => '关闭（默认）', 'on' => '开启'),
-        'off',
-        '是否开启网站禁止手机QQ访问',
-        '介绍：烦人的QQ'
-    );
-    $form->addInput($NoQQ->multiMode());
-
-    $SiteLogo = new Typecho_Widget_Helper_Form_Element_Text('SiteLogo', NULL, NULL, _t('站点名称设置为图片logo(非必填)'), _t('当设置此项时站点名称将不会在导航栏左上角显示,使用png格式'));
-    $form->addInput($SiteLogo);
-
-    $Sitefavicon = new Typecho_Widget_Helper_Form_Element_Text('Sitefavicon', NULL, NULL, _t('网站图标'), _t('网站图标，使用png格式，大小建议不超过64x64'));
-    $form->addInput($Sitefavicon);
-
-    $logoUrl = new Typecho_Widget_Helper_Form_Element_Text('logoUrl', NULL, _t('#null'), _t('作者头像'), _t('在这里填入图片地址，它会显示在右侧栏的作者头像'));
-    $form->addInput($logoUrl);
-
-    $author_description = new Typecho_Widget_Helper_Form_Element_Text('author_description', NULL, _t('作者描述'), _t('作者描述'), _t('在这里填入站点描述，它会显示在右侧栏的作者信息'));
-    $form->addInput($author_description);
-
-    $author_site_description = new Typecho_Widget_Helper_Form_Element_Text('author_site_description', NULL, _t('个人网站'), _t('作者链接描述'), _t('作者链接描述'));
-    $form->addInput($author_site_description);
-
-    $author_site = new Typecho_Widget_Helper_Form_Element_Text('author_site', NULL, _t('#null'), _t('作者链接'), _t('在这里填入作者链接，它会显示在右侧栏的作者信息的个人网站上'));
-    $form->addInput($author_site);
+require_once('config/custom_config.php');
 
-    $author_bottom = new Typecho_Widget_Helper_Form_Element_Textarea('author_bottom', NULL, _t(''), _t('侧栏作者信息最底部内容（非必填）'), _t('这里填入html代码,不会勿填'));
-    $form->addInput($author_bottom);
-
-    $announcement = new Typecho_Widget_Helper_Form_Element_Textarea('announcement', NULL, _t('这里是公告<br>'), _t('公告'), _t('在这里填入公告，它会显示在右侧栏的公告上,采用html写法'));
-    $form->addInput($announcement);
-
-    $AD = new Typecho_Widget_Helper_Form_Element_Textarea('AD', NULL, NULL, _t('广告(由@yzl3014提供)'), _t('在这里填入广告，填入后自动显示在侧栏中公告栏的下方，支持html'));
-    $form->addInput($AD);
-
-    $headerimg = new Typecho_Widget_Helper_Form_Element_Text('headerimg', NULL, _t('https://s2.loli.net/2023/01/18/bIJTVaR3MLPzcZ7.jpg'), _t('主页顶图(banner image)'), _t('填入主页头图链接'));
-    $form->addInput($headerimg);
-
-    $buildtime = new Typecho_Widget_Helper_Form_Element_Text('buildtime', NULL, _t('2021/04/05'), _t('建站时间'), _t('按照输入框内格式填写'));
-    $form->addInput($buildtime);
-
-    $outoftime = new Typecho_Widget_Helper_Form_Element_Text('outoftime', NULL, _t('15'), _t('文章过时提醒'), _t('设置文章过时提醒最大天数，默认15天，可在文章管理单独设置是否显示过期提醒'));
-    $form->addInput($outoftime);
-
-    $archivelink = new Typecho_Widget_Helper_Form_Element_Text('archivelink', NULL, _t('#null'), _t('侧栏文章(归档)链接'), _t('需在独立页面创建并手动填入链接'));
-    $form->addInput($archivelink);
-
-    $tagslink = new Typecho_Widget_Helper_Form_Element_Text('tagslink', NULL, _t('#null'), _t('侧栏标签链接'), _t('需在独立页面创建并手动填入链接'));
-    $form->addInput($tagslink);
-
-    $categorylink = new Typecho_Widget_Helper_Form_Element_Text('categorylink', NULL, _t('#null'), _t('侧栏分类链接'), _t('需在独立页面创建并手动填入链接'));
-    $form->addInput($categorylink);
-
-    $CloseComments = new Typecho_Widget_Helper_Form_Element_Select(
-        'CloseComments',
-        array(
-            'off' => '关闭（默认）',
-            "on" => '开启'
-        ),
-        'off',
-        '全站关闭评论',
-        '介绍：开启后所有文章不能评论'
-    );
-    $form->addInput($CloseComments->multiMode());
-
-    $EnableCommentsLogin = new Typecho_Widget_Helper_Form_Element_Select(
-        'EnableCommentsLogin',
-        array(
-            'off' => '关闭（默认）',
-            "on" => '开启'
-        ),
-        'off',
-        '开启用户评论区登录',
-        '介绍：开启后在评论区会显示登录按钮
-        '
-    );
-    $form->addInput($EnableCommentsLogin->multiMode());
-
-    $ShowRelatedPosts = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowRelatedPosts',
-        array(
-            'off' => '关闭（默认）',
-            'on' => '开启',
-        ),
-        'off',
-        '是否显示文章内相关推荐',
-        '介绍：开启后文章结束后会显示相关的推荐文章(根据文章标签推荐，不一定每篇文章都会显示)'
-    );
-    $form->addInput($ShowRelatedPosts->multiMode());
-
-    $RelatedPostsNum = new Typecho_Widget_Helper_Form_Element_Select(
-        'RelatedPostsNum',
-        array(
-            '3' => '3篇（默认）',
-            '6' => '6篇',
-        ),
-        '3',
-        '相关推荐显示数量',
-        '介绍：最多显示3篇或者6篇相关推荐文章'
-    );
-    $form->addInput($RelatedPostsNum->multiMode());
-
-    $DefaultEncoding = new Typecho_Widget_Helper_Form_Element_Select(
-        'DefaultEncoding',
-        array(
-            '2' => '简体（默认）',
-            '1' => '繁体',
-        ),
-        '2',
-        '博客默认字体',
-        '介绍：如果你使用繁体写文章请选择繁体'
-    );
-    $form->addInput($DefaultEncoding->multiMode());
-
-    $themeFontSize = new Typecho_Widget_Helper_Form_Element_Text('themeFontSize', NULL, _t(''), _t('默认字体大小'), _t('填入像素值，例如14px'));
-    $form->addInput($themeFontSize);
-
-    $GravatarSelect = new Typecho_Widget_Helper_Form_Element_Select(
-        'GravatarSelect',
-        array(
-            "https://gravatar.loli.net/avatar/" => 'loli（默认）',
-            'https://gravatar.helingqi.com/wavatar/' => '禾令奇',
-            "https://sdn.geekzu.org/avatar/" => '极客族',
-            "https://cdn.sep.cc/avatar/" => '九月的风',
-            "https://gravatar.com/avatar/" => '官方源(被墙)',
-            "https://cravatar.cn/avatar/" => '中国官方源(推荐)',
-        ),
-        'loli',
-        'gravatar源选择',
-        '介绍：评论区头像gravatar源'
-    );
-    $GravatarSelect->setAttribute('id', 'gravatarlist');
-    $form->addInput($GravatarSelect->multiMode());
-
-    $baidustatistics = new Typecho_Widget_Helper_Form_Element_Text('baidustatistics', NULL, _t(''), _t('百度统计'), _t('仅需要https://hm.baidu.com/hm.js?xxxxxxxxxxxxxxxxxx部分即可'));
-    $form->addInput($baidustatistics);
-
-    $googleadsense = new Typecho_Widget_Helper_Form_Element_Text('googleadsense', NULL, _t(''), _t('谷歌广告(实验性功能)'), _t('填入client后的部分,如ca-pub-xxxxx'));
-    $form->addInput($googleadsense);
-
-    $EnablePjax = new Typecho_Widget_Helper_Form_Element_Select(
-        'EnablePjax',
-        array(
-            'off' => '关闭（默认）',
-            "on" => '开启'
-        ),
-        'off',
-        '开启PJAX',
-        '介绍：页面无刷新加载,有效提高页面加载速度<br>
-         请先查看<a href="https://blog.wehaox.com/archives/typecho-butterfly.html#cl-13">使用文档</a>'
-    );
-    $EnablePjax->setAttribute('id', 'pjax');
-    $form->addInput($EnablePjax->multiMode());
 
-    $PjaxCallBack = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'PjaxCallBack',
-        NULL,
-        NULL,
-        'PJAX回调函数（非必填）',
-        '用于解决开启pjax导致某些js失效问题(填入js代码)'
-    );
-    $form->addInput($PjaxCallBack);
-
-    /* 友链设置 */
-    $friendset = new Typecho_Widget_Helper_Form_Element_Select(
-        'friendset',
-        array(
-            '0' => '主题模式',
-            '1' => '插件模式',
-        ),
-        '0',
-        '是否使用Link插件进行友链(需点击<a href="https://github.com/JoyNop/Typecho-Links">这里</a>下载)',
-        '介绍：新手和手残党极其友好,默认从主题读取防止报错'
-    );
-    $friendset->setAttribute('id', 'friendset');
-    $form->addInput($friendset);
-
-    $Friends = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'Friends',
-        NULL,
-        NULL,
-        '友情链接（非必填）',
-        '介绍：用于填写友情链接 <br />
-         注意：需在独立页面创建友链，该项才会生效 <br />
-         格式：博客名称 || 博客地址 || 博客头像 || 博客简介 <br />
-         其他：一行一个，一行代表一个友链'
-    );
-    $Friends->setAttribute('id', 'friends');
-    $form->addInput($Friends);
-
-    $LazyLoad = new Typecho_Widget_Helper_Form_Element_Text(
-        'LazyLoad',
-        NULL,
-        NULL,
-        '全局懒加载图（非必填）',
-        '介绍：用于修改懒加载图片 格式：base64 或者 图片url'
-    );
-    $form->addInput($LazyLoad);
-
-
-    $ShowGlobalReward = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowGlobalReward',
-        array(
-            'off' => '关闭（默认）',
-            'show' => '开启打赏',
-        ),
-        'off',
-        '是否开启全局文章打赏',
-        '介绍：开启此功能所有文章将显示打赏'
-    );
-    $ShowGlobalReward->setAttribute('id', 'reward');
-    $form->addInput($ShowGlobalReward->multiMode());
-
-    /* 打赏设置 */
-    $RewardInfo = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'RewardInfo',
-        NULL,
-        _t('微信 || https://cdn.jsdelivr.net/gh/wehaox/CDN@main/reward/wechat.jpg
-支付宝 || https://cdn.jsdelivr.net/gh/wehaox/CDN@main/reward/alipay.jpg'),
-        '打赏信息（非必填）',
-        '注意：需在开启打赏功能，该项才会显示 <br />
-         格式：打赏名称 || 图片地址 <br />一行一个'
-    );
-    $form->addInput($RewardInfo);
-
-    $sidebarBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
-        'sidebarBlock',
-        array(
-            'ShowAuthorInfo' => _t('显示作者信息'),
-            'ShowAnnounce' => _t('显示公告'),
-            'ShowRecentPosts' => _t('显示最新文章'),
-            'ShowRecentComments' => _t('显示最近回复'),
-            'ShowCategory' => _t('显示分类'),
-            'ShowTag' => _t('显示标签'),
-            'ShowArchive' => _t('显示归档'),
-            'ShowWebinfo' => _t('显示网站资讯'),
-            'ShowOther' => _t('显示其它杂项'),
-            'ShowMobileSide' => _t('手机端显示侧栏'),
-            'ShowWeiboHot' => _t('显示微博热搜')
-        ),
-        array('ShowAuthorInfo', 'ShowAnnounce', 'ShowRecentPosts', 'ShowRecentComments', 'ShowCategory', 'ShowTag', 'ShowArchive', 'ShowWebinfo', 'ShowMobileSide'),
-        _t('侧边栏显示')
-    );
-    $sidebarBlock->setAttribute('id', 'aside');
-    $form->addInput($sidebarBlock->multiMode());
-    // 在线人数显示
-    $ShowOnlinePeople = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowOnlinePeople',
-        array(
-            'on' => '开启',
-            'off' => '关闭（默认）',
-        ),
-        'off',
-        '是否显示在线人数',
-        '介绍：侧栏网站咨询模块在线人数统计,防止某些虚拟主机无法开启导致500错误'
-    );
-    $form->addInput($ShowOnlinePeople->multiMode());
-
-    $sidderArchiveNum = new Typecho_Widget_Helper_Form_Element_Text('sidderArchiveNum', NULL, _t('5'), _t('侧栏归档显示行数'), _t('默认为5'));
-    $form->addInput($sidderArchiveNum);
-
-    // 文章侧边栏设置
-    $PostSidebarBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
-        'PostSidebarBlock',
-        array(
-            'ShowAuthorInfo' => _t('显示作者信息'),
-            'ShowAnnounce' => _t('显示公告'),
-            'ShowRecentPosts' => _t('显示最新文章'),
-            'ShowWebinfo' => _t('显示网站咨询'),
-            'ShowOther' => _t('显示其它杂项'),
-            'ShowWeiboHot' => _t('显示微博热搜')
-        ),
-        array('ShowAuthorInfo', 'ShowAnnounce', 'ShowRecentPosts', 'ShowWebinfo'),
-        _t('文章侧边栏显示'),
-        _t('说明:单独设置文章内侧栏')
-    );
-    $form->addInput($PostSidebarBlock->multiMode());
-
-    // 美化选项
-    $beautifyBlock = new Typecho_Widget_Helper_Form_Element_Checkbox(
-        'beautifyBlock',
-        array(
-            'ShowBeautifyChange' => _t('是否开启美化(基于butterfly小康的魔改)'),
-            'ShowColorTags' => _t('是否开启彩色标签云'),
-            'ShowTopimg' => _t('是否显示主页顶图'),
-            'PostShowTopimg' => _t('是否显示文章示顶图'),
-            'PageShowTopimg' => _t('是否显示独立页面顶图'),
-            'showLineNumber' => _t('是否显示代码块行号'),
-            'showSnackbar' => _t('是否显示主题以及简繁切换弹窗'),
-            'showLazyloadBlur' => _t('是否开启懒加载模糊效果'),
-            'showButterflyClock' => _t('是否开启侧栏显示时钟(需要在下方填写和风和高德key)'),
-            'showNoAlertSearch' => _t('是否开启无弹窗搜索框'),
-        ),
-        array('ShowTopimg', 'PostShowTopimg', 'PageShowTopimg', 'showLineNumber', 'showSnackbar', 'showLazyloadBlur', 'showNoAlertSearch'),
-        _t('美化选项')
-    );
-    $beautifyBlock->setAttribute('id', 'beautifyBlock');
-    $form->addInput($beautifyBlock->multiMode());
-
-    // 封面位置
-    $coverPosition = new Typecho_Widget_Helper_Form_Element_Select(
-        'coverPosition',
-        array(
-            'left' => '靠左',
-            'cross' => '交叉(默认)',
-            'right' => '靠右',
-        ),
-        'cross',
-        '主页文章列表封面显示位置',
-        '个人还是还是觉得交叉好看'
-    );
-    $form->addInput($coverPosition->multiMode());
-
-    $qweather_key = new Typecho_Widget_Helper_Form_Element_Text('qweather_key', NULL, null, _t('时钟和风天气key'), _t('<a href="https://github.com/anzhiyu-c/hexo-butterfly-clock-anzhiyu/#安装">按照教程获取key</a>'));
-    $gaud_map_key = new Typecho_Widget_Helper_Form_Element_Text('gaud_map_key', NULL, null, _t('时钟高得地图web服务key'), _t('侧栏显示时钟用到的key，同上'));
-    $form->addInput($qweather_key);
-    $form->addInput($gaud_map_key);
-
-    $ShowLive2D = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowLive2D',
-        array(
-            'off' => '关闭（默认）',
-            "on" => '开启（GitHub默认）'
-        ),
-        'off',
-        '开启Live2D人物模型（仅通过GitHub默认样式且不会在手机显示）',
-        '介绍：开启后会在右下角显示一个小人，该功能采用远程调用不会消耗性能'
-    );
-    $ShowLive2D->setAttribute('id', 'ShowLive2D');
-    $form->addInput($ShowLive2D->multiMode());
-
-    // 弹窗提示
-    $SnackbarPosition = new Typecho_Widget_Helper_Form_Element_Select(
-        'SnackbarPosition',
-        array(
-            'top-left' => '左上(默认)',
-            'top-center' => '中上',
-            'top-right' => '右上',
-            'bottom-left' => '左下',
-            'bottom-center' => '中下',
-            'bottom-right' => '右下',
-        ),
-        'top-left',
-        '主题以及简繁切换弹窗位置',
-        '选择其中一个,需要开启是否显示主题以及简繁切换弹窗 '
-    );
-    $form->addInput($SnackbarPosition->multiMode());
-
-    $CursorEffects = new Typecho_Widget_Helper_Form_Element_Select(
-        'CursorEffects',
-        array(
-            'off' => '关闭（默认）',
-            'heart' => '鼠标点击效果:爱心',
-            'fireworks' => '烟火效果',
-        ),
-        'off',
-        '选择鼠标点击特效',
-        '介绍：用于切换鼠标点击特效 '
-    );
-    $form->addInput($CursorEffects->multiMode());
-    // 自定义subtitle
-    $CustomSubtitle = new Typecho_Widget_Helper_Form_Element_Text(
-        'CustomSubtitle',
-        NULL,
-        NULL,
-        '自定义主页副标题/subtitle（非必填）',
-        '介绍：不填则使用默认的一言api。'
-    );
-    $form->addInput($CustomSubtitle);
-
-    $SubtitleLoop = new Typecho_Widget_Helper_Form_Element_Select(
-        'SubtitleLoop',
-        array(
-            'true' => '开启循环打字（默认）',
-            "false" => '关闭循环打字'
-        ),
-        'true',
-        '副标题循环打字',
-        '介绍：开启后主页副标题循环打字'
-    );
-    $form->addInput($SubtitleLoop->multiMode());
-
-
-    $EnableAutoHeaderLink = new Typecho_Widget_Helper_Form_Element_Select(
-        'EnableAutoHeaderLink',
-        array(
-            'on' => '开启（默认）',
-            "off" => '关闭'
-        ),
-        'on',
-        '自动生成导航栏独立页面链接',
-        '介绍：如果你要自定义导航栏链接部分,你可以选择关闭此项'
-    );
-    $form->addInput($EnableAutoHeaderLink->multiMode());
-
-    // 自定义导航栏链接
-    $CustomHeaderLink = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomHeaderLink',
-        NULL,
-        NULL,
-        '自定义导航栏链接',
-        '介绍：目前使用html写法 <b style="color:red">完全自定义链接记得关闭上方选项</b>'
-    );
-    $CustomHeaderLink->setAttribute('id', 'otherCustom');
-    $form->addInput($CustomHeaderLink);
-
-    // 自定义认证用户
-    $CustomAuthenticated = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomAuthenticated',
-        NULL,
-        NULL,
-        '自定义认证用户',
-        '介绍：评论区认证用户专属头衔<br>
-         格式：邮箱||认证头衔 如:<br> xxx@xxx.com||xxx认证<br>
-        (一行一个)'
-    );
-    $form->addInput($CustomAuthenticated);
-
-    // 自定义css和js
-    $CustomCSS = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomCSS',
-        NULL,
-        NULL,
-        '自定义CSS样式（非必填）',
-        '介绍：请填写自定义CSS内容，填写时无需填写style标签。'
-    );
-    $form->addInput($CustomCSS);
-
-    $CustomScript = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomScript',
-        NULL,
-        NULL,
-        '自定义JS代码（非必填，请看下方介绍）',
-        '介绍：请填写自定义JS内容，填写时无需填写script标签。<br />
-         非专业人士请勿填写！'
-    );
-    $form->addInput($CustomScript);
-
-    $CustomHead = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomHead',
-        NULL,
-        NULL,
-        '自定义head标签内位置内容',
-        '介绍：填写如cdn的&lt;link&gt;标签、百度统计代码等等'
-    );
-    $form->addInput($CustomHead);
-
-    $CustomBodyEnd = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'CustomBodyEnd',
-        NULL,
-        NULL,
-        '自定义body标签末尾位置内容',
-        '介绍：填写如cdn的&lt;script&gt;&lt;/script&gt;标签等等'
-    );
-    $form->addInput($CustomBodyEnd);
-
-    $Customfooter = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'Customfooter',
-        NULL,
-        NULL,
-        '自定义Footer内容',
-        '介绍：网页底部的信息，如备案号等等(可使用html)'
-    );
-    $form->addInput($Customfooter);
-
-    //自定义颜色    
-    $EnableCustomColor = new Typecho_Widget_Helper_Form_Element_Select(
-        'EnableCustomColor',
-        array(
-            "false" => '关闭（默认）',
-            'true' => '开启'
-        ),
-        'false',
-        '开启主题自定义颜色(实验性功能)',
-        '介绍：需要开启此选项下面的自定义颜色才能生效，且下面关于颜色的必填'
-    );
-    $EnableCustomColor->setAttribute('id', 'CustomColor');
-    $form->addInput($EnableCustomColor->multiMode());
-
-    $CustomColorMain = new Typecho_Widget_Helper_Form_Element_Text(
-        'CustomColorMain',
-        NULL,
-        _t('#49b1f5'),
-        '自定主题主要颜色',
-        '介绍：使用hex格式或者颜色英文，如#fff、white'
-    );
-    $form->addInput($CustomColorMain);
-
-    $CustomColorButtonBG = new Typecho_Widget_Helper_Form_Element_Text(
-        'CustomColorButtonBG',
-        NULL,
-        _t('#49b1f5'),
-        '自定按钮颜色',
-        '介绍：同上'
-    );
-    $form->addInput($CustomColorButtonBG);
-
-    $CustomColorButtonHover = new Typecho_Widget_Helper_Form_Element_Text(
-        'CustomColorButtonHover',
-        NULL,
-        _t('#ff7242'),
-        '自定按钮悬停色',
-        '介绍：同上'
-    );
-    $form->addInput($CustomColorButtonHover);
-
-    $CustomColorSelection = new Typecho_Widget_Helper_Form_Element_Text(
-        'CustomColorSelection',
-        NULL,
-        _t('#00c4b6'),
-        '自定文本选择色',
-        '介绍：同上'
-    );
-    $form->addInput($CustomColorSelection);
-    //自定义颜色end
-
-    $siteKey = new Typecho_Widget_Helper_Form_Element_Text(
-        'siteKey',
-        NULL,
-        null,
-        '评论区谷歌验证码 <br> Site Key for reCAPTCHAv2:',
-        '<a href="https://www.google.com/recaptcha/admin/create">点击获取密钥</a>'
-    );
-
-    $secretKey = new Typecho_Widget_Helper_Form_Element_Text('secretKey', NULL, null, _t('Serect Key for reCAPTCHAv2:'), _t('填写两处密钥评论区自动开启谷歌验证码'));
-    $form->addInput($siteKey);
-    $form->addInput($secretKey);
-
-
-    $hcaptchaSecretKey = new Typecho_Widget_Helper_Form_Element_Text(
-        'hcaptchaSecretKey',
-        NULL,
-        null,
-        '<hr> 评论区hcaptch人机验证 <br> 密钥(sietkey)- 使用它作为 secret 来检查用户令牌:',
-        '<a href="https://dashboard.hcaptcha.com/welcome">点击获取密钥</a>'
-    );
-
-    $hcaptchaAPIKey = new Typecho_Widget_Helper_Form_Element_Text('hcaptchaAPIKey', NULL, null, _t('API 密钥:'), _t('填写两处密钥评论区自动开启hcaptch人机验证'));
-
-    $form->addInput($hcaptchaSecretKey);
-    $form->addInput($hcaptchaAPIKey);
-
-
-
-
-    $db = Typecho_Db::get();
-    $sjdq = $db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterfly'));
-    $ysj = $sjdq['value'];
-    if (isset($_POST['type'])) {
-        if ($_POST["type"] == "备份主题数据") {
-            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
-                $update = $db->update('table.options')->rows(array('value' => $ysj))->where('name = ?', 'theme:butterflybf');
-                $updateRows = $db->query($update);
-                echo '<div class="tongzhi">备份已更新，请等待自动刷新！如果等不到请点击';
-                ?>
-                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
-                <script
-                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
-                <?php
-            } else {
-                if ($ysj) {
-                    $insert = $db->insert('table.options')->rows(array('name' => 'theme:butterflybf', 'user' => '0', 'value' => $ysj));
-                    $insertId = $db->query($insert);
-                    echo '<div class="tongzhi">备份完成，请等待自动刷新！如果等不到请点击';
-                    ?>
-                    <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
-                    <script
-                        language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
-                    <?php
-                }
-            }
-        }
-        if ($_POST["type"] == "还原主题数据") {
-            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
-                $sjdub = $db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'));
-                $bsj = $sjdub['value'];
-                $update = $db->update('table.options')->rows(array('value' => $bsj))->where('name = ?', 'theme:butterfly');
-                $updateRows = $db->query($update);
-                echo '<div class="tongzhi">检测到主题备份数据，恢复完成，请等待自动刷新！如果等不到请点击';
-                ?>
-                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
-                <script
-                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2000);</script>
-                <?php
-            } else {
-                echo '<div class="tongzhi">没有主题备份数据，恢复不了哦！</div>';
-            }
-        }
-        if ($_POST["type"] == "删除备份数据") {
-            if ($db->fetchRow($db->select()->from('table.options')->where('name = ?', 'theme:butterflybf'))) {
-                $delete = $db->delete('table.options')->where('name = ?', 'theme:butterflybf');
-                $deletedRows = $db->query($delete);
-                echo '<div class="tongzhi">删除成功，请等待自动刷新，如果等不到请点击';
-                ?>
-                <a href="<?php Helper::options()->adminUrl('options-theme.php'); ?>">这里</a></div>
-                <script
-                    language="JavaScript">window.setTimeout("location=\'<?php Helper::options()->adminUrl('options-theme.php'); ?>\'", 2500);</script>
-                <?php
-            } else {
-                echo '<div class="tongzhi">不用删了！备份不存在！！！</div>';
-            }
-        }
-    }
-    // 结束
-}
-
-function themeFields($layout)
-{
-    $thumb = new Typecho_Widget_Helper_Form_Element_Text(
-        'thumb',
-        NULL,
-        NULL,
-        '自定义文章缩略图',
-        '填写时：将会显示填写的文章缩略图 <br>不填写时采用默认图片'
-    );
-    $layout->addItem($thumb);
-
-    $summaryContent = new Typecho_Widget_Helper_Form_Element_Textarea(
-        'summaryContent',
-        NULL,
-        NULL,
-        '自定义文章摘要',
-        '不喜欢自动生成的摘要？那就来自定义吧！'
-    );
-    $layout->addItem($summaryContent);
-
-    $desc = new Typecho_Widget_Helper_Form_Element_Text(
-        'desc',
-        NULL,
-        NULL,
-        'SEO描述',
-        '用于填写文章或独立页面的SEO描述，如果不填写则没有'
-    );
-    $layout->addItem($desc);
-
-    $keywords = new Typecho_Widget_Helper_Form_Element_Text(
-        'keywords',
-        NULL,
-        NULL,
-        'SEO关键词',
-        '用于填写文章或独立页面的SEO关键词，如果不填写则没有'
-    );
-    $layout->addItem($keywords);
-
-
-    $showTimeWarning = new Typecho_Widget_Helper_Form_Element_Select(
-        'showTimeWarning',
-        array(
-            'on' => '开启（默认）',
-            'off' => '关闭'
-        ),
-        'on',
-        '是否开启当前页面的文章过期警告',
-        '用于单独设置当前文章的过期警告 <br /> <b>仅在文章内作用,独立页面无需改动</b> <br />'
-    );
-    $layout->addItem($showTimeWarning);
-
-    $ShowReward = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowReward',
-        array(
-            'off' => '关闭（默认）',
-            'show' => '开启打赏',
-        ),
-        'off',
-        '是否开启文章打赏',
-        '介绍：开启此功能需要在主题设置中添加二维码图片'
-    );
-    $layout->addItem($ShowReward);
-    $ShowToc = new Typecho_Widget_Helper_Form_Element_Select(
-        'ShowToc',
-        array(
-            'show' => '开启（默认）',
-            'off' => '关闭',
-        ),
-        'show',
-        '是否显示文章目录',
-        '介绍：或许有的文章不需要目录功能,默认是开启的,一般不需要设置'
-    );
-    $layout->addItem($ShowToc);
-
-    $CopyRight = new Typecho_Widget_Helper_Form_Element_Select(
-        'CopyRight',
-        array(
-            'on' => ' CC BY-NC-SA 4.0（默认）',
-            'off' => '禁止转载',
-        ),
-        'on',
-        '文章版权说明',
-        '介绍：默认为CC BY-NC-SA 4.0'
-    );
-    $layout->addItem($CopyRight);
-
-    $NoCover = new Typecho_Widget_Helper_Form_Element_Select(
-        'NoCover',
-        array(
-            'on' => '显示封面',
-            'off' => '不显示封面',
-        ),
-        'on',
-        '主页是否显示封面',
-        '介绍：这篇文章看来不需要封面'
-    );
-    $layout->addItem($NoCover);
-}
 // 新文章缩略图
 function get_ArticleThumbnail($widget)
 {
@@ -844,10 +31,6 @@ function get_ArticleThumbnail($widget)
         return $random;
     }
 }
-;
-
-
-
 
 // 主页文章缩略图
 function GetRandomThumbnail($widget)
@@ -1291,44 +474,10 @@ function ArtPlayer($text)
 // 重写文章图片加载
 function PostImage($text)
 {
-    $doc = new DOMDocument('1.0', 'UTF-8');
-    @$doc->loadHTML('<?xml encoding="UTF-8">' . $text);
-    $images = $doc->getElementsByTagName('img');
-    foreach ($images as $image) {
-        $src = $image->getAttribute('src');
-        $alt = $image->getAttribute('alt');
-        $newImage = $doc->createElement('img');
-        $newImage->setAttribute('title', $alt);
-        $newImage->setAttribute('alt', $alt);
-        $newImage->setAttribute('data-lazy-src', $src);
-        $newImage->setAttribute('src', GetLazyLoad());
-        $image->parentNode->replaceChild($newImage, $image);
-    }
-    return $doc->saveHTML();
-}
-
-
-
-function themeInit($archive)
-{
-    if (Helper::options()->EnablePjax == "on") {
-        Helper::options()->commentsAntiSpam = false;
-    }
-    if ($archive->is('single')) {
-        $archive->content = createCatalog($archive->content);
-        $archive->content = ParseCode($archive->content);
-    }
-    $loginStatus = $archive->widget('Widget_User')->hasLogin();
-    if (Helper::options()->siteKey !== "" && Helper::options()->secretKey !== "" && !$loginStatus) {
-        comments_filter($archive);
-    }
-    if (Helper::options()->hcaptchaSecretKey !== "" && Helper::options()->hcaptchaAPIKey !== "" && !$loginStatus) {
-        hcaptcha_filter($archive);
-    }
-    if ($archive->is('index')) {
-        // echo '<script src="'..'"></script>';        
-    }
-
+    $pattern = '/<img[^>]*src="([^"]+)"[^>]*alt="([^"]+)"[^>]*(style="[^"]+")[^>]*>/i';
+    $replacement = '<img title="$2" alt="$2" data-lazy-src="$1" $3 src="' . GetLazyLoad() . '">';
+    $text = preg_replace($pattern, $replacement, $text);
+    return $text;
 }
 
 /**
@@ -1408,119 +557,77 @@ function getGravatar($email, $name, $comments_a, $s = 96, $d = 'mp', $r = 'g')
 // 获取浏览器信息
 function getBrowser($agent)
 {
-    if (preg_match('/MSIE\s([^\s|;]+)/i', $agent, $regs)) {
-        $outputer = '<i class="fab fa-internet-explorer"></i>&nbsp;&nbsp;Internet Explore';
-    } else if (preg_match('/FireFox\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('Firefox/', $regs[0]);
-        $outputer = '<i class="fab fa-firefox-browser"></i>&nbsp;&nbsp;FireFox';
-    } else if (preg_match('/Maxthon([\d]*)\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('Maxthon/', $agent);
-        $outputer = '<i class="iconfont icon-maxthon"></i>&nbsp遨游';
-    } else if (preg_match('#360([a-zA-Z0-9.]+)#i', $agent, $regs)) {
-        $outputer = '<i class="iconfont icon-chrome"></i>&nbsp;360极速浏览器';
-    } else if (preg_match('/Edg([\d]*)\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('Edge/', $regs[0]);
-        $outputer = '<i class="fab fa-edge"></i>&nbsp;&nbsp;MicroSoft Edge';
-    } else if (preg_match('/UC/i', $agent)) {
-        $str1 = explode('rowser/', $agent);
-        $outputer = '<i class="iconfont icon-UCliulanqi"></i>&nbsp;UC浏览器';
-    } else if (preg_match('/QQ/i', $agent, $regs) || preg_match('/QQBrowser\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('rowser/', $agent);
-        $outputer = '<i class="iconfont icon-QQliulanqi"></i>&nbsp;QQ浏览器';
-    } else if (preg_match('/UBrowser/i', $agent, $regs)) {
-        $str1 = explode('rowser/', $agent);
-        $outputer = '<i class="iconfont icon-UCliulanqi"></i>&nbsp;UC浏览器';
-    } else if (preg_match('/Opera[\s|\/]([^\s]+)|OPR/i', $agent, $regs)) {
-        $outputer = '<i class="fab fa-opera"></i>&nbsp;&nbsp;Opera';
-    } else if (preg_match('/YaBrowser/i', $agent, $regs)) {
-        $str1 = explode('Version/', $agent);
-        $outputer = '<i class="fab fa-yandex-international"></i>&nbsp;&nbsp;Yandex';
-    } else if (preg_match('/Quark/i', $agent, $regs)) {
-        $str1 = explode('Version/', $agent);
-        $outputer = '<i class="iconfont icon-quark"></i>&nbsp;Quark';
-    } else if (preg_match('/XiaoMi/i', $agent, $regs)) {
-        $outputer = '<i class="iconfont icon-XiaoMi"></i>&nbsp;小米浏览器';
-    } else if (preg_match('/Chrome([\d]*)\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('Chrome/', $agent);
-        $outputer = '<i class="fab fa-chrome""></i>&nbsp;&nbsp;Google Chrome';
-    } else if (preg_match('/safari\/([^\s]+)/i', $agent, $regs)) {
-        $str1 = explode('Version/', $agent);
-        $outputer = '<i class="fab fa-safari"></i>&nbsp;&nbsp;Safari';
-    } else {
-        $outputer = '<i class="fab fa-chrome"></i>&nbsp;&nbsp;Google Chrome';
+    $browsers = [
+        '/MSIE\s([^\s|;]+)/i' => ['label' => 'Internet Explorer', 'icon' => 'fab fa-internet-explorer'],
+        '/FireFox\/([^\s]+)/i' => ['label' => 'FireFox', 'icon' => 'fab fa-firefox-browser'],
+        '/Maxthon([\d]*)\/([^\s]+)/i' => ['label' => '遨游', 'icon' => 'iconfont icon-maxthon'],
+        '#360([a-zA-Z0-9.]+)#i' => ['label' => '360极速浏览器', 'icon' => 'iconfont icon-chrome'],
+        '/Edg([\d]*)\/([^\s]+)/i' => ['label' => 'Microsoft Edge', 'icon' => 'fab fa-edge'],
+        '/UC/i' => ['label' => 'UC浏览器', 'icon' => 'iconfont icon-UCliulanqi'],
+        '/QQ/i' => ['label' => 'QQ浏览器', 'icon' => 'iconfont icon-QQliulanqi'],
+        '/QQBrowser\/([^\s]+)/i' => ['label' => 'QQ浏览器', 'icon' => 'iconfont icon-QQliulanqi'],
+        '/UBrowser/i' => ['label' => 'UC浏览器', 'icon' => 'iconfont icon-UCliulanqi'],
+        '/Opera[\s|\/]([^\s]+)|OPR/i' => ['label' => 'Opera', 'icon' => 'fab fa-opera'],
+        '/YaBrowser/i' => ['label' => 'Yandex', 'icon' => 'fab fa-yandex-international'],
+        '/Quark/i' => ['label' => 'Quark', 'icon' => 'iconfont icon-quark'],
+        '/XiaoMi/i' => ['label' => '小米浏览器', 'icon' => 'iconfont icon-XiaoMi'],
+        '/Chrome([\d]*)\/([^\s]+)/i' => ['label' => 'Google Chrome', 'icon' => 'fab fa-chrome'],
+        '/safari\/([^\s]+)/i' => ['label' => 'Safari', 'icon' => 'fab fa-safari'],
+    ];
+    $defaultBrowser = ['label' => 'Google Chrome', 'icon' => 'fab fa-chrome'];
+    foreach ($browsers as $pattern => $info) {
+        if (preg_match($pattern, $agent, $regs)) {
+            echo "<i class='{$info['icon']}'></i>&nbsp;&nbsp;{$info['label']}";
+            return;
+        }
     }
-    echo $outputer;
+    echo "<i class='{$defaultBrowser['icon']}'></i>&nbsp;&nbsp;{$defaultBrowser['label']}";
 }
+
 // 获取操作系统信息
-function getOs($agent)
-{
-    $os = false;
-    if (preg_match('/win/i', $agent)) {
-        if (preg_match('/nt 6.0/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="iconfont icon-windows"></i>&nbsp;Windows Vista&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 6.1/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="iconfont icon-windows"></i>&nbsp;Windows 7&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 6.2/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-windows"></i>&nbsp;&nbsp;Windows 8&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 6.3/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-windows"></i>&nbsp;&nbsp;Windows 8.1&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 5.1/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="iconfont icon-windows"></i>&nbsp;Windows XP&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 10.0/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-windows"></i>&nbsp;&nbsp;Windows 10&nbsp;/&nbsp;';
-        } else if (preg_match('/nt 11.0/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-windows"></i>&nbsp;&nbsp;Windows 11&nbsp;/&nbsp;';
-        } else {
-            $os = '&nbsp;&nbsp;<i class="fab fa-windows"></i>&nbsp;&nbsp;Windows X64&nbsp;/&nbsp;';
-        }
-    } else if (preg_match('/android/i', $agent)) {
-        if (preg_match('/android 9/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android Pie&nbsp;/&nbsp;';
-        } else if (preg_match('/android 4/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android ICS&nbsp;/&nbsp;';
-        } else if (preg_match('/android 5/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android Lollipop&nbsp;/&nbsp;';
-        } else if (preg_match('/android 6/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android M&nbsp;/&nbsp;';
-        } else if (preg_match('/android 7/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android Nougat&nbsp;/&nbsp;';
-        } else if (preg_match('/android 8/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android Oreo&nbsp;/&nbsp;';
-        } else if (preg_match('/android 10/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android Q&nbsp;/&nbsp;';
-        } else if (preg_match('/android 11/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android 11&nbsp;/&nbsp;';
-        } else if (preg_match('/android 12/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android 12&nbsp;/&nbsp;';
-        } else if (preg_match('/android 13/i', $agent)) {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android 13&nbsp;/&nbsp;';
-        } else {
-            $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android&nbsp;/&nbsp;';
+function getOs($agent) {
+    $osData = [
+        'Windows Vista' => ['/nt 6.0/i', 'iconfont icon-windows'],
+        'Windows 7' => ['/nt 6.1/i', 'iconfont icon-windows'],
+        'Windows 8' => ['/nt 6.2/i', 'fab fa-windows'],
+        'Windows 8.1' => ['/nt 6.3/i', 'fab fa-windows'],
+        'Windows XP' => ['/nt 5.1/i', 'iconfont icon-windows'],
+        'Windows 10' => ['/nt 10.0/i', 'fab fa-windows'],
+        'Windows 11' => ['/nt 11.0/i', 'fab fa-windows'],
+        'Android Pie' => ['/android 9/i', 'fab fa-android'],
+        'Android ICS' => ['/android 4/i', 'fab fa-android'],
+        'Android Lollipop' => ['/android 5/i', 'fab fa-android'],
+        'Android M' => ['/android 6/i', 'fab fa-android'],
+        'Android Nougat' => ['/android 7/i', 'fab fa-android'],
+        'Android Oreo' => ['/android 8/i', 'fab fa-android'],
+        'Android Q' => ['/android 10/i', 'fab fa-android'],
+        'Android 11' => ['/android 11/i', 'fab fa-android'],
+        'Android 12' => ['/android 12/i', 'fab fa-android'],
+        'Android 13' => ['/android 13/i', 'fab fa-android'],
+        'Ubuntu' => ['/ubuntu/i', 'fab fa-ubuntu'],
+        'Arch Linux' => ['/Arch/i', 'iconfont icon-Arch-Linux'],
+        'Manjaro' => ['/manjaro/i', 'iconfont icon-manjaro'],
+        'Debian' => ['/debian/i', 'iconfont icon-debianos'],
+        'Linux' => ['/linux/i', 'fab fa-linux'],
+        'iOS(iPad)' => ['/iPad/i', 'fab fa-apple'],
+        'iOS(iPhone)' => ['/iPhone/i', 'fab fa-apple'],
+        'MacOS' => ['/mac/i', 'fab fa-apple'],
+        'Android' => ['/fusion/i', 'fab fa-android'],
+    ];
+
+    foreach ($osData as $osName => list($pattern, $iconClass)) {
+        if (preg_match($pattern, $agent)) {
+            echo '&nbsp;&nbsp;<i class="' . $iconClass . '"></i>&nbsp;' . $osName . '&nbsp;/&nbsp;';
+            return;
         }
-    } else if (preg_match('/ubuntu/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-ubuntu"></i>&nbsp;&nbsp;Ubuntu&nbsp;/&nbsp;';
-    } else if (preg_match('/Arch/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="iconfont icon-Arch-Linux"></i>&nbsp;Arch Linux&nbsp;/&nbsp;';
-    } else if (preg_match('/manjaro/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="iconfont icon-manjaro"></i>&nbsp;&nbsp;Manjaro&nbsp;/&nbsp;';
-    } else if (preg_match('/debian/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="iconfont icon-debianos"></i>&nbsp;Debian&nbsp;/&nbsp;';
-    } else if (preg_match('/linux/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-linux"></i>&nbsp;&nbsp;Linux&nbsp;/&nbsp;';
-    } else if (preg_match('/iPad/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-apple"></i>&nbsp;&nbsp;iOS(iPad)&nbsp;/&nbsp;';
-    } else if (preg_match('/iPhone/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-apple"></i>&nbsp;&nbsp;iOS(iPhone)&nbsp;/&nbsp;';
-    } else if (preg_match('/mac/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-apple"></i>&nbsp;&nbsp;MacOS&nbsp;/&nbsp;';
-    } else if (preg_match('/fusion/i', $agent)) {
-        $os = '&nbsp;&nbsp;<i class="fab fa-android"></i>&nbsp;&nbsp;Android&nbsp;/&nbsp;';
-    } else {
-        $os = '&nbsp;&nbsp;<i class="fab fa-linux"></i>&nbsp;&nbsp;Linux&nbsp;/&nbsp;';
     }
-    echo $os;
+
+    // Default case
+    echo '&nbsp;&nbsp;<i class="fab fa-linux"></i>&nbsp;&nbsp;Linux&nbsp;/&nbsp;';
 }
 
+
+
 function commentRank($widget, $email = NULL)
 {
     if (empty($email))
@@ -1612,11 +719,12 @@ function threadedComments($comments, $options)
                 $name = $comments->author;
                 $comments_a = 'class="vimg" style="border-radius: 50%;"';
                 echo getGravatar($email, $name, $comments_a); ?>
-                <cite class="vnick">
-                    <?php $comments->author(); ?>
-                </cite>
-                <?php commentRank($comments, $comments->mail); ?>
-
+                <div class="vuser">
+                    <cite class="vnick" title="<?php $comments->author(); ?>">
+                        <?php $comments->author(); ?>
+                    </cite>
+                    <?php commentRank($comments, $comments->mail); ?>
+                </div>
             </div>
             <div class="vhead">
                 <b>
@@ -1817,28 +925,21 @@ function get_last_update()
     if ($create >= $update) {
         echo Typecho_I18n::dateWord(isset($create['created']), $now);
     } else {
-        $lastday = floor(date($now - $update['modified']) / 86400);
-        if ($lastday > 365) {
-            $lastyear = floor(date($now - $update['modified']) / 30758400);
-            echo $lastyear . " 年前";
-        } elseif ($lastday > 30) {
-            $lastmom = floor(date($now - $update['modified']) / 2592000);
-            echo $lastmom . " 个月前";
-        } elseif ($lastday < 1) {
-            $lasthour = floor(date($now - $update['modified']) / 3600);
-            if ($lasthour < 1) {
-                $lastmin = floor(date($now - $update['modified']) / 60);
-                if ($lastmin < 1) {
-                    $lastsecd = floor(date($now - $update['modified']));
-                    echo $lastsecd . " 秒前";
-                } else {
-                    echo $lastmin . " 分钟前";
-                }
-            } else {
-                echo $lasthour . " 小时前";
+        $lastModified = $now - $update['modified'];
+        $timeIntervals = [
+            31536000 => '年',
+            2592000 => '个月',
+            86400 => '天',
+            3600 => '小时',
+            60 => '分钟',
+            1 => '秒'
+        ];
+        foreach ($timeIntervals as $interval => $label) {
+            if ($lastModified > $interval) {
+                $value = floor($lastModified / $interval);
+                echo $value . ' ' . $label . '前';
+                break;
             }
-        } else {
-            echo $lastday . " 天前";
         }
     }
 }
@@ -2060,4 +1161,27 @@ function noCover($widget)
         return false;
     }
     return true;
+}
+
+function cdnBaseUrl(){
+    $StaticFile = Helper::options()->StaticFile;
+    $CDNURL = Helper::options()->CDNURL;
+    if($StaticFile == 'CDN' && $CDNURL == ''){
+        echo 'https://' . Helper::options()->jsdelivrLink . '/gh/wehaox/CDN@main/butterfly';
+    }
+    elseif($StaticFile == 'CDN' && $CDNURL != ''){
+        echo $CDNURL;
+    }
+    else{
+        echo Helper::options()->themeUrl . '/static';
+    }
+}
+
+function darkTimeFunc(){
+    $time = Helper::options()->darkTime;
+    if(empty($time)){
+        $time = "7-20";
+    }
+    $timeSlot = explode('-', $time);
+    echo "e <= $timeSlot[0] || e >= $timeSlot[1]";
 }
\ No newline at end of file
diff --git a/header_com.php b/header_com.php
index fa7c923..a807a4a 100644
--- a/header_com.php
+++ b/header_com.php
@@ -1,156 +1,167 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('public/noqq.php'); ?>
-<?php if(!$this->user->hasLogin()):?>
-<?php $this->need('public/defend.php'); ?>
-<?php endif;?>
+<?php if (!$this->user->hasLogin()) : ?>
+  <?php $this->need('public/defend.php'); ?>
+<?php endif; ?>
 <!DOCTYPE HTML>
 <html data-theme="light" class="">
+
 <head>
-    <meta content="always" name="referrer">
-    <link rel="icon" type="image/png" href="<?php $this->options->Sitefavicon() ?>">
-    <meta charset="<?php $this->options->charset(); ?>">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title><?php $this->archiveTitle(array(
+  <meta content="always" name="referrer">
+  <link rel="icon" type="image/png" href="<?php $this->options->Sitefavicon() ?>">
+  <meta charset="<?php $this->options->charset(); ?>">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="renderer" content="webkit">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <meta name="theme-color" content="<?php $this->options->themeColor() ?>">
+  <title><?php $this->archiveTitle(array(
             'category'  =>  _t('分类 %s 下的文章'),
             'search'    =>  _t('包含关键字 %s 的文章'),
             'tag'       =>  _t('标签 %s 下的文章'),
             'author'    =>  _t('%s 发布的文章')
-        ), '', ' - '); ?><?php $this->options->title(); ?></title>
-    <!-- 使用url函数转换相关路径 -->
-    <link rel="preconnect" href="//<?php $this->options->jsdelivrLink() ?>" />
-    <link rel="preconnect" href="//cdn.staticfile.org" />
-    <!--<link rel="stylesheet" href="https://gcore.jsdelivr.net/npm/justifiedGallery/dist/css/justifiedGallery.min.css">-->
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('index.css?v1.7.3'); ?>">
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('css/style.css?v1.7.4'); ?>">
-    <!--魔改美化-->
-    <?php if (!empty($this->options->beautifyBlock) && in_array('ShowBeautifyChange',$this->options->beautifyBlock)): ?>
+          ), '', ' - '); ?><?php $this->options->title(); ?></title>
+  <!-- 使用url函数转换相关路径 -->
+  <link rel="preconnect" href="//<?php $this->options->jsdelivrLink() ?>" />
+  <link rel="preconnect" href="//cdn.staticfile.org" />
+  <!--<link rel="stylesheet" href="https://gcore.jsdelivr.net/npm/justifiedGallery/dist/css/justifiedGallery.min.css">-->
+  <link rel="stylesheet" href="<?php $this->options->themeUrl('index.css?v1.7.3'); ?>">
+  <link rel="stylesheet" href="<?php $this->options->themeUrl('css/style.css?v1.7.8'); ?>">
+  <!--魔改美化-->
+  <?php if (!empty($this->options->beautifyBlock) && in_array('ShowBeautifyChange', $this->options->beautifyBlock)) : ?>
     <link rel="stylesheet" href="<?php $this->options->themeUrl('css/custom.css?v1.5.9'); ?>">
-    <?php endif; ?>
-    <!--百度统计-->
-    <?php if($this->options->baidustatistics != ""): ?>
+  <?php endif; ?>
+  <!--百度统计-->
+  <?php if ($this->options->baidustatistics != "") : ?>
     <script>
-    var _hmt = _hmt || [];
-    (function() {
-     var hm = document.createElement("script");
-     hm.src = "https://hm.baidu.com/hm.js?<?php $this->options->baidustatistics(); ?>";
-     var s = document.getElementsByTagName("script")[0]; 
-     s.parentNode.insertBefore(hm, s);
-    })();
+      var _hmt = _hmt || [];
+      (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?<?php $this->options->baidustatistics(); ?>";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+      })();
     </script>
-    <?php endif; ?>
-    <!--谷歌AdSense广告-->
-    <?php if($this->options->googleadsense != ""): ?>
+  <?php endif; ?>
+  <!--谷歌AdSense广告-->
+  <?php if ($this->options->googleadsense != "") : ?>
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=<?php $this->options->googleadsense(); ?>" crossorigin="anonymous"></script>
-    <?php endif; ?>
-    <!--图标库-->
-    <link href="https://at.alicdn.com/t/font_3159629_5bvsat8p5l.css" rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.1.1/css/all.min.css">
-    <!--其余静态文件-->
-    <?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-    <link rel="stylesheet" href="https://<?php $this->options->jsdelivrLink() ?>/npm/@fancyapps/ui/dist/fancybox.css" />
-    <link rel="stylesheet" href="https://<?php $this->options->jsdelivrLink() ?>/gh/DIYgod/OwO@master/dist/OwO.min.css">
-    <?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
-    <link rel="stylesheet" href="<?php $this->options->CDNURL() ?>/static/css/fancybox.css">
-    <link rel="stylesheet" href="<?php $this->options->CDNURL() ?>/static/css/OwO.min.css">
-    <?php else: ?>
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('static/css/fancybox.css'); ?>" />
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('static/css/OwO.min.css'); ?>" />
-    <?php endif; ?>
-    <?php if (!empty($this->options->beautifyBlock) && in_array('showSnackbar',$this->options->beautifyBlock)): ?>
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('/css/snackbar.min.css')?>" media="print" onload="this.media='all'">
-    <script src="<?php $this->options->themeUrl('js/snackbar.min.js')?>"></script>
-    <?php endif; ?>
-    <?php if (!empty($this->options->beautifyBlock) && in_array('showLazyloadBlur',$this->options->beautifyBlock)): ?>
+  <?php endif; ?>
+  <!--图标库-->
+  <link href="https://at.alicdn.com/t/font_3159629_5bvsat8p5l.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.1.1/css/all.min.css">
+  <!--其余静态文件-->
+  <link rel="stylesheet" href="<?php cdnBaseUrl() ?>/css/fancybox.css">
+  <link rel="stylesheet" href="<?php cdnBaseUrl() ?>/css/OwO.min.css">
+  <?php if (!empty($this->options->beautifyBlock) && in_array('showSnackbar', $this->options->beautifyBlock)) : ?>
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('/css/snackbar.min.css') ?>" media="print" onload="this.media='all'">
+    <script src="<?php $this->options->themeUrl('js/snackbar.min.js') ?>"></script>
+  <?php endif; ?>
+  <?php if (!empty($this->options->beautifyBlock) && in_array('showLazyloadBlur', $this->options->beautifyBlock)) : ?>
     <style>
-      <?php if($this->options->themeFontSize != ""):?>
-      :root {
+      <?php if ($this->options->themeFontSize != "") : ?> :root {
         --global-font-size: <?php $this->options->themeFontSize() ?>;
-      } 
-      <?php endif ?>
-        img[data-lazy-src]:not(.loaded) {filter: blur(10px) brightness(1);}img[data-lazy-src].error {filter: none;}
-        <?php $this->options->CustomCSS() ?>
+      }
+
+      <?php endif ?>img[data-lazy-src]:not(.loaded) {
+        filter: blur(10px) brightness(1);
+      }
+
+      img[data-lazy-src].error {
+        filter: none;
+      }
+
+      <?php $this->options->CustomCSS() ?>
     </style>
-    <?php endif; ?>
-    <?php if (!empty($this->options->sidebarBlock) && !in_array('ShowMobileSide',$this->options->sidebarBlock)): ?>
+  <?php endif; ?>
+  <?php if (!empty($this->options->sidebarBlock) && !in_array('ShowMobileSide', $this->options->sidebarBlock)) : ?>
     <style>
-        @media screen and (max-width:900px){
-            #aside-content .card-info,#aside-content .card-announcement,#aside-content .card-recent-post,#aside-content #card-newest-comments,#aside-content .card-categories,#aside-content .card-tags,#aside-content .card-archives,#aside-content .card-webinfo{display:none;}
-        }
-        ins.adsbygoogle[data-ad-status="unfilled"] {
-            display: none !important;
+      @media screen and (max-width:900px) {
+
+        #aside-content .card-info,
+        #aside-content .card-announcement,
+        #aside-content .card-recent-post,
+        #aside-content #card-newest-comments,
+        #aside-content .card-categories,
+        #aside-content .card-tags,
+        #aside-content .card-archives,
+        #aside-content .card-webinfo {
+          display: none;
         }
+      }
+
+      ins.adsbygoogle[data-ad-status="unfilled"] {
+        display: none !important;
+      }
     </style>
-    <?php endif; ?>
-<!--额外的-->
-<script>
-const GLOBAL_CONFIG = {
-    root: "/",
-    algolia: void 0,
-    localSearch: {
+  <?php endif; ?>
+  <!--额外的-->
+  <script>
+    const GLOBAL_CONFIG = {
+      root: "/",
+      algolia: void 0,
+      localSearch: {
         path: undefined,
         languages: {
-            hits_empty: "回车查询：${query}"
+          hits_empty: "回车查询：${query}"
         }
-    },
-    translate: {
-            defaultEncoding: <?php $this->options->DefaultEncoding() ?>,
-            translateDelay: 0,
-            msgToTraditionalChinese: "繁",
-            msgToSimplifiedChinese: "简"
-        },
-    noticeOutdate: void 0,
-    highlight: {
+      },
+      translate: {
+        defaultEncoding: <?php $this->options->DefaultEncoding() ?>,
+        translateDelay: 0,
+        msgToTraditionalChinese: "繁",
+        msgToSimplifiedChinese: "简"
+      },
+      noticeOutdate: void 0,
+      highlight: {
         plugin: "highlighjs",
         highlightCopy: !0,
         highlightLang: !0,
         highlightHeightLimit: 400
-    },
-    copy: {
-            success: "复制成功",
-            error: "复制错误",
-            noSupport: "浏览器不支持"
-    },
-    relativeDate: {
+      },
+      copy: {
+        success: "复制成功",
+        error: "复制错误",
+        noSupport: "浏览器不支持"
+      },
+      relativeDate: {
         homepage: !0,
         post: !0
-    },
-    runtime: "天",
-    date_suffix: {
-            just: "",
-            min: "",
-            hour: "",
-            day: "",
-            month: ""
-    },
-    copyright: undefined,
-    lightbox: "fancybox",
-    Snackbar: {
-            "chs_to_cht": "你已切换为繁体",
-            "cht_to_chs": "你已切换为简体",
-            "day_to_night": "你已切换为深色模式",
-            "night_to_day": "你已切换为浅色模式",
-            "bgLight": "#49b1f5",
-            "bgDark": "#121212",
-            "position": "<?php $this->options->SnackbarPosition() ?>"
-        },
-    source: {
-            justifiedGallery: {
-                js: "https://cdn.bootcdn.net/ajax/libs/flickr-justified-gallery/2.1.2/fjGallery.min.js",
-                css: "https://cdn.bootcdn.net/ajax/libs/flickr-justified-gallery/2.1.2/fjGallery.min.css"
-            }
-        },
-    isPhotoFigcaption: !1,
-    islazyload: !0,
-    isAnchor: !0,
-    percent: {
+      },
+      runtime: "天",
+      date_suffix: {
+        just: "",
+        min: "",
+        hour: "",
+        day: "",
+        month: ""
+      },
+      copyright: undefined,
+      lightbox: "fancybox",
+      Snackbar: {
+        "chs_to_cht": "你已切换为繁体",
+        "cht_to_chs": "你已切换为简体",
+        "day_to_night": "你已切换为深色模式",
+        "night_to_day": "你已切换为浅色模式",
+        "bgLight": "#49b1f5",
+        "bgDark": "#121212",
+        "position": "<?php $this->options->SnackbarPosition() ?>"
+      },
+      source: {
+        justifiedGallery: {
+          js: "https://cdn.bootcdn.net/ajax/libs/flickr-justified-gallery/2.1.2/fjGallery.min.js",
+          css: "https://cdn.bootcdn.net/ajax/libs/flickr-justified-gallery/2.1.2/fjGallery.min.css"
+        }
+      },
+      isPhotoFigcaption: !1,
+      islazyload: !0,
+      isAnchor: !0,
+      percent: {
         toc: !0,
         rightside: !0
-    },
-    coverPosition: '<?php $this->options->coverPosition() ?>',
-}
-var saveToLocal = {
+      },
+      coverPosition: '<?php $this->options->coverPosition() ?>',
+    }
+    var saveToLocal = {
       set: function setWithExpiry(key, value, ttl) {
         const now = new Date()
         const expiryDay = ttl * 86400000
@@ -181,7 +192,7 @@
       script.src = url
       script.async = true
       script.onerror = reject
-      script.onload = script.onreadystatechange = function () {
+      script.onload = script.onreadystatechange = function() {
         const loadState = this.readyState
         if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
         script.onload = script.onreadystatechange = null
@@ -189,108 +200,113 @@
       }
       document.head.appendChild(script)
     })
-</script>
-<script id="config-diff">
-var GLOBAL_CONFIG_SITE = { 
-		    isPost: !0,
-		    isHome: !0,
-		    isHighlightShrink: !0,
-		    isToc: !0,
-		   }
-</script>
-<?php if ($this->is('post')): ?>
-<script id="config_change">
-var GLOBAL_CONFIG_SITE = {
-    isPost: !0, 
-    isHome: !0, 
-    isHighlightShrink: !1, 
-    isToc: !0, 
+  </script>
+  <script id="config-diff">
+    var GLOBAL_CONFIG_SITE = {
+      isPost: !0,
+      isHome: !0,
+      isHighlightShrink: !0,
+      isToc: !0,
     }
-</script>
-<?php else: ?>
-<script id="config_change">
-var GLOBAL_CONFIG_SITE = {
-    isPost: !1, 
-    isHome: !0, 
-    isHighlightShrink: !1, 
-    isToc: !0, 
-    }
-</script>
-<?php endif; ?>
-<noscript>
+  </script>
+  <?php if ($this->is('post')) : ?>
+    <script id="config_change">
+      var GLOBAL_CONFIG_SITE = {
+        isPost: !0,
+        isHome: !0,
+        isHighlightShrink: !1,
+        isToc: !0,
+      }
+    </script>
+  <?php else : ?>
+    <script id="config_change">
+      var GLOBAL_CONFIG_SITE = {
+        isPost: !1,
+        isHome: !0,
+        isHighlightShrink: !1,
+        isToc: !0,
+      }
+    </script>
+  <?php endif; ?>
+  <noscript>
     <style type="text/css">
       #nav {
         opacity: 1
       }
+
       .justified-gallery img {
         opacity: 1
       }
+
       #recent-posts time,
       #post-meta time {
         display: inline !important
       }
     </style>
-</noscript>
-<script>(function () {
-        window.activateDarkMode = function () {
-          document.documentElement.setAttribute('data-theme', 'dark')
-          if (document.querySelector('meta[name="theme-color"]') !== null) {
-            document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-          }
-        }
-        window.activateLightMode = function () {
-          document.documentElement.setAttribute('data-theme', 'light')
-          if (document.querySelector('meta[name="theme-color"]') !== null) {
-            document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-          }
+  </noscript>
+  <script>
+    (e => {
+      e.saveToLocal = {
+        set: (e, t, a) => {
+          if (0 === a) return;
+          const o = {
+            value: t,
+            expiry: Date.now() + 864e5 * a
+          };
+          localStorage.setItem(e, JSON.stringify(o))
+        },
+        get: e => {
+          const t = localStorage.getItem(e);
+          if (!t) return;
+          const a = JSON.parse(t);
+          if (!(Date.now() > a.expiry)) return a.value;
+          localStorage.removeItem(e)
         }
-        const autoChangeMode = 'true'
-        const t = saveToLocal.get('theme')
-        if (autoChangeMode === '1') {
-          const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-          const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-          const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-          const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-          if (t === undefined) {
-            if (isLightMode) activateLightMode()
-            else if (isDarkMode) activateDarkMode()
-            else if (isNotSpecified || hasNoSupport) {
-              const now = new Date()
-              const hour = now.getHours()
-              const isNight = hour <= 6 || hour >= 18
-              isNight ? activateDarkMode() : activateLightMode()
-            }
-            window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-              if (saveToLocal.get('theme') === undefined) {
-                e.matches ? activateDarkMode() : activateLightMode()
-              }
-            })
-          } else if (t === 'light') activateLightMode()
-          else activateDarkMode()
-        } else if (autoChangeMode === '2') {
-          const now = new Date()
-          const hour = now.getHours()
-          const isNight = hour <= 6 || hour >= 18
-          if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-          else if (t === 'light') activateLightMode()
-          else activateDarkMode()
-        } else {
-          if (t === 'dark') activateDarkMode()
-          else if (t === 'light') activateLightMode()
-        } const asideStatus = saveToLocal.get('aside-status')
-        if (asideStatus !== undefined) {
-          if (asideStatus === 'hide') {
-            document.documentElement.classList.add('hide-aside')
-          } else {
-            document.documentElement.classList.remove('hide-aside')
-          }
-        } const fontSizeVal = saveToLocal.get('global-font-size')
-        if (fontSizeVal !== undefined) {
-          document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
+      }, 
+      e.getScript = (e, t = {}) => new Promise(((a, o) => {
+        const c = document.createElement("script");
+        c.src = e, c.async = !0, c.onerror = o, c.onload = c.onreadystatechange = function() {
+          const e = this.readyState;
+          e && "loaded" !== e && "complete" !== e || (c.onload = c.onreadystatechange = null, a())
+        }, Object.keys(t).forEach((e => {
+          c.setAttribute(e, t[e])
+        })), document.head.appendChild(c)
+      })), 
+      e.getCSS = (e, t = !1) => new Promise(((a, o) => {
+        const c = document.createElement("link");
+        c.rel = "stylesheet", c.href = e, t && (c.id = t), c.onerror = o, c.onload = c.onreadystatechange = function() {
+          const e = this.readyState;
+          e && "loaded" !== e && "complete" !== e || (c.onload = c.onreadystatechange = null, a())
+        }, document.head.appendChild(c)
+      })), 
+      e.activateDarkMode = () => {
+        document.documentElement.setAttribute("data-theme", "dark"), null !== document.querySelector('meta[name="theme-color"]') && document.querySelector('meta[name="theme-color"]').setAttribute("content", "#0d0d0d")
+      }, 
+      e.activateLightMode = () => {
+        document.documentElement.setAttribute("data-theme", "light"), null !== document.querySelector('meta[name="theme-color"]') && document.querySelector('meta[name="theme-color"]').setAttribute("content", "#ffffff")
+      };
+      const t = saveToLocal.get("theme"),
+        a = <?php $this->options->darkModeSelect() ?> === 4,
+        o = <?php $this->options->darkModeSelect() ?> === 1,
+        c = <?php $this->options->darkModeSelect() ?> === 2,
+        n = !a && !o && !c;
+      if (void 0 === t) {
+        if (o) activateLightMode();
+        else if (a) activateDarkMode();
+        else if (n) {
+          const e = (new Date).getHours();
+          <?php darkTimeFunc() ?> ? activateDarkMode() : activateLightMode()
         }
-        if(/iPadliphoneliPod Macintosh/.test(navigator.userAgent)){document.documentElement.classList.add('apple')}
-      })()</script>
-<style type="text/css" data-typed-js-css="true">
+        window.matchMedia("(prefers-color-scheme: dark)").addListener((e => {
+          void 0 === saveToLocal.get("theme") && (e.matches ? activateDarkMode() : activateLightMode())
+        }))
+      } else "light" === t ? activateLightMode() : activateDarkMode();
+      const d = saveToLocal.get("aside-status");
+      void 0 !== d && ("hide" === d ? document.documentElement.classList.add("hide-aside") : document.documentElement.classList.remove("hide-aside"));
+      /iPad|iPhone|iPod|Macintosh/.test(navigator.userAgent) && document.documentElement.classList.add("apple")
+    })(window)
+  </script>
+  <style type="text/css" data-typed-js-css="true">
     .typed-cursor {
       opacity: 1;
     }
@@ -321,181 +337,195 @@
       }
     }
   </style>
-<!--额外的-->
+  <!--额外的-->
+
+  <?php if ($this->options->EnableCustomColor === 'true') : ?>
+    <style>
+      ::-webkit-scrollbar-thumb {
+        background-color: <?php $this->options->CustomColorMain() ?> !important;
+      }
+
+      :root {
+        --btn-hover-color: <?php $this->options->CustomColorButtonHover() ?>;
+        --btn-bg: <?php $this->options->CustomColorButtonBG() ?>;
+        --text-bg-hover: <?php $this->options->CustomColorButtonBG() ?>;
+        --hr-before-color: <?php $this->options->CustomColorButtonBG() ?>;
+        --text-bg-hover: <?php $this->options->CustomColorMain() ?>;
+        --hr-border: <?php $this->options->CustomColorMain() ?>;
+      }
+
+      ::selection,
+      #aside-content #card-toc .toc-content .toc-link.active {
+        background: <?php $this->options->CustomColorSelection() ?>;
+      }
+
+      #page-header.nav-fixed #nav #site-name:hover,
+      #page-header.nav-fixed #nav #toggle-menu:hover,
+      #page-header.nav-fixed #nav #menus .menus_items .menus_item a:hover,
+      #aside-content #card-toc .toc-content .toc-link:hover,
+      #recent-posts>.recent-post-item>.recent-post-info>.article-title:hover,
+      #aside-content .aside-list>.aside-list-item .content>.comment:hover,
+      #aside-content .aside-list>.aside-list-item .content>.title:hover,
+      .widget-list a:hover,
+      .post-copyright-info a:hover,
+      .article-sort-item-title:hover,
+      .search-dialog .search-nav,
+      #page-header.nav-fixed #nav a:hover,
+      .search-dialog .search-nav .search-close-button:hover {
+        color: <?php $this->options->CustomColorMain() ?>;
+      }
+
+      #nav .site-page:not(.child):after {
+        background-color: <?php $this->options->CustomColorMain() ?>
+      }
+
+      #local-search .search-dialog .local-search-box input {
+        border: 2px solid <?php $this->options->CustomColorMain() ?> !important;
+      }
+
+      #aside-content .card-archives ul.card-archive-list>.card-archive-list-item a:hover,
+      #aside-content .card-categories ul.card-category-list>.card-category-list-item a:hover {
+        background-color: var(--btn-bg);
+      }
+
+      #aside-content .card-tag-cloud a:hover {
+        color: <?php $this->options->CustomColorMain() ?> !important;
+      }
+    </style>
+  <?php endif ?>
+  <?php $this->header('generator=&'); ?>
+  <?php $this->options->CustomHead() ?>
+  <?php if (is_array($this->options->beautifyBlock) && in_array('showNoAlertSearch', $this->options->beautifyBlock)) : ?>
+    <style>
+      #dSearch {
+        display: inline-block;
+      }
 
-<?php if ($this->options->EnableCustomColor === 'true'): ?>
-<style>
-::-webkit-scrollbar-thumb {
-    background-color: <?php $this->options->CustomColorMain()?>!important;
-}
-:root {
-    --btn-hover-color: <?php $this->options->CustomColorButtonHover()?>;
-    --btn-bg: <?php $this->options->CustomColorButtonBG()?>;
-    --text-bg-hover: <?php $this->options->CustomColorButtonBG()?>;
-    --hr-before-color: <?php $this->options->CustomColorButtonBG()?>;
-    --text-bg-hover: <?php $this->options->CustomColorMain()?>;
-    --hr-border: <?php $this->options->CustomColorMain()?>;
-} 
-::selection,#aside-content #card-toc .toc-content .toc-link.active {
-    background: <?php $this->options->CustomColorSelection()?>;
-}
-#page-header.nav-fixed #nav #site-name:hover, #page-header.nav-fixed #nav #toggle-menu:hover, #page-header.nav-fixed #nav #menus .menus_items .menus_item  a:hover,#aside-content #card-toc .toc-content .toc-link:hover,#recent-posts>.recent-post-item>.recent-post-info>.article-title:hover,#aside-content .aside-list>.aside-list-item .content>.comment:hover, #aside-content .aside-list>.aside-list-item .content>.title:hover,.widget-list a:hover,.post-copyright-info a:hover,.article-sort-item-title:hover,.search-dialog .search-nav,#page-header.nav-fixed #nav a:hover,.search-dialog .search-nav .search-close-button:hover {
-    color: <?php $this->options->CustomColorMain()?>;
-}
-#nav .site-page:not(.child):after {background-color:<?php $this->options->CustomColorMain()?>}
-#local-search .search-dialog .local-search-box input {border: 2px solid <?php $this->options->CustomColorMain()?>!important;}
-#aside-content .card-archives ul.card-archive-list > .card-archive-list-item a:hover, #aside-content .card-categories ul.card-category-list > .card-category-list-item a:hover{
-    background-color: var(--btn-bg);
-}
-#aside-content .card-tag-cloud a:hover {color: <?php $this->options->CustomColorMain()?>!important; }
-</style>
-<?php endif ?>
-    <?php $this->header(); ?>
-    <?php $this->options->CustomHead() ?>
-<?php if (is_array($this->options->beautifyBlock) && in_array('showNoAlertSearch',$this->options->beautifyBlock)): ?>
-<style>
-#dSearch{
-    display: inline-block;
-}
-#dSearch>input {
-    border: none;
-    opacity: 1;
-    outline: none;
-    width: 35px;
-    text-indent: 2px;
-    transition: all .5s;
-    background: transparent;
-}
-#page-header.nav-fixed #nav ::placeholder,
-#page-header.nav-fixed #nav input {
-    color: var(--font-color);
-}
+      #dSearch>input {
+        border: none;
+        opacity: 1;
+        outline: none;
+        width: 35px;
+        text-indent: 2px;
+        transition: all .5s;
+        background: transparent;
+      }
+
+      #page-header.nav-fixed #nav ::placeholder,
+      #page-header.nav-fixed #nav input {
+        color: var(--font-color);
+      }
 
-#nav ::placeholder,
-#nav input {
-    color: var(--light-grey);
-}
-#page-header.not-top-img #nav ::placeholder,
-#page-header.not-top-img #nav input {
-    color: var(--font-color);
-    text-shadow: none;
-}
+      #nav ::placeholder,
+      #nav input {
+        color: var(--light-grey);
+      }
 
-#page-header.nav-fixed #nav a:hover {
-    color: unset;
-}
+      #page-header.not-top-img #nav ::placeholder,
+      #page-header.not-top-img #nav input {
+        color: var(--font-color);
+        text-shadow: none;
+      }
 
-</style>
-<?php endif ?>
+      #page-header.nav-fixed #nav a:hover {
+        color: unset;
+      }
+    </style>
+  <?php endif ?>
 </head>
+
 <body>
-<script src="<?php $this->options->themeUrl('/js/main.js?v1.7.3'); ?>"> </script>
-<script src="<?php $this->options->themeUrl('/js/utils.js?v1.7.3'); ?>"> </script>
-<script src="<?php $this->options->themeUrl('/js/tw_cn.js?v1.7.3'); ?>"> </script>
-<?php if (is_array($this->options->beautifyBlock) && !in_array('showNoAlertSearch',$this->options->beautifyBlock)): ?>
-<script src="<?php $this->options->themeUrl('/js/local-search.js'); ?>"> </script>
-<?php endif ?>
-<?php if($this->options->StaticFile == 'CDN' && $this->options->CDNURL == ''): ?>
-<script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-y/instant.page/5.1.0/instantpage.min.js" type="module"> </script>
-<script src="https://cdn.staticfile.org/medium-zoom/1.0.6/medium-zoom.min.js"> </script>
-<script src="https://<?php $this->options->jsdelivrLink() ?>/gh/iGaoWei/Dream-Msg/lib/dream-msg.min.js"></script>
-<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-y/vanilla-lazyload/17.3.1/lazyload.iife.min.js"></script>
-<script src="https://<?php $this->options->jsdelivrLink() ?>/npm/@fancyapps/ui/dist/fancybox.umd.js"></script>
-<script src="https://<?php $this->options->jsdelivrLink() ?>/gh/DIYgod/OwO@master/dist/OwO.min.js"></script>
-<script src="https://<?php $this->options->jsdelivrLink() ?>/npm/artplayer/dist/artplayer.js"></script>
-<?php elseif($this->options->StaticFile == 'CDN' && $this->options->CDNURL !== ''): ?>
-<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
-<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-y/instant.page/5.1.0/instantpage.min.js" type="module"> </script>
-<script src="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-y/medium-zoom/1.0.6/medium-zoom.min.js"> </script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/dream-msg.min.js"></script>
-<script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-y/vanilla-lazyload/17.3.1/lazyload.iife.min.js"></script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/fancybox.umd.js"></script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/OwO.min.js"></script>
-<script src="<?php $this->options->CDNURL() ?>/static/js/artplayer.js"> </script>
-<?php else: ?>
-<script src="<?php $this->options->themeUrl('/static/js/jquery.min.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/static/js/instantpage.min.js'); ?>" type="module"> </script>
-<script src="<?php $this->options->themeUrl('/static/js/medium-zoom.min.js'); ?>"> </script>
-<script src="<?php $this->options->themeUrl('/static/js/dream-msg.min.js"'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/static/js/lazyload.iife.min.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/static/js/fancybox.umd.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/static/js/OwO.min.js'); ?>"></script>
-<script src="<?php $this->options->themeUrl('/static/js/artplayer.js'); ?>"> </script>
-<?php endif; ?>
-<!--[if lt IE 8]>
+  <script src="<?php $this->options->themeUrl('/js/main.js?v1.7.3'); ?>"> </script>
+  <script src="<?php $this->options->themeUrl('/js/utils.js?v1.7.3'); ?>"> </script>
+  <script src="<?php $this->options->themeUrl('/js/tw_cn.js?v1.7.3'); ?>"> </script>
+  <?php if (is_array($this->options->beautifyBlock) && !in_array('showNoAlertSearch', $this->options->beautifyBlock)) : ?>
+    <script src="<?php $this->options->themeUrl('/js/local-search.js'); ?>"> </script>
+  <?php endif ?>
+
+  <script src="<?php cdnBaseUrl() ?>/js/jquery.min.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/instantpage.min.js">
+    type = "module" >
+  </script>
+  <script src="<?php cdnBaseUrl() ?>/js/medium-zoom.min.js"> </script>
+  <script src="<?php cdnBaseUrl() ?>/js/dream-msg.min.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/lazyload.iife.min.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/fancybox.umd.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/OwO.min.js"></script>
+  <script src="<?php cdnBaseUrl() ?>/js/artplayer.js"> </script>
+
+  <!--[if lt IE 8]>
     <div class="browsehappy" role="dialog"><?php _e('当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>'); ?>.</div>
 <![endif]-->
-<!--移动导航栏-->
-<div id="sidebar">
+  <!--移动导航栏-->
+  <div id="sidebar">
     <div id="menu-mask" style="display: none;"></div>
     <div id="sidebar-menus" class="">
       <div class="avatar-img is-center">
-          <img src="<?php $this->options->logoUrl() ?>"
-          onerror="this.onerror=null;this.src='https://<?php $this->options->jsdelivrLink() ?>/npm/hexo-butterfly@1.0.0/themes/butterfly/source/img/friend_404.gif'" alt="avatar"></div>
+        <img src="<?php $this->options->logoUrl() ?>" onerror="this.onerror=null;this.src='https://<?php $this->options->jsdelivrLink() ?>/npm/hexo-butterfly@1.0.0/themes/butterfly/source/img/friend_404.gif'" alt="avatar">
+      </div>
       <div class="site-data">
-		<div class="card-info-data site-data is-center">
-			<a href="<?php $this->options->archivelink() ?>">
-				<div class="headline">文章</div>
-				<div class="length-num">
-				<?php Typecho_Widget::widget('Widget_Stat')->to($stat); ?><?php $stat->publishedPostsNum() ?>
-				</div>
-			</a>
-			<a href="<?php $this->options->tagslink() ?>">
-				<div class="headline">标签</div>
-				<div class="length-num"><?php echo tagsNum(); ?></div>
-			</a>
-			<a href="<?php $this->options->categorylink() ?>">
-				<div class="headline">
-					分类
-				</div>
-				<div class="length-num">
-					<?php Typecho_Widget::widget('Widget_Stat')->to($stat); ?><?php $stat->categoriesNum() ?>
-				</div>
-			</a>
-		</div>
+        <div class="card-info-data site-data is-center">
+          <a href="<?php $this->options->archivelink() ?>">
+            <div class="headline">文章</div>
+            <div class="length-num">
+              <?php Typecho_Widget::widget('Widget_Stat')->to($stat); ?><?php $stat->publishedPostsNum() ?>
+            </div>
+          </a>
+          <a href="<?php $this->options->tagslink() ?>">
+            <div class="headline">标签</div>
+            <div class="length-num"><?php echo tagsNum(); ?></div>
+          </a>
+          <a href="<?php $this->options->categorylink() ?>">
+            <div class="headline">
+              分类
+            </div>
+            <div class="length-num">
+              <?php Typecho_Widget::widget('Widget_Stat')->to($stat); ?><?php $stat->categoriesNum() ?>
+            </div>
+          </a>
+        </div>
       </div>
       <hr>
       <div class="menus_items">
         <div class="menus_item">
-        <a class="site-page" href="<?php $this->options->siteUrl(); ?>"><i
-              class="fa-fw fas fa-home"></i><span> 首页</span></a></div>
-              <?php if($this->options->EnableAutoHeaderLink === 'on') : ?>
-      <?php $this->widget('Widget_Contents_Page_List')->to($pages); ?> <?php while($pages->next()): ?>
-        <div class="menus_item">
-               <a<?php if($this->is('page', $pages->slug)): ?><?php endif; ?> class="site-page" href="<?php $pages->permalink(); ?>">
-                            <?php switch ($pages->title){
-                                case "友链":
-                                    echo"<i class='fa-fw fas fa-link'></i>";
-                                    break;  
-                                case "关于":
-                                    echo"<i class='fa-fw fas fa-user'></i>";
-                                    break;
-                                case "留言":
-                                   echo"<i class='fa-fw fas fa-comment-dots'></i>";
-                                    break;
-                                case "归档":
-                                   echo"<i class='fa-fw fas fa-archive'></i>";
-                                    break;
-                                case "标签":
-                                    echo"<i class='fa-fw fas fa-tags'></i>";
-                                    break;
-                                case "分类":
-                                   echo"<i class='fa-fw fas fa-folder-open'></i>";
-                                    break;
-                                case "留言板":
-                                   echo"<i class='fa-fw fa fa-comment-dots'></i>";
-                                    break;                                   
-                                default:
-                                    echo"<i class='fa-fw fa fa-coffee'></i>";    
-                            }?>
-                         <span><?php $pages->title(); ?></span>
-                    </a>
-              </div>
-         <?php endwhile; ?>
-         <?php endif; ?>
-         <?php $this->options->CustomHeaderLink() ?>
+          <a class="site-page" href="<?php $this->options->siteUrl(); ?>"><i class="fa-fw fas fa-home"></i><span> 首页</span></a>
+        </div>
+        <?php if ($this->options->EnableAutoHeaderLink === 'on') : ?>
+          <?php $this->widget('Widget_Contents_Page_List')->to($pages); ?> <?php while ($pages->next()) : ?>
+            <div class="menus_item">
+              <a<?php if ($this->is('page', $pages->slug)) : ?><?php endif; ?> class="site-page" href="<?php $pages->permalink(); ?>">
+                <?php switch ($pages->title) {
+                                                                                case "友链":
+                                                                                  echo "<i class='fa-fw fas fa-link'></i>";
+                                                                                  break;
+                                                                                case "关于":
+                                                                                  echo "<i class='fa-fw fas fa-user'></i>";
+                                                                                  break;
+                                                                                case "留言":
+                                                                                  echo "<i class='fa-fw fas fa-comment-dots'></i>";
+                                                                                  break;
+                                                                                case "归档":
+                                                                                  echo "<i class='fa-fw fas fa-archive'></i>";
+                                                                                  break;
+                                                                                case "标签":
+                                                                                  echo "<i class='fa-fw fas fa-tags'></i>";
+                                                                                  break;
+                                                                                case "分类":
+                                                                                  echo "<i class='fa-fw fas fa-folder-open'></i>";
+                                                                                  break;
+                                                                                case "留言板":
+                                                                                  echo "<i class='fa-fw fa fa-comment-dots'></i>";
+                                                                                  break;
+                                                                                default:
+                                                                                  echo "<i class='fa-fw fa fa-coffee'></i>";
+                                                                              } ?>
+                <span><?php $pages->title(); ?></span>
+                </a>
+            </div>
+          <?php endwhile; ?>
+        <?php endif; ?>
+        <?php $this->options->CustomHeaderLink() ?>
       </div>
     </div>
   </div>
-<!--移动导航栏-->
+  <!--移动导航栏-->
\ No newline at end of file
diff --git a/index.php b/index.php
index 4646983..0b544ae 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
  * <a href="https://www.wehaox.com">个人网站</a> | <a href="https://blog.wehaox.com/archives/typecho-butterfly.html">主题使用文档</a>
  * @package Typecho-Butterfly
  * @author b站:wehao-
- * @version 1.7.7
+ * @version 1.7.8
  * @link https://space.bilibili.com/34174433
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
@@ -142,7 +142,7 @@ function ver() {console.log(`
     #    # #    #   #     #   #      #   #  #      #        #     
     #####   ####    #     #   ###### #    # #      ######   #  
     
-                            1.7.7
+                            1.7.8
 ===================================================================
 `);}
 </script>
\ No newline at end of file
diff --git a/post.php b/post.php
index 315d434..3877ce4 100644
--- a/post.php
+++ b/post.php
@@ -1,244 +1,243 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('post_header.php'); ?>
 <main class="layout" id="content-inner">
-<div id="post" >
-<?php if (is_array($this->options->beautifyBlock) && !in_array('PostShowTopimg',$this->options->beautifyBlock)): ?>  
-    <div id="post-info">
-  <h1 class="post-title"><?php $this->title() ?>
-  <?php if($this->user->hasLogin()):?>
-  <a style="float: none;"  class="post-edit-link" href="<?php $this->options->adminUrl(); ?>write-post.php?cid=<?php echo $this->cid;?>" title="編輯" target="_blank"><i class="fas fa-pencil-alt"></i></a><?php endif;?></h1>
-  <div id="post-meta">
-    <div class="meta-firstline">
-      <span class="post-meta-date">
-        <i class="far fa-calendar-alt fa-fw post-meta-icon"></i>
-        <span class="post-meta-label">发表于</span>
-        <!--<time class="post-meta-date-created" title="发表于<?php $this->date(); ?>"></time>-->
-        <?php $this->date(); ?>
-        <span class="post-meta-separator">|</span>
-        <i class="fas fa-history fa-fw post-meta-icon"></i>
-        <span class="post-meta-label">更新于</span>
-        <!--<time class="post-meta-date-updated" title="更新于<?php echo date('Y-m-d' , $this->modified);?>"></time>-->
-        <?php echo date('Y-m-d' , $this->modified);?>
-        </span>
-      <span class="post-meta-categories">
-        <span class="post-meta-separator">|</span>
-        <i class="fas fa-inbox fa-fw post-meta-icon"></i>
-        <a class="post-meta-categories"><?php printTag($this); ?></a>
-    </div>
-    <div class="meta-secondline">
-      <span class="post-meta-separator">|</span>
-      <span class="post-meta-wordcount">
-        <i class="far fa-file-word fa-fw post-meta-icon"></i>
-        <span class="post-meta-label">字数总计:</span>
-        <span class="word-count"><?php echo art_count($this->cid); ?></span>
-        <span class="post-meta-separator">|</span>
-        <i class="far fa-clock fa-fw post-meta-icon"></i>
-        <span class="post-meta-label">阅读时长:</span>
-        <span><?php echo art_time($this->cid); ?>分钟</span>
-        <span class="post-meta-separator">|</span>
-        <span class="post-meta-pv-cv"><i class="far fa-eye fa-fw post-meta-icon"></i>
-        <span class="post-meta-label">阅读量:</span>
-        <span id="busuanzi_value_page_pv"><?php get_post_view($this) ?></span></span>
-    </div>
-  </div>
-</div>
-<?php endif; ?>
-<?php if($this->fields->showTimeWarning !== 'off'&&(time()-($this->modified))/86400 >= $this->options->outoftime) : ?>
-<div class="post-outdate-notice">
-<div style="width: 94%;">这篇文章距离最后更新已过<?php echo floor((time()-($this->modified))/86400);?>
-天,如果文章内容或图片资源失效，请留言反馈，我会及时处理，谢谢！
-</div><a id="close-outdate"><i class="fas fa-times"></i></a></div>  
-<script>$("#close-outdate").click(function(){$(".post-outdate-notice").fadeOut(900);;})</script>
-<?php endif; ?>
+  <div id="post">
+    <?php if (is_array($this->options->beautifyBlock) && !in_array('PostShowTopimg', $this->options->beautifyBlock)) : ?>
+      <div id="post-info">
+        <h1 class="post-title"><?php $this->title() ?>
+          <?php if ($this->user->hasLogin()) : ?>
+            <a style="float: none;" class="post-edit-link" href="<?php $this->options->adminUrl(); ?>write-post.php?cid=<?php echo $this->cid; ?>" title="編輯" target="_blank"><i class="fas fa-pencil-alt"></i></a><?php endif; ?>
+        </h1>
+        <div id="post-meta">
+          <div class="meta-firstline">
+            <span class="post-meta-date">
+              <i class="far fa-calendar-alt fa-fw post-meta-icon"></i>
+              <span class="post-meta-label">发表于</span>
+              <!--<time class="post-meta-date-created" title="发表于<?php $this->date(); ?>"></time>-->
+              <?php $this->date(); ?>
+              <span class="post-meta-separator">|</span>
+              <i class="fas fa-history fa-fw post-meta-icon"></i>
+              <span class="post-meta-label">更新于</span>
+              <!--<time class="post-meta-date-updated" title="更新于<?php echo date('Y-m-d', $this->modified); ?>"></time>-->
+              <?php echo date('Y-m-d', $this->modified); ?>
+            </span>
+            <span class="post-meta-categories">
+              <span class="post-meta-separator">|</span>
+              <i class="fas fa-inbox fa-fw post-meta-icon"></i>
+              <a class="post-meta-categories"><?php printTag($this); ?></a>
+          </div>
+          <div class="meta-secondline">
+            <span class="post-meta-separator">|</span>
+            <span class="post-meta-wordcount">
+              <i class="far fa-file-word fa-fw post-meta-icon"></i>
+              <span class="post-meta-label">字数总计:</span>
+              <span class="word-count"><?php echo art_count($this->cid); ?></span>
+              <span class="post-meta-separator">|</span>
+              <i class="far fa-clock fa-fw post-meta-icon"></i>
+              <span class="post-meta-label">阅读时长:</span>
+              <span><?php echo art_time($this->cid); ?>分钟</span>
+              <span class="post-meta-separator">|</span>
+              <span class="post-meta-pv-cv"><i class="far fa-eye fa-fw post-meta-icon"></i>
+                <span class="post-meta-label">阅读量:</span>
+                <span id="busuanzi_value_page_pv"><?php get_post_view($this) ?></span></span>
+          </div>
+        </div>
+      </div>
+    <?php endif; ?>
+    <?php if ($this->fields->showTimeWarning !== 'off' && (time() - ($this->modified)) / 86400 >= $this->options->outoftime) : ?>
+      <div class="post-outdate-notice">
+        <div style="width: 94%;">这篇文章距离最后更新已过<?php echo floor((time() - ($this->modified)) / 86400); ?>
+          天,如果文章内容或图片资源失效，请留言反馈，我会及时处理，谢谢！
+        </div><a id="close-outdate"><i class="fas fa-times"></i></a>
+      </div>
+      <script>
+        $("#close-outdate").click(function() {
+          $(".post-outdate-notice").fadeOut(900);;
+        })
+      </script>
+    <?php endif; ?>
     <article class="post-content" id="article-container">
-       <?php
-        $db = Typecho_Db::get();
-        $sql = $db->select()->from('table.comments')
-         ->where('cid = ?', $this->cid)
-         ->where('mail = ?', $this->remember('mail', true))
-         ->limit(1);
-         $result = $db->fetchAll($sql);
-         if ($this->user->hasLogin() || $result) {
-         $content = preg_replace("/\[hide\](.*?)\[\/hide\]/sm", '<div class="reply-content">$1</div>', $this->content);
-         } else {
-         $content = preg_replace("/\[hide\](.*?)\[\/hide\]/sm", '<p class="need-reply">此处内容 <a href="#comments">回复</a> 可见</p>', $this->content);
-         }
-        echo $content;
-       ?>
+      <?php
+      $db = Typecho_Db::get();
+      $sql = $db->select()->from('table.comments')
+        ->where('cid = ?', $this->cid)
+        ->where('mail = ?', $this->remember('mail', true))
+        ->limit(1);
+      $result = $db->fetchAll($sql);
+      if ($this->user->hasLogin() || $result) {
+        $content = preg_replace("/\[hide\](.*?)\[\/hide\]/sm", '<div class="reply-content">$1</div>', $this->content);
+      } else {
+        $content = preg_replace("/\[hide\](.*?)\[\/hide\]/sm", '<p class="need-reply">此处内容 <a href="#comments">回复</a> 可见</p>', $this->content);
+      }
+      echo $content;
+      ?>
     </article>
-<div class="post-copyright">
-    <div class="post-copyright__author">
-    <span class="post-copyright-meta"> <?php _e('作者: '); ?> </span>
-    <span class="post-copyright-info">
-        <a itemprop="name" href="<?php $this->author->permalink(); ?>" rel="author"><?php $this->author(); ?></a></span>
-        </div>
-        <div class="post-copyright__type">
-            <span class="post-copyright-meta">文章链接: </span>
-            <span class="post-copyright-info"><a href="<?php $this -> permalink() ?>">
-                <?php $this -> permalink() ?></a></span>
-                </div>
-       <div class="post-copyright__notice">
-           <span class="post-copyright-meta">版权声明: </span>
-           <span class="post-copyright-info">
-            <?php if($this->fields->CopyRight == 'off') :?>
-           <b style="color:red">本文严禁转载</b>，引用或转载文章前请先联系博主！            
-           <?php else: ?>
-            本博客所有文章除特别声明外，均采用 
-            <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank">CC BY-NC-SA 4.0</a> 
+    <div class="post-copyright">
+      <div class="post-copyright__author">
+        <span class="post-copyright-meta"> <?php _e('作者: '); ?> </span>
+        <span class="post-copyright-info">
+          <a itemprop="name" href="<?php $this->author->permalink(); ?>" rel="author"><?php $this->author(); ?></a></span>
+      </div>
+      <div class="post-copyright__type">
+        <span class="post-copyright-meta">文章链接: </span>
+        <span class="post-copyright-info"><a href="<?php $this->permalink() ?>">
+            <?php $this->permalink() ?></a></span>
+      </div>
+      <div class="post-copyright__notice">
+        <span class="post-copyright-meta">版权声明: </span>
+        <span class="post-copyright-info">
+          <?php if ($this->fields->CopyRight == 'off') : ?>
+            <b style="color:red">本文严禁转载</b>，引用或转载文章前请先联系博主！
+          <?php else : ?>
+            本博客所有文章除特别声明外，均采用
+            <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank">CC BY-NC-SA 4.0</a>
             许可协议。转载请注明来自<a href="<?php $this->options->siteUrl(); ?>"><?php $this->options->title() ?></a> ！
-           <?php endif?>
-           </span>
+          <?php endif ?>
+        </span>
       </div>
-</div>
-  <div class="tag_share">
+    </div>
+    <div class="tag_share">
       <div class="post-meta__tag-list">
         <?php printTag($this); ?>
       </div>
-         <div class="post_share">
-	<div class="social-share share-component"
-		data-image="https://tva4.sinaimg.cn/large/007X0Rdygy1ghm2u8yvhdj30sg0g0gp1.jpg"
-		data-sites="facebook,twitter,wechat,weibo,qq">
-	<link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/social-share.js/1.0.16/css/share.min.css" media="all"
-		onload="this.media='all'">
-	<script src="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-M/social-share.js/1.0.16/js/social-share.min.js" defer=""></script>
-</div>
-   </div>
-   </div>
-<?php if($this->fields->ShowReward === 'show' || $this->options->ShowGlobalReward === 'show') : ?>
-   <div class="post-reward">
-  <div class="reward-button button--animated">
-    <i class="fas fa-qrcode"></i>打赏</div>
-  <div class="reward-main">
-    <ul class="reward-all">
-<?php if ($this->options->RewardInfo) : ?>
-        <?php
-        if (strpos($this->options->RewardInfo, '||') !== false) {
-            $list = "";
-            $txt = $this->options->RewardInfo;
-            $string_arr = explode("\r\n", $txt);
-            $long = count($string_arr);
-            for ($i = 0; $i < $long; $i++) {
-                $list = $list . 
-                '<li class="reward-item">
+      <div class="post_share">
+        <div class="social-share share-component" data-image="https://tva4.sinaimg.cn/large/007X0Rdygy1ghm2u8yvhdj30sg0g0gp1.jpg" data-sites="facebook,twitter,wechat,weibo,qq">
+          <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/social-share.js/1.0.16/css/share.min.css" media="all" onload="this.media='all'">
+          <script src="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-M/social-share.js/1.0.16/js/social-share.min.js" defer=""></script>
+        </div>
+      </div>
+    </div>
+    <?php if ($this->fields->ShowReward === 'show' || $this->options->ShowGlobalReward === 'show') : ?>
+      <div class="post-reward">
+        <div class="reward-button button--animated">
+          <i class="fas fa-qrcode"></i>打赏
+        </div>
+        <div class="reward-main">
+          <ul class="reward-all">
+            <?php if ($this->options->RewardInfo) : ?>
+              <?php
+              if (strpos($this->options->RewardInfo, '||') !== false) {
+                $list = "";
+                $txt = $this->options->RewardInfo;
+                $string_arr = explode("\r\n", $txt);
+                $long = count($string_arr);
+                for ($i = 0; $i < $long; $i++) {
+                  $list = $list .
+                    '<li class="reward-item">
                 <a href="' . explode("||", $string_arr[$i])[1] . '" rel="external nofollow noreferrer" target="_blank">
-                <img class="post-qr-code-img entered loaded" data-lazy-src="' . explode("||", $string_arr[$i])[1] . '" alt="' . explode("||", $string_arr[$i])[0] . '" src="'.GetLazyLoad().'">
+                <img class="post-qr-code-img entered loaded" data-lazy-src="' . explode("||", $string_arr[$i])[1] . '" alt="' . explode("||", $string_arr[$i])[0] . '" src="' . GetLazyLoad() . '">
                  <div class="post-qr-code-desc">' . explode("||", $string_arr[$i])[0] . '</div>
                 </a>
                 </li>';
-            }
-            echo $list;
-        }
-        ?>
-    <?php endif; ?>  
-    </ul>
-  </div>
-</div>
-<?php endif; ?>
-<?php if($this->options->googleadsense != ""): ?>
-  <div class="ads-wrap">
-  <ins class="adsbygoogle"
-       style="display:block;height: 180px;"
-       data-ad-layout="rectangle,horizonta"
-       data-ad-format="fluid"
-       data-ad-client="<?php $this->options->googleadsense(); ?>"></ins></div>
-  <script>
-       (adsbygoogle = window.adsbygoogle || []).push({});
-  </script>
-  
-<?php endif; ?>
-<nav class="pagination-post" id="pagination">
-<?php $prevId = thePrevCid($this);$nextId=theNextCid($this);?>
-<?php if(!empty($nextId)&&!empty($prevId)) : ?>
-<?php $this->widget('Widget_Archive@recommend'.$prevId, 'pageSize=1&type=post', 'cid='.$prevId)->to($prev);?>
-    <?php $this->widget('Widget_Archive@recommend'.$prevId, 'pageSize=1&type=post', 'cid='.$prevId)->to($prev);?>
-<div class="prev-post pull-left">
-      <a href="<?php $prev->permalink();?>" title="<?php $prev->title();?>">
-       <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" data-lazy-src="<?php echo get_ArticleThumbnail($prev);?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $prev->title();?>">
-        <div class="pagination-info">
-        <div class="label">上一篇</div>
-        <div class="next_info"><?php $prev->title();?></div>
+                }
+                echo $list;
+              }
+              ?>
+            <?php endif; ?>
+          </ul>
         </div>
-      </a>
       </div>
-<?php elseif(!empty($nextId)&&empty($prevId)) : ?>   
- <?php $this->widget('Widget_Archive@recommend'.$nextId, 'pageSize=1&type=post', 'cid='.$nextId)->to($next);?>
-<div class="prev-post pull-full">
-    <a href="<?php $next->permalink();?>" title="<?php $next->title();?>">
-      <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" class="next-cover" data-lazy-src="<?php echo get_ArticleThumbnail($next);?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $next->title();?>">
-             <div class="pagination-info">
-        <div class="label">下一篇</div>
-        <div class="next_info"><?php $next->title();?></div></div>
-    </a>
-    </div>      
-<?php endif; ?>
-<?php if(!empty($nextId)&&!empty($prevId)) : ?>
-<?php $this->widget('Widget_Archive@recommend'.$prevId, 'pageSize=1&type=post', 'cid='.$prevId)->to($prev);?>
-  <?php $this->widget('Widget_Archive@recommend'.$nextId, 'pageSize=1&type=post', 'cid='.$nextId)->to($next);?>
-  <div class="next-post pull-right">
-    <a href="<?php $next->permalink();?>" title="<?php $next->title();?>">
-      <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" class="next-cover" data-lazy-src="<?php echo get_ArticleThumbnail($next);?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $next->title();?>">
-             <div class="pagination-info">
-        <div class="label">下一篇</div>
-        <div class="next_info"><?php $next->title();?></div></div>
-    </a>
-    </div>
-<?php elseif(empty($nextId)&&!empty($prevId)) : ?>   
-    <?php $this->widget('Widget_Archive@recommend'.$prevId, 'pageSize=1&type=post', 'cid='.$prevId)->to($prev);?>
-<div class="prev-post pull-full">
-      <a href="<?php $prev->permalink();?>">
-       <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" class="prev-cover" data-lazy-src="<?php echo get_ArticleThumbnail($prev);?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $prev->title();?>">
-        <div class="pagination-info">
-        <div class="label">上一篇</div>
-        <div class="next_info"><?php $prev->title();?></div>
+    <?php endif; ?>
+    <?php if ($this->options->googleadsense != "") : ?>
+      <div class="ads-wrap">
+        <ins class="adsbygoogle" style="display:block;height: 180px;" data-ad-layout="rectangle,horizonta" data-ad-format="fluid" data-ad-client="<?php $this->options->googleadsense(); ?>"></ins>
+      </div>
+      <script>
+        (adsbygoogle = window.adsbygoogle || []).push({});
+      </script>
+
+    <?php endif; ?>
+    <nav class="pagination-post" id="pagination">
+      <?php
+      $prevId = thePrevCid($this);
+      $nextId = theNextCid($this);
+      if (!empty($prevId)) :
+        $this->widget('Widget_Archive@recommend' . $prevId, 'pageSize=1&type=post', 'cid=' . $prevId)->to($prev);
+      ?>
+        <div class="prev-post <?php echo empty($nextId) ? 'pull-full' : 'pull-left'; ?>">
+          <a href="<?php $prev->permalink(); ?>" title="<?php $prev->title(); ?>">
+            <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" data-lazy-src="<?php echo get_ArticleThumbnail($prev); ?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $prev->title(); ?>">
+            <div class="pagination-info">
+              <div class="label">上一篇</div>
+              <div class="next_info"><?php $prev->title(); ?></div>
+            </div>
+          </a>
+        </div>
+      <?php endif; ?>
+      <?php if (!empty($nextId)) :
+        $this->widget('Widget_Archive@recommend' . $nextId, 'pageSize=1&type=post', 'cid=' . $nextId)->to($next);
+      ?>
+        <div class="next-post <?php echo empty($prevId) ? 'pull-full' : 'pull-right'; ?>">
+          <a href="<?php $next->permalink(); ?>" title="<?php $next->title(); ?>">
+            <img class="cover" onerror="this.onerror=null;this.src='<?php $this->options->themeUrl('img/404.jpg'); ?>'" class="<?php echo empty($prevId) ? 'next-cover' : 'prev-cover'; ?>" data-lazy-src="<?php echo get_ArticleThumbnail($next); ?>" src="<?php echo GetLazyLoad() ?>" alt="<?php $next->title(); ?>">
+            <div class="pagination-info">
+              <div class="label">下一篇</div>
+              <div class="next_info"><?php $next->title(); ?></div>
+            </div>
+          </a>
+        </div>
+      <?php endif; ?>
+    </nav>
+    <?php if ($this->options->ShowRelatedPosts == 'on') : ?>
+      <div class="relatedPosts">
+        <div class="headline">
+          <i class="fas fa-thumbs-up fa-fw"></i>
+          <span>相关推荐</span>
+        </div>
+        <div class="relatedPosts-list">
+          <?php $this->related($this->options->RelatedPostsNum)->to($relatedPosts); ?>
+          <?php while ($relatedPosts->next()) : ?><div><a href="<?php $relatedPosts->permalink(); ?>" title="<?php $relatedPosts->title(); ?>"><img class="cover" data-lazy-src="<?php echo get_ArticleThumbnail($relatedPosts); ?>" src="<?php echo GetLazyLoad() ?>" alt="cover">
+                <div class="content is-center">
+                  <div class="date"><i class="far fa-calendar-alt fa-fw"></i> <?php $relatedPosts->date('Y-m-d'); ?></div>
+                  <div class="title"><?php $relatedPosts->title(); ?></div>
+                </div>
+              </a></div><?php endwhile; ?>
         </div>
-      </a>
       </div>
-<?php endif; ?>
-</nav>
-<?php if($this->options->ShowRelatedPosts == 'on'): ?>
-<div class="relatedPosts">
-<div class="headline">
-<i class="fas fa-thumbs-up fa-fw"></i>
-<span>相关推荐</span>
-</div>
-<div class="relatedPosts-list">
-<?php $this->related($this->options->RelatedPostsNum)->to($relatedPosts); ?>
-<?php while ($relatedPosts->next()): ?><div><a href="<?php $relatedPosts->permalink(); ?>" title="<?php $relatedPosts->title(); ?>"><img class="cover" data-lazy-src="<?php echo get_ArticleThumbnail($relatedPosts);?>" src="<?php echo GetLazyLoad() ?>" alt="cover"><div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i> <?php $relatedPosts->date('Y-m-d'); ?></div><div class="title"><?php $relatedPosts->title(); ?></div></div></a></div><?php endwhile; ?>
-</div>
-</div>
-<script>
-$(document).ready(function(){
-    const related = document.querySelector(".relatedPosts-list").innerHTML
-    if(related == '\n'){
-        $(".relatedPosts").remove()
-    }
-})
-</script>
-<?php endif?>
-<?php $this->need('comments.php'); ?>
-</div>
-<?php $this->need('post_sidebar.php'); ?>
-<link rel="stylesheet" href="<?php $this->options->themeUrl('css/GrayMac.css'); ?>">
-<script type="text/javascript" src="<?php $this->options->themeUrl('js/prism.js?v1.5.3'); ?>"></script>
-<script type="text/javascript" src="<?php $this->options->themeUrl('js/clipboard.min.js'); ?>"></script>
-<script>
-$(document).ready(function(){if($(".toc").html().length == "14"){$("#card-toc,#mobile-toc-button").remove()}});
-</script>
-<?php if (!empty($this->options->beautifyBlock) && in_array('showLineNumber',
-    $this->options->beautifyBlock)): ?> 
-<script type="text/javascript">
-	(function(){
-		var pres = document.querySelectorAll('pre');
-		var lineNumberClassName = 'line-numbers';
-		pres.forEach(function (item, index) {
-			item.className = item.className == '' ? lineNumberClassName : item.className + ' ' + lineNumberClassName;
-		});
-	})();
-</script>
-<?php endif; ?>
-<?php if($this->fields->ShowToc === 'off') : ?>
-<style>#card-toc,#mobile-toc-button{display: none!important;}</style>
-<?php endif?>
+      <script>
+        $(document).ready(function() {
+          const related = document.querySelector(".relatedPosts-list").innerHTML
+          if (related == '\n') {
+            $(".relatedPosts").remove()
+          }
+        })
+      </script>
+    <?php endif ?>
+    <?php $this->need('comments.php'); ?>
+  </div>
+  <?php $this->need('post_sidebar.php'); ?>
+  <link rel="stylesheet" href="<?php $this->options->themeUrl('css/GrayMac.css'); ?>">
+  <script type="text/javascript" src="<?php $this->options->themeUrl('js/prism.js?v1.5.3'); ?>"></script>
+  <script type="text/javascript" src="<?php $this->options->themeUrl('js/clipboard.min.js'); ?>"></script>
+  <script>
+    $(document).ready(function() {
+      if ($(".toc").html().length == "14") {
+        $("#card-toc,#mobile-toc-button").remove()
+      }
+    });
+  </script>
+  <?php if (!empty($this->options->beautifyBlock) && in_array(
+    'showLineNumber',
+    $this->options->beautifyBlock
+  )) : ?>
+    <script type="text/javascript">
+      (function() {
+        var pres = document.querySelectorAll('pre');
+        var lineNumberClassName = 'line-numbers';
+        pres.forEach(function(item, index) {
+          item.className = item.className == '' ? lineNumberClassName : item.className + ' ' + lineNumberClassName;
+        });
+      })();
+    </script>
+  <?php endif; ?>
+  <?php if ($this->fields->ShowToc === 'off') : ?>
+    <style>
+      #card-toc,
+      #mobile-toc-button {
+        display: none !important;
+      }
+    </style>
+  <?php endif ?>
 </main>
 <!-- end #main-->
 <?php $this->need('footer.php'); ?>
\ No newline at end of file
diff --git a/public/rightside.php b/public/rightside.php
new file mode 100644
index 0000000..16a694e
--- /dev/null
+++ b/public/rightside.php
@@ -0,0 +1,45 @@
+<div id="rightside">
+  <div id="rightside-config-hide" class="">
+    <button id="font-plus" type="button" title="放大字体"><i class="fas fa-plus"></i></button>
+    <button id="font-minus" type="button" title="缩小字体"><i class="fas fa-minus"></i></button>
+    <?php if ($this->is('post')) : ?>
+      <button id="readmode" type="button" title="阅读模式">
+        <i class="fas fa-book-open"></i>
+      </button>
+    <?php endif ?>
+    <button id="translateLink" type="button" title="简繁转换">
+      繁
+    </button>
+    <button id="darkmode" type="button" title="浅色和深色模式转换">
+      <i class="fas fa-adjust">
+      </i>
+    </button>
+    <button id="hide-aside-btn" type="button" title="单栏和双栏切换">
+      <i class="fas fa-arrows-alt-h">
+      </i>
+    </button>
+  </div>
+  <div id="rightside-config-show">
+    <button id="rightside_config" type="button" title="设置">
+      <i class="fas fa-cog fa-spin">
+      </i>
+    </button>
+    <?php if ($this->is('post')) : ?>
+      <button class="close" id="mobile-toc-button" type="button" title="目录">
+        <i class="fas fa-list-ul">
+        </i>
+      </button>
+    <?php endif ?>
+    <?php if ($this->is('post') && $this->allow('comment') || $this->is('page') && $this->allow('comment')) : ?>
+      <a id="to_comment" href="#comments" title="直达评论">
+        <i class="fas fa-comments">
+        </i>
+      </a>
+    <?php endif ?>
+    <button id="go-up" type="button" title="回到頂部" class="show-percent">
+      <span class="scroll-percent"></span>
+      <i class="fas fa-arrow-up">
+      </i>
+    </button>
+  </div>
+</div>
\ No newline at end of file