diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 38b6dda9..3006de87 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -8,7 +8,7 @@
 </header>
 {{ end }}
 
-{{ $paginator := .Paginate (where .Pages ".Params.type" "!=" "page") }}
+{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
 
 {{ if gt $paginator.TotalPages 0 }}
 {{ range $index, $page := $paginator.Pages }}
@@ -20,7 +20,7 @@
    <p>{{ .Summary | plainify | htmlUnescape }}...</p>
   </section>
   <footer class="entry-footer">
-    <time>{{ .Date.Format (.Site.Params.dateFormat | default "2006.1.2") }}</time>
+    <time>{{ .Date.Format "January 2, 2006" }}</time>
   </footer>
   <a class="entry-link" href="{{ .Permalink }}"></a>
 </article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b54adaab..97c42002 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,19 +6,19 @@
     <div class="post-meta">
       {{- if or .Params.author .Site.Params.author -}}
       {{ .Params.author | default .Site.Params.author }} · {{ end }}
-      {{- .Date.Format (.Site.Params.dateFormat | default "2006.1.2") -}}
+      {{- .Date.Format "January 2, 2006" -}}
     </div>
   </header>
   <div class="post-content">{{ .Content }}</div>
+  {{ if .Params.tags }}
   <footer class="post-footer">
-    {{ if .Params.tags }}
     <ul class="post-tags">
       {{ range .Params.tags }}
       <li><a href="{{ "tags/" | absURL }}{{ . | urlize }}/">{{ . }}</a></li>
       {{ end }}
     </ul>
-    {{ end }}
   </footer>
+  {{ end }}
   <!-- Comments area start -->
   {{ if not (eq .Params.comments false) }}
   {{ if .Site.DisqusShortname }}
diff --git a/layouts/partials/header-include.html b/layouts/partials/header-include.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 2098e2c9..696dbfcc 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -22,11 +22,11 @@
     <meta name="author" content="{{ .Site.Params.author }}">
     {{ end -}}
     <!-- Styles -->
-    <link href="{{ "css/github-gist.min.css" | absURL }}" rel="stylesheet">
-    <link href="{{ "css/style.css" | absURL }}" rel="stylesheet">
+    <link href="{{ "an-old-hope.min.css" | absURL }}" rel="stylesheet">
+    <link href="{{ "style.css" | absURL }}" rel="stylesheet">
     <!-- Favicons -->
-    <link rel="apple-touch-icon" href="{{ "img/apple-touch-icon.png" | absURL }}">
-    <link rel="icon" href="{{ "img/favicon.ico" | absURL }}">
+    <link rel="apple-touch-icon" href="{{ "apple-touch-icon.png" | absURL }}">
+    <link rel="icon" href="{{ "favicon.ico" | absURL }}">
     <!-- Generator -->
     {{ hugo.Generator }}
     <!-- RSS -->
@@ -35,30 +35,24 @@
     {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
     {{ template "_internal/google_analytics_async.html" . }}
     {{ end }}
-    {{ partial "header-include.html" . }}
   </head>
   <body class="{{if eq .Kind `page` }}single{{else}}list{{ if .IsHome }} home{{ end }}{{end}}">
     <header class="header">
-      <div class="wrap">
+      <nav class="nav">
         {{ if .IsHome }}
         <h1 class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></h1>
         {{ else }}
         <p class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></p>
         {{ end }}
         {{ if .Site.Menus.main }}
-        <button class="menu-toggle" type="button"></button>
+        <ul class="menu">
+          {{ range .Site.Menus.main }}
+          <li>
+            <a href="{{ .URL }}">{{ .Name }}</a>
+          </li>
+          {{ end }}
+        </ul>
         {{ end }}
-      </div>
+      </nav>
     </header>
-    {{ if .Site.Menus.main }}
-    <nav class="nav">
-      <ul class="menu">
-        {{ range .Site.Menus.main }}
-        <li>
-          <a href="{{ .URL }}">{{ .Name }}</a>
-        </li>
-        {{ end }}
-      </ul>
-    </nav>
-    {{ end }}
     <main class="main">
