diff --git a/404.md b/404.md
index b97ea868..ccc5e898 100644
--- a/404.md
+++ b/404.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: content
 permalink: /404
 backLink: False
 ---
diff --git a/_config.yml b/_config.yml
index 9ec488dd..26617c5e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -44,12 +44,12 @@ defaults:
       path: ""
       type: "posts"
     values:
-      layout: "post"
+      layout: "collection/post"
   - scope:
       path: ""
       type: "news"
     values:
-      layout: "news"
+      layout: "collection/news"
   - scope:
       path: ""
     values:
diff --git a/_layouts/collection_base.html b/_layouts/collection/collection_base.html
similarity index 100%
rename from _layouts/collection_base.html
rename to _layouts/collection/collection_base.html
diff --git a/_layouts/collection/collection_index.html b/_layouts/collection/collection_index.html
new file mode 100644
index 00000000..3b317a9f
--- /dev/null
+++ b/_layouts/collection/collection_index.html
@@ -0,0 +1,22 @@
+---
+layout: default
+---
+  <section class="cm-gray-2 body-font">
+    <div class="pt-3 pb-1 section-container">
+      <h1 class="header-text title-font mb-4 cm-gray-2">{{ page.title_text }}</h1>
+      <div class="flex flex-wrap">
+
+      {% assign cols = site[page.collection] %}
+      {% if page.collection_reverse == true %}{% assign cols = cols | reverse %}{% endif %}
+      {% for item in cols %}
+        <div class="p-6 md:w-1/2 flex flex-col items-start">
+          <h2 class="header-text title-font mb-4 cm-gray-1">
+            <a href="{{ item.url | relative_url }}">{{ item.title }}</a>
+          </h2>
+          <span class="leading-relaxed mb-4">{{ item.excerpt | strip_html | strip_newlines | truncate: 156  }}</span>
+          <span>{{ item.date | date_to_string }} | </span>
+        </div>
+      {% endfor %}
+      </div>
+    </div>
+  </section>
diff --git a/_layouts/news.html b/_layouts/collection/news.html
similarity index 53%
rename from _layouts/news.html
rename to _layouts/collection/news.html
index 31d8afae..2f89785d 100644
--- a/_layouts/news.html
+++ b/_layouts/collection/news.html
@@ -1,5 +1,5 @@
 ---
-layout: collection_base
+layout: collection/collection_base
 base_link: '/news'
 ---
 {{ content }}
diff --git a/_layouts/post.html b/_layouts/collection/post.html
similarity index 53%
rename from _layouts/post.html
rename to _layouts/collection/post.html
index 6da5956c..83746349 100644
--- a/_layouts/post.html
+++ b/_layouts/collection/post.html
@@ -1,5 +1,5 @@
 ---
-layout: collection_base
+layout: collection/collection_base
 base_link: '/blog'
 ---
 {{ content }}
diff --git a/blog.html b/blog.html
index a54f32c7..fc2da2a0 100644
--- a/blog.html
+++ b/blog.html
@@ -1,25 +1,7 @@
 ---
-layout: default
+layout: collection/collection_index
 title: Blog
+title_text: InvenTree Blog
 permalink: /blog
----
-  <section class="cm-gray-2 body-font">
-    <div class="pt-3 pb-1 section-container">
-      <h1 class="header-text title-font mb-4 cm-gray-2">InvenTree Blog</h1>
-      <div class="flex flex-wrap">
-
-      {% for post in site.posts %}
-        <div class="p-6 md:w-1/2 flex flex-col items-start">
-          <h2 class="header-text title-font mb-4 cm-gray-1">
-            <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-          </h2>
-          <span class="leading-relaxed mb-4">{{ post.excerpt | strip_html | strip_newlines | truncate: 156  }}</span>
-          <span>
-            {{ post.date | date_to_string }} | 
-          {% include partial/publisher_ref.html pub=post.publisher %}
-          </span>
-        </div>
-      {% endfor %}
-      </div>
-    </div>
-  </section>
+collection: posts
+---
\ No newline at end of file
diff --git a/news.html b/news.html
index 3e5ca7f4..4275d4ed 100644
--- a/news.html
+++ b/news.html
@@ -1,22 +1,8 @@
 ---
-layout: default
+layout: collection/collection_index
 title: News
+title_text: InvenTree News
 permalink: /news
----
-  <section class="cm-gray-2 body-font">
-    <div class="pt-3 pb-1 section-container">
-      <h1 class="header-text title-font mb-4 cm-gray-2">InvenTree News</h1>
-      <div class="flex flex-wrap">
-
-      {% for post in site.news %}
-        <div class="p-6 md:w-1/2 flex flex-col items-start">
-          <h2 class="header-text title-font mb-4 cm-gray-1">
-            <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-          </h2>
-          <span class="leading-relaxed mb-4">{{ post.excerpt | strip_html | strip_newlines | truncate: 156  }}</span>
-          <span>{{ post.date | date_to_string }} | </span>
-        </div>
-      {% endfor %}
-      </div>
-    </div>
-  </section>
+collection: news
+collection_reverse: true
+---
\ No newline at end of file