diff --git a/source/_includes/footer.html.twig b/source/_includes/footer.html.twig
new file mode 100644
index 00000000..ca262aa1
--- /dev/null
+++ b/source/_includes/footer.html.twig
@@ -0,0 +1,7 @@
+
diff --git a/source/_includes/head.html.twig b/source/_includes/head.html.twig
new file mode 100644
index 00000000..470accf7
--- /dev/null
+++ b/source/_includes/head.html.twig
@@ -0,0 +1,24 @@
+
+ {% if page.url == '/.' %}{{ site.subtitle }} | {{ site.title }}{% else %}{{ page.title }} | {{ site.title }}{% endif %}
+
+
+
+
+
+ {% if page.meta.description %}
+
+ {% endif %}
+
+ {% include 'og' with { og: page.meta.og } %}
+
+
+ {% block stylesheets '' %}
+
+ {% for size in site.apple_touch_icon_sizes %}
+
+ {% endfor %}
+
+ {% for size in site.favicon_sizes %}
+
+ {% endfor %}
+
diff --git a/source/_includes/scripts.html.twig b/source/_includes/scripts.html.twig
new file mode 100644
index 00000000..4a31ee8a
--- /dev/null
+++ b/source/_includes/scripts.html.twig
@@ -0,0 +1,7 @@
+
+
+{% if site.google_analytics_tracking_id %}
+
+{% endif %}
+
+{% block scripts %}{% endblock %}
diff --git a/source/_includes/sidebar.html.twig b/source/_includes/sidebar.html.twig
new file mode 100644
index 00000000..f9d70bf0
--- /dev/null
+++ b/source/_includes/sidebar.html.twig
@@ -0,0 +1,9 @@
+{% block sidebar_wrapper %}
+
+ {% block sidebar %}
+ {% include 'badges' %}
+ {% include 'availability' %}
+ {% include 'posts/latest' %}
+ {% endblock %}
+
+{% endblock %}
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 7a43ca13..a8f7f3ff 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -1,71 +1,25 @@
-
- {% if page.url == '/.' %}{{ site.subtitle }} | {{ site.title }}{% else %}{{ page.title }} | {{ site.title }}{% endif %}
-
-
-
-
-
- {% if page.meta.description %}
-
- {% endif %}
-
- {% include 'og' with { og: page.meta.og } %}
-
-
- {% block stylesheets '' %}
-
- {% for size in site.apple_touch_icon_sizes %}
-
- {% endfor %}
-
- {% for size in site.favicon_sizes %}
-
- {% endfor %}
-
+ {% include 'head.html.twig' %}
- {% include 'nav' %}
+ {% include 'nav.html.twig' %}
+
{% block breadcrumb %}{% endblock %}
-
-
-
-
- {% block content_top %}{% endblock %}
- {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
- {% block content_bottom %}{% endblock %}
-
+
+
+ {% block content_top %}{% endblock %}
+ {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
+ {% block content_bottom %}{% endblock %}
+
- {% block sidebar_wrapper %}
-
- {% block sidebar %}
- {% include 'badges' %}
- {% include 'availability' %}
- {% include 'posts/latest' %}
- {% endblock %}
-
- {% endblock %}
-
-
-
-
+ {% include 'sidebar.html.twig' %}
+
+ {% include 'footer.html.twig' %}
-
-
- {% if site.google_analytics_tracking_id %}
-
- {% endif %}
-
- {% block scripts %}{% endblock %}
+ {% include 'scripts.html.twig' %}