diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 3045e01b0b..286fb3c3d2 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -220,7 +220,7 @@
     {#####################}
 
     {%- if theme.related_posts.enable and (theme.related_posts.display_in_home or not is_index) %}
-      {% include '../_partials/post/post-related.swig' %}
+      {{ partial('_partials/post/post-related.swig') }}
     {%- endif %}
 
     {%- if not is_index %}
@@ -240,7 +240,7 @@
       {%- endif %}
 
       {%- if theme.creative_commons.license and theme.creative_commons.post %}
-        {% include '../_partials/post/post-copyright.swig' %}
+        {{ partial('_partials/post/post-copyright.swig') }}
       {%- endif %}
 
       <footer class="post-footer">
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
index 1f731dceb9..3056cef476 100644
--- a/layout/_partials/footer.swig
+++ b/layout/_partials/footer.swig
@@ -10,6 +10,7 @@
 {%- endif %}
 
 <div class="copyright">
+  {% set copyright_year = date(null, 'YYYY') %}
   &copy; {% if theme.footer.since and theme.footer.since != copyright_year %}{{ theme.footer.since }} – {% endif %}
   <span itemprop="copyrightYear">{{ copyright_year }}</span>
   <span class="with-love">
diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig
index 7137f794bb..ce4b003d92 100644
--- a/layout/_third-party/comments/disqus.swig
+++ b/layout/_third-party/comments/disqus.swig
@@ -12,19 +12,20 @@
 {%- endif %}
 {%- if page.comments %}
 <script>
-  function disqus_config() {
-    this.page.url = {{ page.permalink | json }};
-    this.page.identifier = {{ page.path | json }};
-    this.page.title = '{{ page.title | addslashes }}';
-    {%- if __('disqus') !== 'disqus' %}
-      this.language = '{{ __('disqus') }}';
-    {%- endif %}
-  }
   function loadComments() {
     if (window.DISQUS) {
       DISQUS.reset({
         reload: true,
-        config: disqus_config
+        config: {
+          {%- if __('disqus') !== 'disqus' -%}
+            language: '{{ __('disqus') }}',
+          {% endif -%}
+          page: {
+            url: {{ page.permalink | json }},
+            identifier: {{ page.path | json }},
+            title: {{ page.title | json }}
+          }
+        }
       });
     } else {
       var d = document, s = d.createElement('script');
diff --git a/layout/_third-party/math/index.swig b/layout/_third-party/math/index.swig
index 5e4b7191b8..d8eeb9d646 100644
--- a/layout/_third-party/math/index.swig
+++ b/layout/_third-party/math/index.swig
@@ -12,9 +12,9 @@
 
   {%- if not theme.math.per_page or is_index_has_math or page.mathjax %}
     {%- if theme.math.mathjax.enable %}
-      {% include 'mathjax.swig' %}
+      {% include '_third-party/math/mathjax.swig' %}
     {% elif theme.math.katex.enable %}
-      {% include 'katex.swig' %}
+      {% include '_third-party/math/katex.swig' %}
     {%- endif %}
   {%- endif %}
 {%- endif %}
diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
index d02120ac71..4e179c8016 100644
--- a/scripts/events/lib/config.js
+++ b/scripts/events/lib/config.js
@@ -28,6 +28,7 @@ module.exports = hexo => {
     hexo.log.warn('Since caching is turned on, the `relative_link` option in Hexo `_config.yml` is set to `false` to avoid potential hazards.');
     hexo.config.relative_link = false;
   }
+  hexo.config.meta_generator = false;
 
   // Custom languages support. Introduced in NexT v6.3.0.
   if (data.languages) {
diff --git a/scripts/filters/excerpt.js b/scripts/filters/excerpt.js
deleted file mode 100644
index ba67f77990..0000000000
--- a/scripts/filters/excerpt.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* global hexo */
-
-'use strict';
-
-let cheerio;
-
-hexo.extend.filter.register('after_post_render', data => {
-  const theme = hexo.theme.config;
-  // Exit if `auto_excerpt` option disable in NexT.
-  if (!theme.auto_excerpt || !theme.auto_excerpt.enable || data.excerpt !== '') return;
-
-  if (!cheerio) cheerio = require('cheerio');
-
-  const $ = cheerio.load(data.content, {decodeEntities: false});
-  const elements = $.root().children();
-  if (!elements.length) return;
-
-  var length = 0;
-  const _$ = cheerio.load('', {decodeEntities: false});
-  elements.each((i, o) => {
-    if (length > theme.auto_excerpt.length) {
-      return;
-    }
-    length += $(o).text().length;
-    _$.root().append($(o).remove());
-  });
-
-  if ($.root().children().length) {
-    data.excerpt = _$.html();
-    data.more = $.html();
-    data.content = data.excerpt + '<a id="more"></a>' + data.more;
-  } else {
-    data.excerpt = '';
-    data.more = data.content;
-  }
-}, 20);
diff --git a/scripts/filters/exturl.js b/scripts/filters/exturl.js
deleted file mode 100644
index e7a6513ed1..0000000000
--- a/scripts/filters/exturl.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* global hexo */
-
-'use strict';
-
-let cheerio;
-
-hexo.extend.filter.register('after_post_render', data => {
-  // Exit if `exturl` option disable in NexT.
-  if (!hexo.theme.config.exturl) return;
-
-  const url = require('url');
-
-  if (!cheerio) cheerio = require('cheerio');
-
-  const $ = cheerio.load(data.content, {decodeEntities: false});
-  const links = $('a');
-  if (!links.length) return;
-
-  var config = hexo.config;
-  var siteHost = url.parse(config.url).hostname || config.url;
-
-  links.each((i, o) => {
-    var href = $(o).attr('href');
-    // Exit if the href attribute doesn't exists.
-    if (!href) return;
-
-    var data = url.parse(href);
-
-    // Exit if the link doesn't have protocol, which means it's an internal link.
-    if (!data.protocol) return;
-
-    // Exit if the url has same host with `config.url`.
-    if (data.hostname === siteHost) return;
-
-    // If title atribute filled, set it as title; if not, set url as title.
-    var title = $(o).attr('title') || href;
-
-    var encoded = Buffer.from(href).toString('base64');
-
-    $(o).replaceWith(() => {
-      return $(`<span class="exturl" data-url="${encoded}" title="${title}">${$(o).html()}<i class="fa fa-external-link"></i></span>`);
-    });
-
-  });
-
-  data.content = $.html();
-}, 0);
diff --git a/scripts/filters/lazyload.js b/scripts/filters/lazyload.js
deleted file mode 100644
index 6cb6cd3583..0000000000
--- a/scripts/filters/lazyload.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* global hexo */
-
-'use strict';
-
-let cheerio;
-
-hexo.extend.filter.register('after_post_render', data => {
-  // Exit if `lazyload` option disable in NexT.
-  if (!hexo.theme.config.lazyload) return;
-
-  if (!cheerio) cheerio = require('cheerio');
-
-  const $ = cheerio.load(data.content, {decodeEntities: false});
-  const images = $('img');
-  if (!images.length) return;
-
-  images.each((i, o) => {
-    let src = $(o).attr('src');
-    $(o).attr('data-src', src).removeAttr('src');
-  });
-
-  data.content = $.html();
-}, 0);
diff --git a/scripts/filters/locals.js b/scripts/filters/locals.js
index d93c69d684..a6dca71e70 100644
--- a/scripts/filters/locals.js
+++ b/scripts/filters/locals.js
@@ -4,19 +4,17 @@
 
 const path = require('path');
 
-hexo.extend.filter.register('template_locals', function(locals) {
-  const { config } = this;
-  const { __ } = locals;
+hexo.extend.filter.register('template_locals', locals => {
+  const { env, config } = hexo;
+  const { __, theme } = locals;
   // Hexo & NexT version
-  locals.hexo_version = this.env.version;
+  locals.hexo_version = env.version;
   locals.next_version = require(path.normalize('../../package.json')).version;
   // Language & Config
-  locals.title = __('title') !== 'title' && __('title') || config.title;
-  locals.subtitle = __('subtitle') !== 'subtitle' && __('subtitle') || config.subtitle;
-  locals.author = __('author') !== 'author' && __('author') || config.author;
-  locals.description = __('description') !== 'description' && __('description') || config.description;
-  // Current year
-  locals.copyright_year = new Date().getFullYear();
+  locals.title = __('title') !== 'title' ? __('title') : config.title;
+  locals.subtitle = __('subtitle') !== 'subtitle' ? __('subtitle') : config.subtitle;
+  locals.author = __('author') !== 'author' ? __('author') : config.author;
+  locals.description = __('description') !== 'description' ? __('description') : config.description;
   // PJAX
-  locals.pjax = this.theme.config.pjax ? ' pjax' : '';
+  locals.pjax = theme.pjax ? ' pjax' : '';
 });
diff --git a/scripts/filters/post.js b/scripts/filters/post.js
new file mode 100644
index 0000000000..5e09ae3401
--- /dev/null
+++ b/scripts/filters/post.js
@@ -0,0 +1,77 @@
+/* global hexo */
+
+'use strict';
+
+hexo.extend.filter.register('after_post_render', data => {
+  const { config } = hexo;
+  const theme = hexo.theme.config;
+  const filters = {
+    excerpt : theme.auto_excerpt && theme.auto_excerpt.enable && data.excerpt === '',
+    exturl  : theme.exturl,
+    lazyload: theme.lazyload
+  };
+  if (!filters.excerpt && !filters.exturl && !filters.lazyload) {
+    return;
+  }
+  const cheerio = require('cheerio');
+  const $ = cheerio.load(data.content, {
+    decodeEntities: false
+  });
+  if (filters.lazyload) {
+    $('img').each((i, o) => {
+      let src = $(o).attr('src');
+      $(o).attr('data-src', src).removeAttr('src');
+    });
+  }
+  if (filters.exturl) {
+    const url = require('url');
+    var siteHost = url.parse(config.url).hostname || config.url;
+
+    $('a').each((i, o) => {
+      var href = $(o).attr('href');
+      // Exit if the href attribute doesn't exists.
+      if (!href) return;
+
+      var data = url.parse(href);
+
+      // Exit if the url has same host with `config.url`, which means it's an internal link
+      if (!data.protocol || data.hostname === siteHost) return;
+
+      // If title atribute filled, set it as title; if not, set url as title.
+      var title = $(o).attr('title') || href;
+
+      var encoded = Buffer.from(href).toString('base64');
+
+      $(o).replaceWith(() => {
+        return $(`<span class="exturl" data-url="${encoded}" title="${title}">${$(o).html()}<i class="fa fa-external-link"></i></span>`);
+      });
+    });
+  }
+  if (filters.excerpt) {
+    const elements = $.root().children();
+    const _$ = cheerio.load('', {
+      decodeEntities: false
+    });
+    var length = 0;
+    elements.each((i, o) => {
+      if (length > theme.auto_excerpt.length) {
+        return;
+      }
+      length += $(o).text().length;
+      _$.root().append($(o).remove());
+    });
+
+    if ($.root().children().length) {
+      data.excerpt = _$.html();
+      data.more = $.html();
+      data.content = data.excerpt + '<a id="more"></a>' + data.more;
+    } else {
+      data.excerpt = '';
+      data.content = _$.html();
+      data.more = data.content;
+    }
+  } else {
+    data.content = $.html();
+  }
+
+}, 20);
diff --git a/scripts/helpers/engine.js b/scripts/helpers/engine.js
index 149a5afd46..485a39e799 100644
--- a/scripts/helpers/engine.js
+++ b/scripts/helpers/engine.js
@@ -26,8 +26,7 @@ hexo.extend.helper.register('next_vendors', function(url) {
 hexo.extend.helper.register('post_edit', function(src) {
   const theme = hexo.theme.config;
   if (!theme.post_edit.enable) return '';
-  const editIcon = '<i class="fa fa-pencil"></i>';
-  return this.next_url(theme.post_edit.url + src, editIcon, {
+  return this.next_url(theme.post_edit.url + src, '<i class="fa fa-pencil"></i>', {
     class: 'post-edit-link',
     title: this.__('post.edit')
   });
diff --git a/scripts/helpers/next-url.js b/scripts/helpers/next-url.js
index bf124bf746..54fe75f949 100644
--- a/scripts/helpers/next-url.js
+++ b/scripts/helpers/next-url.js
@@ -1,7 +1,3 @@
-/**
- * next-url.js | https://theme-next.org/api/helpers/next-url/
- */
-
 /* global hexo */
 
 'use strict';
diff --git a/scripts/renderer.js b/scripts/renderer.js
index a462f4cd48..2bedcf5544 100644
--- a/scripts/renderer.js
+++ b/scripts/renderer.js
@@ -7,11 +7,9 @@ const path = require('path');
 
 function njkCompile(data) {
   const templateDir = path.dirname(data.path);
-  const config = Object.assign({
-    autoescape: false,
-    watch: false
-  }, hexo.config.nunjucks);
-  const env = nunjucks.configure(templateDir, config);
+  const env = nunjucks.configure(templateDir, {
+    autoescape: false
+  });
   env.addFilter('attr', function(dictionary, key, value) {
     dictionary[key] = value;
     return dictionary;
@@ -32,8 +30,8 @@ njkRenderer.compile = function(data) {
   // Need a closure to keep the compiled template.
   return function(locals, callback) {
     return compiledTemplate.render(locals, callback);
-  }
-}
+  };
+};
 
 hexo.extend.renderer.register('njk', 'html', njkRenderer);
 hexo.extend.renderer.register('swig', 'html', njkRenderer);