diff --git a/layouts/404.html b/layouts/404.html
deleted file mode 100644
index e680954..0000000
--- a/layouts/404.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ define "main" }}
-
-
404 — {{ $.Site.Params.missingContentMessage | default "Page not found..." }}
-
-
-
-
-{{ end }}
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
deleted file mode 100644
index b68fbae..0000000
--- a/layouts/_default/_markup/render-heading.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ .Text | safeHTML }}
-{{- if and (ge .Level 2) (le .Level 5) }}{{" " -}}
-
-{{- end -}}
-
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 0000000..ae3b9cc
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,27 @@
+
+
+
+ {{ block "title" . }}
+ {{ if .IsHome }}{{ $.Site.Title }}{{ else }}{{ .Title }} :: {{ $.Site.Title }}{{ end }}
+ {{ end }}
+ {{ partial "head.html" . }}
+
+
+{{ $container := cond ($.Site.Params.FullWidthTheme | default false) "container full" (cond ($.Site.Params.CenterTheme | default false) "container center" "container") }}
+
+
+
+ {{ partial "header.html" . }}
+
+
+ {{ block "main" . }}
+ {{ end }}
+
+
+ {{ block "footer" . }}
+ {{ partial "footer.html" . }}
+ {{ end }}
+
+
+
+
diff --git a/layouts/_default/partials/footer.html b/layouts/_default/partials/footer.html
deleted file mode 100644
index 49c4068..0000000
--- a/layouts/_default/partials/footer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-