diff --git a/layout/_partial/Paradox-post-thumbnail.ejs b/layout/_partial/Paradox-post-thumbnail.ejs
index 56a9393f7..1eefb8183 100644
--- a/layout/_partial/Paradox-post-thumbnail.ejs
+++ b/layout/_partial/Paradox-post-thumbnail.ejs
@@ -1,4 +1,4 @@
-<script type="text/ls-javascript" id="thumbnail-script">
+<script type="text/ls-javascript" id="post-thumbnail-script">
     var randomNum = Math.floor(Math.random() * <%= theme.thumbnail.random_amount %> + 1);
 
     $('.post_thumbnail-random').attr('data-original', '<%= theme.img.random_thumbnail %>' + randomNum + '.png');
diff --git a/layout/_partial/config_css.ejs b/layout/_partial/config_css.ejs
index 5707949a9..a5cc08fcd 100644
--- a/layout/_partial/config_css.ejs
+++ b/layout/_partial/config_css.ejs
@@ -15,6 +15,14 @@
     src: url(<%- config.root %>fonts/MaterialIcons-Regular.woff2) format('woff2'), url(<%- config.root %>fonts/MaterialIcons-Regular.woff) format('woff'), url(<%- config.root %>fonts/MaterialIcons-Regular.ttf) format('truetype')
   }
 
+  @font-face {
+    font-family: 'FontAwesome';
+    src: url(<%- config.root %>fonts/fontawesome-webfont.eot?v=4.5.0);
+    src: url(<%- config.root %>fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format('embedded-opentype'), url(../fonts/fontawesome-webfont.woff2?v=4.5.0) format('woff2'), url(../fonts/fontawesome-webfont.woff?v=4.5.0) format('woff'), url(../fonts/fontawesome-webfont.ttf?v=4.5.0) format('truetype'), url(../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format('svg');
+    font-weight: 400;
+    font-style: normal
+  }
+
   a {
     color: <%= theme.uiux.hyperlink_color %>;
   }
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index 54219f800..6902c99d0 100644
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -99,7 +99,7 @@
         <% } %>
     <![endif]-->
 
-    <%- jsHex('js/lsloader') %>
+    <%- jsHex('js/lsloader.min') %>
 
     <!-- Import CSS & jQuery -->
     <% if(theme.materialcdn.use === true) { %>
diff --git a/layout/_partial/import_js.ejs b/layout/_partial/import_js.ejs
index 4479c36c3..ab7ebc183 100644
--- a/layout/_partial/import_js.ejs
+++ b/layout/_partial/import_js.ejs
@@ -12,7 +12,7 @@
 
 <% if( theme.js_effect.smoothscroll === true ) { %>
     <% if(theme.materialcdn.use === true) { %>
-        j<%- sLsload(theme.materialcdn.base + "/js/smoothscroll.js") %>
+        <%- jsLsload(theme.materialcdn.base + "/js/smoothscroll.js") %>
     <%}else{%>
         <%- jsLsload('js/smoothscroll') %>
     <%}%>
@@ -30,7 +30,7 @@
     <% if( theme.search.use === 'local' ) { %>
         <%- partial('_widget/search-local-js') %>
 
-        <script type="text/ls-javascript" id="search-input">
+        <script type="text/ls-javascript" id="search-input-script">
             var inputArea = document.querySelector('#search');
             var getSearchFile = function() {
                 var path = '<%= config.search.path %>';
@@ -47,30 +47,6 @@
 <% } %>
 
 <!-- UC Browser Compatible -->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-<script>
-    var agent = navigator.userAgent.toLowerCase();
-    if(agent.indexOf('ucbrowser')>0) {
-        document.write("<%- css('css/uc').replace(/\"/g,"\\\"") %>");
-        alert('由于 UC 浏览器使用极旧的内核，而本网站使用了一些新的特性。\n为了您能更好的浏览，推荐使用 Chrome 或 Firefox 浏览器。');
-    }
-</script>
-
-<!-- Window Load-->
->>>>>>> viosey/canary
 <script>
     var agent = navigator.userAgent.toLowerCase();
     if(agent.indexOf('ucbrowser')>0) {
diff --git a/source/css/style.css b/source/css/style.css
index 2d31a8f66..15c36e45f 100644
--- a/source/css/style.css
+++ b/source/css/style.css
@@ -2648,25 +2648,6 @@ a {
     }
 }
 
-
-
-
-
-/****************/
-/* Font_Awesome */
-/****************/
-/*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@font-face {
-    font-family: 'FontAwesome';
-    src: url(../fonts/fontawesome-webfont.eot?v=4.5.0);
-    src: url(../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format('embedded-opentype'), url(../fonts/fontawesome-webfont.woff2?v=4.5.0) format('woff2'), url(../fonts/fontawesome-webfont.woff?v=4.5.0) format('woff'), url(../fonts/fontawesome-webfont.ttf?v=4.5.0) format('truetype'), url(../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format('svg');
-    font-weight: 400;
-    font-style: normal
-}
 .fa {
     font: normal normal normal 14px/1 FontAwesome;
     font-size: inherit;
diff --git a/source/css/style.min.css b/source/css/style.min.css
index b85f675aa..da6f9abdc 100644
--- a/source/css/style.min.css
+++ b/source/css/style.min.css
@@ -217,11 +217,7 @@ to{transform:rotate(135deg)}}@keyframes status-inactive{from{transform:rotate(13
 #nprogress .spinner{display:block;position:fixed;z-index:10;top:15px;right:15px}.fa,.fa-stack{display:inline-block}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}
 .nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}
 @-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0)}
-100%{transform:rotate(360deg)}}/*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url(./fonts/fontawesome-webfont.eot?v=4.5.0);src:url(./fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format('embedded-opentype'),url(./fonts/fontawesome-webfont.woff2?v=4.5.0) format('woff2'),url(./fonts/fontawesome-webfont.woff?v=4.5.0) format('woff'),url(./fonts/fontawesome-webfont.ttf?v=4.5.0) format('truetype'),url(./fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal}
-.fa{font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}
+100%{transform:rotate(360deg)}}.fa{font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}
 .fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}
 .fa.fa-pull-right,.fa.pull-right{margin-left:.3em}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}
 .fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right,.pull-right{float:right}
diff --git a/source/js/lsloader.js b/source/js/lsloader.js
index 50bad7768..4961e44d4 100644
--- a/source/js/lsloader.js
+++ b/source/js/lsloader.js
@@ -383,6 +383,7 @@
         this.runjs();
     }
 
-})()/**
- * Created by yanghuanyu on 16/3/19.
+})()/** !
+ * Created by EYHN on 2017/4/17.
+ * 修改自 sexdevil/LSLoader https://github.com/sexdevil/LSLoader
  */
\ No newline at end of file
diff --git a/source/js/lsloader.min.js b/source/js/lsloader.min.js
new file mode 100644
index 000000000..3e051d80d
--- /dev/null
+++ b/source/js/lsloader.min.js
@@ -0,0 +1 @@
+!function(){var e="http://"+location.host+"/combo?combo=";window.lsloader={jsRunSequence:[],jsnamemap:{},cssnamemap:{}},lsloader.removeLS=function(e){try{localStorage.removeItem(e)}catch(e){}},lsloader.setLS=function(e,t){try{localStorage.setItem(e,t)}catch(e){}},lsloader.getLS=function(e){var t="";try{t=localStorage.getItem(e)}catch(e){t=""}return t},lsloader.load=function(e,t,s){s=s||function(){};var n;if(n=this.getLS(e),!/\/\*codestartv1\*\//.test(n))return this.removeLS(e),void this.requestResource(e,t,s);if(n){var a=n.split("/*codestartv1*/")[0];if(a!=t)return console.log("reload:"+t),this.removeLS(e),void this.requestResource(e,t,s);n=n.split("/*codestartv1*/")[1],/\.js?.+$/.test(a)?(this.jsRunSequence.push({name:e,code:n}),this.runjs(t,e,n)):(document.getElementById(e).appendChild(document.createTextNode(n)),s())}else this.requestResource(e,t,s)},lsloader.requestResource=function(e,t,s){var n=this;/\.js?.+$/.test(t)?this.iojs(t,e,function(e,t,s){n.setLS(t,e+"/*codestartv1*/"+s),n.runjs(e,t,s)}):/\.css?.+$/.test(t)&&this.iocss(t,e,function(s){document.getElementById(e).appendChild(document.createTextNode(s)),n.setLS(e,t+"/*codestartv1*/"+s)},s)},lsloader.iojs=function(e,t,s){var n=this;n.jsRunSequence.push({name:t,code:""});try{var a=new XMLHttpRequest;a.open("get",e,!0),a.onreadystatechange=function(){if(4==a.readyState){if((a.status>=200&&a.status<300||304==a.status)&&""!=a.response)return void s(e,t,a.response);n.jsfallback(e,t)}},a.send(null)}catch(s){n.jsfallback(e,t)}},lsloader.iocss=function(e,t,s,n){var a=this;try{var u=new XMLHttpRequest;u.open("get",e,!0),u.onreadystatechange=function(){if(4==u.readyState){if((u.status>=200&&u.status<300||304==u.status)&&""!=u.response)return s(u.response),void n();a.cssfallback(e,t,n)}},u.send(null)}catch(s){a.cssfallback(e,t,n)}},lsloader.iofonts=function(e,t,s,n){var a=this;try{var u=new XMLHttpRequest;u.open("get",e,!0),u.onreadystatechange=function(){if(4==u.readyState){if((u.status>=200&&u.status<300||304==u.status)&&""!=u.response)return s(u.response),void n();a.cssfallback(e,t,n)}},u.send(null)}catch(s){a.cssfallback(e,t,n)}},lsloader.runjs=function(e,t,s){if(t&&s)for(var n in this.jsRunSequence)this.jsRunSequence[n].name==t&&(this.jsRunSequence[n].code=s);if(this.jsRunSequence[0]&&this.jsRunSequence[0].code&&"failed"!=this.jsRunSequence[0].status){var a=document.createElement("script");a.appendChild(document.createTextNode(this.jsRunSequence[0].code)),a.type="text/javascript",document.getElementsByTagName("head")[0].appendChild(a),this.jsRunSequence.shift(),this.jsRunSequence.length>0&&this.runjs()}else if(this.jsRunSequence[0]&&"failed"==this.jsRunSequence[0].status){var u=this,a=document.createElement("script");a.src=this.jsRunSequence[0].path,a.type="text/javascript",this.jsRunSequence[0].status="loading",a.onload=function(){u.jsRunSequence.shift(),u.jsRunSequence.length>0&&u.runjs()},document.body.appendChild(a)}},lsloader.tagLoad=function(e,t){this.jsRunSequence.push({name:t,code:"",path:e,status:"failed"}),this.runjs()},lsloader.jsfallback=function(e,t){if(!this.jsnamemap[t]){this.jsnamemap[t]=t;for(var s in this.jsRunSequence)this.jsRunSequence[s].name==t&&(this.jsRunSequence[s].code="",this.jsRunSequence[s].status="failed",this.jsRunSequence[s].path=e);this.runjs()}},lsloader.cssfallback=function(e,t,s){if(!this.cssnamemap[t]){this.cssnamemap[t]=1;var n=document.createElement("link");n.type="text/css",n.href=e,n.rel="stylesheet",n.onload=n.onerror=s;var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(n,a)}},lsloader.runInlineScript=function(e,t){var s=document.getElementById(t).innerText;this.jsRunSequence.push({name:e,code:s}),this.runjs()},lsloader.loadCombo=function(t){var s="",n={};for(var a in t){var u=this.getLS(t[a].name);if(u)var o=u.split("/*codestartv1*/")[0],c=u.split("/*codestartv1*/")[1];else var o="";o==t[a].path?this.jsRunSequence.push({name:t[a].name,code:c,path:t[a].path}):(this.jsRunSequence.push({name:t[a].name,code:null,path:t[a].path,status:"comboloading"}),n[t[a].name]=!0,s+=(""==s?"":";")+t[a].path)}var i=this;if(s){var r=new XMLHttpRequest;r.open("get",e+s,!0),r.onreadystatechange=function(){if(4==r.readyState)if(r.status>=200&&r.status<300||304==r.status){if(""!=r.response)return void i.runCombo(r.response,n)}else{for(var e in i.jsRunSequence)n[i.jsRunSequence[e].name]&&(i.jsRunSequence[e].status="failed");i.runjs()}},r.send(null)}this.runjs()},lsloader.runCombo=function(e,t){e=e.split("/*combojs*/"),e.shift();for(var s in this.jsRunSequence)t[this.jsRunSequence[s].name]&&e[0]&&(this.jsRunSequence[s].status="comboJS",this.jsRunSequence[s].code=e[0],this.setLS(this.jsRunSequence[s].name,this.jsRunSequence[s].path+"/*codestartv1*/"+e[0]),e.shift());this.runjs()}}();
\ No newline at end of file