@@ -1,15 +1,19 @@
 {% extends "base.html" %}
 
+{% block body_attrs %} class="h-card vcard"{% endblock %}
+
+{% block title_class %} p-name fn{% endblock %}
+
 {% block main %}
-<main class="h-card">
-  <h1 class="p-name">{{ config.title }}</h1>
-  {{ section.content | safe }}
+  <content>
+    {{ section.content | safe }}
+  </content>
   <section>
     <h2>Latest Posts</h2>
     <ul class="h-feed">
       {%- for page in section.pages | slice(end=3) %}
         <li class="h-entry">
-          <time class="dt-published" datetime="{{ page.date | date(format="%+") }}">{{ page.date | date(format="%F") }}</time>
+          <time class="dt-published" datetime="{{ page.date | date(format="%+") }}">{{ page.date | date(format=config.extra.date_format) }}</time>
           <a class="u-url p-name" href="{{ page.path | safe }}">{{ page.title }}</a>
         </li>
       {%- endfor %}
@@ -18,7 +22,7 @@ </section>
   <section>
     <h2>Elsewhere on the Internet</h2>
     <ul>
-      {%- for item in config.extra.menu.contact %}
+      {%- for item in config.extra.contact_menu %}
         <li>
           {%- if item.url is starting_with("mailto:") %}
             <a href="{{ item.url | safe }}" class="u-email email" rel="me">{{ item.name }}</a>
@@ -30,7 +34,6 @@ {%- endfor %}
     </ul>
   </section>
   <footer>
-    GPG Key: <a href="{{ config.extra.gpg_url | safe }}" rel="u-key pgpkey">{{ config.extra.gpg_fingerprint }}</a>
+    GPG Key: <a href="{{ config.extra.gpg_url | safe }}" rel="u-key key">{{ config.extra.gpg_fingerprint }}</a>
   </footer>
-</main>
 {% endblock %}