diff --git a/layout/_partial/after_footer.jade b/layout/_partial/after_footer.pug
similarity index 100%
rename from layout/_partial/after_footer.jade
rename to layout/_partial/after_footer.pug
diff --git a/layout/_partial/comments.jade b/layout/_partial/comments.pug
similarity index 100%
rename from layout/_partial/comments.jade
rename to layout/_partial/comments.pug
diff --git a/layout/_partial/footer.jade b/layout/_partial/footer.pug
similarity index 100%
rename from layout/_partial/footer.jade
rename to layout/_partial/footer.pug
diff --git a/layout/_partial/head.jade b/layout/_partial/head.pug
similarity index 100%
rename from layout/_partial/head.jade
rename to layout/_partial/head.pug
diff --git a/layout/_partial/helpers.jade b/layout/_partial/helpers.pug
similarity index 100%
rename from layout/_partial/helpers.jade
rename to layout/_partial/helpers.pug
diff --git a/layout/_partial/mathjax.jade b/layout/_partial/mathjax.pug
similarity index 100%
rename from layout/_partial/mathjax.jade
rename to layout/_partial/mathjax.pug
diff --git a/layout/_partial/mathjax2.jade b/layout/_partial/mathjax2.pug
similarity index 100%
rename from layout/_partial/mathjax2.jade
rename to layout/_partial/mathjax2.pug
diff --git a/layout/_partial/paginator.jade b/layout/_partial/paginator.pug
similarity index 100%
rename from layout/_partial/paginator.jade
rename to layout/_partial/paginator.pug
diff --git a/layout/_partial/post_nav.jade b/layout/_partial/post_nav.pug
similarity index 100%
rename from layout/_partial/post_nav.jade
rename to layout/_partial/post_nav.pug
diff --git a/layout/_partial/tag.jade b/layout/_partial/tag.pug
similarity index 100%
rename from layout/_partial/tag.jade
rename to layout/_partial/tag.pug
diff --git a/layout/_partial/totop.jade b/layout/_partial/totop.pug
similarity index 100%
rename from layout/_partial/totop.jade
rename to layout/_partial/totop.pug
diff --git a/layout/_widget/category.jade b/layout/_widget/category.pug
similarity index 100%
rename from layout/_widget/category.jade
rename to layout/_widget/category.pug
diff --git a/layout/_widget/links.jade b/layout/_widget/links.pug
similarity index 100%
rename from layout/_widget/links.jade
rename to layout/_widget/links.pug
diff --git a/layout/_widget/recent_comments.jade b/layout/_widget/recent_comments.pug
similarity index 100%
rename from layout/_widget/recent_comments.jade
rename to layout/_widget/recent_comments.pug
diff --git a/layout/_widget/recent_posts.jade b/layout/_widget/recent_posts.pug
similarity index 100%
rename from layout/_widget/recent_posts.jade
rename to layout/_widget/recent_posts.pug
diff --git a/layout/_widget/search.jade b/layout/_widget/search.pug
similarity index 100%
rename from layout/_widget/search.jade
rename to layout/_widget/search.pug
diff --git a/layout/_widget/tag.jade b/layout/_widget/tag.pug
similarity index 100%
rename from layout/_widget/tag.jade
rename to layout/_widget/tag.pug
diff --git a/layout/archive.jade b/layout/archive.pug
similarity index 95%
rename from layout/archive.jade
rename to layout/archive.pug
index 226bbb0b4..f3da2c8da 100644
--- a/layout/archive.jade
+++ b/layout/archive.pug
@@ -21,4 +21,4 @@ block content
                 span.date= post.date.format('YYYY/MM/DD')
                 a(href=url_for(post.path), title=post.title)
                   +title(post)
-  include _partial/paginator.jade
+  include _partial/paginator.pug
diff --git a/layout/base-without-sidebar.jade b/layout/base-without-sidebar.pug
similarity index 81%
rename from layout/base-without-sidebar.jade
rename to layout/base-without-sidebar.pug
index b66192723..f9a6ba630 100644
--- a/layout/base-without-sidebar.jade
+++ b/layout/base-without-sidebar.pug
@@ -1,4 +1,4 @@
-include _partial/helpers
+include _partial/helpers.pug
 
 if page.title
   - var current_title = page.title
@@ -16,7 +16,7 @@ if config.feed
 doctype html
 html(lang='#{config.language}')
 
-  include _partial/head
+  include _partial/head.pug
 
   body: .body_container
     #header
@@ -32,7 +32,7 @@ html(lang='#{config.language}')
       .pure-u-1.pure-u-md-4-4: .content_container
         block content
       .pure-u-1.pure-u-md-4-4
-        != partial('_partial/footer.jade')
+        != partial('_partial/footer.pug')
 
-    include _partial/totop
-    include _partial/after_footer
+    include _partial/totop.pug
+    include _partial/after_footer.pug
diff --git a/layout/base.jade b/layout/base.pug
similarity index 73%
rename from layout/base.jade
rename to layout/base.pug
index c02b94c01..6d73a496f 100644
--- a/layout/base.jade
+++ b/layout/base.pug
@@ -1,4 +1,4 @@
-include _partial/helpers
+include _partial/helpers.pug
 
 if page.title
   - var current_title = page.title
@@ -16,7 +16,7 @@ if config.feed
 doctype html
 html(lang='#{config.language}')
 
-  include _partial/head
+  include _partial/head.pug
 
   body: .body_container
     #header
@@ -34,13 +34,13 @@ html(lang='#{config.language}')
       if theme.widgets_on_small_screens
         .pure-u-1.pure-u-md-1-4: #sidebar
           each item in theme.widgets
-            != partial('_widget/' + item + '.jade', null, {cache: !config.relative_link})
+            != partial('_widget/' + item + '.pug', null, {cache: !config.relative_link})
       else
         .pure-u-1-4.hidden_mid_and_down: #sidebar
           each item in theme.widgets
-            != partial('_widget/' + item + '.jade', null, {cache: !config.relative_link})
+            != partial('_widget/' + item + '.pug', null, {cache: !config.relative_link})
       .pure-u-1.pure-u-md-3-4
-        != partial('_partial/footer.jade')
+        != partial('_partial/footer.pug')
 
-    include _partial/totop
-    include _partial/after_footer
+    include _partial/totop.pug
+    include _partial/after_footer.pug
diff --git a/layout/index.jade b/layout/index.pug
similarity index 88%
rename from layout/index.jade
rename to layout/index.pug
index 94f546c4e..c65d39cb0 100644
--- a/layout/index.jade
+++ b/layout/index.pug
@@ -1,17 +1,16 @@
 extends base
-- var current_title = page.title || tag.name || category.name || site.title
 
-block title
+block title 
   if config.subtitle
     title= config.title + ' | ' + config.subtitle
   else
     title= config.title
-block content
 
+block content
   for post in page.posts.toArray()
     .post
       h1.post-title
-        include _partial/helpers
+        include _partial/helpers.pug
         a(href=url_for(post.path))
           +title(post)
       .post-meta= post.date.format(config.date_format)
@@ -45,12 +44,12 @@ block content
       p(class='readmore')
         a(href=url_for(post.path))= __('Readmore')
 
-  include _partial/paginator
+  include _partial/paginator.pug
   if theme.disqus
     script(id='dsq-count-scr', src='//#{theme.disqus}.disqus.com/count.js', async)
   if theme.changyan
     script#cy_cmt_num(src='https://changyan.sohu.com/upload/plugins/plugins.list.count.js?clientId=cyt4LaybM', async)
   if config.mathjax
-    include _partial/mathjax
+    include _partial/mathjax.pug
   if config.mathjax2
-    include _partial/mathjax2
+    include _partial/mathjax2.pug
diff --git a/layout/page.jade b/layout/page.pug
similarity index 94%
rename from layout/page.jade
rename to layout/page.pug
index 46ee6a5da..f0b82ba43 100644
--- a/layout/page.jade
+++ b/layout/page.pug
@@ -9,5 +9,5 @@ block content
   if page.donate
       iframe(src='/donate/?AliPayQR=#{theme.donate.alipay_qr}&WeChatQR=#{theme.donate.wechat_qr}&GitHub=#{theme.donate.github}&BTCQR=#{theme.donate.btc_qr}&BTCKEY=#{theme.donate.btc_key}&PayPal=#{theme.donate.paypal_url}',style='overflow-x:hidden;overflow-y:hidden; border:0xp none #fff; min-height:240px; width:100%;',frameborder='0',scrolling='no')
   if page.comments
-    include _partial/comments
+    include _partial/comments.pug
 
diff --git a/layout/post.jade b/layout/post.pug
similarity index 89%
rename from layout/post.jade
rename to layout/post.pug
index 0fbcb6f99..0ab030b6a 100644
--- a/layout/post.jade
+++ b/layout/post.pug
@@ -39,10 +39,10 @@ block content
       iframe(src='/donate/?AliPayQR=#{theme.donate.alipay_qr}&WeChatQR=#{theme.donate.wechat_qr}&GitHub=#{theme.donate.github}&BTCQR=#{theme.donate.btc_qr}&BTCKEY=#{theme.donate.btc_key}&PayPal=#{theme.donate.paypal_url}',style='overflow-x:hidden;overflow-y:hidden; border:0xp none #fff; min-height:240px; width:100%;',frameborder='0',scrolling='no')
     if theme.shareto == true
       script(type='text/javascript', src=url_for(theme.js) + '/share.js' + '?v=' + theme.version, async)
-      a.article-share-link(data-url='#{page.permalink}', data-id='#{page._id}', data-qrcode=qrcode(page.permalink))= __('shareto')
+      a.article-share-link(data-url=page.permalink, data-id=page._id, data-qrcode=qrcode(page.permalink))= __('shareto')
 
-    include _partial/tag
-    include _partial/post_nav
+    include _partial/tag.pug
+    include _partial/post_nav.pug
 
     if page.comments
-      include _partial/comments
+      include _partial/comments.pug
diff --git a/layout/single-column.jade b/layout/single-column.pug
similarity index 85%
rename from layout/single-column.jade
rename to layout/single-column.pug
index f6f1a896f..ff8c2f76b 100644
--- a/layout/single-column.jade
+++ b/layout/single-column.pug
@@ -7,4 +7,4 @@ block content
     .post-content
       != page.content
   if page.comments
-    include _partial/comments
+    include _partial/comments.pug
diff --git a/layout/timeline.jade b/layout/timeline.pug
similarity index 96%
rename from layout/timeline.jade
rename to layout/timeline.pug
index f70ae2134..6d3fb3e06 100644
--- a/layout/timeline.jade
+++ b/layout/timeline.pug
@@ -25,5 +25,5 @@ block content
                           span.word= theme.timeline[i].word
 
   if page.comments
-    include _partial/comments
+    include _partial/comments.pug
 
diff --git a/package.json b/package.json
index c4423d4e0..3924613c8 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "hexo-generator-index": "^0.1.0",
     "hexo-generator-tag": "^0.1.0",
     "hexo-renderer-ejs": "^0.1.0",
-    "hexo-renderer-jade": "^0.1.0",
+    "hexo-renderer-pug": "^0.0.5",
     "hexo-renderer-marked": "^0.2.4",
     "hexo-renderer-sass": "^0.1.2",
     "hexo-renderer-stylus": "^0.2.3",