diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6eced67..9d50c00 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,48 +1,26 @@
-
- {{ if not .IsHome }}{{ .Title | title }} | {{ end }}{{ .Site.Title }}
-
-
-
-
-
- {{ with .Site.Params.favicon }}
- {{ end -}}
-
- {{ if isset .Params "tags" }}
- {{ end -}}
-
-
-
-
+{{ partial "head.html" . }}
-{{ if .Site.Menus.main }}{{ partial "nav.html" . }}{{ end -}}
-
-
- {{ if .IsHome }} {{ .Site.Title }} {{ end }}
- {{ block "title" . }}
- {{ end }}
-
- {{ if not .IsHome }} {{ .Params.description }} {{ end }}
-
-
-
-{{ block "main" . }}
-{{ .Content }}
-{{ end }}
-{{ if not .IsHome }}
{{end -}}
-{{ if .Param "nextprev" }}{{ partial "nextprev.html" . -}}{{ end -}}
-{{ if .Param "taglist" }}{{ partial "taglist.html" . }}{{ end -}}
-
-
-{{ block "footer" . }}
-
-{{ end }}
+
+ {{ block "header" . }}
+ {{ partial "header.html" . }}
+ {{ end }}
+
+
+
+ {{ .Page.Title }}
+
+
+
+ {{ block "main" . }}
+ {{ .Content }}
+ {{ end }}
+
+ {{ block "footer" . }}
+ {{ partial "footer.html" . }}
+ {{ end }}
+
-
\ No newline at end of file