diff --git a/_config.yml b/_config.yml
index 33db71b..6be4cdb 100644
--- a/_config.yml
+++ b/_config.yml
@@ -5,7 +5,7 @@ header-color: "#208c5b"
 tagline: "cn"  
 description: "ZKer|读而立·写而生"  
 baseurl: ""
-url: "./"
+url: "http://sparon.github.io"
 
 # About/contact
 owner: 
@@ -63,5 +63,3 @@ google_verify:
 bing_verify:
 
 # Links to include in footer navigation
-
-theme: jekyll-theme-cayman
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 2952256..28102d2 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -96,7 +96,7 @@
 </footer>
 
 <!-- Custom Theme JavaScript -->
-<script src="{{ "/js/clean-blog.min.js " | prepend: site.baseurl }}"></script>
+<script src="{{ site.baseurl }}{{ "/js/clean-blog.min.js " }}"></script>
 
 <!-- Highlight.js -->
 <script type="text/javascript">
diff --git a/_includes/head.html b/_includes/head.html
index a45dfbd..869559a 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -7,19 +7,19 @@
 
     <title>{% if page.title %}{{ page.title }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
 
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+    <link rel="canonical" href="{{ site.baseurl }}">
 
     <!-- Icons -->
     <link rel="shortcut icon" href="img/favicon.ico">
 
     <!-- Bootstrap Core CSS -->
-    <link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ site.baseurl }}{{ "/css/bootstrap.min.css" }}">
 
     <!-- Custom CSS -->
-    <link rel="stylesheet" href="{{ "/css/clean-blog.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ site.baseurl }}{{ "/css/clean-blog.css" }}">
 
     <!-- Pygments Github CSS -->
-    <link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ site.baseurl }}{{ "/css/syntax.css" }}">
 
     <!-- Custom Fonts -->
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
@@ -34,10 +34,10 @@
     <![endif]-->
 
     <!-- jQuery -->
-    <script src="{{ "/js/jquery.min.js " | prepend: site.baseurl }}"></script>
+    <script src="{{ site.baseurl }}{{ "/js/jquery.min.js " }}"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{{ "/js/bootstrap.min.js " | prepend: site.baseurl }}"></script>
+    <script src="{{ site.baseurl }}{{ "/js/bootstrap.min.js " }}"></script>
 
     <!-- async load function -->
     <script>