diff --git a/layouts/partials/header.html b/layouts/_default/baseof.html
similarity index 56%
rename from layouts/partials/header.html
rename to layouts/_default/baseof.html
index f304fde..57e17ce 100644
--- a/layouts/partials/header.html
+++ b/layouts/_default/baseof.html
@@ -15,7 +15,22 @@
 	<meta charset="utf-8">
 </head>
 <body>
-{{- if .Site.Menus.main }}
-{{ partial "nav.html" . }}
-{{ end }}
+{{ if .Site.Menus.main }}{{ partial "nav.html" . }}{{ end -}}
 <main>
+<header><h1 id="tag_{{ .Title }}">{{ block "title" . }}{{ end }}</h1></header>
+<article>
+{{ block "main" . }}
+{{ .Content }}
+{{ end }}
+{{ if .Param "nextprev" }}{{ partial "nextprev.html" . -}}{{ end -}}
+{{ if .Param "taglist" }}{{ partial "taglist.html" . }}{{ end -}}
+</article>
+</main>
+{{ block "footer" . }}
+<footer>
+	<a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a>
+	{{- if .Param "showrss" }}<br><br><a href="/index.xml"><img src="/rss.svg" style="max-height:1.5em" alt="RSS Feed" title="Subscribe via RSS for updates."></a>{{ end }}
+</footer>
+{{ end }}
+</body>
+</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b6a63be..b05c0a2 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,11 +1,17 @@
-{{ partial "header.html" . -}}
-<header><h1 id="tag_{{ .Title }}">{{ .Title | title }}</h1></header>
-<article>
-{{ .Content -}}
+{{ define "title" -}}
+{{ .Title | title }}
+{{- end }}
+{{ define "main" -}}
+{{ .Content }}
 <ul>
 {{- range.Pages }}
-	<li><time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006 Jan 02" }}</time> &ndash; <a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-{{ end -}}
+	<li>
+		{{- if .Param "datesinlist" }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006 Jan 02" }}</time> &ndash; {{ end -}}
+		<a href="{{ .RelPermalink }}">{{ .Title }}</a>
+		{{- if .Param "authorsinlist" }}
+		{{- range .Param "authors" }} by {{ . }}{{ end -}}
+		{{ end -}}
+		</li>
+{{- end }}
 </ul>
-</article>
-{{- partial "footer.html" . }}
+{{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 43e8c2a..56c5a11 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,3 @@
-{{ partial "header.html" . -}}
-<header><h1>{{ .Title }}</h1></header>
-<article>
-{{ .Content -}}
-{{ partial "footer.html" . }}
+{{ define "title" -}}
+{{ .Title }}
+{{- end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index 4e942f2..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ partial "nextprev.html" . -}}
-{{ partial "taglist.html" . -}}
-</article>
-</main>
-<footer>
-	<a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a><br><br>
-	<a href="/index.xml"><img src="/rss.svg" style="max-height:1.5em" alt="RSS Feed" title="Subscribe via RSS for updates."></a>
-</footer>
-</body>
-</html>
