3 files changed, 36 insertions, 59 deletions
diff --git a/layouts/index.html b/layouts/index.html
index 1d1c3e8..870efea 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,40 +1,35 @@
-{{ partial "head.html" . }}
-<body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
-	<main class="content container" role="main">
-    <section class="about">
-      {{ .Content }}
-    </section>
-		<section class="recent">
-			<h2>Recent Posts</h2>
-			<ul class="posts">
-				{{ range first 3 .Data.Pages }}
-				<li>
-					<a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a>
-					<time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
-				</li>
-				{{ end }}
-			</ul>
-		</section>
-    <section class="contact">
-			<h2>Contact</h2>
-			<ul>
-				{{ range .Site.Menus.contact }}
-				<li>
-					{{ if hasPrefix .URL "mailto:" }}
-					<a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
-					{{ else }}
-					<a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
-					{{ end }}
-				</li>
-				{{ end }}
-			</ul>
-		</section>
-    <footer>
-      {{ with .Site.Params.GPG }}
-      GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
-      {{ end }}
-    </footer>
-	</main>
-  {{ partial "sidebar.html" . }}
-</body>
-</html>
+{{ define "main" -}}
+<section class="about">
+  {{ .Content }}
+  </section>
+  <section class="recent">
+    <h2>Recent Posts</h2>
+    <ul class="posts">
+      {{- range first 3 .Data.Pages }}
+      <li>
+        <a class="post-title" href="{{ .RelPermalink | replaceRE "/$" "" }}">{{ .Title }}</a>
+        <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+      </li>
+      {{- end }}
+    </ul>
+  </section>
+  <section class="contact">
+    <h2>Contact</h2>
+    <ul>
+      {{- range .Site.Menus.contact }}
+      <li>
+        {{- if hasPrefix .URL "mailto:" }}
+        <a href="{{ .URL }}" class="u-email email" rel="me">{{ .Name }}</a>
+        {{- else }}
+        <a href="{{ .URL }}" class="u-url url" rel="me">{{ .Name }}</a>
+        {{- end }}
+      </li>
+      {{- end }}
+    </ul>
+  </section>
+  <footer>
+    {{- with .Site.Params.GPG }}
+    GPG Key: <a href="{{ .url }}" rel="pgpkey">{{ .fingerprint }}</a>
+    {{- end }}
+  </footer>
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
deleted file mode 100644
index 2cf88f5..0000000
--- a/layouts/partials/head.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-GB">
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1">
-
-		{{ if .IsHome }}
-		<title>{{ .Site.Title }}</title>
-		{{ else }}
-		<title>{{ .Title }} &middot; {{ .Site.Title }}</title>
-		{{ end }}
-
-		<link rel="stylesheet" href="/css/poole.css">
-		<link rel="stylesheet" href="/css/syntax.css">
-		<link rel="stylesheet" href="/css/hyde.css">
-		<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}">
-		<link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
-    <link href="{{ .Site.Params.GPG.url | absURL }}" rel="pgpkey">
-	</head>
diff --git a/layouts/partials/hook_head_end.html b/layouts/partials/hook_head_end.html
new file mode 100644
index 0000000..3442304
--- /dev/null
+++ b/layouts/partials/hook_head_end.html
@@ -0,0 +1 @@
+<link href="{{ if .IsPage }}{{ .Permalink | replaceRE "/$" "" }}{{ else }}{{ .Permalink }}{{ end }}" rel="canonical">
\ No newline at end of file