diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000..30648f5
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    {{ "<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->" | safeHTML }}
+
+    {{ if .Site.Params.description }}<meta name="description" content="{{ .Site.Params.description }}">{{ end }}
+    {{ if .Site.Params.author }}<meta name="author" content="{{ .Site.Params.author }}">{{ end }}
+
+    {{ .Hugo.Generator }}
+
+    <base href="{{ .Site.BaseURL }}">
+    <link rel="canonical" href="{{ .Permalink }}">
+
+    <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+
+    {{ "<!-- combined, minified CSS -->" | safeHTML }}
+    <link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet">
+  </head>
+
+<body>
+
+  <div class="blog-masthead">
+    <div class="container">
+      <nav class="nav blog-nav">
+        <a class="nav-link" href="{{ .Site.BaseURL }}">Home</a>
+      </nav>
+    </div>
+  </div>
+
+  <div class="blog-header">
+    <div class="container">
+      <h1 class="blog-title">{{ .Site.Title | safeHTML }}</h1>
+      {{ if .Site.Params.description }}<p class="lead blog-description">{{ .Site.Params.description | safeHTML }}</p>{{ end }}
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-8 blog-main">
+
+        {{ block "main" . }}
+        <!-- The part of the page that begins to differ between templates -->
+        {{ end }}
+
+      </div> {{ "<!-- /.blog-main -->" | safeHTML }}
+
+      {{ if not .Site.Params.sidebar.hide }}
+        {{ partial "sidebar.html" . }}
+      {{ end }}
+
+    </div> {{ "<!-- /.row -->" | safeHTML }}
+  </div> {{ "<!-- /.container -->" | safeHTML }}
+
+  <footer class="blog-footer">
+    <p>
+      Blog template built by <a href='https://twitter.com/mralanorth'>@mralanorth</a>.
+    </p>
+  </footer>
+
+</body>
+
+</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e69de29..2039ed6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -0,0 +1,7 @@
+{{ define "main" }}
+
+  {{ range .Data.Pages }}
+    {{ .Render "summary"}}
+  {{ end }}
+
+{{ end }}
diff --git a/layouts/partials/content.html b/layouts/_default/single.html
similarity index 59%
rename from layouts/partials/content.html
rename to layouts/_default/single.html
index 9c8e4df..f3c8372 100644
--- a/layouts/partials/content.html
+++ b/layouts/_default/single.html
@@ -1,16 +1,8 @@
-<div class="container">
-  <div class="row">
-    <div class="col-sm-8 blog-main">
+{{ define "title" }}{{ .Title }} &ndash; {{ .Site.Title }}{{ end }}
+{{ define "main" }}
       <article class="blog-post">
         <h2 class="blog-post-title"><a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a></h2>
         <p class="blog-post-meta"><time datetime="{{ .Date }}">{{ .Date.Format .Site.Params.date_format }}</time> by <a href="#">{{ .Params.author | default .Site.Params.author }}</a></p>
         {{ .Content }}
       </article> <!-- /.blog-post -->
-    </div> <!-- /.blog-main -->
-
-    {{ if not .Site.Params.sidebar.hide }}
-      {{ partial "sidebar.html" . }}
-    {{ end }}
-
-  </div> <!-- /.row -->
-</div> <!-- /.container -->
+{{ end }}
diff --git a/layouts/post/summary.html b/layouts/_default/summary.html
similarity index 100%
rename from layouts/post/summary.html
rename to layouts/_default/summary.html
diff --git a/layouts/index.html b/layouts/index.html
deleted file mode 100644
index d4693ff..0000000
--- a/layouts/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ partial "head.html" . }}
-
-{{ partial "menu.html" . }}
-
-{{ partial "header.html" . }}
-
-{{ partial "content-summary.html" . }}
-
-{{ partial "footer.html" . }}
-
-{{ partial "after-footer.html" . }}
diff --git a/layouts/partials/after-footer.html b/layouts/partials/after-footer.html
deleted file mode 100644
index 15b9011..0000000
--- a/layouts/partials/after-footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-</body>
-
-</html>
diff --git a/layouts/partials/content-summary.html b/layouts/partials/content-summary.html
deleted file mode 100644
index 03f88e4..0000000
--- a/layouts/partials/content-summary.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="container">
-  <div class="row">
-    <div class="col-sm-8 blog-main">
-      {{ range .Data.Pages }}
-      {{ .Render "summary"}}
-      {{ end }}
-    </div> <!-- /.blog-main -->
-
-    {{ if not .Site.Params.sidebar.hide }}
-      {{ partial "sidebar.html" . }}
-    {{ end }}
-
-  </div> <!-- /.row -->
-</div> <!-- /.container -->
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index ab600b2..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-  <footer class="blog-footer">
-    <p>
-      Blog template built by <a href='https://twitter.com/mralanorth'>@mralanorth</a>.
-    </p>
-  </footer>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
deleted file mode 100644
index 18784f0..0000000
--- a/layouts/partials/head.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-
-    {{ if .Site.Params.description }}<meta name="description" content="{{ .Site.Params.description }}">{{ end }}
-    {{ if .Site.Params.author }}<meta name="author" content="{{ .Site.Params.author }}">{{ end }}
-
-    {{ .Hugo.Generator }}
-
-    <base href="{{ .Site.BaseURL }}">
-    <link rel="canonical" href="{{ .Permalink }}">
-
-    <title>{{ .Title }}</title>
-
-    <!-- combined, minified CSS -->
-    <link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet">
-  </head>
-
-<body>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
deleted file mode 100644
index 361dbda..0000000
--- a/layouts/partials/header.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="blog-header">
-  <div class="container">
-    <h1 class="blog-title">{{ .Site.Title | safeHTML }}</h1>
-    {{ if .Site.Params.description }}<p class="lead blog-description">{{ .Site.Params.description | safeHTML }}</p>{{ end }}
-  </div>
-</div>
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
deleted file mode 100644
index ff49965..0000000
--- a/layouts/partials/menu.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="blog-masthead">
-  <div class="container">
-    <nav class="nav blog-nav">
-      <a class="nav-link" href="{{ .Site.BaseURL }}">Home</a>
-    </nav>
-  </div>
-</div>
diff --git a/layouts/post/single.html b/layouts/post/single.html
deleted file mode 100644
index b530878..0000000
--- a/layouts/post/single.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ partial "head.html" . }}
-
-{{ partial "menu.html" . }}
-
-{{ partial "header.html" . }}
-
-{{ partial "content.html" . }}
-
-{{ partial "footer.html" . }}
-
-{{ partial "after-footer.html" . }}
