diff --git a/src/templates/layouts/countdown.hbs b/src/templates/layouts/countdown.hbs
index 459cbf1b..d0f264d5 100644
--- a/src/templates/layouts/countdown.hbs
+++ b/src/templates/layouts/countdown.hbs
@@ -1,42 +1,46 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-  {{> meta}}
+    {{> meta}}
 
     <!-- Bootstrap -->
-    {{#if rtl}}
-    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/dist/css/bootstrap.rtl.css">
-    {{else}}
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-    {{/if}}
+    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
+
     <!-- Metis core stylesheet -->
-    {{#if rtl}}
-    <link rel="stylesheet" href="{{assets}}/css/main.rtl.css">
-    {{else}}
-    <link rel="stylesheet" href="{{assets}}/css/main.min.css">
-    {{/if}}
+    <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
 
     <link rel="stylesheet" href="{{assets}}/css/countdown.css">
 
-    {{#if rtl}}
-    <style>body{direction: rtl;}</style>
-    {{/if}}
+    {{> rtl-style}}
 
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
 
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+
 <body class="bg-dark lter">
-{% body %}
-
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-<!--Bootstrap -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
-<script src="//maps.google.com/maps/api/js?sensor=true"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/gmaps.js/0.4.12/gmaps.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-countdown/2.0.1/jquery.plugin.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-countdown/2.0.1/jquery.countdown.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.13.1/jquery.validate.min.js"></script>
-<script src="{{assets}}/js/countdown.js"></script>
+    {% body %}
+
+    <!--jQuery -->
+    <script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
+
+    <!--Bootstrap -->
+    <script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
+
+    <script src="//maps.google.com/maps/api/js?sensor=true"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/gmaps.js/0.4.12/gmaps.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-countdown/2.0.1/jquery.plugin.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-countdown/2.0.1/jquery.countdown.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.13.1/jquery.validate.min.js"></script>
+    <script src="{{assets}}/js/countdown.js"></script>
 </body>
+
 </html>
diff --git a/src/templates/layouts/default.hbs b/src/templates/layouts/default.hbs
index 07686e48..6cd4f95a 100644
--- a/src/templates/layouts/default.hbs
+++ b/src/templates/layouts/default.hbs
@@ -2,155 +2,154 @@
 <html>
 
 <head>
-  {{> meta}}
-
-  <!-- Bootstrap -->
-  <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
-
-  <!-- Font Awesome -->
-  <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
-
-  <!-- Metis core stylesheet -->
-  <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
-
-  <!-- metisMenu stylesheet -->
-  <link rel="stylesheet" href="{{assets}}/metismenu/metisMenu{{#if production}}.min{{/if}}.css">
-
-  {{#if rtl}}
-  <style>body{direction: rtl;}</style>
-  {{/if}}
-  {{#if stylesheets}}
-  {{#each stylesheets}}
-    {{.}}
-  {{/each}}
-  {{/if}}
-  {{#if cdncss}}
-  {{#each cdncss}}
-    {{.}}
-  {{/each}}
-  {{/if}}
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
+    {{> meta}}
+
+    <!-- Bootstrap -->
+    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+    <!-- Font Awesome -->
+    <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
+
+    <!-- Metis core stylesheet -->
+    <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+    <!-- metisMenu stylesheet -->
+    <link rel="stylesheet" href="{{assets}}/metismenu/metisMenu{{#if production}}.min{{/if}}.css">
+
+{{> rtl-style}}
+
+    {{#if stylesheets}}
+        {{#each stylesheets}}
+            {{.}}
+        {{/each}}
+    {{/if}}
+    {{#if cdncss}}
+        {{#each cdncss}}
+            {{.}}
+        {{/each}}
+    {{/if}}
+
+<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+<!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
-  <!--For Development Only. Not required -->
-  <script>
-  less = {
-    env: "development",
-    relativeUrls: false,
-    rootpath: "{{assets}}/"
-  };
-  </script>
-  <link rel="stylesheet" href="{{assets}}/css/style-switcher{{#if production}}.min{{/if}}.css">
-  <link rel="stylesheet/less" type="text/css" href="{{assets}}/less/theme.less">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.1/less{{#if production}}.min{{/if}}.js"></script>
-
-  {{!-- {{> analytic}} --}}
-
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body class="{{#if boXed}}boxed{{/if}} {{#if sideMini}}sidebar-left-mini{{/if}} {{#if fixedMenu}}menu-affix{{/if}}">
-  <div class="bg-dark dk" id="wrap">
-    <div id="top">
-      {{> nav }}
-      {{#if noHeader}}
-      {{else}}
-      <header class="head">
-        {{#if noMainSearch}}
-        {{else}}
-        <div class="search-bar">
-          {{> mainSearch }}
-        </div>
-        <!-- /.search-bar -->
-        {{/if}}
-        <div class="main-bar">
-          <h3>
+<![endif]-->
+
+    <!--For Development Only. Not required -->
+    <script>
+        less = {
+            env: "development",
+            relativeUrls: false,
+            rootpath: "{{assets}}/"
+        };
+    </script>
+    <link rel="stylesheet" href="{{assets}}/css/style-switcher{{#if production}}.min{{/if}}.css">
+    <link rel="stylesheet/less" type="text/css" href="{{assets}}/less/theme.less">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.1/less{{#if production}}.min{{/if}}.js"></script>
+
+    {{!-- {{> analytic}}
+    --}}
+          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+
+        <body class="{{#if boXed}}boxed{{/if}} {{#if sideMini}}sidebar-left-mini{{/if}} {{#if fixedMenu}}menu-affix{{/if}}">
+            <div class="bg-dark dk" id="wrap">
+                <div id="top">
+                    {{> nav }}
+                    {{#if noHeader}}
+                    {{else}}
+                        <header class="head">
+                            {{#if noMainSearch}}
+                            {{else}}
+                                <div class="search-bar">
+                                    {{> mainSearch }}
+                                </div>
+                                <!-- /.search-bar -->
+                            {{/if}}
+                            <div class="main-bar">
+                                <h3>
             {{#if icon}}
               <i class="{{ icon }}"></i>&nbsp;
             {{/if}}
             {{ title }}
           </h3>
-        </div>
-        <!-- /.main-bar -->
-      </header>
-      <!-- /.head -->
-      {{/if}}
-    </div>
-    <!-- /#top -->
-    {{#if noLeftSidebar}}
-    {{else}}
-    <div id="left">
-      {{> left }}
-    </div>
-    <!-- /#left -->
-    {{/if}}
-    <div id="content">
-      <div class="outer">
-        <div class="inner bg-light lter">
-          {% body %}
-        </div>
-        <!-- /.inner -->
-      </div>
-      <!-- /.outer -->
-    </div>
-    <!-- /#content -->
-    {{#if noRightSidebar}}
-    {{else}}
-    <div id="right" class="bg-light lter">
-      {{> right }}
-    </div>
-    <!-- /#right -->
-    {{/if}}
-  </div>
-  <!-- /#wrap -->
-  <footer class="Footer bg-dark dker">
-    <p>2016 &copy; Metis Bootstrap Admin Template</p>
-  </footer>
-  <!-- /#footer -->
-  {{> helpModal }}
-
-  <!--jQuery -->
-  <script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
-
-  {{#if cdnjs}}
-    {{#each cdnjs}}
-      <script src="{{.}}"></script>
-    {{/each}}
-  {{/if}}
-
-  <!--Bootstrap -->
-  <script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
-  <!-- MetisMenu -->
-  <script src="{{assets}}/lib/metismenu/metisMenu{{#if production}}.min{{/if}}.js"></script>
-  <!-- Screenfull -->
-  <script src="{{assets}}/lib/screenfull/screenfull{{#if production}}.min{{/if}}.js"></script>
-
-  {{#if javascripts}}
-    {{#each javascripts}}
-      <script src="{{assets}}/{{.}}"></script>
-    {{/each}}
-  {{/if}}
-
-  <!-- Metis core scripts -->
-  <script src="{{assets}}/js/core{{#if production}}.min{{/if}}.js"></script>
-  <!-- Metis demo scripts -->
-  <script src="{{assets}}/js/app{{#if production}}.min{{/if}}.js"></script>
-
-  {{#if scripts}}
-    <script>
-      $(function(){
-        {{#each scripts}}
-          {{.}};
-        {{/each}}
-      });
-    </script>
-  {{/if}}
+                            </div>
+                            <!-- /.main-bar -->
+                        </header>
+                        <!-- /.head -->
+                    {{/if}}
+                </div>
+                <!-- /#top -->
+                {{#if noLeftSidebar}}
+                {{else}}
+                    <div id="left">
+                        {{> left }}
+                    </div>
+                    <!-- /#left -->
+                {{/if}}
+                <div id="content">
+                    <div class="outer">
+                        <div class="inner bg-light lter">
+                            {% body %}
+                        </div>
+                        <!-- /.inner -->
+                    </div>
+                    <!-- /.outer -->
+                </div>
+                <!-- /#content -->
+                {{#if noRightSidebar}}
+                {{else}}
+                    <div id="right" class="bg-light lter">
+                        {{> right }}
+                    </div>
+                    <!-- /#right -->
+                {{/if}}
+            </div>
+            <!-- /#wrap -->
+            <footer class="Footer bg-dark dker">
+                <p>2016 &copy; Metis Bootstrap Admin Template</p>
+            </footer>
+            <!-- /#footer -->
+            {{> helpModal }}
+
+            <!--jQuery -->
+            <script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
+
+            {{#if cdnjs}}
+                {{#each cdnjs}}
+                    <script src="{{.}}"></script>
+                {{/each}}
+            {{/if}}
+
+            <!--Bootstrap -->
+            <script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
+            <!-- MetisMenu -->
+            <script src="{{assets}}/lib/metismenu/metisMenu{{#if production}}.min{{/if}}.js"></script>
+            <!-- Screenfull -->
+            <script src="{{assets}}/lib/screenfull/screenfull{{#if production}}.min{{/if}}.js"></script>
+
+            {{#if javascripts}}
+                {{#each javascripts}}
+                    <script src="{{assets}}/{{.}}"></script>
+                {{/each}}
+            {{/if}}
+
+            <!-- Metis core scripts -->
+            <script src="{{assets}}/js/core{{#if production}}.min{{/if}}.js"></script>
+            <!-- Metis demo scripts -->
+            <script src="{{assets}}/js/app{{#if production}}.min{{/if}}.js"></script>
+
+            {{#if scripts}}
+                <script>
+                    $(function() {
+                    {{#each scripts }}
+                      {{.}};
+                    {{/each}}
+                    });
+                </script>
+            {{/if}}
 
-  <script src="{{assets}}/js/style-switcher{{#if production}}.min{{/if}}.js"></script>
-</body>
+            <script src="{{assets}}/js/style-switcher{{#if production}}.min{{/if}}.js"></script>
+        </body>
 
 </html>
diff --git a/src/templates/layouts/errors.hbs b/src/templates/layouts/errors.hbs
index 238ab605..ba42e39b 100644
--- a/src/templates/layouts/errors.hbs
+++ b/src/templates/layouts/errors.hbs
@@ -1,58 +1,61 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-  {{> meta}}
-  
-  <!-- Bootstrap -->
-  {{#if rtl}}
-  <link rel="stylesheet" href="{{assets}}/lib/bootstrap/dist/css/bootstrap.rtl.css">
-  {{else}}
-  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-  {{/if}}
-  <!-- Font Awesome -->
-  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
-  <!-- Metis core stylesheet -->
-  {{#if rtl}}
-  <link rel="stylesheet" href="{{assets}}/css/main.rtl.css">
-  {{else}}
-  <link rel="stylesheet" href="{{assets}}/css/main.min.css">
-  {{/if}}
-  {{#if rtl}}
-  <style>body{direction: rtl;}</style>
-  {{/if}}
+    {{> meta}}
+
+    <!-- Bootstrap -->
+    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+    <!-- Font Awesome -->
+    <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
+
+    <!-- Metis core stylesheet -->
+    <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+{{> rtl-style}}
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
 
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+
 <body class="error">
-  <div class="container">
-    <div class="col-lg-8 col-lg-offset-2 text-center">
-      <div class="logo">
-        <h1>{{title}}</h1>
-      </div>
-      <p class="lead text-muted">{{message}}</p>
-      <div class="clearfix"></div>
-      <div class="col-lg-6 col-lg-offset-3">
-        <form action="index.html">
-          <div class="input-group">
-            <input type="text" placeholder="search ..." class="form-control">
-            <span class="input-group-btn">
+    <div class="container">
+        <div class="col-lg-8 col-lg-offset-2 text-center">
+            <div class="logo">
+                <h1>{{title}}</h1>
+            </div>
+            <p class="lead text-muted">{{message}}</p>
+            <div class="clearfix"></div>
+            <div class="col-lg-6 col-lg-offset-3">
+                <form action="index.html">
+                    <div class="input-group">
+                        <input type="text" placeholder="search ..." class="form-control">
+                        <span class="input-group-btn">
               <button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
             </span>
-          </div>
-        </form>
-      </div>
-      <div class="clearfix"></div>
-      <div class="sr-only">
-        {% body %}
-      </div>
-      <br>
-      <div class="col-lg-6 col-lg-offset-3">
-        <div class="btn-group btn-group-justified">
-          <a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
-          <a href="index.html" class="btn btn-warning">Return Website</a>
+                    </div>
+                </form>
+            </div>
+            <div class="clearfix"></div>
+            <div class="sr-only">
+                {% body %}
+            </div>
+            <br>
+            <div class="col-lg-6 col-lg-offset-3">
+                <div class="btn-group btn-group-justified">
+                    <a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
+                    <a href="index.html" class="btn btn-warning">Return Website</a>
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- /.col-lg-8 col-offset-2 -->
     </div>
-    <!-- /.col-lg-8 col-offset-2 -->
-  </div>
 </body>
+
 </html>
diff --git a/src/templates/layouts/fixed.hbs b/src/templates/layouts/fixed.hbs
index 63201b36..84ea4c2e 100644
--- a/src/templates/layouts/fixed.hbs
+++ b/src/templates/layouts/fixed.hbs
@@ -1,123 +1,116 @@
 <!doctype html>
 <html class="no-js">
+
 <head>
     {{> meta}}
-    
+
     <!-- Bootstrap -->
-    {{#if rtl}}
-    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/dist/css/bootstrap.rtl.css">
-    {{else}}
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-    {{/if}}
+    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
+
     <!-- Metis core stylesheet -->
-    {{#if rtl}}
-    <link rel="stylesheet" href="{{assets}}/css/main.rtl.css">
-    {{else}}
-    <link rel="stylesheet" href="{{assets}}/css/main.min.css">
-    {{/if}}
+    <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
     <!-- Metis Theme stylesheet -->
     <link rel="stylesheet" href="{{assets}}/css/theme.css">
 
-    {{#if rtl}}
-    <style>body{direction: rtl;}</style>
-    {{/if}}
+{{> rtl-style}}
 
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <script src="{{assets}}/lib/html5shiv/html5shiv.js"></script>
-    <script src="{{assets}}/lib/respond/respond.min.js"></script>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <!--Modernizr -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
-<div id="wrap">
-    <div id="top">
 
-        <!-- .navbar -->
-<nav class="navbar navbar-inverse navbar-{{#if fixedNav}}fixed{{else}}static{{/if}}-top">
-    <div class="container-fluid">
-
-
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <header class="navbar-header">
-            <a href="index.html" class="navbar-brand"><img src="{{assets}}/img/logo.png" alt=""></a>
-        </header>
-
-
-
-        <div class="topnav">
-            <div class="btn-group">
-                <a data-placement="bottom" data-original-title="Show / Hide Left" data-toggle="tooltip"
-                   class="btn btn-primary btn-sm toggle-left">
-                    <i class="fa fa-bars"></i>
-                </a>
-                <a data-placement="bottom" data-original-title="Show / Hide Right" data-toggle="tooltip"
-                   class="btn btn-default btn-sm toggle-right">
-                    <span class="glyphicon glyphicon-comment"></span>
-                </a>
-            </div>
+        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
+<body>
+    <div id="wrap">
+        <div id="top">
+
+            <!-- .navbar -->
+            <nav class="navbar navbar-inverse navbar-{{#if fixedNav}}fixed{{else}}static{{/if}}-top">
+                <div class="container-fluid">
+
+
+                    <!-- Brand and toggle get grouped for better mobile display -->
+                    <header class="navbar-header">
+                        <a href="index.html" class="navbar-brand"><img src="{{assets}}/img/logo.png" alt=""></a>
+                    </header>
+
+
+
+                    <div class="topnav">
+                        <div class="btn-group">
+                            <a data-placement="bottom" data-original-title="Show / Hide Left" data-toggle="tooltip" class="btn btn-primary btn-sm toggle-left">
+                                <i class="fa fa-bars"></i>
+                            </a>
+                            <a data-placement="bottom" data-original-title="Show / Hide Right" data-toggle="tooltip" class="btn btn-default btn-sm toggle-right">
+                                <span class="glyphicon glyphicon-comment"></span>
+                            </a>
+                        </div>
+
+                    </div>
+
+                </div>
+                <!-- /.container-fluid -->
+            </nav>
+            <!-- /.navbar -->
+
+            <header class="head">
+                <div class="search-bar">
+                    {{> mainSearch }}
+                </div>
+                <!-- /.search-bar -->
+
+                <div class="main-bar">
+                    <h3><i class="{{ icon }}"></i> {{ title }}</h3>
+                </div>
+                <!-- /.main-bar -->
+            </header>
+            <!-- /.head -->
         </div>
-
-    </div>
-    <!-- /.container-fluid -->
-</nav>
-<!-- /.navbar -->
-
-        <header class="head">
-            <div class="search-bar">
-                {{> mainSearch }}
-            </div>
-            <!-- /.search-bar -->
-
-            <div class="main-bar">
-                <h3><i class="{{ icon }}"></i> {{ title }}</h3>
-            </div>
-            <!-- /.main-bar -->
-        </header>
-        <!-- /.head -->
-    </div>
-    <!-- /#top -->
-    <div id="left">
-        <p>LEFT</p>
-    </div>
-    <!-- /#left -->
-    <div id="content">
-        <div class="outer">
-            <div class="inner">
-                {% body %}
+        <!-- /#top -->
+        <div id="left">
+            <p>LEFT</p>
+        </div>
+        <!-- /#left -->
+        <div id="content">
+            <div class="outer">
+                <div class="inner">
+                    {% body %}
+                </div>
+                <!-- /.inner -->
             </div>
-            <!-- /.inner -->
+            <!-- /.outer -->
         </div>
-        <!-- /.outer -->
-    </div>
-    <!-- /#content -->
+        <!-- /#content -->
 
-    <div id="right">
-        <p>RIGHT</p>
+        <div id="right">
+            <p>RIGHT</p>
+        </div>
+        <!-- /#right -->
     </div>
-    <!-- /#right -->
-</div>
-<!-- /#wrap -->
-<footer id="footer">
-    <p>2014 &copy; Metis Bootstrap Admin Template</p>
-</footer>
-<!-- /#footer -->
+    <!-- /#wrap -->
+    <footer id="footer">
+        <p>2014 &copy; Metis Bootstrap Admin Template</p>
+    </footer>
+    <!-- /#footer -->
 
 
-<!--jQuery 2.1.1 -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-<!--Bootstrap -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/metisMenu/1.1.3/metisMenu.min.js"></script>
+    <!--jQuery -->
+    <script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
 
+    <!--Bootstrap -->
+    <script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
 
 
-<!-- Metis core scripts -->
-<script src="{{assets}}/js/core.min.js"></script>
+    <!-- Metis core scripts -->
+    <script src="{{assets}}/js/core.min.js"></script>
 
 </body>
+
 </html>
diff --git a/src/templates/layouts/login.hbs b/src/templates/layouts/login.hbs
index 22a83c71..f6656dce 100644
--- a/src/templates/layouts/login.hbs
+++ b/src/templates/layouts/login.hbs
@@ -5,25 +5,22 @@
     {{> meta}}
 
     <!-- Bootstrap -->
-    {{#if rtl}}
-        <link rel="stylesheet" href="{{assets}}/lib/bootstrap/dist/css/bootstrap.rtl.css">
-    {{else}}
-        <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-    {{/if}}
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.0/animate.min.css">
+    <link rel="stylesheet" href="{{assets}}/lib/bootstrap/css/bootstrap{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+    <!-- Font Awesome -->
+    <link rel="stylesheet" href="{{assets}}/lib/font-awesome/css/font-awesome{{#if production}}.min{{/if}}.css">
+
     <!-- Metis core stylesheet -->
-    {{#if rtl}}
-        <link rel="stylesheet" href="{{assets}}/css/main.rtl.css">
-    {{else}}
-        <link rel="stylesheet" href="{{assets}}/css/main.min.css">
-    {{/if}}
-    {{#if rtl}}
-        <style>
-            body {
-                direction: rtl;
-            }
-        </style>
-    {{/if}}
+    <link rel="stylesheet" href="{{assets}}/css/main{{#if rtl}}.rtl{{/if}}{{#if production}}.min{{/if}}.css">
+
+{{> rtl-style}}
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
 
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
@@ -33,9 +30,11 @@
 
 
     <!--jQuery -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+    <script src="{{assets}}/lib/jquery/jquery{{#if production}}.min{{/if}}.js"></script>
+
     <!--Bootstrap -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
+    <script src="{{assets}}/lib/bootstrap/js/bootstrap{{#if production}}.min{{/if}}.js"></script>
+
 
     <script type="text/javascript">
         (function($) {
diff --git a/src/templates/layouts/post.hbs b/src/templates/layouts/post.hbs
index 07578ea7..900dfcf5 100644
--- a/src/templates/layouts/post.hbs
+++ b/src/templates/layouts/post.hbs
@@ -1,24 +1,34 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<head>
     {{> meta}}
-    
+
     <link rel="stylesheet" href="{{assets}}/bootstrap.css">
-          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-  <body>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+
+<body>
     <!-- nav partial -->
     {{> nav }}
     <div class="container">
-      <!-- pages -->
-      <div class="post">
-        <h2>{{title}}</h2>
-        <p>Posted on: {{posted}}
-          {{#markdown}}
-            {% body %}
-          {{/markdown}}
-        </p>
-      </div>
-      <script src="{{assets}}/highlight.js"></script>
+        <!-- pages -->
+        <div class="post">
+            <h2>{{title}}</h2>
+            <p>Posted on: {{posted}}
+                {{#markdown}}
+                    {% body %}
+                {{/markdown}}
+            </p>
+        </div>
+        <script src="{{assets}}/highlight.js"></script>
     </div>
-  </body>
+</body>
+
 </html>
diff --git a/src/templates/partials/rtl-style.hbs b/src/templates/partials/rtl-style.hbs
new file mode 100644
index 00000000..16149d50
--- /dev/null
+++ b/src/templates/partials/rtl-style.hbs
@@ -0,0 +1,7 @@
+{{#if rtl}}
+    <style media="screen">
+        body {
+            direction: rtl;
+        }
+    </style>
+{{/if}}
