diff --git a/layout/_layout.swig b/layout/_layout.swig
index bbbb3da5fd..6e5a9f10e1 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -108,9 +108,10 @@
   {% include '_third-party/search/index.swig' %}
   {% include '_third-party/analytics/lean-analytics.swig' %}
   {% include '_third-party/analytics/firestore.swig' %}
-  {% include '_third-party/seo/baidu-push.swig' %}
-  {% include '_third-party/schedule.swig' %}
   {% include '_third-party/math/index.swig' %}
+  {% include '_third-party/pdf.swig' %}
+  {% include '_third-party/baidu-push.swig' %}
+  {% include '_third-party/schedule.swig' %}
   {% include '_third-party/needsharebutton.swig' %}
   {% include '_third-party/rating.swig' %}
   {% include '_third-party/pangu.swig' %}
@@ -118,6 +119,5 @@
   {% include '_third-party/exturl.swig' %}
   {% include '_third-party/bookmark.swig' %}
   {% include '_third-party/copy-code.swig' %}
-  {% include '_third-party/pdf.swig' %}
 </body>
 </html>
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index a542d62363..a8f9e16c55 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -153,14 +153,14 @@
                   <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
                 </a>
               </span>
-            {% elseif theme.disqus.enable and theme.disqus.count %}
+            {% elif theme.disqus.enable and theme.disqus.count %}
               {{ comments() }}
                 <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count disqus-comment-count" data-disqus-identifier="{{ post.path }}" itemprop="commentCount"></span>
                 </a>
               </span>
-            {% elseif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
+            {% elif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
               {{ comments() }}
               {% if is_post() %}
                 <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
@@ -173,14 +173,14 @@
                   <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentCount"></span>
                 </a>
               {% endif %}
-            {% elseif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
+            {% elif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
               {{ comments() }}
                 <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
                 </a>
               </span>
-            {% elseif (is_post() or theme.valine.comment_count) and theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
+            {% elif (is_post() or theme.valine.comment_count) and theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
               {{ comments() }}
                 <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
diff --git a/layout/_partials/header/menu.swig b/layout/_partials/header/menu.swig
index 83edc6fc2b..2394449f0c 100644
--- a/layout/_partials/header/menu.swig
+++ b/layout/_partials/header/menu.swig
@@ -22,12 +22,12 @@
         {%- endif -%}
       {%- endfor %}
 
-      {% set hasSearch = theme.swiftype_key || theme.algolia_search.enable || theme.tinysou_Key || theme.local_search.enable %}
+      {% set hasSearch = theme.swiftype_key || theme.algolia_search.enable || theme.local_search.enable %}
       {% if hasSearch %}
         <li class="menu-item menu-item-search">
           {% if theme.swiftype_key %}
             <a href="javascript:;" class="st-search-show-outputs">
-          {% elseif theme.local_search.enable || theme.algolia_search.enable %}
+          {% elif theme.local_search.enable || theme.algolia_search.enable %}
             <a href="javascript:;" class="popup-trigger">
           {% endif %}
             {% if theme.menu_settings.icons %}
diff --git a/layout/_third-party/search/algolia-search/dom.swig b/layout/_partials/search/algolia-search.swig
similarity index 100%
rename from layout/_third-party/search/algolia-search/dom.swig
rename to layout/_partials/search/algolia-search.swig
diff --git a/layout/_partials/search/index.swig b/layout/_partials/search/index.swig
index 9f2bc8b509..76645fe094 100644
--- a/layout/_partials/search/index.swig
+++ b/layout/_partials/search/index.swig
@@ -1,9 +1,7 @@
 {% if theme.algolia_search.enable %}
-  {% include '../../_third-party/search/algolia-search/dom.swig' %}
+  {% include 'algolia-search.swig' %}
 {% elseif theme.swiftype_key %}
   {% include 'swiftype.swig' %}
-{% elseif theme.tinysou_Key %}
-  {% include 'tinysou.swig' %}
 {% elseif theme.local_search.enable %}
   {% include 'localsearch.swig' %}
 {% endif %}
diff --git a/layout/_partials/search/tinysou.swig b/layout/_partials/search/tinysou.swig
deleted file mode 100644
index 2dfa3e3175..0000000000
--- a/layout/_partials/search/tinysou.swig
+++ /dev/null
@@ -1,3 +0,0 @@
-<form class="site-search-form" >
-  <input type="text" id="ts-search-input" class="menu-search-input">
-</form>
diff --git a/layout/_partials/share/add-this.swig b/layout/_partials/share/add-this.swig
index ae0a6b4f50..1c7ad4c32f 100644
--- a/layout/_partials/share/add-this.swig
+++ b/layout/_partials/share/add-this.swig
@@ -1,4 +1,3 @@
-<!-- Go to www.addthis.com/dashboard to customize your tools -->
 <div class="addthis_inline_share_toolbox">
-  <script type = "text/javascript" src = "//s7.addthis.com/js/300/addthis_widget.js#pubid={{ theme.add_this_id }}" async = "async" ></script>
+  <script src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ theme.add_this_id }}" async="async"></script>
 </div>
diff --git a/layout/_partials/share/duoshuo_share.swig b/layout/_partials/share/duoshuo_share.swig
deleted file mode 100644
index 339ba727ef..0000000000
--- a/layout/_partials/share/duoshuo_share.swig
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="ds-share flat" data-thread-key="{{ page.path }}"
-     data-title="{{ page.title }}"
-     data-content=""
-     data-url="{{ page.permalink }}">
-  <div class="ds-share-inline">
-    <ul  class="ds-share-icons-16">
-      <li data-toggle="ds-share-icons-more"><a class="ds-more" href="javascript:void(0);">分享到：</a></li>
-      <li><a class="ds-weibo" href="javascript:void(0);" data-service="weibo">微博</a></li>
-      <li><a class="ds-qzone" href="javascript:void(0);" data-service="qzone">QQ空间</a></li>
-      <li><a class="ds-qqt" href="javascript:void(0);" data-service="qqt">腾讯微博</a></li>
-      <li><a class="ds-wechat" href="javascript:void(0);" data-service="wechat">微信</a></li>
-    </ul>
-    <div class="ds-share-icons-more">
-    </div>
-  </div>
-</div>
diff --git a/layout/_third-party/analytics/growingio.swig b/layout/_third-party/analytics/growingio.swig
index b39380378a..fdbb00fe10 100644
--- a/layout/_third-party/analytics/growingio.swig
+++ b/layout/_third-party/analytics/growingio.swig
@@ -1,5 +1,5 @@
 {% if theme.growingio_analytics %}
-  <script type='text/javascript'>
+  <script>
     !function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.growingio.com/2.1/gio.js","gio");
     gio('init','{{theme.growingio_analytics}}', {});
     gio('send');
diff --git a/layout/_third-party/seo/baidu-push.swig b/layout/_third-party/baidu-push.swig
similarity index 85%
rename from layout/_third-party/seo/baidu-push.swig
rename to layout/_third-party/baidu-push.swig
index d2ecfdf6bb..c400d2f265 100644
--- a/layout/_third-party/seo/baidu-push.swig
+++ b/layout/_third-party/baidu-push.swig
@@ -4,7 +4,7 @@
       var bp = document.createElement('script');
       var curProtocol = window.location.protocol.split(':')[0];
       if (curProtocol === 'https') {
-        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';        
+        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js'; 
       }
       else {
         bp.src = 'http://push.zhanzhang.baidu.com/push.js';
diff --git a/layout/_third-party/search/algolia-search/assets.swig b/layout/_third-party/search/algolia-search.swig
similarity index 100%
rename from layout/_third-party/search/algolia-search/assets.swig
rename to layout/_third-party/search/algolia-search.swig
diff --git a/layout/_third-party/search/index.swig b/layout/_third-party/search/index.swig
index 0a352bcc8e..b6c494562e 100644
--- a/layout/_third-party/search/index.swig
+++ b/layout/_third-party/search/index.swig
@@ -1,3 +1,2 @@
-{% include 'tinysou.swig' %}
 {% include 'localsearch.swig' %}
-{% include 'algolia-search/assets.swig' %}
+{% include 'algolia-search.swig' %}
diff --git a/layout/_third-party/search/tinysou.swig b/layout/_third-party/search/tinysou.swig
deleted file mode 100644
index 6e186847ab..0000000000
--- a/layout/_third-party/search/tinysou.swig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% if config.tinysou_Key %}
-  <script>
-    var customRenderActFunction = function(item) {
-      var out = '<p class="title">' + item['document']['title'].split(" // ")[0] + '</p>';
-      return out;
-    };
-    var option = {
-      engineKey: '{{ config.tinysou_Key }}',
-      renderActFunction: customRenderActFunction
-    };
-    (function(w,d,t,u,n,s,e){
-      s = d.createElement(t);
-      s.src = u;
-      s.async = 1;
-      w[n] = function(r){
-        w[n].opts = r;
-      };
-      e = d.getElementsByTagName(t)[0];
-      e.parentNode.insertBefore(s, e);
-    })(window,document,'script','//tinysou-cdn.b0.upaiyun.com/ts.js','_ts');
-    _ts(option);
-  </script>
-{% endif %}
\ No newline at end of file