diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2fd8d7c..a39bba9 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -9,7 +9,7 @@
             <span class="archive-category">{{ .Title }}</span>
         </div>
         <div class="archives">
-            {{ $paginator := .Paginate .Data.Pages }}
+            {{ $paginator := .Paginate .Site.RegularPages }}
             {{ range $paginator.Pages }}
                 {{ .Render "summary" }} 
             {{ end }}
@@ -17,4 +17,4 @@
     </section>
     {{ partial "pagination" . }}
     {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html
index 739af86..1990a3c 100644
--- a/layouts/partials/article_footer.html
+++ b/layouts/partials/article_footer.html
@@ -1,5 +1,5 @@
 <footer class="article-footer">
-    <a data-url="{{ .Permalink }}" data-id="{{ .UniqueID }}" class="article-share-link">
+	<a data-url="{{ .Permalink }}" data-id="{{ with .File }} {{ .UniqueID }} {{ end }} " class="article-share-link">
         <i class="fa fa-share"></i>
         {{with .Site.Data.l10n.articles.share}}{{.}}{{end}}
     </a>
diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html
index 37d4581..e2b79e6 100644
--- a/layouts/partials/article_list.html
+++ b/layouts/partials/article_list.html
@@ -1,4 +1,4 @@
-{{ $paginator := .Paginate (where .Data.Pages "Section" "in" .Site.Params.mainSections) }}
+{{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
 {{ range $paginator.Pages }}
 <article class="article article-type-post" itemscope="" itemprop="blogPost">
     <div class="article-inner">
@@ -24,4 +24,4 @@
 </article>
 {{ end }}
 
-{{ partial "pagination" . }}
\ No newline at end of file
+{{ partial "pagination" . }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2348be8..86044f7 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -2,7 +2,7 @@
 <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
 <head>
     <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }} &middot; {{ .Site.Title }}{{ end }}</title>
-    {{ .Hugo.Generator }}
+    {{ hugo.Generator }}
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
@@ -11,7 +11,7 @@
     {{ else }}
       <meta name="description" content="{{ .Site.Params.site_description }}">
     {{ end }}
-    {{ with .RSSLink }}
+    {{ with .RelPermalink }}
       <link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
       <link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
     {{ end }}
