diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 0718bae..821168f 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -18,7 +18,7 @@
     {{ partial "meta-twitter" . }}
     {{ partial "meta-facebook" . }}
 
-    {{ .Hugo.Generator }}
+    {{ hugo.Generator }}
 
     {{ "<!-- Stylesheets -->" | safeHTML }}
     <link rel="stylesheet" type="text/css" href="{{ "built/screen.css" | absURL}}" /> 
@@ -26,6 +26,6 @@
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" />
     {{ range .Site.Params.customCSS }} <link rel="stylesheet" href="{{ . | absURL }}" /> {{ end }}
 
-    {{ if .Site.Params.RSSLink}}<link href="{{.Site.Params.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{else}}{{ if eq .URL "/" }}<link href="{{ "index.xml" | absURL}}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} {{ end }}
+    {{ if .Site.Params.RSSLink}}<link href="{{.Site.Params.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{else}}{{ if eq .Permalink "/" }}{{ .Name }}  {{ end }} {{ end }}
 
 </head>
diff --git a/layouts/partials/header-sori-tag.html b/layouts/partials/header-sori-tag.html
index 32ddecf..5daaaf5 100644
--- a/layouts/partials/header-sori-tag.html
+++ b/layouts/partials/header-sori-tag.html
@@ -36,11 +36,11 @@
     </nav>  
 
     <div class="site-header-content">
-        <h1 class="site-title">{{.Title}}</h1>{{$.Scratch.Set "total" (len .Data.Pages)}}
+        <h1 class="site-title">{{.Title}}</h1>{{$.Scratch.Set "total" (len .Site.RegularPages )}}
         <h2 class="site-description">
                 {{if ge ($.Scratch.Get "total") 2 }}A collection of {{$.Scratch.Get "total"}} posts
                 {{else}}{{$.Scratch.Get "total"}} post{{end}}
         </h2>
     </div>
   </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/layouts/partials/header-sori-term.html b/layouts/partials/header-sori-term.html
index 06388d1..5387f95 100644
--- a/layouts/partials/header-sori-term.html
+++ b/layouts/partials/header-sori-term.html
@@ -46,4 +46,4 @@ <h2 class="site-description">&#x2F;&nbsp;
         </h2>
     </div>
   </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/layouts/partials/header-sori.html b/layouts/partials/header-sori.html
index b3dcdb7..58edadd 100644
--- a/layouts/partials/header-sori.html
+++ b/layouts/partials/header-sori.html
@@ -36,4 +36,4 @@
     </nav>  
 
   </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 2262936..01613e1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -40,4 +40,4 @@ <h2 class="site-description">{{ .Site.Params.subtitle }} </h2>
     </nav>  
 
   </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/layouts/partials/meta-facebook.html b/layouts/partials/meta-facebook.html
index ad86bc8..e1cd697 100644
--- a/layouts/partials/meta-facebook.html
+++ b/layouts/partials/meta-facebook.html
@@ -1,5 +1,5 @@
 <meta property="og:site_name" content="{{ .Site.Title }}" />
-    <meta property="og:title" content="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Params.Title }}" />
+    <meta property="og:title" content="{{ if ne .Permalink "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Params.Title }}" />
     <meta property="og:url" content="{{ .Permalink }}" />
     {{if .Site.Params.fbName}}<meta property="article:publisher" content="https://www.facebook.com/{{.Site.Params.fbName}}" />{{end}}
 {{ if .IsPage }}
@@ -14,4 +14,4 @@
 {{ end }}{{if .Params.image }}
     <meta property="og:image" content="{{ .Params.image | absURL}}"/>
 {{else}}{{if .Site.Params.cover}}
-    <meta property="og:image" content="{{ .Site.Params.cover | absURL}}"/>{{end}}{{end}}
\ No newline at end of file
+    <meta property="og:image" content="{{ .Site.Params.cover | absURL}}"/>{{end}}{{end}}
diff --git a/layouts/partials/meta-twitter.html b/layouts/partials/meta-twitter.html
index 37c6d6a..7c08039 100644
--- a/layouts/partials/meta-twitter.html
+++ b/layouts/partials/meta-twitter.html
@@ -11,5 +11,5 @@
 {{ end }} <!-- Twitter Card data -->
     <meta name="twitter:title" content="{{ .Title }}"/>
     <meta name="twitter:description" content="{{if .IsPage}}{{ .Description | default (substr .Summary 0 160) }}{{ else }}{{ .Site.Params.description }}{{ end }}"/>
-    <meta name="twitter:url" content="{{.URL | absURL}}" />
+    <meta name="twitter:url" content="{{.Permalink | absURL}}" />
     <meta name="twitter:site" content="@{{ .Site.Params.twitterName }}"/>
diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html
index 50a80a0..df837d3 100644
--- a/layouts/partials/post-list.html
+++ b/layouts/partials/post-list.html
@@ -1,4 +1,4 @@
-{{ $paginator := .Paginate (where .Data.Pages.ByDate.Reverse "Type" "post") }}
+{{ $paginator := .Paginate (where .Site.RegularPages.ByDate.Reverse "Type" "post") }}
 {{ range $paginator.Pages }}
 
 <article class="post-card post">