diff --git a/themes/default/bootstrap.theme.css b/themes/default/assets/css/bootstrap.theme.css
old mode 100644
new mode 100755
similarity index 83%
rename from themes/default/bootstrap.theme.css
rename to themes/default/assets/css/bootstrap.theme.css
index 90b1542..04943db
--- a/themes/default/bootstrap.theme.css
+++ b/themes/default/assets/css/bootstrap.theme.css
@@ -121,6 +121,44 @@ pre code {
     color: #FFF !important;
 }
 
+.breadcrumb {
+    margin-left: -1em;
+    margin-right: -1em;
+}
+
+/* Main column and sidebar layout
+/*---------------------------------------------*/
+
+/* Sidebar modules for boxing content */
+.sidebar-module {
+  padding: 1rem;
+}
+.sidebar-module-inset {
+  padding: 1rem;
+  background-color: #f5f5f5;
+  border-radius: .25rem;
+}
+.sidebar-module-inset p:last-child,
+.sidebar-module-inset ul:last-child,
+.sidebar-module-inset ol:last-child {
+  margin-bottom: 0;
+}
+
+/* Blog posts
+/*---------------------------------------------*/
+
+.blog-post {
+  margin-bottom: 4rem;
+}
+.blog-post-title {
+  margin-bottom: .25rem;
+  font-size: 2.5rem;
+}
+.blog-post-meta {
+  margin-bottom: 1.25rem;
+  color: #999;
+}
+
 /* Footer Styles
 /*---------------------------------------------*/
 .footer {
diff --git a/themes/default/includes/foot.twig b/themes/default/includes/foot.twig
new file mode 100644
index 0000000..3ad46f1
--- /dev/null
+++ b/themes/default/includes/foot.twig
@@ -0,0 +1,19 @@
+<!-- Footer -->
+<footer class="footer">
+    <div class="container">
+        <p class="text-center">
+        {% if config.theme_config.copyright %}
+            {{ config.theme_config.copyright }}
+        {% else %}
+            <a href="http://picocms.org/">Pico</a>
+            was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
+            and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
+            Released under the MIT License.
+        {% endif %}
+        </p>
+    </div>
+</footer>
+
+<!-- Javascript -->
+<script src="http://code.jquery.com/jquery-2.1.4.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/js/bootstrap.min.js"></script>
diff --git a/themes/default/includes/head.twig b/themes/default/includes/head.twig
new file mode 100644
index 0000000..9b24435
--- /dev/null
+++ b/themes/default/includes/head.twig
@@ -0,0 +1,30 @@
+<head>
+    <!-- Page Meta -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="generator" content="Pico 1.0">
+
+    <!-- Post Meta -->
+    {% if meta.description %}
+    <meta name="description" content="{{ meta.description|striptags }}">
+    {% endif %}{% if meta.robots %}
+    <meta name="robots" content="{{ meta.robots }}">
+    {% endif %}{% if meta.author %}
+    <meta name="author" content="{{ meta.author }}">
+    {% endif %}
+
+    <!-- Page Title -->
+    <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
+
+    <!-- Fonts -->
+    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css">
+
+    <!-- Stylesheets -->
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/css/bootstrap.min.css" type="text/css" />
+    <link rel="stylesheet" href="{{ theme_url }}/assets/css/bootstrap.theme.css" type="text/css" />
+
+    <!-- Icons -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+
+</head>
diff --git a/themes/default/includes/htmlFoot.twig b/themes/default/includes/htmlFoot.twig
new file mode 100644
index 0000000..5f85cab
--- /dev/null
+++ b/themes/default/includes/htmlFoot.twig
@@ -0,0 +1 @@
+</html>
diff --git a/themes/default/includes/htmlHead.twig b/themes/default/includes/htmlHead.twig
new file mode 100644
index 0000000..ce8fe85
--- /dev/null
+++ b/themes/default/includes/htmlHead.twig
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<html lang="en">
diff --git a/themes/default/includes/nav.twig b/themes/default/includes/nav.twig
new file mode 100644
index 0000000..634b3e4
--- /dev/null
+++ b/themes/default/includes/nav.twig
@@ -0,0 +1,20 @@
+<!-- Navigation -->
+<nav class="navbar navbar-light">
+    <button class="navbar-toggler hidden-sm-up pull-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar">
+        &#9776;
+    </button>
+    <div class="container">
+        <a class="navbar-brand" href="{{ 'index'|link }}">{{ site_title }}</a>
+        <div class="collapse navbar-toggleable-xs" id="CollapsingNavbar">
+            <ul class="nav navbar-nav pull-right">
+                {% for page in pages %}
+                    {% if page.id starts with "blog/" %}{% else %}
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ page.url }}">{{ page.title }}</a>
+                    </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+</nav>
diff --git a/themes/default/index.twig b/themes/default/index.twig
old mode 100644
new mode 100755
index f5ba28b..5947fe9
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -1,47 +1,7 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <!-- Page Meta -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    {% if meta.description %}
-    <meta name="description" content="{{ meta.description|striptags }}">
-    {% endif %}{% if meta.robots %}
-    <meta name="robots" content="{{ meta.robots }}">
-    {% endif %}
-
-    <!-- Page Title -->
-    <title>{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}</title>
-
-    <!-- Fonts -->
-    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" type="text/css">
-
-    <!-- Stylesheets -->
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/css/bootstrap.min.css" type="text/css" />
-    <link rel="stylesheet" href="{{ theme_url }}/bootstrap.theme.css" type="text/css" />
-
-</head>
+{% include 'includes/htmlHead.twig' %}
+{% include 'includes/head.twig' %}
 <body>
-    <!-- Navigation -->
-    <nav class="navbar navbar-light">
-        <button class="navbar-toggler hidden-sm-up pull-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar">
-            &#9776;
-        </button>
-        <div class="container">
-            <a class="navbar-brand" href="{{ 'index'|link }}">{{ site_title }}</a>
-            <div class="collapse navbar-toggleable-xs" id="CollapsingNavbar">
-                <ul class="nav navbar-nav pull-right">
-                    {% for page in pages %}
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ page.url }}">{{ page.title }}</a>
-                    </li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </nav>
-
+    {% include 'includes/nav.twig' %}
     <!-- Main Content -->
     <div class="container">
         <div class="row">
@@ -50,21 +10,6 @@
             </div>
         </div>
     </div>
-
-    <!-- Footer -->
-    <footer class="footer">
-        <div class="container">
-            <p class="text-center">
-                <a href="http://picocms.org/">Pico</a>
-                was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a>
-                and is maintained by <a href="https://github.com/picocms/Pico/graphs/contributors">The Pico Community</a>.
-                Released under the MIT License.
-            </p>
-        </div>
-    </footer>
-
-    <!-- Javascript -->
-    <script src="http://code.jquery.com/jquery-2.1.4.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/js/bootstrap.min.js"></script>
+    {% include 'includes/foot.twig' %}
 </body>
-</html>
+{% include 'includes/htmlFoot.twig' %}
