diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
index a174066f..b8a66b72 100644
--- a/source/_layouts/base.html.twig
+++ b/source/_layouts/base.html.twig
@@ -1,13 +1,16 @@
+{% macro htmlTitle(site, page) -%}
+ {% if page.title is defined and page.url != '//' %}
+ {{ page.title }} |
+ {% endif %}
+ {{ site.title }} - {{ site.subtitle }}
+{%- endmacro %}
+
+{% import _self as helpers %}
+
-
- {% if page.title is defined and page.url != '//' %}
- {{ page.title }} |
- {% endif %}
- {{ site.title }} - {{ site.subtitle }}
-
-
+ {{ helpers.htmlTitle(site, page) }}
{% include 'meta' %}
diff --git a/source/_partials/meta.html.twig b/source/_partials/meta.html.twig
index 77710ae0..cd27f43f 100644
--- a/source/_partials/meta.html.twig
+++ b/source/_partials/meta.html.twig
@@ -1,7 +1,14 @@
+{% macro canonicalUrl(site, page) -%}
+ {{ site.url }}
+ {{- page.url != '//' ? page.url }}
+{%- endmacro %}
+
+{% import _self as helpers %}
+
-
+
{% if page.meta.description %}