diff --git a/templates/404.html b/templates/404.html
index 616d6e5..c729ec1 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -11,12 +11,12 @@ because I don't know what URL will be served this template. #}
   <meta property="og:locale" content="en-us">
   <meta property="og:title" content="404 Not Found">
   <meta property="og:description" content="404 Not Found">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="twitter:card" content="summary">
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="404 Not Found">
   <meta property="twitter:description" content="404 Not Found">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {# Again, since I dont't know ahead of time what page will be served the this
@@ -36,5 +36,5 @@ template. Best we can do is replace the canonical link with a blank. #}
       </figcaption>
     </figure>
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}
diff --git a/templates/comments.html b/templates/_partials/comments.html
similarity index 100%
rename from templates/comments.html
rename to templates/_partials/comments.html
diff --git a/templates/footer.html b/templates/_partials/footer.html
similarity index 100%
rename from templates/footer.html
rename to templates/_partials/footer.html
diff --git a/templates/_partials/head.html b/templates/_partials/head.html
new file mode 100644
index 0000000..e69de29
diff --git a/templates/archive.html b/templates/archive.html
index 4126818..ac781ae 100644
--- a/templates/archive.html
+++ b/templates/archive.html
@@ -22,5 +22,5 @@
             </div>
         {% endfor %}
     </main>
-    {% include "footer.html" %}
+    {% include "_partials/footer.html" %}
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 048503d..ec51608 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,12 +13,12 @@
       <meta property="og:title" content="{{ section.title }}">
       <meta property="og:description" content="{{ section.description }}">
       <meta property="og:type" content="profile">
-      <meta property="og:image" content="https://andwati.github.io/self.jpg">
+      <meta property="og:image" content="https://andwati.github.io/self.webp">
       <meta property="twitter:card" content="summary">
       <meta property="twitter:site" content="@andwati_">
       <meta property="twitter:title" content="{{ section.title }}">
       <meta property="twitter:description" content="{{ section.description }}">
-      <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+      <meta property="twitter:image" content="https://andwati.github.io/self.webp">
     {% endblock meta %}
     <link rel="dns-prefetch" href="https://fonts.googleapis.com/">
     <link rel="stylesheet" href="/site.css">
@@ -38,7 +38,7 @@
         </header>
         {{ section.content | safe }}
       </main>
-      {% include "footer.html" %}
+      {% include "_partials/footer.html" %}
     {% endblock content %}
   </body>
 </html>
diff --git a/templates/page.html b/templates/page.html
index 4bdf665..d582626 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -11,12 +11,12 @@
   <meta property="og:url" content="{{ page.permalink }}">
   <meta property="og:title" content="{{ page.title }}">
   <meta property="og:description" content="{{ page.description }}">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="twitter:card" content="summary">
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="{{ page.title }}">
   <meta property="twitter:description" content="{{ page.description }}">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {# Override base links to use page-specific ones. #}
@@ -32,5 +32,5 @@
     </header>
     {{ page.content | safe }}
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}
diff --git a/templates/post.html b/templates/post.html
index f38d99d..8d05f94 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -11,7 +11,7 @@ posts add article metadata. #}
   <meta property="og:title" content="{{ page.title }}">
   <meta property="og:description" content="{{ page.description }}">
   <meta property="og:type" content="article">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="og:article:author" content="{{ config.extra.author }}">
   <meta property="og:article:published_time" content="{{ page.date }}">
   <meta property="og:article:section" content="Posts">
@@ -22,7 +22,7 @@ posts add article metadata. #}
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="{{ page.title }}">
   <meta property="twitter:description" content="{{ page.description }}">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {% block content %}
@@ -34,7 +34,7 @@ posts add article metadata. #}
       </header>
       {{ page.content | safe }}
     </article>
-    {% include "comments.html" %}
+    {% include "_partials/comments.html" %}
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}
diff --git a/templates/posts.html b/templates/posts.html
index 4cbd8b4..a96c7f2 100644
--- a/templates/posts.html
+++ b/templates/posts.html
@@ -10,5 +10,5 @@
       {{ post_macros::snippet(page=page) }}
     {% endfor %}
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}
diff --git a/templates/section.html b/templates/section.html
index f863b41..1607e4c 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -11,12 +11,12 @@
   <meta property="og:url" content="{{ section.permalink }}">
   <meta property="og:title" content="{{ section.title }}">
   <meta property="og:description" content="{{ section.description }}">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="twitter:card" content="summary">
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="{{ section.title }}">
   <meta property="twitter:description" content="{{ section.description }}">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {# Override base links to use section-specific ones. #}
diff --git a/templates/tags/list.html b/templates/tags/list.html
index 2c6b4d0..be2be54 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -9,12 +9,12 @@
   <meta property="og:url" content="{{ current_url }}">
   <meta property="og:title" content="Tags">
   <meta property="og:description" content="All tags.">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="twitter:card" content="summary">
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="Tags">
   <meta property="twitter:description" content="All tags.">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {% block links %}
@@ -34,6 +34,6 @@
       </ul>
     {% endif %}
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}
 
diff --git a/templates/tags/single.html b/templates/tags/single.html
index 604f997..16dc7fa 100644
--- a/templates/tags/single.html
+++ b/templates/tags/single.html
@@ -10,12 +10,12 @@
   <meta property="og:url" content="{{ current_url }}">
   <meta property="og:title" content="Tag - {{ term.name }}">
   <meta property="og:description" content="Posts tagged as {{ term.name }}">
-  <meta property="og:image" content="https://andwati.github.io/self.jpg">
+  <meta property="og:image" content="https://andwati.github.io/self.webp">
   <meta property="twitter:card" content="summary">
   <meta property="twitter:site" content="@andwati_">
   <meta property="twitter:title" content="Tag - {{ term.name }}">
   <meta property="twitter:description" content="Posts tagged as {{ term.name }}">
-  <meta property="twitter:image" content="https://andwati.github.io/self.jpg">
+  <meta property="twitter:image" content="https://andwati.github.io/self.webp">
 {% endblock meta %}
 
 {% block links %}
@@ -31,5 +31,5 @@
       {{ post_macros::snippet(page=page) }}
     {% endfor %}
   </main>
-  {% include "footer.html" %}
+  {% include "_partials/footer.html" %}
 {% endblock content %}