diff --git a/source/_layouts/app.html.twig b/source/_layouts/base.html.twig
similarity index 67%
rename from source/_layouts/app.html.twig
rename to source/_layouts/base.html.twig
index 01f94730d..ae22b9ffa 100644
--- a/source/_layouts/app.html.twig
+++ b/source/_layouts/base.html.twig
@@ -22,7 +22,27 @@
- {% block body %}{% endblock %}
+
+ Skip to main content
+
+
+ {% include 'layout/navbar' %}
+
+
+
+ {% block page_title_wrapper %}
+
+ {% block page_title %}{{ page.title }}{% endblock %}
+
+ {% endblock %}
+
+ {% block content_wrapper %}
+ {% block content %}{% endblock %}
+ {% endblock %}
+
+
+ {% include 'layout/footer' %}
+
{% if site.google_analytics.id %}
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 735a4ecc1..9c11d90b6 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -1,25 +1 @@
-{% extends 'app' %}
-
-{% block body %}
-
- Skip to main content
-
-
- {% include 'layout/navbar' %}
-
-
-
- {% block page_title_wrapper %}
-
- {% block page_title %}{{ page.title }}{% endblock %}
-
- {% endblock %}
-
- {% block content_wrapper %}
- {% block content %}{% endblock %}
- {% endblock %}
-
-
- {% include 'layout/footer' %}
-
-{% endblock %}
+{% extends 'base' %}