diff --git a/_config.yml b/_config.yml
index d692d50..475f136 100644
--- a/_config.yml
+++ b/_config.yml
@@ -936,3 +936,9 @@ vendors:
 
   # Canvas ribbon
   canvas_ribbon:
+
+# Assets
+# Accelerate delivery of static files using a CDN
+css: css
+js: js
+images: images
diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk
index 20c9282..891be3e 100644
--- a/layout/_macro/post.njk
+++ b/layout/_macro/post.njk
@@ -9,7 +9,7 @@
     <link itemprop="mainEntityOfPage" href="{{ post.permalink }}">
 
     <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
-      <meta itemprop="image" content="{{ url_for(theme.avatar.url or 'images/avatar.gif') }}">
+      <meta itemprop="image" content="{{ url_for(theme.avatar.url or theme.images + '/avatar.gif') }}">
       <meta itemprop="name" content="{{ author }}">
       <meta itemprop="description" content="{{ description }}">
     </span>
diff --git a/layout/_partials/head/head.njk b/layout/_partials/head/head.njk
index 1adb5f3..949a476 100644
--- a/layout/_partials/head/head.njk
+++ b/layout/_partials/head/head.njk
@@ -38,7 +38,7 @@
   <meta name="baidu-site-verification" content="{{ theme.baidu_site_verification }}">
 {%- endif %}
 
-<link rel="stylesheet" href="{{ url_for('css/main.css') }}">
+<link rel="stylesheet" href="{{ url_for(theme.css) }}/main.css">
 
 {{ next_font() }}
 
diff --git a/layout/_partials/sidebar/site-overview.njk b/layout/_partials/sidebar/site-overview.njk
index 5faedd6..73fa566 100644
--- a/layout/_partials/sidebar/site-overview.njk
+++ b/layout/_partials/sidebar/site-overview.njk
@@ -89,7 +89,7 @@
 
 {%- if theme.creative_commons.license and theme.creative_commons.sidebar %}
   <div class="cc-license site-overview-item animated" itemprop="license">
-  {%- set ccImage = '<img src="' + url_for('images/cc-' + theme.creative_commons.license + '.svg') + '" alt="Creative Commons">' %}
+  {%- set ccImage = '<img src="' + url_for(theme.images + '/cc-' + theme.creative_commons.license + '.svg') + '" alt="Creative Commons">' %}
     {{ next_url(ccURL, ccImage, {class: 'cc-opacity'}) }}
   </div>
 {%- endif %}
diff --git a/scripts/helpers/engine.js b/scripts/helpers/engine.js
index e20afdc..e4a0597 100644
--- a/scripts/helpers/engine.js
+++ b/scripts/helpers/engine.js
@@ -19,7 +19,7 @@ hexo.extend.helper.register('next_js', function(file, pjax = false) {
   const { next_version } = this;
   const { internal } = this.theme.vendors;
   const links = {
-    local   : this.url_for(`js/${file}`),
+    local   : this.url_for(`${this.theme.js}/${file}`),
     jsdelivr: `//cdn.jsdelivr.net/npm/hexo-theme-next@${next_version}/source/js/${file}`,
     unpkg   : `//unpkg.com/hexo-theme-next@${next_version}/source/js/${file}`,
     cdnjs   : `//cdnjs.cloudflare.com/ajax/libs/hexo-theme-next/${next_version}/${file}`
@@ -60,9 +60,9 @@ hexo.extend.helper.register('post_gallery', function(photos) {
 });
 
 hexo.extend.helper.register('post_edit', function(src) {
-  const { theme } = this;
-  if (!theme.post_edit.enable) return '';
-  return this.next_url(theme.post_edit.url + src, '<i class="fa fa-pen-nib"></i>', {
+  const { post_edit } = this.theme;
+  if (!post_edit.enable) return '';
+  return this.next_url(post_edit.url + src, '<i class="fa fa-pen-nib"></i>', {
     class: 'post-edit-link',
     title: this.__('post.edit')
   });
diff --git a/scripts/helpers/next-config.js b/scripts/helpers/next-config.js
index 010a5ce..36819bb 100644
--- a/scripts/helpers/next-config.js
+++ b/scripts/helpers/next-config.js
@@ -8,10 +8,11 @@ const { parse } = require('url');
  * Export theme config to js
  */
 hexo.extend.helper.register('next_config', function() {
-  const { config, theme, __ } = this;
+  const { config, theme, url_for, __ } = this;
   const exportConfig = {
     hostname  : parse(config.url).hostname || config.url,
     root      : config.root,
+    images    : url_for(theme.images),
     scheme    : theme.scheme,
     version   : this.next_version,
     exturl    : theme.exturl,
@@ -41,7 +42,7 @@ hexo.extend.helper.register('next_config', function() {
     };
   }
   if (config.search && theme.local_search && theme.local_search.enable) {
-    exportConfig.path = this.url_for(config.search.path);
+    exportConfig.path = url_for(config.search.path);
     exportConfig.localsearch = theme.local_search;
   }
   return `<script class="hexo-configurations">
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index 7ebaebe..a8304d4 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -43,7 +43,7 @@ document.addEventListener('DOMContentLoaded', () => {
             .replace(/\$\{hits}/, data.nbHits)
             .replace(/\$\{time}/, data.processingTimeMS);
           return `<span>${stats}</span>
-            <img src="${CONFIG.root}images/logo-algolia-nebula-blue-full.svg" alt="Algolia">`;
+            <img src="${CONFIG.images}/logo-algolia-nebula-blue-full.svg" alt="Algolia">`;
         }
       },
       cssClasses: {