diff --git a/layout/archive.pug b/layout/archive.pug
index 689a328..e1f1d92 100644
--- a/layout/archive.pug
+++ b/layout/archive.pug
@@ -1,4 +1,4 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
     div#tag
@@ -18,7 +18,7 @@ block content
                     time.article-time(datetime=date_xml(article.date))= date(article.date)
                     a.article-link(href=url_for(article.path))= article.title || 'No Title'
         - })
-    include includes/pagination
+    include includes/pagination.pug
     // - var categoriesList = list_categories({ show_count: false })
     // - var tagsList = list_tags({ show_count: false })
     // - var archivesList = list_archives({ show_count: false })
@@ -70,6 +70,6 @@ block content
     //                 a(href=url_for(article.path))= article.title || 'No Title'
     //             time(datetime=date_xml(article.date))= date(article.date)
     //         - })
-    //         include includes/pagination
+    //         include includes/pagination.pug
             //div!= paginator()
 
diff --git a/layout/category.pug b/layout/category.pug
index 5ff529f..2520d31 100644
--- a/layout/category.pug
+++ b/layout/category.pug
@@ -1,4 +1,4 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
 
@@ -30,6 +30,6 @@ block content
     //            a(href=url_for(article.path))= article.title || 'No Title'
     //        time(datetime=date_xml(article.date))= date(article.date)
     //    - })
-    include includes/pagination
+    include includes/pagination.pug
     //div!= paginator()
 
diff --git a/layout/includes/footer.pug b/layout/includes/footer.pug
index 69aee0f..359d0c5 100644
--- a/layout/includes/footer.pug
+++ b/layout/includes/footer.pug
@@ -3,10 +3,12 @@
         i.fas.fa-arrow-right
     .right-content
         if theme.busuanzi.enable
-            include ./count/busuanzi
+            include ./count/busuanzi.pug
         - var now = new Date()
         - var nowYear = now.getFullYear()
         if theme.since && theme.since != nowYear
-            .copyright!= `©${theme.since} ～ ${nowYear} By ${config.author}`
+            - let copyrightSince = `©${theme.since} ～ ${nowYear} By ${config.author}`
+            .copyright!= copyrightSince
         else
-            .copyright!= `©${nowYear} By ${config.author}`
+            - let copyright = `©${nowYear} By ${config.author}`
+            .copyright!= copyright
diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug
index ecefbb1..b2ca8f2 100644
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -34,10 +34,10 @@ html(lang=config.language)
     body
         canvas(id="universe")
         //#body
-        include sidebar
+        include sidebar.pug
         #main-container
             header
-                include header
+                include header.pug
             #content-outer
                 #content-inner
                     if body
@@ -47,7 +47,7 @@ html(lang=config.language)
             #return-top.button-hover
                 i.fas.fa-arrow-up(aria-hidden="true")
             footer
-                include footer
+                include footer.pug
         if theme.scripts !== undefined && theme.scripts.length > 0
             //- scripts list from config.yml
             each url in theme.scripts
@@ -55,4 +55,4 @@ html(lang=config.language)
                 script(src=url_for(url))
                 //script(src=url)
         include ./search/index.pug
-        include ./additional-js.pug
\ No newline at end of file
+        include ./additional-js.pug
diff --git a/layout/index.pug b/layout/index.pug
index 641f070..b75619e 100644
--- a/layout/index.pug
+++ b/layout/index.pug
@@ -1,8 +1,8 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
-    include includes/recent-posts
-    include includes/pagination
+    include includes/recent-posts.pug
+    include includes/pagination.pug
 
 
 
diff --git a/layout/page.pug b/layout/page.pug
index 775bf7d..cf0d1c1 100644
--- a/layout/page.pug
+++ b/layout/page.pug
@@ -1,4 +1,4 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
     article#page
@@ -19,5 +19,5 @@ block content
             article.page
                 h1= _p('menu.' + page.title)
                 .about!= page.content
-            include includes/pagination
+            include includes/pagination.pug
         //div!= paginator()
diff --git a/layout/post.pug b/layout/post.pug
index 86d60de..c421677 100644
--- a/layout/post.pug
+++ b/layout/post.pug
@@ -1,4 +1,4 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
     article#post
@@ -25,7 +25,8 @@ block content
                 .post-copyright-author
                     span.post-copyright-meta= _p('post.copyright.author') + ": "
                     span.post-copyright-info
-                        a(href=`mailto:${config.email}`) #[=config.author]
+                        - let mailto = `mailto:${config.email}`
+                        a(href=mailto) #[=config.author]
                 .post-copyright-type
                     span.post-copyright-meta= _p('post.copyright.link') + ": "
                     span.post-copyright-info
@@ -33,5 +34,5 @@ block content
                 .post-copyright-notice
                     span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
                     span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
-    include includes/pagination
+    include includes/pagination.pug
     //div!= paginator()
diff --git a/layout/tag.pug b/layout/tag.pug
index 7b00b8f..f8aea34 100644
--- a/layout/tag.pug
+++ b/layout/tag.pug
@@ -1,4 +1,4 @@
-extends includes/layout
+extends includes/layout.pug
 
 block content
     div#tag
@@ -18,6 +18,6 @@ block content
                     time.article-time(datetime=date_xml(article.date))= date(article.date)
                     a.article-link(href=url_for(article.path))= article.title || 'No Title'
         - })
-    include includes/pagination
+    include includes/pagination.pug
     //div!= paginator()