diff --git a/examples/blog/layouts/categories/list.html b/examples/blog/layouts/categories/list.html
new file mode 100644
index 000000000..0390d77c2
--- /dev/null
+++ b/examples/blog/layouts/categories/list.html
@@ -0,0 +1,25 @@
+{{ partial "header.html" . }}
+
+
+ {{ partial "navbar.html" . }}
+
+
+
+
+
Items in category {{ .Title | lower }}
+
+ {{ range .Data.Pages }}
+ {{ .Render "li" }}
+ {{ end}}
+
+
+
+
+
+
+ {{ partial "menu.html" . }}
+
+
+ {{ partial "footer.copyright.html" . }}
+
+ {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/examples/blog/layouts/indexes/category.html b/examples/blog/layouts/indexes/category.html
deleted file mode 100644
index 653d81964..000000000
--- a/examples/blog/layouts/indexes/category.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{{ partial "header.html" . }}
-
-{{ partial "navbar.html" . }}
-
-
-
-
-
Items in category {{ .Title | lower }}
-
- {{ range .Data.Pages }}
- {{ .Render "li" }}
- {{ end}}
-
-
-
-
-
-
- {{ partial "menu.html" . }}
-
-
-{{ partial "footer.copyright.html" . }}
-
-{{ partial "footer.html" . }}
diff --git a/examples/blog/layouts/partials/header.html b/examples/blog/layouts/partials/header.html
index 5863e59ec..94de4c123 100644
--- a/examples/blog/layouts/partials/header.html
+++ b/examples/blog/layouts/partials/header.html
@@ -1,5 +1,6 @@
+
{{ partial "meta.html" . }}
@@ -7,6 +8,6 @@
{{ partial "header.includes.html" . }}
{{ with .OutputFormats.Get "RSS" -}}
- {{ printf "" .Permalink .MediaType .Title | safeHTML }}
+ {{ printf "" .Permalink .MediaType $.Site.Title | safeHTML }}
{{- end }}
-
+
\ No newline at end of file
diff --git a/examples/blog/layouts/indexes/post.html b/examples/blog/layouts/post/list.html
similarity index 100%
rename from examples/blog/layouts/indexes/post.html
rename to examples/blog/layouts/post/list.html
diff --git a/examples/blog/layouts/indexes/tag.html b/examples/blog/layouts/tags/list.html
similarity index 100%
rename from examples/blog/layouts/indexes/tag.html
rename to examples/blog/layouts/tags/list.html