diff --git a/layouts/404.html b/layouts/404.html.twig
similarity index 95%
rename from layouts/404.html
rename to layouts/404.html.twig
index 0271053..02befbe 100644
--- a/layouts/404.html
+++ b/layouts/404.html.twig
@@ -1,15 +1,11 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 <section id="main">
     <div>
         <h1 id="title">{{ page.title }}</h1>
     </div>
 </section>
-
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html.twig
similarity index 66%
rename from layouts/_default/list.html
rename to layouts/_default/list.html.twig
index 58aefaa..98592d9 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html.twig
@@ -1,29 +1,20 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <div class="posts">
-        {% for post in site.pages|filterBySection(page.pathname)|sortByDate %}
+{% for post in site.pages|filterBySection(page.pathname)|sortByDate %}
         <div class="post">
             <h1 class="post-title">
-                <a href="{{ url(post) }}">
-                    {{ post.title }}
-                </a>
+                <a href="{{ url(post) }}">{{ post.title }}</a>
             </h1>
-
             <span class="post-date">{{ post.date|date("j M Y") }}</span>
-
-            {{ post.content|excerpt }}
+{{ post.content|excerpt }}
         </div>
         {% endfor %}
     </div>
 </div>
-
 </body>
 </html>
diff --git a/layouts/_default/page.html b/layouts/_default/page.html.twig
similarity index 88%
rename from layouts/_default/page.html
rename to layouts/_default/page.html.twig
index fc7bad0..3edce5a 100644
--- a/layouts/_default/page.html
+++ b/layouts/_default/page.html.twig
@@ -1,16 +1,11 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <h1 class="page-title">{{ page.title }}</h1>
-    {{ page.content }}
+{{ page.content }}
 </div>
-
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html.twig
similarity index 85%
rename from layouts/_default/taxonomy.html
rename to layouts/_default/taxonomy.html.twig
index 3cff744..c2cbf4a 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html.twig
@@ -1,22 +1,17 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <h1 class="page-title">{{ page.singular|title }} "{{ page.title }}"</h1>
     <ul>
-    {% for term in page.pages|sortByDate %}
+{% for term in page.pages|sortByDate %}
         <li>
             <a href="{{ url(term) }}">{{ term.title }}</a>
         </li>
-    {% endfor %}
+{% endfor %}
     </ul>
 </div>
-
 </body>
 </html>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html.twig
similarity index 77%
rename from layouts/_default/terms.html
rename to layouts/_default/terms.html.twig
index 836560f..88b5451 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html.twig
@@ -1,26 +1,21 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">  
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <h1>{{ page.plural }}</h1>
     <ul>
-        {% for name, term in page.terms %}
+{% for name, term in page.terms %}
         <li><h2><a href="{{ url(page.plural ~ '/' ~ name) }}">{{ name }}</a> ({{ term|length }})</h2>
             <ul>
-                {% for page in term %}
+{% for page in term %}
                 <li><a href="{{ url(page) }}">{{ page.title }}</a></li>
-                {% endfor %}
+{% endfor %}
             </ul>
         </li>
-        {% endfor %}
+{% endfor %}
     </ul>
 </div>
-
 </body>
 </html>
diff --git a/layouts/blog/page.html b/layouts/blog/page.html.twig
similarity index 76%
rename from layouts/blog/page.html
rename to layouts/blog/page.html.twig
index e53412d..f00ffef 100644
--- a/layouts/blog/page.html
+++ b/layouts/blog/page.html.twig
@@ -1,24 +1,19 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <h1 class="page-title">{{ page.title }}</h1>
-    {% if page.date %}
+{% if page.date %}
     <span class="post-date">{{ page.date|date("j M Y") }}</span>
-    {% endif %}
-    {{ page.content }}
+{% endif %}
+{{ page.content }}
     <p>
-    {% for tag in page.tags %}
+{% for tag in page.tags %}
         <a href="{{ url('tags/' ~ tag) }}">#{{ tag }}</a>&nbsp;
-    {% endfor %}
+{% endfor %}
     </p>
 </div>
-
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/include/head.html b/layouts/include/head.html.twig
similarity index 71%
rename from layouts/include/head.html
rename to layouts/include/head.html.twig
index 061d07a..1206bb2 100644
--- a/layouts/include/head.html
+++ b/layouts/include/head.html.twig
@@ -2,32 +2,27 @@
     <link href="http://gmpg.org/xfn/11" rel="profile">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
     <!-- Enable responsiveness on mobile devices-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
     <title>
-        {% if page.title == "Home" %}
-        {{ site.title }} &middot; {{ site.baseline }}
-        {% else %}
-        {{ page.title }} &middot; {{ site.title }}
-        {% endif %}
+{% if page.title == "Home" %}
+{{ site.title }} &middot; {{ site.baseline }}
+{% else %}
+{{ page.title }} &middot; {{ site.title }}
+{% endif %}
     </title>
-
     <!-- CSS -->
-    <link rel="stylesheet" href="{{ url() }}public/css/poole.css">
-    <link rel="stylesheet" href="{{ url() }}public/css/syntax.css">
-    <link rel="stylesheet" href="{{ url() }}public/css/hyde.css">
+    <link rel="stylesheet" href="{{ url(minify('public/css/poole.css')) }}">
+    <link rel="stylesheet" href="{{ url(minify('public/css/syntax.css')) }}">
+    <link rel="stylesheet" href="{{ url(minify('public/css/hyde.css')) }}">
     <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700|Abril+Fatface">
-
     <!-- Icons -->
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ url() }}public/apple-touch-icon-144-precomposed.png">
     <link rel="shortcut icon" href="{{ url() }}public/favicon.ico">
-
     <!-- RSS -->
     <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
-
+    <!-- Highlight JS -->
     <link rel="stylesheet" href="https://highlightjs.org/static/demo/styles/monokai_sublime.css">
     <script src="https://highlightjs.org/static/highlight.pack.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-</head>
\ No newline at end of file
+</head>
diff --git a/layouts/include/sidebar.html b/layouts/include/sidebar.html.twig
similarity index 87%
rename from layouts/include/sidebar.html
rename to layouts/include/sidebar.html.twig
index c76e142..378ac25 100644
--- a/layouts/include/sidebar.html
+++ b/layouts/include/sidebar.html.twig
@@ -6,15 +6,11 @@ <h1>
             </h1>
             <p class="lead">{{ site.description }}</p>
         </div>
-
         <nav class="sidebar-nav">
-
-            {% for menu in site.menus.main|sortByWeight %}
+{% for menu in site.menus.main|sortByWeight %}
             <a class="sidebar-nav-item{% if page.pathname == menu.url %} active{% endif %}" href="{{ url(menu.url) }}">{{ menu.name }}</a>
-            {% endfor %}
-
+{% endfor %}
         </nav>
-
         <p>Powered by <a href="{{ phpoole.url }}">{{ phpoole.poweredby }}</a> & <a href="http://hyde.getpoole.com">Hyde</a>.</p>
     </div>
 </div>
diff --git a/layouts/index.html b/layouts/index.html.twig
similarity index 62%
rename from layouts/index.html
rename to layouts/index.html.twig
index e013794..273d73f 100644
--- a/layouts/index.html
+++ b/layouts/index.html.twig
@@ -1,29 +1,20 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-
 {% include 'include/head.html' %}
-
 <body>
-
 {% include 'include/sidebar.html' %}
-
 <div class="content container">
     <div class="posts">
-        {% for post in site.pages|filterBySection('blog')|sortByDate|slice(0, 5) %}
+{% for post in site.pages|filterBySection('blog')|sortByDate|slice(0, 5) %}
         <div class="post">
             <h1 class="post-title">
-                <a href="{{ url(post) }}">
-                    {{ post.title }}
-                </a>
+                <a href="{{ url(post) }}">{{ post.title }}</a>
             </h1>
-
             <span class="post-date">{{ post.date|date("j M Y") }}</span>
-
-            {{ post.content|excerpt }}
+{{ post.content|excerpt }}
         </div>
-        {% endfor %}
+{% endfor %}
     </div>
 </div>
-
 </body>
 </html>
diff --git a/layouts/sitemap.html b/layouts/sitemap.xml.twig
similarity index 100%
rename from layouts/sitemap.html
rename to layouts/sitemap.xml.twig
