diff --git a/templates/base.html b/templates/base.html
index 6fad7f8..1364a4d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,10 +3,18 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link type="text/css" rel="stylesheet" href="{{ get_url(path='css/general.css') }}" />
+        <link
+            type="text/css"
+            rel="stylesheet"
+            href="{{ get_url(path='css/general.css') }}"
+        />
         <meta name="color-scheme" content="dark light" />
         <link rel="canonical" href="{{ current_url }}" />
-        <link rel="alternate" type="application/atom+xml" href="{{ get_url(path='atom.xml') }}"/>
+        <link
+            rel="alternate"
+            type="application/atom+xml"
+            href="{{ get_url(path='atom.xml') }}"
+        />
         <!--Mastodon account ownership verification-->
         <link rel="me" href="https://ruhr.social/@jotoho" />
         <title>jotoho.de - A personal website</title>
@@ -15,39 +23,60 @@
     <body>
         <header>
             <div>
-                <a href="{{ config.base_url }}"><h1>jotoho.de - My personal website</h1></a>
+                <a href="{{ config.base_url }}"
+                    ><h1>jotoho.de - My personal website</h1></a
+                >
             </div>
         </header>
         <nav class="globalnav">
             <!--<a class="globalnav-element" href="{{ get_url(path='@/blog/_index.md') }}"> Blog </a>-->
-            <a class="globalnav-element" href="{{ get_url(path='@/servers/index.md') }}"> Servers </a>
-            <a class="globalnav-element" href="{{ get_url(path='@/profiles/index.md') }}"> Profiles </a>
+            <a
+                class="globalnav-element"
+                href="{{ get_url(path='@/servers/index.md') }}"
+            >
+                Servers
+            </a>
+            <a
+                class="globalnav-element"
+                href="{{ get_url(path='@/profiles/index.md') }}"
+            >
+                Profiles
+            </a>
         </nav>
         <hr />
 
-        <article id="mainarticle">
-            {% block content %} {% endblock %}
-        </article>
+        <article id="mainarticle">{% block content %} {% endblock %}</article>
 
         <hr />
         <footer>
             <p>
-                Copyright {{ now() | date(format="%Y", timezone="Europe/Berlin") }} Jonas Tobias Hopusch (<a
-                    rel="noreferer" href="https://gitlab.com/jotoho"
+                <!--{% set current_year = now() | date(format="%Y",
+                timezone="Europe/Berlin") %} -->
+
+                Copyright
+                <time datetime="{{ current_year }}">{{ current_year }}</time>
+                Jonas Tobias Hopusch (<a
+                    rel="noreferer"
+                    href="https://gitlab.com/jotoho"
                     >@jotoho</a
                 >) - <strong>All rights reserved</strong>
             </p>
             <p>
                 This page is being served using
-                <a rel="noreferer" href="https://docs.gitlab.com/ee/user/project/pages/">GitLab Pages</a>
+                <a
+                    rel="noreferer"
+                    href="https://docs.gitlab.com/ee/user/project/pages/"
+                    >GitLab Pages</a
+                >
                 and created with the help of
-                <a rel="noreferer" href="https://www.getzola.org/">Zola</a>.
-                You can contact me via
+                <a rel="noreferer" href="https://www.getzola.org/">Zola</a>. You
+                can contact me via
                 <a href="mailto:webmaster@jotoho.de">email</a>
                 regarding any issues with this website.
             </p>
             <p>
-                You can download my OpenPGP public keys <a href="https://downloads.jotoho.de/openpgp/">here</a>.
+                You can download my OpenPGP public keys
+                <a href="https://downloads.jotoho.de/openpgp/">here</a>.
             </p>
         </footer>
     </body>
diff --git a/templates/page.html b/templates/page.html
index 0887d82..0d88a20 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,26 +1,29 @@
-{% extends "base.html" %}
+{% extends "base.html" %} {% block metadata %}
 
-{% block metadata %}
+<meta name="description" content="{{ page.description }}" />
 
-<meta name="description" content="{{ page.description }}"/>
-
-{% endblock %}
-
-{% block content %}
-    <h2>
-        {{ page.title }}
-    </h2>
-    {% if page.date and page.date is defined %}
-    <p>
-        <em><strong>Published on</strong>: {{ page.date | date(format="%A, %e %B %Y %R %Z", timezone="Europe/Berlin") }}</em>
-    </p>
-    {% endif %}
-    {% if page.updated and page.updated != page.date %}
-    <p>
-        <em><strong>Last updated on</strong>: {{ page.updated | date(format="%A, %e %B %Y %R %Z", timezone="Europe/Berlin") }}</em>
-    </p>
-    {% endif %}
-    <div>
-        {{ page.content | safe }}
-    </div>
+{% endblock %} {% block content %}
+<h2>{{ page.title }}</h2>
+{% if page.date and page.date is defined %}
+<p>
+    <em
+        ><strong>Published on</strong>:
+        <time datetime="{{page.date}}"
+            >{{ page.date | date(format="%A, %e %B %Y %R %Z",
+            timezone="Europe/Berlin") }}</time
+        ></em
+    >
+</p>
+{% endif %} {% if page.updated and page.updated != page.date %}
+<p>
+    <em
+        ><strong>Last updated on</strong>:
+        <time datetime="{{page.updated}}"
+            >{{ page.updated | date(format="%A, %e %B %Y %R %Z",
+            timezone="Europe/Berlin") }}</time
+        ></em
+    >
+</p>
+{% endif %}
+<div>{{ page.content | safe }}</div>
 {% endblock content %}
