diff --git a/site/404.tsx b/site/404.tsx
index 269e47e..0d5e37a 100644
--- a/site/404.tsx
+++ b/site/404.tsx
@@ -1,6 +1,5 @@
 import Cube from "./_includes/cube.tsx";
 
-export const layout = "base.vto";
 export const title = "404";
 
 export default (_data: Lume.Data, helpers: Lume.Helpers) => {
diff --git a/site/_includes/article.vto b/site/_includes/article.vto
index 5f5b649..e90ea8a 100644
--- a/site/_includes/article.vto
+++ b/site/_includes/article.vto
@@ -1,15 +1,15 @@
 ---
-layout: base.vto
-type: article
+layout: text.vto
 ---
 
-<nav>
-  <a href="/">HOME</a>
-  <a href="/about">ABOUT</a>
-  <a href="/blog">BLOG</a>
-  <a href="/contact">CONTACT</a>
-</nav>
+{{ content }}
 
-<div class="content">{{ content }}</div>
+{{ if tags.length !== 0 }}
+  <p>Tags: {{ tags.join(", ") }}</p>
+{{ /if }}
 
-<footer>Copyright © RGBCube</footer>
+<p>
+  Also, if you are a dinosaur that enjoys good technology, check out my
+  <a href="/blog.rss">RSS Feed</a>
+  .
+</p>
diff --git a/site/_includes/post.vto b/site/_includes/post.vto
deleted file mode 100644
index 72fdcc5..0000000
--- a/site/_includes/post.vto
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: article.vto
----
-
-{{ content }}
-
-{{ if tags.length !== 0 }}
-  <p>Tags: {{ tags.join(", ") }}</p>
-{{ /if }}
-
-<p>
-  Also, if you are a dinosaur that enjoys good technology, check out my
-  <a href="/blog.rss">RSS Feed</a>
-  .
-</p>
diff --git a/site/_includes/posts.vto b/site/_includes/posts.vto
deleted file mode 100644
index 0930940..0000000
--- a/site/_includes/posts.vto
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul>
-  {{ for post of search.pages("layout=base.vto", "date")}}
-  <li>
-    <p>
-      <a href="{{ post.url }}">{{ post.date.toISOString().slice(0, 10) }}</a>:
-      {{ post.title }}
-    </p>
-  </li>
-  {{ /for }}
-</ul>
diff --git a/site/_includes/text.vto b/site/_includes/text.vto
new file mode 100644
index 0000000..3be7236
--- /dev/null
+++ b/site/_includes/text.vto
@@ -0,0 +1,14 @@
+---
+layout: base.vto
+---
+
+<nav>
+  <a href="/">HOME</a>
+  <a href="/about">ABOUT</a>
+  <a href="/blog">BLOG</a>
+  <a href="/contact">CONTACT</a>
+</nav>
+
+<div class="content">{{ content }}</div>
+
+<footer>Copyright © RGBCube</footer>
diff --git a/site/about.md b/site/about.md
index 0b908f0..ad5099f 100644
--- a/site/about.md
+++ b/site/about.md
@@ -1,6 +1,5 @@
 ---
-layout: article.vto
-
+layout: text.vto
 title: About
 ---
 
diff --git a/site/blog.vto b/site/blog.vto
new file mode 100644
index 0000000..14f139b
--- /dev/null
+++ b/site/blog.vto
@@ -0,0 +1,21 @@
+---
+layout: text.vto
+
+title: Blog
+---
+
+<h1>Blog Articles</h1>
+
+Are you old? Then you might want to check out my super cool
+<a href="/feed">RSS Feed</a> too!
+
+<ul>
+  {{ for article of search.pages("type=article", "date")}}
+  <li>
+    <p>
+      <a href="{{ article.url }}">{{ article.date.toISOString().slice(0, 10) }}</a>:
+      {{ article.title }}
+    </p>
+  </li>
+  {{ /for }}
+</ul>
diff --git a/site/blog/_data.json b/site/blog/_data.json
index f9bf63f..f709779 100644
--- a/site/blog/_data.json
+++ b/site/blog/_data.json
@@ -1,4 +1,4 @@
 {
-  "layout": "post.vto",
-  "title": "$ h1"
+  "layout": "article.vto",
+  "type": "article"
 }
diff --git a/site/blog/a.md b/site/blog/a.md
index 4829426..405c133 100644
--- a/site/blog/a.md
+++ b/site/blog/a.md
@@ -1,7 +1,8 @@
 ---
-layout: post.vto
 date: 2024-01-01
-url: /blog/a
+title: Test
 ---
 
+# Test
+
 test
diff --git a/site/blog/index.vto b/site/blog/index.vto
deleted file mode 100644
index 05bdeef..0000000
--- a/site/blog/index.vto
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: article.vto
-
-title: Blog
----
-
-<h1>Blog Articles</h1>
-
-Are you old? Then you might want to check
-out my super cool
-<a href="/feed">RSS Feed</a> too!
-
-{{ include "posts.vto" }}
-
diff --git a/site/contact.md b/site/contact.md
index 05a4f55..8c60329 100644
--- a/site/contact.md
+++ b/site/contact.md
@@ -1,6 +1,5 @@
 ---
-layout: article.vto
-
+layout: text.vto
 title: Contact
 ---
 
diff --git a/site/index.tsx b/site/index.tsx
index 63bbf13..62f27f6 100644
--- a/site/index.tsx
+++ b/site/index.tsx
@@ -1,6 +1,5 @@
 import Cube from "./_includes/cube.tsx";
 
-export const layout = "base.vto";
 export const title = "RGBCube";
 
 export default (