diff --git a/eleventy.config.js b/eleventy.config.js
index d6789bb..9a83481 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -29,6 +29,10 @@ const setupPlugins = eleventyConfig => {
             },
         },
     })
+
+    eleventyConfig.addLiquidFilter('dateToRfc822', rssPlugin.dateToRfc822)
+    eleventyConfig.addLiquidFilter('dateToRfc3339', rssPlugin.dateToRfc3339)
+    eleventyConfig.addLiquidFilter('getNewestCollectionItemDate', rssPlugin.getNewestCollectionItemDate)
 }
 
 export default function (eleventyConfig) {
diff --git a/src/_includes/blog.liquid b/src/_includes/blog.liquid
new file mode 100644
index 0000000..bffc656
--- /dev/null
+++ b/src/_includes/blog.liquid
@@ -0,0 +1,21 @@
+{% layout 'obsidian.liquid' %}
+
+{% block content %}
+	<div class="container" id="top">
+		<div class="inner">
+			<section id="blog-header">
+				<h1>Garrett's Blog</h1>
+				<p class="button-links">
+					<a class="button" href="/blog">Home</a>
+					<a class="button" href="/blog/archive">Archive</a>
+					<a class="button" href="/blog/tags">Tags</a>
+					<a class="button" href="/blog/feeds">Feeds</a>
+				</p>
+			</section>
+
+			{% block blog_content %}
+				<div class="content-wrapper">{{ content }}</div>
+			{% endblock %}
+		</div>
+	</div>
+{% endblock %}
diff --git a/src/_includes/blog.pug b/src/_includes/blog.pug
deleted file mode 100644
index 3e0d110..0000000
--- a/src/_includes/blog.pug
+++ /dev/null
@@ -1,15 +0,0 @@
-extends ./obsidian
-
-block content
-    .container#top
-        .inner
-            section#blog-header
-                h1 Garrett's Blog
-                p.button-links
-                    a.button(href='/blog') Home
-                    a.button(href='/blog/archive') Archive
-                    a.button(href='/blog/tags') Tags
-                    a.button(href='/blog/feeds') Feeds
-
-            block blog_content
-                .content-wrapper !{content}
diff --git a/src/_includes/blog_post.liquid b/src/_includes/blog_post.liquid
new file mode 100644
index 0000000..fa87202
--- /dev/null
+++ b/src/_includes/blog_post.liquid
@@ -0,0 +1,16 @@
+{% layout 'blog.liquid' %}
+
+{% block blog_content %}
+	<h2>{{ title }}</h2>
+	<p>by Garrett Mills on {{ page.date | date: "%Y-%m-%d" }}</p>
+	<div class="post-tags">
+		<p class="button-links">
+			{% for tag in blogtags %}
+				<a class="button-small secondary" href="/blog/tag/{{ tag }}">#{{ tag }}</a>
+			{% endfor %}
+		</p>
+	</div>
+	{% block blog_inner_content %}
+		<div class="blog content-wrapper">{{ content }}</div>
+	{% endblock %}
+{% endblock %}
diff --git a/src/_includes/blog_post.pug b/src/_includes/blog_post.pug
deleted file mode 100644
index ba2dff1..0000000
--- a/src/_includes/blog_post.pug
+++ /dev/null
@@ -1,10 +0,0 @@
-extends ./blog
-
-block blog_content
-    h2 #{title}
-    p by Garrett Mills on #{page.date.toISOString().split('T')[0]}
-    .post-tags
-        p.button-links
-            each tag in blogtags
-                a.button-small.secondary(href='/blog/tag/' + tag) ##{tag}
-    .blog.content-wrapper !{content}
diff --git a/src/_includes/feed_post.liquid b/src/_includes/feed_post.liquid
new file mode 100644
index 0000000..fb9fdb1
--- /dev/null
+++ b/src/_includes/feed_post.liquid
@@ -0,0 +1,20 @@
+{% layout 'obsidian.liquid' %}
+
+{% block content %}
+	<div class="feed">
+		<div class="post" id="{{ slug }}">
+			{% if feedtags %}
+				<div class="tags">
+					{% for tag in feedtags %}
+						<a class="tag" href="#">{{ tag }}</a>
+					{% endfor %}
+				</div>
+			{% endif %}
+			<h2>{{ title }}</h2>
+			<div class="content-wrapper">{{ content }}</div>
+			<div class="footer">
+				<span class="date">{{ date | date: "%m/%d/%Y" }}</span>
+			</div>
+		</div>
+	</div>
+{% endblock %}
diff --git a/src/_includes/feed_post.pug b/src/_includes/feed_post.pug
deleted file mode 100644
index 8c2ed8e..0000000
--- a/src/_includes/feed_post.pug
+++ /dev/null
@@ -1,13 +0,0 @@
-extends ./obsidian
-
-block content
-    .feed
-        .post(id=slug)
-            if feedtags
-                .tags
-                    each tag in feedtags
-                        a.tag(href="#") #{tag}
-            h2 #{title}
-            .content-wrapper !{content}
-            .footer
-                span.date #{date.toLocaleDateString()}
diff --git a/src/_includes/markmark.liquid b/src/_includes/markmark.liquid
new file mode 100644
index 0000000..de15bab
--- /dev/null
+++ b/src/_includes/markmark.liquid
@@ -0,0 +1,7 @@
+{% layout 'obsidian.liquid' %}
+
+{% block content %}
+    <img src="/assets/markmark-light.svg" eleventy:ignore>
+    <header class="hero-2">Standard MarkMark (v1.1)</header>
+    <div class="markmark content-wrapper">{{ content }}</div>
+{% endblock %}
diff --git a/src/_includes/markmark.pug b/src/_includes/markmark.pug
deleted file mode 100644
index 5b12416..0000000
--- a/src/_includes/markmark.pug
+++ /dev/null
@@ -1,6 +0,0 @@
-extends ./obsidian
-
-block content
-    img(src='/assets/markmark-light.svg' eleventy:ignore)
-    header.hero-2 Standard MarkMark (v1.1)
-    .markmark.content-wrapper !{content}
diff --git a/src/_includes/obsidian.liquid b/src/_includes/obsidian.liquid
new file mode 100644
index 0000000..d0ee2d5
--- /dev/null
+++ b/src/_includes/obsidian.liquid
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<style>
+			body {
+				--background: #111;
+				--background-2: #252525;
+				--background-3: #444;
+				--color: #fffbe3;
+				--color-2: #d0c895;
+
+				background: var(--background);
+				color: var(--color);
+				font-family: "Reckless", serif;
+				margin: 0;
+				padding: 0;
+				overflow-x: hidden;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+			}
+
+			.wrapper {
+				max-width: 800px;
+				width: calc(100% - 40px);
+				padding-left: 20px;
+				padding-right: 20px;
+				margin-bottom: 100px;
+				min-height: 100vh;
+			}
+		</style>
+
+		{% block meta %}
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+			<meta http-equiv="x-ua-compatible" content="ie=edge">
+			<meta name="description" content="Hi, there! My name is Garrett. I am a computer scientist, software engineer, and speaker.">
+			<meta name="keywords" content="garrett mills glmdev developer speaker flitter extollo student">
+			<meta name="author" content="Garrett Mills">
+			<meta name="robots" content="index, follow">
+			<link rel="author" href="/humans.txt">
+			<link rel="alternate" href="/feed/atom.xml" title="Garrett Mills - Notes (Atom)" type="application/atom+xml">
+			<link rel="alternate" href="/feed/rss.xml" title="Garrett Mills - Notes (RSS)" type="application/rss+xml">
+			<link rel="alternate" href="/feed/json.json" title="Garrett Mills - Notes (JSON)" type="application/feed+json">
+			<link rel="alternate" href="/blog/atom.xml" title="Garrett's Blog (Atom)" type="application/atom+xml">
+			<link rel="alternate" href="/blog/rss2.xml" title="Garrett's Blog (RSS)" type="application/rss+xml">
+			<link rel="alternate" href="/blog/json.json" title="Garrett's Blog (JSON)" type="application/feed+json">
+			{% include 'meta.html' %}
+		{% endblock %}
+
+		{% block title %}
+			{% if title %}
+				<title>{{ title }} | Garrett Mills</title>
+			{% else %}
+				<title>Garrett Mills</title>
+			{% endif %}
+		{% endblock %}
+
+		{% block style %}
+			<!-- Register fonts here to avoid 2 layer network dependency tree for bundle.css -->
+			<style>
+				@font-face {
+					font-family: 'Obsidian';
+					src: url('/assets/font/obsidian/Obsidian-Roman.otf') format('opentype');
+					font-weight: normal;
+					font-style: normal;
+					font-display: swap;
+				}
+
+				@font-face {
+					font-family: "JetBrains Mono";
+					src: url("/assets/font/jetbrains-mono/JetBrainsMono-Regular.woff2") format('woff2');
+					font-weight: normal;
+					font-style: normal;
+					font-display: swap;
+				}
+
+				@font-face {
+					font-family: "Reckless";
+					src: url("/assets/font/reckless/WEB/Reckless-Regular.woff2") format('woff2');
+					font-weight: normal;
+					font-style: normal;
+					font-display: swap;
+				}
+
+				@font-face {
+					font-family: "Reckless";
+					src: url("/assets/font/reckless/WEB/Reckless-RegularItalic.woff2") format('woff2');
+					font-weight: normal;
+					font-style: italic;
+					font-display: swap;
+				}
+
+				@font-face {
+					font-family: "Reckless";
+					src: url("/assets/font/reckless/WEB/Reckless-Bold.woff2") format('woff2');
+					font-weight: bold;
+					font-style: normal;
+					font-display: swap;
+				}
+			</style>
+			<link rel="stylesheet" href="/bundle.css">
+		{% endblock %}
+	</head>
+	<body>
+		<div class="wrapper">
+			<header class="hero">glm.</header>
+			<nav>
+				<ul>
+					<li><a href="/">Home</a></li>
+					<!--<li><a href="/timeline">Timeline</a></li>-->
+					<li><a href="/blog">Blog</a></li>
+					<li><a href="/feed">Notes</a></li>
+					<li><a href="/links">Bookmarks <img class="inline-markmark-logo" src="/assets/img/markmark-light.svg" eleventy:ignore alt="MarkMark logo"/></a></li>
+				</ul>
+			</nav>
+
+			{% block content %}
+				<div class="content-wrapper" role="main">{{ content }}</div>
+			{% endblock %}
+		</div>
+
+		<footer>
+			<div class="obsidian">glm.</div>
+			<p>&copy; 2015-{{ "now" | date: "%Y" }} Garrett Mills — <a href="/technical">Technical Info</a><br><small><a href="/technical/#source-code-and-licensing">AI Scraping Notice</a></small></p>
+		</footer>
+
+		{% block script %}{% endblock %}
+	</body>
+</html>
diff --git a/src/_includes/obsidian.pug b/src/_includes/obsidian.pug
deleted file mode 100644
index 306fb26..0000000
--- a/src/_includes/obsidian.pug
+++ /dev/null
@@ -1,124 +0,0 @@
-doctype html
-html(lang="en")
-    head
-        style.
-            body {
-                --background: #111;
-                --background-2: #252525;
-                --background-3: #444;
-                --color: #fffbe3;
-                --color-2: #d0c895;
-
-                background: var(--background);
-                color: var(--color);
-                font-family: "Reckless", serif;
-                margin: 0;
-                padding: 0;
-                overflow-x: hidden;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-            }
-
-            .wrapper {
-                max-width: 800px;
-                width: calc(100% - 40px);
-                padding-left: 20px;
-                padding-right: 20px;
-                margin-bottom: 100px;
-                min-height: 100vh;
-            }
-
-        block meta
-            meta(charset='utf-8')
-            meta(name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no')
-            meta(http-equiv='x-ua-compatible' content='ie=edge')
-            meta(name='description' content='Hi, there! My name is Garrett. I am a computer scientist, software engineer, and speaker.')
-            meta(name='keywords' content='garrett mills glmdev developer speaker flitter extollo student')
-            meta(name='author' content='Garrett Mills')
-            meta(name='robots' content='index, follow')
-            link(rel='author' href='/humans.txt')
-            link(rel="alternate" href="/feed/atom.xml" title="Garrett Mills - Notes (Atom)" type="application/atom+xml")
-            link(rel="alternate" href="/feed/rss.xml" title="Garrett Mills - Notes (RSS)" type="application/rss+xml")
-            link(rel="alternate" href="/feed/json.json" title="Garrett Mills - Notes (JSON)" type="application/feed+json")
-            link(rel="alternate" href="/blog/atom.xml" title="Garrett's Blog (Atom)" type="application/atom+xml")
-            link(rel="alternate" href="/blog/rss2.xml" title="Garrett's Blog (RSS)" type="application/rss+xml")
-            link(rel="alternate" href="/blog/json.json" title="Garrett's Blog (JSON)" type="application/feed+json")
-            include meta.html
-
-        block title
-            if title
-                title #{title} | Garrett Mills
-            else
-                title Garrett Mills
-
-        block style
-            // Register fonts here to avoid 2 layer network dependency tree for bundle.css
-            style.
-                @font-face {
-                    font-family: 'Obsidian';
-                    src: url('/assets/font/obsidian/Obsidian-Roman.otf') format('opentype');
-                    font-weight: normal;
-                    font-style: normal;
-                    font-display: swap;
-                }
-
-                @font-face {
-                    font-family: "JetBrains Mono";
-                    src: url("/assets/font/jetbrains-mono/JetBrainsMono-Regular.woff2") format('woff2');
-                    font-weight: normal;
-                    font-style: normal;
-                    font-display: swap;
-                }
-
-                @font-face {
-                    font-family: "Reckless";
-                    src: url("/assets/font/reckless/WEB/Reckless-Regular.woff2") format('woff2');
-                    font-weight: normal;
-                    font-style: normal;
-                    font-display: swap;
-                }
-
-                @font-face {
-                    font-family: "Reckless";
-                    src: url("/assets/font/reckless/WEB/Reckless-RegularItalic.woff2") format('woff2');
-                    font-weight: normal;
-                    font-style: italic;
-                    font-display: swap;
-                }
-
-                @font-face {
-                    font-family: "Reckless";
-                    src: url("/assets/font/reckless/WEB/Reckless-Bold.woff2") format('woff2');
-                    font-weight: bold;
-                    font-style: normal;
-                    font-display: swap;
-                }
-
-            link(rel='stylesheet' href='/bundle.css')
-
-    body
-        .wrapper
-            header.hero glm.
-            nav
-                ul
-                    li
-                        a(href='/') Home
-                    //li
-                        a(href='/timeline') Timeline
-                    li
-                        a(href='/blog') Blog
-                    li
-                        a(href='/feed') Notes
-                    li
-                        a(href='/links') Bookmarks <img class="inline-markmark-logo" src="/assets/img/markmark-light.svg" eleventy:ignore alt="MarkMark logo"/>
-
-            block content
-                div.content-wrapper(role='main') !{content}
-
-        footer
-            .obsidian glm.
-            p &copy 2015-#{(new Date).getFullYear()} Garrett Mills — <a href="/technical">Technical Info</a><br><small><a href="/technical/#source-code-and-licensing">AI Scraping Notice</a></small>
-
-        block script
-
diff --git a/src/_includes/redirect.liquid b/src/_includes/redirect.liquid
new file mode 100644
index 0000000..7af1daf
--- /dev/null
+++ b/src/_includes/redirect.liquid
@@ -0,0 +1,13 @@
+{% layout 'obsidian.liquid' %}
+
+{% block content %}
+	<div class="content-wrapper">
+		<p>You should be redirected shortly. If not, click <a href="{{ redirect_to }}">here</a>.</p>
+	</div>
+
+	{% block script %}
+		<script>
+			window.location.href = "{{ redirect_to }}"
+		</script>
+	{% endblock %}
+{% endblock %}
diff --git a/src/_includes/redirect.pug b/src/_includes/redirect.pug
deleted file mode 100644
index 72b7e57..0000000
--- a/src/_includes/redirect.pug
+++ /dev/null
@@ -1,8 +0,0 @@
-extends ./obsidian
-
-block content
-    div.content-wrapper
-        p You should be redirected shortly. If not, click <a href="!{redirect_to}">here</a>.
-
-    script.
-        window.location.href = "!{redirect_to}"
diff --git a/src/blog/archive.liquid b/src/blog/archive.liquid
new file mode 100644
index 0000000..bf6ae9b
--- /dev/null
+++ b/src/blog/archive.liquid
@@ -0,0 +1,19 @@
+{% layout 'blog.liquid' %}
+
+{% block blog_content %}
+	<h2>Post Archive</h2>
+
+	<div class="recent-posts">
+		{% for year in collections.blogByYear %}
+			<h3>{{ year.year }}</h3>
+			<ul class="plain">
+				{% for post in year.posts %}
+					<li>
+						<div class="secondary">{{ post.date | date: "%Y-%m-%d" }}</div>
+						<a class="title" href="{{ post.url }}">{{ post.data.title }}</a>
+					</li>
+				{% endfor %}
+			</ul>
+		{% endfor %}
+	</div>
+{% endblock %}
diff --git a/src/blog/archive.pug b/src/blog/archive.pug
deleted file mode 100644
index 526b84e..0000000
--- a/src/blog/archive.pug
+++ /dev/null
@@ -1,13 +0,0 @@
-extends /blog
-
-block blog_content
-    h2 Post Archive
-
-    .recent-posts
-        each year in collections.blogByYear
-            h3 #{year.year}
-            ul.plain
-                each post in year.posts
-                    li
-                        .secondary #{post.date.toISOString().split('T')[0]}
-                        a.title(href=post.url) #{post.data.title}
diff --git a/src/blog/feeds.liquid b/src/blog/feeds.liquid
new file mode 100644
index 0000000..391c6e1
--- /dev/null
+++ b/src/blog/feeds.liquid
@@ -0,0 +1,24 @@
+---
+layout: blog
+---
+
+{% renderFile 'src/blog/feeds-stub.md' %}
+
+<h3>Garrett's RSS List</h3>
+
+<blockquote>
+This list is also available in the standard <a href="/assets/rss_opml.xml" download>OPML format</a>.
+</blockquote>
+
+{% for cat in collections.opmlByCategory %}
+	{% if cat.title == "Garrett Mills" %}
+		<h4 style="background-color: var(--c-font)">{{ cat.title }} (Shameless Self-Plug)</h4>
+	{% else %}
+		<h4 style="background-color: var(--c-font)">{{ cat.title }}</h4>
+	{% endif %}
+	<ul>
+		{% for sub in cat.subs %}
+			<li><a href="{{ sub.htmlUrl }}" download>{{ sub.title }}</a></li>
+		{% endfor %}
+	</ul>
+{% endfor %}
diff --git a/src/blog/feeds.njk b/src/blog/feeds.njk
deleted file mode 100644
index 2fdabe7..0000000
--- a/src/blog/feeds.njk
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: blog
----
-
-{% renderFile "src/blog/feeds-stub.md" %}
-
-<h3>Garrett's RSS List</h3>
-
-<blockquote>
-This list is also available in the standard <a href="/assets/rss_opml.xml" download>OPML format</a>.
-</blockquote>
-
-{% for cat in collections.opmlByCategory %}
-    {% if (cat.title == "Garrett Mills") %}
-        <h4 style="background-color: var(--c-font)">{{ cat.title }} (Shameless Self-Plug)</h4>
-    {% else %}
-        <h4 style="background-color: var(--c-font)">{{ cat.title }}</h4>
-    {% endif %}
-    <ul>
-        {% for sub in cat.subs %}
-            <li><a href="{{ sub.htmlUrl }}" download>{{ sub.title }}</a></li>
-        {% endfor %}
-    </ul>
-{% endfor %}
diff --git a/src/blog/feeds/atom.xml.njk b/src/blog/feeds/atom.xml.liquid
similarity index 92%
rename from src/blog/feeds/atom.xml.njk
rename to src/blog/feeds/atom.xml.liquid
index 77b9bd1..e062cfd 100644
--- a/src/blog/feeds/atom.xml.njk
+++ b/src/blog/feeds/atom.xml.liquid
@@ -30,7 +30,7 @@ metadata:
     <category term="Technology"/>
     <category term="Software Development"/>
     {%- for post in collections.blog %}
-        {%- set absolutePostUrl = post.url | htmlBaseUrl(metadata.base) %}
+        {%- assign absolutePostUrl = post.url | htmlBaseUrl: metadata.base %}
         <entry>
             <title type="html"><![CDATA[{{ post.data.title }}]]></title>
             <id>{{ absolutePostUrl }}</id>
@@ -41,7 +41,7 @@ metadata:
                 <email>{{ metadata.author.email }}</email>
                 <uri>{{ metadata.base }}/#about</uri>
             </author>
-            <content type="html">{{ post.content | renderTransforms(post.data.page, metadata.base) }}</content>
+            <content type="html">{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</content>
         </entry>
     {%- endfor %}
-</feed>
\ No newline at end of file
+</feed>
diff --git a/src/blog/feeds/json.json.liquid b/src/blog/feeds/json.json.liquid
new file mode 100644
index 0000000..b4afa28
--- /dev/null
+++ b/src/blog/feeds/json.json.liquid
@@ -0,0 +1,45 @@
+---
+permalink: /blog/json.json
+eleventyExcludeFromCollections: true
+metadata:
+    title: "Garrett's Blog"
+    description: "Write-ups and musings by Garrett Mills, often technical, sometimes not."
+    language: en
+    base: "https://garrettmills.dev"
+    author:
+        name: "Garrett Mills"
+        email: "shout@garrettmills.dev"
+---
+{
+	"version": "https://jsonfeed.org/version/1.1",
+	"title": "{{ metadata.title }}",
+	"language": "{{ metadata.language }}",
+	"home_page_url": "{{ metadata.base | addPathPrefixToFullUrl }}",
+	"feed_url": "{{ permalink | htmlBaseUrl: metadata.base }}",
+	"description": "{{ metadata.description }}",
+	"icon": "{{ metadata.base }}/assets/favicon/apple-touch-icon.png",
+	"authors": [
+		{
+			"name": "{{ metadata.author.name }}",
+			"url": "{{ metadata.base }}/#about"
+		}
+	],
+	"items": [
+		{%- for post in collections.blog %}
+			{%- capture absolutePostUrl %}{{ post.url | htmlBaseUrl: metadata.base }}{% endcapture %}
+			{
+				"id": "{{ absolutePostUrl }}",
+				"url": "{{ absolutePostUrl }}",
+				"title": "{{ post.data.title }}",
+				"content_html": {% if post.content %}{{ post.content | renderTransforms: post.data.page, metadata.base | json }}{% else %}""{% endif %},
+				"date_published": "{{ post.date | dateToRfc3339 }}",
+				"date_modified": "{{ post.date | dateToRfc3339 }}",
+				"author": {
+					"name": "{{ metadata.author.name }}",
+					"url": "{{ metadata.base }}/#about"
+				}
+			}
+			{% unless forloop.last %},{% endunless %}
+		{%- endfor %}
+	]
+}
diff --git a/src/blog/feeds/json.json.njk b/src/blog/feeds/json.json.njk
deleted file mode 100644
index f0435cb..0000000
--- a/src/blog/feeds/json.json.njk
+++ /dev/null
@@ -1,45 +0,0 @@
----
-permalink: /blog/json.json
-eleventyExcludeFromCollections: true
-metadata:
-    title: "Garrett's Blog"
-    description: "Write-ups and musings by Garrett Mills, often technical, sometimes not."
-    language: en
-    base: "https://garrettmills.dev"
-    author:
-        name: "Garrett Mills"
-        email: "shout@garrettmills.dev"
----
-{
-    "version": "https://jsonfeed.org/version/1.1",
-    "title": "{{ metadata.title }}",
-    "language": "{{ metadata.language }}",
-    "home_page_url": "{{ metadata.base | addPathPrefixToFullUrl }}",
-    "feed_url": "{{ permalink | htmlBaseUrl(metadata.base) }}",
-    "description": "{{ metadata.description }}",
-    "icon": "{{ metadata.base }}/assets/favicon/apple-touch-icon.png",
-    "authors": [
-        {
-            "name": "{{ metadata.author.name }}",
-            "url": "{{ metadata.base }}/#about"
-        }
-    ],
-    "items": [
-        {%- for post in collections.blog %}
-            {%- set absolutePostUrl %}{{ post.url | htmlBaseUrl(metadata.base) }}{% endset %}
-            {
-                "id": "{{ absolutePostUrl }}",
-                "url": "{{ absolutePostUrl }}",
-                "title": "{{ post.data.title }}",
-                "content_html": {% if post.content %}{{ post.content | renderTransforms(post.data.page, metadata.base) | dump | safe }}{% else %}""{% endif %},
-                "date_published": "{{ post.date | dateToRfc3339 }}",
-                "date_modified": "{{ post.date | dateToRfc3339 }}",
-                "author": {
-                    "name": "{{ metadata.author.name }}",
-                    "url": "{{ metadata.base }}/#about"
-                }
-            }
-            {% if not loop.last %},{% endif %}
-        {%- endfor %}
-    ]
-}
\ No newline at end of file
diff --git a/src/blog/feeds/obsidian.xsl.njk b/src/blog/feeds/obsidian.xsl.liquid
similarity index 100%
rename from src/blog/feeds/obsidian.xsl.njk
rename to src/blog/feeds/obsidian.xsl.liquid
diff --git a/src/blog/feeds/rss2.xml.njk b/src/blog/feeds/rss2.xml.liquid
similarity index 85%
rename from src/blog/feeds/rss2.xml.njk
rename to src/blog/feeds/rss2.xml.liquid
index d99fe85..0395368 100644
--- a/src/blog/feeds/rss2.xml.njk
+++ b/src/blog/feeds/rss2.xml.liquid
@@ -28,10 +28,10 @@ metadata:
         <copyright>Copyright (c) 2026 Garrett Mills. See website for licensing details.</copyright>
         <category>Technology</category>
         <category>Software Development</category>
-        <atom:link href="permalink | htmlBaseUrl(metadata.base)" rel="self" type="application/rss+xml"/>
+        <atom:link href="permalink | htmlBaseUrl: metadata.base" rel="self" type="application/rss+xml"/>
 
         {%- for post in collections.blog %}
-            {%- set absolutePostUrl = post.url | htmlBaseUrl(metadata.base) %}
+            {%- assign absolutePostUrl = post.url | htmlBaseUrl: metadata.base %}
             <item>
                 <title><![CDATA[{{ post.data.title }}]]></title>
                 <link>{{ absolutePostUrl }}</link>
@@ -39,9 +39,9 @@ metadata:
                 <pubDate>{{ post.date | dateToRfc822 }}</pubDate>
                 <author>{{ metadata.author.name }}</author>
                 <dc:creator>{{ metadata.author.name }}</dc:creator>
-                <description>{{ post.content | renderTransforms(post.data.page, metadata.base) }}</description>
-                <content:encoded>{{ post.content | renderTransforms(post.data.page, metadata.base) }}</content:encoded>
+                <description>{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</description>
+                <content:encoded>{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</content:encoded>
             </item>
         {%- endfor %}
     </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/src/blog/index.liquid b/src/blog/index.liquid
new file mode 100644
index 0000000..4fe1a8d
--- /dev/null
+++ b/src/blog/index.liquid
@@ -0,0 +1,18 @@
+{% layout 'blog.liquid' %}
+
+{% block blog_content %}
+	<p>Write-ups and musings, often technical, sometimes not.</p>
+
+	<h2>Recent(ish) Posts</h2>
+
+	<div class="recent-posts">
+		<ul class="plain">
+			{% for post in collections.blog reversed limit:10 %}
+				<li>
+					<div class="secondary">{{ post.data.date | date: "%Y-%m-%d" }}</div>
+					<a class="title" href="{{ post.url }}">{{ post.data.title }}</a>
+				</li>
+			{% endfor %}
+		</ul>
+	</div>
+{% endblock %}
diff --git a/src/blog/index.pug b/src/blog/index.pug
deleted file mode 100644
index 4fc33c5..0000000
--- a/src/blog/index.pug
+++ /dev/null
@@ -1,13 +0,0 @@
-extends /blog
-
-block blog_content
-    p Write-ups and musings, often technical, sometimes not.
-
-    h2 Recent(ish) Posts
-
-    .recent-posts
-        ul.plain
-            each post in collections.blog.reverse().slice(0, 10)
-                li
-                    .secondary #{post.data.date.toISOString().split('T')[0]}
-                    a.title(href=post.url) #{post.data.title}
diff --git a/src/blog/tag.liquid b/src/blog/tag.liquid
new file mode 100644
index 0000000..5e76127
--- /dev/null
+++ b/src/blog/tag.liquid
@@ -0,0 +1,21 @@
+---
+layout: blog
+pagination:
+    data: collections.blogByTag
+    size: 1
+    alias: tag
+permalink: "/blog/tag/{{ tag.tag }}/"
+---
+
+<h2>Posts w/ Tag: {{ tag.tag }}</h2>
+
+<div class="recent-posts">
+	<ul class="plain">
+		{% for post in tag.posts %}
+			<li>
+				<div class="secondary">{{ post.date | date: "%Y-%m-%d" }}</div>
+				<a class="title" href="{{ post.url }}">{{ post.data.title }}</a>
+			</li>
+		{% endfor %}
+	</ul>
+</div>
diff --git a/src/blog/tag.njk b/src/blog/tag.njk
deleted file mode 100644
index 77784ba..0000000
--- a/src/blog/tag.njk
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: blog
-pagination:
-    data: collections.blogByTag
-    size: 1
-    alias: tag
-permalink: "/blog/tag/{{ tag.tag }}/"
----
-
-<h2>Posts w/ Tag: {{ tag.tag }}</h2>
-
-<div class="recent-posts">
-    <ul class="plain">
-        {% for post in tag.posts %}
-            <li>
-                <div class="secondary">{{ post.date.toISOString().split('T')[0] }}</div>
-                <a class="title" href="{{ post.url }}">{{ post.data.title }}</a>
-            </li>
-        {% endfor %}
-    </ul>
-</div>
diff --git a/src/blog/tags.liquid b/src/blog/tags.liquid
new file mode 100644
index 0000000..fe8f228
--- /dev/null
+++ b/src/blog/tags.liquid
@@ -0,0 +1,13 @@
+{% layout 'blog.liquid' %}
+
+{% block blog_content %}
+	<h2>Tags</h2>
+
+	<div class="post-tags listed">
+		<ul>
+			{% for tag in collections.blogByTag %}
+				<li><a class="button" href="/blog/tag/{{ tag.tag }}">#{{ tag.tag }}</a>&nbsp;&nbsp;&nbsp;<span style="color: var(--color-2); font-variant-ligatures: none;">({{ tag.posts | size }})</span></li>
+			{% endfor %}
+		</ul>
+	</div>
+{% endblock %}
diff --git a/src/blog/tags.pug b/src/blog/tags.pug
deleted file mode 100644
index 27a19bf..0000000
--- a/src/blog/tags.pug
+++ /dev/null
@@ -1,9 +0,0 @@
-extends /blog
-
-block blog_content
-    h2 Tags
-
-    .post-tags.listed
-        ul
-            each tag in collections.blogByTag
-                li <a class="button" href="/blog/tag/#{tag.tag}">##{tag.tag}</a>&nbsp;&nbsp;&nbsp;<span style="color: var(--color-2); font-variant-ligatures: none;">(#{tag.posts.length})</a>
diff --git a/src/css-bundle.liquid b/src/css-bundle.liquid
new file mode 100644
index 0000000..504f097
--- /dev/null
+++ b/src/css-bundle.liquid
@@ -0,0 +1,7 @@
+---
+permalink: bundle.css
+---
+{% include './assets/css/normalize.css' %}
+{% include './assets/css/prism-cb.css' %}
+{% include './assets/css/obsidian.css' %}
+{% include './assets/css/feed.css' %}
diff --git a/src/css-bundle.njk b/src/css-bundle.njk
deleted file mode 100644
index 03c8b3a..0000000
--- a/src/css-bundle.njk
+++ /dev/null
@@ -1,7 +0,0 @@
----
-permalink: bundle.css
----
-{% include "./assets/css/normalize.css" %}
-{% include "./assets/css/prism-cb.css" %}
-{% include "./assets/css/obsidian.css" %}
-{% include "./assets/css/feed.css" %}
diff --git a/src/feed/feeds/atom.xml.njk b/src/feed/feeds/atom.xml.liquid
similarity index 92%
rename from src/feed/feeds/atom.xml.njk
rename to src/feed/feeds/atom.xml.liquid
index d85f7da..f1a481a 100644
--- a/src/feed/feeds/atom.xml.njk
+++ b/src/feed/feeds/atom.xml.liquid
@@ -30,7 +30,7 @@ metadata:
     <category term="Technology"/>
     <category term="Software Development"/>
     {%- for post in collections.feedDesc %}
-        {%- set absolutePostUrl = post.url | htmlBaseUrl(metadata.base) %}
+        {%- assign absolutePostUrl = post.url | htmlBaseUrl: metadata.base %}
         <entry>
             <title type="html"><![CDATA[{{ post.data.title }}]]></title>
             <id>{{ absolutePostUrl }}</id>
@@ -41,7 +41,7 @@ metadata:
                 <email>{{ metadata.author.email }}</email>
                 <uri>{{ metadata.base }}/#about</uri>
             </author>
-            <content type="html">{{ post.content | renderTransforms(post.data.page, metadata.base) }}</content>
+            <content type="html">{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</content>
         </entry>
     {%- endfor %}
-</feed>
\ No newline at end of file
+</feed>
diff --git a/src/feed/feeds/json.json.liquid b/src/feed/feeds/json.json.liquid
new file mode 100644
index 0000000..e1b4017
--- /dev/null
+++ b/src/feed/feeds/json.json.liquid
@@ -0,0 +1,45 @@
+---
+permalink: /feed/json.json
+eleventyExcludeFromCollections: true
+metadata:
+    title: "Garrett Mills - Notes"
+    description: "Misc notes, posts, links, and updates from garrettmills.dev."
+    language: en
+    base: "https://garrettmills.dev"
+    author:
+        name: "Garrett Mills"
+        email: "shout@garrettmills.dev"
+---
+{
+	"version": "https://jsonfeed.org/version/1.1",
+	"title": "{{ metadata.title }}",
+	"language": "{{ metadata.language }}",
+	"home_page_url": "{{ metadata.base | addPathPrefixToFullUrl }}",
+	"feed_url": "{{ permalink | htmlBaseUrl: metadata.base }}",
+	"description": "{{ metadata.description }}",
+	"icon": "{{ metadata.base }}/assets/favicon/apple-touch-icon.png",
+	"authors": [
+		{
+			"name": "{{ metadata.author.name }}",
+			"url": "{{ metadata.base }}/#about"
+		}
+	],
+	"items": [
+		{%- for post in collections.feedDesc %}
+			{%- capture absolutePostUrl %}{{ post.url | htmlBaseUrl: metadata.base }}{% endcapture %}
+			{
+				"id": "{{ absolutePostUrl }}",
+				"url": "{{ absolutePostUrl }}",
+				"title": "{{ post.data.title }}",
+				"content_html": {% if post.content %}{{ post.content | renderTransforms: post.data.page, metadata.base | json }}{% else %}""{% endif %},
+				"date_published": "{{ post.date | dateToRfc3339 }}",
+				"date_modified": "{{ post.date | dateToRfc3339 }}",
+				"author": {
+					"name": "{{ metadata.author.name }}",
+					"url": "{{ metadata.base }}/#about"
+				}
+			}
+			{% unless forloop.last %},{% endunless %}
+		{%- endfor %}
+	]
+}
diff --git a/src/feed/feeds/json.json.njk b/src/feed/feeds/json.json.njk
deleted file mode 100644
index 74cdb8c..0000000
--- a/src/feed/feeds/json.json.njk
+++ /dev/null
@@ -1,45 +0,0 @@
----
-permalink: /feed/json.json
-eleventyExcludeFromCollections: true
-metadata:
-    title: "Garrett Mills - Notes"
-    description: "Misc notes, posts, links, and updates from garrettmills.dev."
-    language: en
-    base: "https://garrettmills.dev"
-    author:
-        name: "Garrett Mills"
-        email: "shout@garrettmills.dev"
----
-{
-    "version": "https://jsonfeed.org/version/1.1",
-    "title": "{{ metadata.title }}",
-    "language": "{{ metadata.language }}",
-    "home_page_url": "{{ metadata.base | addPathPrefixToFullUrl }}",
-    "feed_url": "{{ permalink | htmlBaseUrl(metadata.base) }}",
-    "description": "{{ metadata.description }}",
-    "icon": "{{ metadata.base }}/assets/favicon/apple-touch-icon.png",
-    "authors": [
-        {
-            "name": "{{ metadata.author.name }}",
-            "url": "{{ metadata.base }}/#about"
-        }
-    ],
-    "items": [
-        {%- for post in collections.feedDesc %}
-            {%- set absolutePostUrl %}{{ post.url | htmlBaseUrl(metadata.base) }}{% endset %}
-            {
-                "id": "{{ absolutePostUrl }}",
-                "url": "{{ absolutePostUrl }}",
-                "title": "{{ post.data.title }}",
-                "content_html": {% if post.content %}{{ post.content | renderTransforms(post.data.page, metadata.base) | dump | safe }}{% else %}""{% endif %},
-                "date_published": "{{ post.date | dateToRfc3339 }}",
-                "date_modified": "{{ post.date | dateToRfc3339 }}",
-                "author": {
-                    "name": "{{ metadata.author.name }}",
-                    "url": "{{ metadata.base }}/#about"
-                }
-            }
-            {% if not loop.last %},{% endif %}
-        {%- endfor %}
-    ]
-}
\ No newline at end of file
diff --git a/src/feed/feeds/rss2.xml.njk b/src/feed/feeds/rss2.xml.liquid
similarity index 85%
rename from src/feed/feeds/rss2.xml.njk
rename to src/feed/feeds/rss2.xml.liquid
index 59f8c8b..7bdb6aa 100644
--- a/src/feed/feeds/rss2.xml.njk
+++ b/src/feed/feeds/rss2.xml.liquid
@@ -28,10 +28,10 @@ metadata:
         <copyright>Copyright (c) 2026 Garrett Mills. See website for licensing details.</copyright>
         <category>Technology</category>
         <category>Software Development</category>
-        <atom:link href="permalink | htmlBaseUrl(metadata.base)" rel="self" type="application/rss+xml"/>
+        <atom:link href="permalink | htmlBaseUrl: metadata.base" rel="self" type="application/rss+xml"/>
 
         {%- for post in collections.feedDesc %}
-            {%- set absolutePostUrl = post.url | htmlBaseUrl(metadata.base) %}
+            {%- assign absolutePostUrl = post.url | htmlBaseUrl: metadata.base %}
             <item>
                 <title><![CDATA[{{ post.data.title }}]]></title>
                 <link>{{ absolutePostUrl }}</link>
@@ -39,9 +39,9 @@ metadata:
                 <pubDate>{{ post.date | dateToRfc822 }}</pubDate>
                 <author>{{ metadata.author.name }}</author>
                 <dc:creator>{{ metadata.author.name }}</dc:creator>
-                <description>{{ post.content | renderTransforms(post.data.page, metadata.base) }}</description>
-                <content:encoded>{{ post.content | renderTransforms(post.data.page, metadata.base) }}</content:encoded>
+                <description>{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</description>
+                <content:encoded>{{ post.content | renderTransforms: post.data.page, metadata.base | xml_escape }}</content:encoded>
             </item>
         {%- endfor %}
     </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/src/feed/index.liquid b/src/feed/index.liquid
new file mode 100644
index 0000000..78364ea
--- /dev/null
+++ b/src/feed/index.liquid
@@ -0,0 +1,33 @@
+{% layout 'obsidian.liquid' %}
+
+{% block content %}
+	<div class="container feed" id="top">
+		<h1>Notes</h1>
+		<p class="button-links">
+			<a class="button" href="/feed/rss.xml">RSS</a>
+			<a class="button" href="/feed/atom.xml">Atom</a>
+			<a class="button" href="/feed/json.json">JSON</a>
+		</p>
+
+		<section id="posts">
+			{% for post in collections.feedDesc %}
+				<div class="post" id="{{ post.data.slug }}">
+					{% if post.data.feedtags %}
+						<div class="tags">
+							{% for tag in post.data.feedtags %}
+								<a class="tag" href="#">{{ tag }}</a>
+							{% endfor %}
+						</div>
+					{% endif %}
+					<h2>{{ post.data.title }}</h2>
+					<div class="content-wrapper">{{ post.content }}</div>
+					<div class="footer">
+						<a class="permalink" href="{{ post.url }}">permalink (v2)</a>
+						<span class="sep">|</span>
+						<span class="date">{{ post.date | date: "%m/%d/%Y" }}</span>
+					</div>
+				</div>
+			{% endfor %}
+		</section>
+	</div>
+{% endblock %}
diff --git a/src/feed/index.pug b/src/feed/index.pug
deleted file mode 100644
index 54f6dcf..0000000
--- a/src/feed/index.pug
+++ /dev/null
@@ -1,23 +0,0 @@
-extends /obsidian
-
-block content
-    .container.feed#top
-        h1 Notes
-        p.button-links
-            a.button(href='/feed/rss.xml') RSS
-            a.button(href='/feed/atom.xml') Atom
-            a.button(href='/feed/json.json') JSON
-
-        section#posts
-            each post in collections.feedDesc
-                .post(id=post.data.slug)
-                    if post.data.feedtags
-                        .tags
-                            each tag in post.data.feedtags
-                                a.tag(href="#") #{tag}
-                    h2 #{post.data.title}
-                    .content-wrapper !{post.content}
-                    .footer
-                        a.permalink(href=post.url) permalink (v2)
-                        span.sep |
-                        span.date #{post.date.toLocaleDateString()}
diff --git a/src/go/comp_pi.njk b/src/go/comp_pi.liquid
similarity index 100%
rename from src/go/comp_pi.njk
rename to src/go/comp_pi.liquid
diff --git a/src/go/csx.njk b/src/go/csx.liquid
similarity index 100%
rename from src/go/csx.njk
rename to src/go/csx.liquid
diff --git a/src/go/open-letter.njk b/src/go/open-letter.liquid
similarity index 100%
rename from src/go/open-letter.njk
rename to src/go/open-letter.liquid
diff --git a/src/go/resume.njk b/src/go/resume.liquid
similarity index 100%
rename from src/go/resume.njk
rename to src/go/resume.liquid
diff --git a/src/humans.njk b/src/humans.liquid
similarity index 100%
rename from src/humans.njk
rename to src/humans.liquid
diff --git a/src/robots.njk b/src/robots.liquid
similarity index 100%
rename from src/robots.njk
rename to src/robots.liquid