diff --git a/layouts/partials/page_header.html b/layouts/partials/page_header.html
index fc995a6..7f9a3bb 100644
--- a/layouts/partials/page_header.html
+++ b/layouts/partials/page_header.html
@@ -8,9 +8,9 @@
       <ul>
         {{ range .Site.Menus.main }}
             <li>
-              <a href="{{ .URL }}">{{ .Name }}</a>
+              <a href="{{.URL}}">{{ .Name }}</a>
               {{ if in ($.Scratch.Get "sections") .Name }}
-                <a href="{{ .URL }}index.xml"><img src="/img/rss.svg" class="rss-icon" /></a>
+                <a href="{{.URL}}index.xml"><img src="/img/rss.svg" class="rss-icon" /></a>
               {{ end }}
             </li>
         {{ end }}
diff --git a/layouts/partials/preview_list.html b/layouts/partials/preview_list.html
index 16521f4..4824547 100644
--- a/layouts/partials/preview_list.html
+++ b/layouts/partials/preview_list.html
@@ -1,4 +1,10 @@
-{{ $paginator := .Paginate (where .Data.Pages "Type" "!=" "page") }}
+
+{{ $pages := .Pages }}
+{{ if .IsHome }}
+{{ $pages = .Site.RegularPages }}
+{{ end }}
+{{ $paginator := .Paginate $pages }}
+
 {{ range .Paginator.Pages }}
   {{ $url := replace .Permalink .Site.BaseURL "" }}
 
diff --git a/layouts/partials/site_header.html b/layouts/partials/site_header.html
index daaf2c0..a1bf7eb 100644
--- a/layouts/partials/site_header.html
+++ b/layouts/partials/site_header.html
@@ -6,17 +6,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="{{ with .Site.Author.firstname }}{{ . }}{{ end }} {{ with .Site.Author.lastname }}{{ . }}{{ end }}">
     <meta name="description" content="{{ with .Site.Params.description }}{{ . }}{{ end }}">
-    {{ .Hugo.Generator }}
+    {{ hugo.Generator }}
 
     {{ $.Scratch.Add "title" .Site.Title }}
     <title>{{ with .Title }}{{ if ne . ($.Scratch.Get "title") }}{{ . }} &middot; {{ end }}{{ end }}@{{ .Site.Author.handle }}’s {{ .Site.Title }}</title>
 
-    <link rel="stylesheet" href="{{ .Site.BaseURL }}css/weblog.css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="{{.Site.BaseURL}}css/weblog.css" media="screen" charset="utf-8" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/lightgallery/1.2.14/css/lightgallery.min.css" type="text/css" />
     {{ partial "custom_stylesheets.html" . }}
 
     {{ if .Site.Params.rssenabled }}
-	<link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+	<link href="{{.Site.RSSLink}}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
 	{{ end }}
   </head>
   <body class="site">
diff --git a/layouts/partials/yearly_grouping.html b/layouts/partials/yearly_grouping.html
index 0cccf9e..a1b91f9 100644
--- a/layouts/partials/yearly_grouping.html
+++ b/layouts/partials/yearly_grouping.html
@@ -1,7 +1,7 @@
 <main class="content">
   <article class="post-groups">
     <div class="post-group">
-    {{ range .Data.Pages.GroupByDate "2006" }}
+    {{ range .Pages.GroupByDate "2006" }}
       <div class="post-group-item">
         <h3>{{ .Key }}</h3>
         <ul>
diff --git a/layouts/rss.xml b/layouts/rss.xml
index bac5e56..b607d52 100644
--- a/layouts/rss.xml
+++ b/layouts/rss.xml
@@ -8,7 +8,7 @@
     {{ with .Site.Copyright }}<copyright>{{.}}</copyright>{{end}}
     {{ if not .Date.IsZero }}<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
     <atom:link href="{{.URL}}" rel="self" type="application/rss+xml" />
-    {{ range .Data.Pages }}
+    {{ range .Site.RegularPages }}
       {{ if ne .Type "page" }}
       <item>
         <title>{{ .Title }}</title>
diff --git a/layouts/section/microposts.rss.xml b/layouts/section/microposts.rss.xml
index d6852f1..8d495f8 100644
--- a/layouts/section/microposts.rss.xml
+++ b/layouts/section/microposts.rss.xml
@@ -8,7 +8,7 @@
     {{ with .Site.Copyright }}<copyright>{{.}}</copyright>{{end}}
     {{ if not .Date.IsZero }}<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
     <atom:link href="{{.URL}}" rel="self" type="application/rss+xml" />
-    {{ range .Data.Pages }}
+    {{ range .Site.RegularPages }}
       {{ if ne .Type "page" }}
       <item>
       	{{ if (not (isset .Site.Params "rssmicroposttitles" )) | or (eq .Site.Params.rssmicroposttitles true )}}
