diff --git a/docs/_pages/category-archive.html b/docs/_pages/category-archive.html
deleted file mode 100644
index c9e03e15..00000000
--- a/docs/_pages/category-archive.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: archive
-permalink: /categories/
-title: "Posts by Category"
-author_profile: true
----
-
-{% include group-by-array collection=site.posts field="categories" %}
-
-{% for category in group_names %}
- {% assign posts = group_items[forloop.index0] %}
-
{{ category }}
- {% for post in posts %}
- {% include archive-single.html %}
- {% endfor %}
-{% endfor %}
\ No newline at end of file
diff --git a/docs/_pages/category-archive.md b/docs/_pages/category-archive.md
new file mode 100644
index 00000000..3add9914
--- /dev/null
+++ b/docs/_pages/category-archive.md
@@ -0,0 +1,6 @@
+---
+title: "Posts by Category"
+layout: categories
+permalink: /categories-archive/
+author_profile: true
+---
diff --git a/docs/_pages/edge-case.md b/docs/_pages/edge-case.md
new file mode 100644
index 00000000..016138a4
--- /dev/null
+++ b/docs/_pages/edge-case.md
@@ -0,0 +1,8 @@
+---
+title: Edge Case
+layout: category
+permalink: /categories/edge-case/
+taxonomy: Edge Case
+---
+
+Sample post listing for the category `Edge Case`.
diff --git a/docs/_pages/markup.md b/docs/_pages/markup.md
new file mode 100644
index 00000000..147a719a
--- /dev/null
+++ b/docs/_pages/markup.md
@@ -0,0 +1,8 @@
+---
+title: Markup
+layout: tag
+permalink: /tags/markup/
+taxonomy: markup
+---
+
+Sample post listing for the tag `markup`.
diff --git a/docs/_pages/portfolio-archive.html b/docs/_pages/portfolio-archive.html
deleted file mode 100644
index f206c570..00000000
--- a/docs/_pages/portfolio-archive.html
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: archive
-title: "Portfolio"
-permalink: /portfolio/
-author_profile: false
----
-
-
- {% for post in site.portfolio %}
- {% include archive-single.html type="grid" %}
- {% endfor %}
-
\ No newline at end of file
diff --git a/docs/_pages/portfolio-archive.md b/docs/_pages/portfolio-archive.md
new file mode 100644
index 00000000..019082f4
--- /dev/null
+++ b/docs/_pages/portfolio-archive.md
@@ -0,0 +1,10 @@
+---
+title: Portfolio
+layout: collection
+permalink: /portfolio/
+collection: portfolio
+entries_layout: grid
+classes: wide
+---
+
+Sample document listing for the collection `_portfolio`.
diff --git a/docs/_pages/recipes-archive.html b/docs/_pages/recipes-archive.html
deleted file mode 100644
index b5e2dfc2..00000000
--- a/docs/_pages/recipes-archive.html
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: archive
-title: "Recipes"
-permalink: /recipes/
-author_profile: false
----
-
-{% for post in site.recipes %}
- {% include archive-single.html %}
-{% endfor %}
\ No newline at end of file
diff --git a/docs/_pages/recipes-archive.md b/docs/_pages/recipes-archive.md
new file mode 100644
index 00000000..cdde1e4e
--- /dev/null
+++ b/docs/_pages/recipes-archive.md
@@ -0,0 +1,9 @@
+---
+layout: collection
+title: "Recipes"
+collection: recipes
+permalink: /recipes-archive/
+author_profile: false
+---
+
+Sample document listing for the collection `_recipes`.
\ No newline at end of file
diff --git a/docs/_pages/tag-archive.html b/docs/_pages/tag-archive.html
deleted file mode 100644
index b30a57f5..00000000
--- a/docs/_pages/tag-archive.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: archive
-permalink: /tags/
-title: "Posts by Tag"
-author_profile: true
----
-
-{% include group-by-array collection=site.posts field="tags" %}
-
-{% for tag in group_names %}
- {% assign posts = group_items[forloop.index0] %}
- {{ tag }}
- {% for post in posts %}
- {% include archive-single.html %}
- {% endfor %}
-{% endfor %}
diff --git a/docs/_pages/tag-archive.md b/docs/_pages/tag-archive.md
new file mode 100644
index 00000000..a512e456
--- /dev/null
+++ b/docs/_pages/tag-archive.md
@@ -0,0 +1,6 @@
+---
+title: "Posts by Tag"
+permalink: /tags-archive/
+layout: tags
+author_profile: true
+---
diff --git a/docs/_pages/year-archive.html b/docs/_pages/year-archive.html
deleted file mode 100644
index 13135a91..00000000
--- a/docs/_pages/year-archive.html
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: archive
-permalink: /year-archive/
-title: "Posts by Year"
-author_profile: true
----
-
-{% assign postsByYear = site.posts | group_by_exp:"post", "post.date | date: '%Y'" %}
-{% for year in postsByYear %}
- {{ year.name }}
- {% for post in year.items %}
- {% include archive-single.html %}
- {% endfor %}
-{% endfor %}
\ No newline at end of file
diff --git a/docs/_pages/year-archive.md b/docs/_pages/year-archive.md
new file mode 100644
index 00000000..1021452a
--- /dev/null
+++ b/docs/_pages/year-archive.md
@@ -0,0 +1,6 @@
+---
+title: "Posts by Year"
+permalink: /year-archive/
+layout: posts
+author_profile: true
+---