diff --git a/dist/index.html b/dist/index.html
index c9fb86a..f924db7 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -20,27 +20,29 @@
 
 <nav class="Site-nav Nav" x-data :style="$store['subNav'].open ? '--Site-nav-gridArea: Site-nav;' : ''">
     <a href="/" class="Nav-link">index</a>
-    <button class="Nav-link" @click="$store['subNav'].toggle('collections')" aria-controls="collections-submenu"
-            aria-expanded="false">
-        collections
-    </button>
-    <a href="/about/" class="Nav-link">about</a>
-    <a href="/manifesto/" class="Nav-link">manifesto</a>
-    <a href="/diary/" class="Nav-link">diary</a>
-    <a href="/links/" class="Nav-link">links</a>
+<button class="Nav-link" @click="$store['subNav'].toggle('collections')" aria-controls="collections-submenu"
+        aria-expanded="false">
+    collections
+</button>
+<a href="/about/" class="Nav-link">about</a>
+<a href="/manifesto/" class="Nav-link">manifesto</a>
+<a href="/diary/" class="Nav-link">diary</a>
+<a href="/links/" class="Nav-link">links</a>
 
-    <hr class="Nav-separator">
+<hr class="Nav-separator">
+
+<a href="https://epiphany.punkfairie.net" target="_blank" class="Nav-link">epiphany</a>
+<a href="https://saudade.punkfairie.net" target="_blank" class="Nav-link">petz archive</a>
 
-    <a href="https://epiphany.punkfairie.net" target="_blank" class="Nav-link">epiphany</a>
-    <a href="https://saudade.punkfairie.net" target="_blank" class="Nav-link">petz archive</a>
 </nav>
 
 <nav class="Site-subNav Nav" x-data x-show="$store['subNav'].current === 'collections'" id="collections-submenu">
     <p class="Nav-caption"><i>Warning: flashing gifs; very image heavy.</i></p>
 
-    <a href="/collections/buttons/" class="Nav-link">buttons</a>
-    <a href="/collections/blinkies/" class="Nav-link">blinkies</a>
-    <a href="/collections/stamps/" class="Nav-link">stamps</a>
+<a href="/collections/buttons/" class="Nav-link">buttons</a>
+<a href="/collections/blinkies/" class="Nav-link">blinkies</a>
+<a href="/collections/stamps/" class="Nav-link">stamps</a>
+
 </nav>
 
 <main class="Site-content">
@@ -53,11 +55,11 @@
 </main>
 
 <aside class="Site-info">
-
+    
 </aside>
 
 <aside class="Site-social">
-
+    
 </aside>
 
 <!--suppress HtmlUnknownTarget -->
diff --git a/src/_includes/collections-nav.liquid b/src/_includes/collections-nav.liquid
new file mode 100644
index 0000000..1302cbe
--- /dev/null
+++ b/src/_includes/collections-nav.liquid
@@ -0,0 +1,5 @@
+<p class="Nav-caption"><i>Warning: flashing gifs; very image heavy.</i></p>
+
+<a href="/collections/buttons/" class="Nav-link">buttons</a>
+<a href="/collections/blinkies/" class="Nav-link">blinkies</a>
+<a href="/collections/stamps/" class="Nav-link">stamps</a>
diff --git a/src/_includes/layout.liquid b/src/_includes/layout.liquid
index 092dfa3..a431d9b 100644
--- a/src/_includes/layout.liquid
+++ b/src/_includes/layout.liquid
@@ -19,28 +19,11 @@
 <h1 class="Site-title">punkfairie.net</h1>
 
 <nav class="Site-nav Nav" x-data :style="$store['subNav'].open ? '--Site-nav-gridArea: Site-nav;' : ''">
-    <a href="/" class="Nav-link">index</a>
-    <button class="Nav-link" @click="$store['subNav'].toggle('collections')" aria-controls="collections-submenu"
-            aria-expanded="false">
-        collections
-    </button>
-    <a href="/about/" class="Nav-link">about</a>
-    <a href="/manifesto/" class="Nav-link">manifesto</a>
-    <a href="/diary/" class="Nav-link">diary</a>
-    <a href="/links/" class="Nav-link">links</a>
-
-    <hr class="Nav-separator">
-
-    <a href="https://epiphany.punkfairie.net" target="_blank" class="Nav-link">epiphany</a>
-    <a href="https://saudade.punkfairie.net" target="_blank" class="Nav-link">petz archive</a>
+    {% include 'main-nav' %}
 </nav>
 
 <nav class="Site-subNav Nav" x-data x-show="$store['subNav'].current === 'collections'" id="collections-submenu">
-    <p class="Nav-caption"><i>Warning: flashing gifs; very image heavy.</i></p>
-
-    <a href="/collections/buttons/" class="Nav-link">buttons</a>
-    <a href="/collections/blinkies/" class="Nav-link">blinkies</a>
-    <a href="/collections/stamps/" class="Nav-link">stamps</a>
+    {% include 'collections-nav' %}
 </nav>
 
 <main class="Site-content">
@@ -48,11 +31,11 @@
 </main>
 
 <aside class="Site-info">
-
+    {% include 'site-info' %}
 </aside>
 
 <aside class="Site-social">
-
+    {% include 'site-social' %}
 </aside>
 
 <!--suppress HtmlUnknownTarget -->
diff --git a/src/_includes/main-nav.liquid b/src/_includes/main-nav.liquid
new file mode 100644
index 0000000..36d7683
--- /dev/null
+++ b/src/_includes/main-nav.liquid
@@ -0,0 +1,14 @@
+<a href="/" class="Nav-link">index</a>
+<button class="Nav-link" @click="$store['subNav'].toggle('collections')" aria-controls="collections-submenu"
+        aria-expanded="false">
+    collections
+</button>
+<a href="/about/" class="Nav-link">about</a>
+<a href="/manifesto/" class="Nav-link">manifesto</a>
+<a href="/diary/" class="Nav-link">diary</a>
+<a href="/links/" class="Nav-link">links</a>
+
+<hr class="Nav-separator">
+
+<a href="https://epiphany.punkfairie.net" target="_blank" class="Nav-link">epiphany</a>
+<a href="https://saudade.punkfairie.net" target="_blank" class="Nav-link">petz archive</a>
diff --git a/src/_includes/site-info.liquid b/src/_includes/site-info.liquid
new file mode 100644
index 0000000..e69de29
diff --git a/src/_includes/site-social.liquid b/src/_includes/site-social.liquid
new file mode 100644
index 0000000..e69de29