From f162f04a6e63d9815dc3dedf051e45b533db84c6 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Sat, 8 Jul 2023 12:57:37 -0700
Subject: [PATCH] chore: refactor includes to render

---
 src/404.html                                |  2 +-
 src/_data/site.js                           | 12 +++++++
 src/_data/site.json                         | 19 -----------
 src/_includes/base.liquid                   |  2 +-
 src/_includes/default.liquid                |  2 +-
 src/_includes/icons/apple-music.liquid      | 24 +++++++-------
 src/_includes/icons/coffee.liquid           | 25 +++++++-------
 src/_includes/icons/fastmail.liquid         | 36 ++++++++++-----------
 src/_includes/icons/github.liquid           | 24 +++++++-------
 src/_includes/icons/letterboxd.liquid       | 24 +++++++-------
 src/_includes/icons/mastodon.liquid         | 24 +++++++-------
 src/_includes/icons/trakt.liquid            | 24 +++++++-------
 src/_includes/main.liquid                   |  2 +-
 src/_includes/now.liquid                    |  2 +-
 src/_includes/partials/author.liquid        |  3 +-
 src/_includes/partials/footer.liquid        | 14 ++++----
 src/_includes/partials/header.liquid        |  2 +-
 src/_includes/partials/nav.liquid           |  6 ++--
 src/_includes/partials/popular-posts.liquid |  2 +-
 src/_includes/post.liquid                   | 10 +++---
 src/search.html                             |  2 +-
 21 files changed, 119 insertions(+), 142 deletions(-)
 create mode 100644 src/_data/site.js
 delete mode 100644 src/_data/site.json

diff --git a/src/404.html b/src/404.html
index 8c4f9f92..ee8e665f 100644
--- a/src/404.html
+++ b/src/404.html
@@ -21,4 +21,4 @@ permalink: 404.html
   </div>
 </div>
 <hr />
-{% include "partials/popular-posts.liquid" %}
+{% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %}
diff --git a/src/_data/site.js b/src/_data/site.js
new file mode 100644
index 00000000..09f92949
--- /dev/null
+++ b/src/_data/site.js
@@ -0,0 +1,12 @@
+module.exports = async function () {
+  return {
+    "name": "Cory Dransfeldt",
+    "email": "hi@coryd.dev",
+    "url": "https://coryd.dev",
+    "logo": "https://coryd.dev/assets/img/logo.webp",
+    "title": "Cory Dransfeldt",
+    "description": "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, music, writing, reading and tv and movies.",
+    "letterboxd-host": "https://a.ltrbxd.com",
+    "cdn-movies": "https://movies.coryd.dev"
+  }
+}
diff --git a/src/_data/site.json b/src/_data/site.json
deleted file mode 100644
index 5119c3b5..00000000
--- a/src/_data/site.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "Cory Dransfeldt",
-  "email": "hi@coryd.dev",
-  "url": "https://coryd.dev",
-  "logo": "https://coryd.dev/assets/img/logo.webp",
-  "title": "Cory Dransfeldt",
-  "description": "I'm a software developer in Camarillo, California. I enjoy hanging out with my beautiful family and 4 rescue dogs, technology, automation, music, writing, reading and tv and movies.",
-  "fastmail": "mailto:hi@coryd.dev",
-  "github": "https://github.com/cdransf",
-  "mastodon": "https://social.lol/@cory",
-  "applemusic": "https://music.apple.com/profile/cdransf",
-  "listenbrainz": "https://listenbrainz.org/user/cdransf/",
-  "instapaper": "https://www.instapaper.com/p/coryd",
-  "letterboxd": "https://letterboxd.com/cdme",
-  "letterboxd-host": "https://a.ltrbxd.com",
-  "trakt": "https://trakt.tv/users/cdransf",
-  "coffee": "https://www.buymeacoffee.com/cory",
-  "cdn-movies": "https://movies.coryd.dev"
-}
diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid
index 4102f344..b8032c1a 100644
--- a/src/_includes/base.liquid
+++ b/src/_includes/base.liquid
@@ -31,7 +31,7 @@
     <link rel="apple-touch-icon" href="/assets/img/favicon/apple-touch-icon.png">
     <link href="/assets/styles/tailwind.css?v={% version %}" rel="stylesheet" />
     {% capture css %}
-      {% include "../assets/styles/prism.css" %}
+      {% render "../assets/styles/prism.css" %}
     {% endcapture %}
     <style>
       {{ css | cssmin }}
diff --git a/src/_includes/default.liquid b/src/_includes/default.liquid
index 7d6f14ce..d99a4c9d 100644
--- a/src/_includes/default.liquid
+++ b/src/_includes/default.liquid
@@ -2,7 +2,7 @@
 layout: main
 ---
 
-{% include "partials/header.liquid" %}
+{% render "partials/header.liquid", site: site %}
 
 <div class="pt-8 prose dark:prose-invert hover:prose-a:text-blue-500 max-w-full">
   {{ content }}
diff --git a/src/_includes/icons/apple-music.liquid b/src/_includes/icons/apple-music.liquid
index e3db63c6..3d5784e5 100644
--- a/src/_includes/icons/apple-music.liquid
+++ b/src/_includes/icons/apple-music.liquid
@@ -1,13 +1,11 @@
-{% if site.applemusic != "" %}
-  <a
-    href={{ site.applemusic }}
-    rel="me"
-    title="Apple Music">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apple Music</title>
-      <path
-        d="M23.994 6.124a9.23 9.23 0 00-.24-2.19c-.317-1.31-1.062-2.31-2.18-3.043a5.022 5.022 0 00-1.877-.726 10.496 10.496 0 00-1.564-.15c-.04-.003-.083-.01-.124-.013H5.986c-.152.01-.303.017-.455.026-.747.043-1.49.123-2.193.4-1.336.53-2.3 1.452-2.865 2.78-.192.448-.292.925-.363 1.408-.056.392-.088.785-.1 1.18 0 .032-.007.062-.01.093v12.223c.01.14.017.283.027.424.05.815.154 1.624.497 2.373.65 1.42 1.738 2.353 3.234 2.801.42.127.856.187 1.293.228.555.053 1.11.06 1.667.06h11.03a12.5 12.5 0 001.57-.1c.822-.106 1.596-.35 2.295-.81a5.046 5.046 0 001.88-2.207c.186-.42.293-.87.37-1.324.113-.675.138-1.358.137-2.04-.002-3.8 0-7.595-.003-11.393zm-6.423 3.99v5.712c0 .417-.058.827-.244 1.206-.29.59-.76.962-1.388 1.14-.35.1-.706.157-1.07.173-.95.045-1.773-.6-1.943-1.536a1.88 1.88 0 011.038-2.022c.323-.16.67-.25 1.018-.324.378-.082.758-.153 1.134-.24.274-.063.457-.23.51-.516a.904.904 0 00.02-.193c0-1.815 0-3.63-.002-5.443a.725.725 0 00-.026-.185c-.04-.15-.15-.243-.304-.234-.16.01-.318.035-.475.066-.76.15-1.52.303-2.28.456l-2.325.47-1.374.278c-.016.003-.032.01-.048.013-.277.077-.377.203-.39.49-.002.042 0 .086 0 .13-.002 2.602 0 5.204-.003 7.805 0 .42-.047.836-.215 1.227-.278.64-.77 1.04-1.434 1.233-.35.1-.71.16-1.075.172-.96.036-1.755-.6-1.92-1.544-.14-.812.23-1.685 1.154-2.075.357-.15.73-.232 1.108-.31.287-.06.575-.116.86-.177.383-.083.583-.323.6-.714v-.15c0-2.96 0-5.922.002-8.882 0-.123.013-.25.042-.37.07-.285.273-.448.546-.518.255-.066.515-.112.774-.165.733-.15 1.466-.296 2.2-.444l2.27-.46c.67-.134 1.34-.27 2.01-.403.22-.043.442-.088.663-.106.31-.025.523.17.554.482.008.073.012.148.012.223.002 1.91.002 3.822 0 5.732z"/>
-    </svg>
-  </a>
-{% endif %}
\ No newline at end of file
+<a
+  href="https://music.apple.com/profile/cdransf"
+  rel="me"
+  title="Apple Music">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apple Music</title>
+    <path
+      d="M23.994 6.124a9.23 9.23 0 00-.24-2.19c-.317-1.31-1.062-2.31-2.18-3.043a5.022 5.022 0 00-1.877-.726 10.496 10.496 0 00-1.564-.15c-.04-.003-.083-.01-.124-.013H5.986c-.152.01-.303.017-.455.026-.747.043-1.49.123-2.193.4-1.336.53-2.3 1.452-2.865 2.78-.192.448-.292.925-.363 1.408-.056.392-.088.785-.1 1.18 0 .032-.007.062-.01.093v12.223c.01.14.017.283.027.424.05.815.154 1.624.497 2.373.65 1.42 1.738 2.353 3.234 2.801.42.127.856.187 1.293.228.555.053 1.11.06 1.667.06h11.03a12.5 12.5 0 001.57-.1c.822-.106 1.596-.35 2.295-.81a5.046 5.046 0 001.88-2.207c.186-.42.293-.87.37-1.324.113-.675.138-1.358.137-2.04-.002-3.8 0-7.595-.003-11.393zm-6.423 3.99v5.712c0 .417-.058.827-.244 1.206-.29.59-.76.962-1.388 1.14-.35.1-.706.157-1.07.173-.95.045-1.773-.6-1.943-1.536a1.88 1.88 0 011.038-2.022c.323-.16.67-.25 1.018-.324.378-.082.758-.153 1.134-.24.274-.063.457-.23.51-.516a.904.904 0 00.02-.193c0-1.815 0-3.63-.002-5.443a.725.725 0 00-.026-.185c-.04-.15-.15-.243-.304-.234-.16.01-.318.035-.475.066-.76.15-1.52.303-2.28.456l-2.325.47-1.374.278c-.016.003-.032.01-.048.013-.277.077-.377.203-.39.49-.002.042 0 .086 0 .13-.002 2.602 0 5.204-.003 7.805 0 .42-.047.836-.215 1.227-.278.64-.77 1.04-1.434 1.233-.35.1-.71.16-1.075.172-.96.036-1.755-.6-1.92-1.544-.14-.812.23-1.685 1.154-2.075.357-.15.73-.232 1.108-.31.287-.06.575-.116.86-.177.383-.083.583-.323.6-.714v-.15c0-2.96 0-5.922.002-8.882 0-.123.013-.25.042-.37.07-.285.273-.448.546-.518.255-.066.515-.112.774-.165.733-.15 1.466-.296 2.2-.444l2.27-.46c.67-.134 1.34-.27 2.01-.403.22-.043.442-.088.663-.106.31-.025.523.17.554.482.008.073.012.148.012.223.002 1.91.002 3.822 0 5.732z"/>
+  </svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/coffee.liquid b/src/_includes/icons/coffee.liquid
index fe073aa2..1237efbf 100644
--- a/src/_includes/icons/coffee.liquid
+++ b/src/_includes/icons/coffee.liquid
@@ -1,14 +1,11 @@
-{% if site.coffee != "" %}
-    <a
-    href={{ site.coffee }}
-    onclick="fathom.trackGoal('XMRKO0GY', 0)"
-    rel="me"
-    title="Buy Me a Coffee">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg">
-      <title>Buy Me A Coffee</title><path d="M20.216 6.415l-.132-.666c-.119-.598-.388-1.163-1.001-1.379-.197-.069-.42-.098-.57-.241-.152-.143-.196-.366-.231-.572-.065-.378-.125-.756-.192-1.133-.057-.325-.102-.69-.25-.987-.195-.4-.597-.634-.996-.788a5.723 5.723 0 00-.626-.194c-1-.263-2.05-.36-3.077-.416a25.834 25.834 0 00-3.7.062c-.915.083-1.88.184-2.75.5-.318.116-.646.256-.888.501-.297.302-.393.77-.177 1.146.154.267.415.456.692.58.36.162.737.284 1.123.366 1.075.238 2.189.331 3.287.37 1.218.05 2.437.01 3.65-.118.299-.033.598-.073.896-.119.352-.054.578-.513.474-.834-.124-.383-.457-.531-.834-.473-.466.074-.96.108-1.382.146-1.177.08-2.358.082-3.536.006a22.228 22.228 0 01-1.157-.107c-.086-.01-.18-.025-.258-.036-.243-.036-.484-.08-.724-.13-.111-.027-.111-.185 0-.212h.005c.277-.06.557-.108.838-.147h.002c.131-.009.263-.032.394-.048a25.076 25.076 0 013.426-.12c.674.019 1.347.067 2.017.144l.228.031c.267.04.533.088.798.145.392.085.895.113 1.07.542.055.137.08.288.111.431l.319 1.484a.237.237 0 01-.199.284h-.003c-.037.006-.075.01-.112.015a36.704 36.704 0 01-4.743.295 37.059 37.059 0 01-4.699-.304c-.14-.017-.293-.042-.417-.06-.326-.048-.649-.108-.973-.161-.393-.065-.768-.032-1.123.161-.29.16-.527.404-.675.701-.154.316-.199.66-.267 1-.069.34-.176.707-.135 1.056.087.753.613 1.365 1.37 1.502a39.69 39.69 0 0011.343.376.483.483 0 01.535.53l-.071.697-1.018 9.907c-.041.41-.047.832-.125 1.237-.122.637-.553 1.028-1.182 1.171-.577.131-1.165.2-1.756.205-.656.004-1.31-.025-1.966-.022-.699.004-1.556-.06-2.095-.58-.475-.458-.54-1.174-.605-1.793l-.731-7.013-.322-3.094c-.037-.351-.286-.695-.678-.678-.336.015-.718.3-.678.679l.228 2.185.949 9.112c.147 1.344 1.174 2.068 2.446 2.272.742.12 1.503.144 2.257.156.966.016 1.942.053 2.892-.122 1.408-.258 2.465-1.198 2.616-2.657.34-3.332.683-6.663 1.024-9.995l.215-2.087a.484.484 0 01.39-.426c.402-.078.787-.212 1.074-.518.455-.488.546-1.124.385-1.766zm-1.478.772c-.145.137-.363.201-.578.233-2.416.359-4.866.54-7.308.46-1.748-.06-3.477-.254-5.207-.498-.17-.024-.353-.055-.47-.18-.22-.236-.111-.71-.054-.995.052-.26.152-.609.463-.646.484-.057 1.046.148 1.526.22.577.088 1.156.159 1.737.212 2.48.226 5.002.19 7.472-.14.45-.06.899-.13 1.345-.21.399-.072.84-.206 1.08.206.166.281.188.657.162.974a.544.544 0 01-.169.364zm-6.159 3.9c-.862.37-1.84.788-3.109.788a5.884 5.884 0 01-1.569-.217l.877 9.004c.065.78.717 1.38 1.5 1.38 0 0 1.243.065 1.658.065.447 0 1.786-.065 1.786-.065.783 0 1.434-.6 1.499-1.38l.94-9.95a3.996 3.996 0 00-1.322-.238c-.826 0-1.491.284-2.26.613z" /></svg>
-  </a>
-{% endif %}
+  <a
+  href="https://www.buymeacoffee.com/cory"
+  rel="me"
+  title="Buy Me a Coffee">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>Buy Me A Coffee</title><path d="M20.216 6.415l-.132-.666c-.119-.598-.388-1.163-1.001-1.379-.197-.069-.42-.098-.57-.241-.152-.143-.196-.366-.231-.572-.065-.378-.125-.756-.192-1.133-.057-.325-.102-.69-.25-.987-.195-.4-.597-.634-.996-.788a5.723 5.723 0 00-.626-.194c-1-.263-2.05-.36-3.077-.416a25.834 25.834 0 00-3.7.062c-.915.083-1.88.184-2.75.5-.318.116-.646.256-.888.501-.297.302-.393.77-.177 1.146.154.267.415.456.692.58.36.162.737.284 1.123.366 1.075.238 2.189.331 3.287.37 1.218.05 2.437.01 3.65-.118.299-.033.598-.073.896-.119.352-.054.578-.513.474-.834-.124-.383-.457-.531-.834-.473-.466.074-.96.108-1.382.146-1.177.08-2.358.082-3.536.006a22.228 22.228 0 01-1.157-.107c-.086-.01-.18-.025-.258-.036-.243-.036-.484-.08-.724-.13-.111-.027-.111-.185 0-.212h.005c.277-.06.557-.108.838-.147h.002c.131-.009.263-.032.394-.048a25.076 25.076 0 013.426-.12c.674.019 1.347.067 2.017.144l.228.031c.267.04.533.088.798.145.392.085.895.113 1.07.542.055.137.08.288.111.431l.319 1.484a.237.237 0 01-.199.284h-.003c-.037.006-.075.01-.112.015a36.704 36.704 0 01-4.743.295 37.059 37.059 0 01-4.699-.304c-.14-.017-.293-.042-.417-.06-.326-.048-.649-.108-.973-.161-.393-.065-.768-.032-1.123.161-.29.16-.527.404-.675.701-.154.316-.199.66-.267 1-.069.34-.176.707-.135 1.056.087.753.613 1.365 1.37 1.502a39.69 39.69 0 0011.343.376.483.483 0 01.535.53l-.071.697-1.018 9.907c-.041.41-.047.832-.125 1.237-.122.637-.553 1.028-1.182 1.171-.577.131-1.165.2-1.756.205-.656.004-1.31-.025-1.966-.022-.699.004-1.556-.06-2.095-.58-.475-.458-.54-1.174-.605-1.793l-.731-7.013-.322-3.094c-.037-.351-.286-.695-.678-.678-.336.015-.718.3-.678.679l.228 2.185.949 9.112c.147 1.344 1.174 2.068 2.446 2.272.742.12 1.503.144 2.257.156.966.016 1.942.053 2.892-.122 1.408-.258 2.465-1.198 2.616-2.657.34-3.332.683-6.663 1.024-9.995l.215-2.087a.484.484 0 01.39-.426c.402-.078.787-.212 1.074-.518.455-.488.546-1.124.385-1.766zm-1.478.772c-.145.137-.363.201-.578.233-2.416.359-4.866.54-7.308.46-1.748-.06-3.477-.254-5.207-.498-.17-.024-.353-.055-.47-.18-.22-.236-.111-.71-.054-.995.052-.26.152-.609.463-.646.484-.057 1.046.148 1.526.22.577.088 1.156.159 1.737.212 2.48.226 5.002.19 7.472-.14.45-.06.899-.13 1.345-.21.399-.072.84-.206 1.08.206.166.281.188.657.162.974a.544.544 0 01-.169.364zm-6.159 3.9c-.862.37-1.84.788-3.109.788a5.884 5.884 0 01-1.569-.217l.877 9.004c.065.78.717 1.38 1.5 1.38 0 0 1.243.065 1.658.065.447 0 1.786-.065 1.786-.065.783 0 1.434-.6 1.499-1.38l.94-9.95a3.996 3.996 0 00-1.322-.238c-.826 0-1.491.284-2.26.613z" /></svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/fastmail.liquid b/src/_includes/icons/fastmail.liquid
index cd1a5d07..d4542fed 100644
--- a/src/_includes/icons/fastmail.liquid
+++ b/src/_includes/icons/fastmail.liquid
@@ -1,20 +1,18 @@
-{% if site.fastmail != "" %}
-  <a
-    href={{ site.fastmail }}
-    rel="me"
-    title="Fastmail">
-    <?xml version="1.0" encoding="utf-8"?>
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-      <g transform="matrix(0.976563, 0, 0, -0.976563, -0.000137, 437.500092)">
-        <g transform="">
-          <path
-            d="M 256 192 L 375 274 L 375 125 C 375 117 368 110 360 110 L 136 110 L 136 274 L 256 192 Z M 512 192 C 512 51 397 -64 256 -64 C 168 -64 91 -20 45 47 L 91 79 C 127 27 187 -8 256 -8 C 366 -8 456 82 456 192 C 456 233 443 272 420 305 L 420 305 C 384 358 324 392 256 392 C 145 392 56 303 56 192 C 56 152 68 112 91 79 L 45 47 C 16 90 0 140 0 192 C 0 333 115 448 256 448 C 343 448 420 404 466 337 C 496 294 512 244 512 192 Z M 512 192"
-          />
-        </g>
+<a
+  href="mailto:hi@coryd.dev"
+  rel="me"
+  title="Fastmail">
+  <?xml version="1.0" encoding="utf-8"?>
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+    <g transform="matrix(0.976563, 0, 0, -0.976563, -0.000137, 437.500092)">
+      <g transform="">
+        <path
+          d="M 256 192 L 375 274 L 375 125 C 375 117 368 110 360 110 L 136 110 L 136 274 L 256 192 Z M 512 192 C 512 51 397 -64 256 -64 C 168 -64 91 -20 45 47 L 91 79 C 127 27 187 -8 256 -8 C 366 -8 456 82 456 192 C 456 233 443 272 420 305 L 420 305 C 384 358 324 392 256 392 C 145 392 56 303 56 192 C 56 152 68 112 91 79 L 45 47 C 16 90 0 140 0 192 C 0 333 115 448 256 448 C 343 448 420 404 466 337 C 496 294 512 244 512 192 Z M 512 192"
+        />
       </g>
-      <title>Fastmail</title>
-    </svg>
-  </a>
-{% endif %}
\ No newline at end of file
+    </g>
+    <title>Fastmail</title>
+  </svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/github.liquid b/src/_includes/icons/github.liquid
index c100b0ca..3ecbd1ff 100644
--- a/src/_includes/icons/github.liquid
+++ b/src/_includes/icons/github.liquid
@@ -1,13 +1,11 @@
-{% if site.github != "" %}
-    <a
-    href={{ site.github }}
-    rel="me"
-    title="GitHub">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg">
-      <title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" /></svg>
-  </a>
-{% endif %}
+<a
+  href="https://github.com/cdransf"
+  rel="me"
+  title="GitHub">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" /></svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/letterboxd.liquid b/src/_includes/icons/letterboxd.liquid
index 4caf7b5c..f0f883e5 100644
--- a/src/_includes/icons/letterboxd.liquid
+++ b/src/_includes/icons/letterboxd.liquid
@@ -1,13 +1,11 @@
-{% if site.letterboxd != "" %}
-  <a
-    href={{ site.letterboxd }}
-    rel="me"
-    title="Letterboxd">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg">
-      <title>Letterboxd</title><path d="M8.29 16.752V7.2H6.546V4.8h6.328v2.4h-1.746v9.574h3.925v-2.618h2.839V19.2H6.545v-2.448h1.746zM0 12c0 6.628 5.372 12 12 12s12-5.372 12-12S18.628 0 12 0 0 5.372 0 12z" /></svg>
-  </a>
-{% endif %}
\ No newline at end of file
+<a
+  href="https://letterboxd.com/cdme"
+  rel="me"
+  title="Letterboxd">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>Letterboxd</title><path d="M8.29 16.752V7.2H6.546V4.8h6.328v2.4h-1.746v9.574h3.925v-2.618h2.839V19.2H6.545v-2.448h1.746zM0 12c0 6.628 5.372 12 12 12s12-5.372 12-12S18.628 0 12 0 0 5.372 0 12z" /></svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/mastodon.liquid b/src/_includes/icons/mastodon.liquid
index 1451d98a..f1e3e90d 100644
--- a/src/_includes/icons/mastodon.liquid
+++ b/src/_includes/icons/mastodon.liquid
@@ -1,13 +1,11 @@
-{% if site.mastodon != "" %}
-  <a
-    href={{ site.mastodon }}
-    rel="me"
-    title="Mastodon">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg">
-      <title>Mastodon</title><path d="M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.67 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z" /></svg>
-  </a>
-{% endif %}
\ No newline at end of file
+<a
+  href="https://social.lol/@cory"
+  rel="me"
+  title="Mastodon">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>Mastodon</title><path d="M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.67 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z" /></svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/icons/trakt.liquid b/src/_includes/icons/trakt.liquid
index 38ca6cdf..b1a8c7b6 100644
--- a/src/_includes/icons/trakt.liquid
+++ b/src/_includes/icons/trakt.liquid
@@ -1,13 +1,11 @@
-{% if site.trakt != "" %}
-  <a
-    href={{ site.trakt }}
-    rel="me"
-    title="Trakt">
-    <svg
-      class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
-      role="img"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg">
-      <title>Trakt</title><path d="M12 24C5.385 24 0 18.615 0 12S5.385 0 12 0s12 5.385 12 12-5.385 12-12 12zm0-22.789C6.05 1.211 1.211 6.05 1.211 12S6.05 22.79 12 22.79 22.79 17.95 22.79 12 17.95 1.211 12 1.211zm-7.11 17.32c1.756 1.92 4.294 3.113 7.11 3.113 1.439 0 2.801-.313 4.027-.876l-6.697-6.68-4.44 4.443zm14.288-.067c1.541-1.71 2.484-3.99 2.484-6.466 0-3.885-2.287-7.215-5.568-8.76l-6.089 6.076 9.164 9.15h.009zm-9.877-8.429L4.227 15.09l-.679-.68 5.337-5.336 6.23-6.225c-.978-.328-2.02-.509-3.115-.509C6.663 2.337 2.337 6.663 2.337 12c0 2.172.713 4.178 1.939 5.801l5.056-5.055.359.329 7.245 7.245c.15-.082.285-.164.42-.266L9.33 12.05l-4.854 4.855-.679-.679 5.535-5.535.359.331 8.46 8.437c.135-.1.255-.215.375-.316L9.39 10.027l-.083.015-.006-.007zm3.047 1.028l-.678-.676 4.788-4.79.679.689-4.789 4.785v-.008zm4.542-6.578l-5.52 5.52-.68-.679 5.521-5.52.679.684v-.005z" /></svg>
-  </a>
-{% endif %}
\ No newline at end of file
+<a
+  href="https://trakt.tv/users/cdransf"
+  rel="me"
+  title="Trakt">
+  <svg
+    class="inline w-6 h-6 fill-current text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500"
+    role="img"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg">
+    <title>Trakt</title><path d="M12 24C5.385 24 0 18.615 0 12S5.385 0 12 0s12 5.385 12 12-5.385 12-12 12zm0-22.789C6.05 1.211 1.211 6.05 1.211 12S6.05 22.79 12 22.79 22.79 17.95 22.79 12 17.95 1.211 12 1.211zm-7.11 17.32c1.756 1.92 4.294 3.113 7.11 3.113 1.439 0 2.801-.313 4.027-.876l-6.697-6.68-4.44 4.443zm14.288-.067c1.541-1.71 2.484-3.99 2.484-6.466 0-3.885-2.287-7.215-5.568-8.76l-6.089 6.076 9.164 9.15h.009zm-9.877-8.429L4.227 15.09l-.679-.68 5.337-5.336 6.23-6.225c-.978-.328-2.02-.509-3.115-.509C6.663 2.337 2.337 6.663 2.337 12c0 2.172.713 4.178 1.939 5.801l5.056-5.055.359.329 7.245 7.245c.15-.082.285-.164.42-.266L9.33 12.05l-4.854 4.855-.679-.679 5.535-5.535.359.331 8.46 8.437c.135-.1.255-.215.375-.316L9.39 10.027l-.083.015-.006-.007zm3.047 1.028l-.678-.676 4.788-4.79.679.689-4.789 4.785v-.008zm4.542-6.578l-5.52 5.52-.68-.679 5.521-5.52.679.684v-.005z" /></svg>
+</a>
\ No newline at end of file
diff --git a/src/_includes/main.liquid b/src/_includes/main.liquid
index 8f96b110..8b8ea661 100644
--- a/src/_includes/main.liquid
+++ b/src/_includes/main.liquid
@@ -6,5 +6,5 @@ layout: base
   <main class="flex-1 w-10/12 max-w-screen-sm md:max-w-screen-md mx-auto">
     {{ content }}
   </main>
-  {% include "partials/footer.liquid" %}
+  {% render "partials/footer.liquid" %}
 </div>
\ No newline at end of file
diff --git a/src/_includes/now.liquid b/src/_includes/now.liquid
index 11a06273..bdba9c7a 100644
--- a/src/_includes/now.liquid
+++ b/src/_includes/now.liquid
@@ -1,7 +1,7 @@
 ---
 layout: main
 ---
-{% include "partials/header.liquid" %}
+{% render "partials/header.liquid", site: site %}
 <h2 class="m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4">
   {% heroicon "outline" "clock" "Currently" "height=28" %}
   <div class="ml-1">Currently</div>
diff --git a/src/_includes/partials/author.liquid b/src/_includes/partials/author.liquid
index 431b75df..41da2f88 100644
--- a/src/_includes/partials/author.liquid
+++ b/src/_includes/partials/author.liquid
@@ -1,8 +1,7 @@
-<!--suppress ALL -->
 <div class="mt-12 py-8 border-t-2 flex flex-col md:flex-row justify-between items-center">
   <div class="flex flex-col mb-4 md:mb-0 md:flex-row items-center flex-1">
     {% image './src/assets/img/avatar.webp', site.name, 'inline-block h-20 w-20 mr-2', '80px' %}
     <span class="text-lg font-medium">{{ site.name }}</span>
   </div>
   <p class="text-sm flex-1">{{ site.description }}</p>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/_includes/partials/footer.liquid b/src/_includes/partials/footer.liquid
index cfa3fb07..972a029e 100644
--- a/src/_includes/partials/footer.liquid
+++ b/src/_includes/partials/footer.liquid
@@ -1,12 +1,12 @@
 <footer>
   <div class="mt-8 pt-8 pb-4 flex gap-3 justify-center w-full">
-    {% include "icons/fastmail.liquid" %}
-    {% include "icons/github.liquid" %}
-    {% include "icons/mastodon.liquid" %}
-    {% include "icons/apple-music.liquid" %}
-    {% include "icons/letterboxd.liquid" %}
-    {% include "icons/trakt.liquid" %}
-    {% include "icons/coffee.liquid" %}
+    {% render "icons/fastmail.liquid" %}
+    {% render "icons/github.liquid" %}
+    {% render "icons/mastodon.liquid" %}
+    {% render "icons/apple-music.liquid" %}
+    {% render "icons/letterboxd.liquid" %}
+    {% render "icons/trakt.liquid" %}
+    {% render "icons/coffee.liquid" %}
   </div>
   <p class="text-sm text-gray-500 dark:text-gray-100 pb-8 text-center">
     <a class="text-gray-500 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500{% if page.url == '/uses/' %} active{% endif %}" href="/uses">Uses</a> •
diff --git a/src/_includes/partials/header.liquid b/src/_includes/partials/header.liquid
index b91f170c..cc8bf55a 100644
--- a/src/_includes/partials/header.liquid
+++ b/src/_includes/partials/header.liquid
@@ -2,5 +2,5 @@
   <h1 class="text-2xl md:text-3xl font-black leading-tight pb-5 md:pb-0">
     <a class="text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500" href="/">{{ site.title }}</a>
   </h1>
-  {% include "partials/nav.liquid" %}
+  {% render "partials/nav.liquid" %}
 </div>
\ No newline at end of file
diff --git a/src/_includes/partials/nav.liquid b/src/_includes/partials/nav.liquid
index 7a38d09b..a5b63def 100644
--- a/src/_includes/partials/nav.liquid
+++ b/src/_includes/partials/nav.liquid
@@ -7,13 +7,13 @@
       <a class="text-gray-700 hover:text-purple-500 dark:text-gray-200 dark:hover:text-purple-500{% if page.url == '/about/' %} active{% endif %}" href="/about">About</a>
     </li>
     <li class="mr-6">
-      {% include "icons/tags.liquid" %}
+      {% render "icons/tags.liquid" %}
     </li>
     <li class="mr-6 client-side">
-      {% include "icons/search.liquid" %}
+      {% render "icons/search.liquid" %}
     </li>
     <li>
-      {% include "icons/rss.liquid" %}
+      {% render "icons/rss.liquid" %}
     </li>
   </ul>
 </nav>
\ No newline at end of file
diff --git a/src/_includes/partials/popular-posts.liquid b/src/_includes/partials/popular-posts.liquid
index b6e1d19a..a2bbd67e 100644
--- a/src/_includes/partials/popular-posts.liquid
+++ b/src/_includes/partials/popular-posts.liquid
@@ -1,4 +1,4 @@
-{% assign posts = collections.posts | getPopularPosts: analytics %}
+{% assign posts = posts | getPopularPosts: analytics %}
 <div class="not-prose">
   <h2 class="m-0 text-xl flex flex-row items-center font-black leading-tight tracking-normal dark:text-gray-200 md:text-2xl mt-8 mb-4">
     {% heroicon "outline" "fire" "Popular" "height=28" %}
diff --git a/src/_includes/post.liquid b/src/_includes/post.liquid
index 36b1fba8..c8096def 100644
--- a/src/_includes/post.liquid
+++ b/src/_includes/post.liquid
@@ -1,7 +1,7 @@
 ---
 layout: main
 ---
-{% include "partials/header.liquid" %}
+{% render "partials/header.liquid", site: site %}
 <article class="h-entry" data-pagefind-body>
   <h2 class="p-name text-xl md:text-2xl font-black leading-tight dark:text-gray-200 pt-8" data-pagefind-meta="title">{{ title }}</h2>
   <span class="p-author h-card hidden">{{ site.title }}</span>
@@ -11,7 +11,7 @@ layout: main
     {{ content }}
   </div>
 </article>
-{% include "partials/post-tags.liquid" %}
-{% include "partials/webmentions.liquid" %}
-{% include "partials/author.liquid" %}
-{% include "partials/popular-posts.liquid" %}
\ No newline at end of file
+{% render "partials/post-tags.liquid", tags: tags %}
+{% render "partials/webmentions.liquid", webmentions: webmentions %}
+{% render "partials/author.liquid", site: site %}
+{% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %}
\ No newline at end of file
diff --git a/src/search.html b/src/search.html
index 2a4acb4a..96d27f22 100644
--- a/src/search.html
+++ b/src/search.html
@@ -36,4 +36,4 @@ meta:
 </style>
 <div id="search" class="search"></div>
 <script src="https://coryd.dev/_pagefind/pagefind-ui.js" onload="new PagefindUI({ element: '#search', showImages: false });"></script>
-{% include "partials/popular-posts.liquid" %}
+{% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %}