diff --git a/_pages/category-archive.html b/_pages/category-archive.html
new file mode 100644
index 00000000..4bc065b2
--- /dev/null
+++ b/_pages/category-archive.html
@@ -0,0 +1,28 @@
+---
+layout: archive
+permalink: /category-archive/
+title: "Posts by Category"
+---
+
+{% include absolute-url.liquid %}
+{% capture site_categories %}{% for category in site.categories %}{{ category | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+{% assign category_list = site_categories | split:',' | sort %}
+
+{% for item in (0..site.categories.size) %}
+ {% unless forloop.last %}
+ {% capture category_name %}{{ category_list[item] | strip_newlines }}{% endcapture %}
+
{{ category_name }}
+ {% for post in site.categories[category_name] %}
+ {% if post.title != null %}
+
+ {% if post.link %}
+
+ {% else %}
+
+ {{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+ {% endunless %}
+{% endfor %}
\ No newline at end of file
diff --git a/_pages/category-archive.md b/_pages/category-archive.md
deleted file mode 100644
index 58ac70ac..00000000
--- a/_pages/category-archive.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: archive
-permalink: /category-archive/
-title: "Posts by Category"
----
-
-{% include absolute-url.liquid %}
-{% capture site_categories %}{% for category in site.categories %}{{ category | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
-{% assign category_list = site_categories | split:',' | sort %}
-
-{% for item in (0..site.categories.size) %}{% unless forloop.last %}
-{% capture category_name %}{{ category_list[item] | strip_newlines }}{% endcapture %}
- {{ category_name }}
- {% for post in site.categories[category_name] %}{% if post.title != null %}
-
- {% if post.link %}
-
- {% else %}
-
- {{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
- {% endif %}
-
- {% endif %}{% endfor %}
-{% endunless %}{% endfor %}
\ No newline at end of file
diff --git a/_pages/page-archive.html b/_pages/page-archive.html
new file mode 100644
index 00000000..bde76bcd
--- /dev/null
+++ b/_pages/page-archive.html
@@ -0,0 +1,16 @@
+---
+layout: archive
+title: "Page Archive"
+permalink: /page-archive/
+---
+{% include absolute-url.liquid %}
+{% for post in site.pages %}
+
+ {% if post.link %}
+
+ {% else %}
+
+ {% if post.excerpt %}{{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
{% endif %}
+ {% endif %}
+
+{% endfor %}
\ No newline at end of file
diff --git a/_pages/page-archive.md b/_pages/page-archive.md
deleted file mode 100644
index 5ff806a1..00000000
--- a/_pages/page-archive.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: archive
-title: "Page Archive"
-permalink: /page-archive/
----
-{% include absolute-url.liquid %}
-{% for post in site.pages %}
-
-{% if post.link %}
-
-{% else %}
-
- {% if post.excerpt %}{{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
{% endif %}
-{% endif %}
-
-{% endfor %}
\ No newline at end of file
diff --git a/_pages/tag-archive.html b/_pages/tag-archive.html
new file mode 100644
index 00000000..66f007ab
--- /dev/null
+++ b/_pages/tag-archive.html
@@ -0,0 +1,26 @@
+---
+layout: archive
+permalink: /tag-archive/
+title: "Posts by Tags"
+---
+{% include absolute-url.liquid %}
+{% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+{% assign tag_list = site_tags | split:',' | sort %}
+
+{% for item in (0..site.tags.size) %}
+ {% unless forloop.last %}
+ {% capture tag_name %}{{ tag_list[item] | strip_newlines }}{% endcapture %}
+ {{ tag_name }}
+ {% for post in site.tags[tag_name] %}{% if post.title != null %}
+
+ {% if post.link %}
+
+ {% else %}
+
+ {{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+ {% endunless %}
+{% endfor %}
\ No newline at end of file
diff --git a/_pages/tag-archive.md b/_pages/tag-archive.md
deleted file mode 100644
index 006d69b9..00000000
--- a/_pages/tag-archive.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: archive
-permalink: /tag-archive/
-title: "Posts by Tags"
----
-{% include absolute-url.liquid %}
-{% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
-{% assign tag_list = site_tags | split:',' | sort %}
-
-{% for item in (0..site.tags.size) %}{% unless forloop.last %}
-{% capture tag_name %}{{ tag_list[item] | strip_newlines }}{% endcapture %}
- {{ tag_name }}
- {% for post in site.tags[tag_name] %}{% if post.title != null %}
-
- {% if post.link %}
-
- {% else %}
-
- {{ post.excerpt | markdownify | strip_html | strip_newlines | escape_once }}
- {% endif %}
-
- {% endif %}{% endfor %}
-{% endunless %}{% endfor %}
\ No newline at end of file