diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 1d050f855..2f4407f6e 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -4,14 +4,14 @@
     <!--[if gt IE 9]><html lang="{{ site.html_lang }}"><![endif]-->
     <!--[if !IE]><!--><html lang="{{ site.html_lang }}"><!--<![endif]-->
     <head>
-        {% include 'title' %}
+        {% include('title') %}
 
         {% if page.meta.description %}
             <meta name="description" content="{{ page.meta.description|e('html') }}">
         {% endif %}
 
         {% if page.meta.og %}
-            {% include "og" with { og: page.meta.og } %}
+            {{ include('og', { og: page.meta.og }) }}
         {% endif %}
 
         <meta lang="{{ site.html_lang }}" charset="utf-8">
@@ -31,7 +31,7 @@
             <link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
         {% endfor %}
     </head>
-    <body{% if page.blocks.body_classes %} class="{{ page.blocks.body_classes }}"{% endif %}>
+    <body class="{{ page.blocks.body_classes }}">
         <nav class="navbar navbar-inverse navbar-fixed-top">
             <div class="container">
                 <div class="navbar-header">
@@ -60,9 +60,9 @@
             <div class="row">
                 {% block content_wrapper %}
                     <main class="col-md-9">
-                        {% block content %}{% endblock content %}
+                        {% block content %}{% endblock %}
                     </main>
-                {% endblock content_wrapper %}
+                {% endblock %}
 
                 {% block sidebar_wrapper %}
                     <div class="col-md-3">
@@ -77,17 +77,17 @@
                                 </a>
                             </div>
 
-                            {% include 'availability' %}
-                        {% endblock sidebar %}
+                            {% include('availability') %}
+                        {% endblock %}
                     </div>
-                {% endblock sidebar_wrapper %}
+                {% endblock %}
             </div>{# .row #}
         </div>{# .container #}
 
         <footer class="container">
             <p class="copyright">&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a> and <a href="https://www.digitalocean.com/?refcode={{ site.digitalocean_referral }}">DigitalOcean</a>.</p>
 
-            {% include 'meetups' %}
+            {% include('meetups') %}
         </footer>
 
         <script src="{{ site.url }}/components/jquery/jquery.min.js"></script>
@@ -95,7 +95,7 @@
         <script src="{{ site.url }}/components/highlightjs/highlight.pack.js"></script>
         <script>hljs.initHighlightingOnLoad();</script>
 
-        {% block scripts %}{% endblock scripts %}
+        {% block scripts %}{% endblock %}
 
         {% if page.tweets %}
             <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 605ab4154..536f733a4 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -2,9 +2,9 @@
 
 {% block content_wrapper %}
     <main class="col-md-9">
-        {% include 'post-header' %}
+        {% include('post-header') %}
 
-        {% block content %}{% endblock content %}
+        {% block content %}{% endblock %}
 
         <p class="post-feedback" style="font-style: italic">
             <b>Have feedback about this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/home?status=@{{ site.twitter.name }} {{ site.url }}{{ page.url }}:">send me a tweet</a>.
@@ -47,4 +47,4 @@
         {% endif %}
 
     </main>
-{% endblock content_wrapper %}
+{% endblock %}
