diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
new file mode 100644
index 00000000..4035dd6b
--- /dev/null
+++ b/layouts/_default/baseof.html
@@ -0,0 +1,31 @@
+
+
+
+
+ {{- partial "head.html" . }}
+
+
+
+
+
+
+
+ {{- block "main" . }}
+ {{end }}
+
+
+
+ {{ $highlight := resources.Get "highlight.min.js" | minify }}
+
+
+
+
+
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 96863ba4..969f98b6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,4 @@
-{{- partial "header.html" . }}
+{{ define "main" }}
{{- $scope := .Site }}
@@ -39,4 +39,4 @@
{{- end }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{ end }}{{/* end main */}}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 08976000..842fa318 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{- partial "header.html" . }}
+{{ define "main" }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{ end }}{{/* end main */}}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c186c8f0..11cff658 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,16 +1,5 @@
-
-
-{{ $highlight := resources.Get "highlight.min.js" | minify }}
-
-
-