diff --git a/themes/hugo-sustain/assets/scss/custom.scss b/themes/hugo-sustain/assets/scss/custom.scss
index 821a408..e69de29 100644
--- a/themes/hugo-sustain/assets/scss/custom.scss
+++ b/themes/hugo-sustain/assets/scss/custom.scss
@@ -1,145 +0,0 @@
-/* COLOURS */
-html, body {
-  border-top: 3px solid #0D76EC;
-}
-div.footer {
-  border-bottom: 5px solid #0D76EC;
-}
-.container a {
-  color: #0D76EC;
-}
-.container a:hover {
-  color: #12437A;
-}
-.container .label-success {
-  background-color: rgba(92, 139, 184, 0.6);
-  color: #FFF;
-}
-.container a.label-success:hover,
-.container a.label-success.active {
-  background-color: rgba(92, 139, 184, 0.9);
-  color: #FFF;
-}
-.container a.label-rss {
-  background-color: rgba(242, 101, 34, 0.8);
-  color: #FFF;
-}
-.container a.label-rss:hover {
-  background-color: rgba(242, 101, 34, 1);
-}
-.container h1 {
-  font-weight: bold;
-  color: #0D76EC;
-}
-.container h4 a {
-  color: #0D76EC;
-}
-.container h4 a:hover {
-  color: #0060CC;
-}
-
-/* Avoid scrollbar jumps in centering 
- * see https://css-tricks.com/eliminate-jumps-in-horizontal-centering-by-forcing-a-scroll-bar/
- */
-div#wrap { 
-  margin-left: calc(100vw - 100%);
-}
-
-div.avatar img {
-  max-height: 190px;
-}
-.panel {
-  box-shadow: none;
-  -webkit-box-shadow: none;
-}
-
-/* Site specific settings */
-section#about p {
-  font-size: 18px;
-  margin-bottom: 20px;
-}
-
-div.contact p {
-  line-height: 1.5em;
-  margin-bottom: 30px;
-}
-
-/* transparency of tags */
-
-
-/* Scale social icons with hovering */
-.social-links {
-  display: flex;
-  justify-content: center;
-}
-.social-links li a {
-  font-size: 26px;
-}
-.social-links li a i {
-  transform: scale(0.8);
-  transition: transform .3s;
-}
-.social-links li a:hover i {
-  transform: scale(1);
-}
-
-/* BLOG */
-.metadata-page {
-  font-size: 18px;
-  text-align: left;
-  margin: 3em 0 2em 0;
-}
-.metadata-page .row {
-  padding-bottom: 0;
-}
-.blog-summary {
-  padding-bottom: 1em;
-}
-.metadata-summary {
-  font-size: 0.8em;
-  opacity: 0.7;
-}
-.blogpost .header-image img {
-  width: 100%;
-  height: auto;
-  padding-bottom: 2px;
-}
-.blogpost .header-image p {
-  opacity: 0.7;
-  font-size: 0.8em;
-  text-align: center;
-  line-height: 1em;
-  margin-bottom: 1.5em;
-}
-
-a.learn-more {
-  font-size: 1.8em;
-  line-height: 0.8em;
-  font-weight: 700;
-  font-variant: small-caps;
-  text-transform: lowercase;
-  padding: 0 1em 0 .3em;
-  position: absolute;
-}
-a.learn-more::after {
-  position: absolute;
-  right: 0.3em;
-  content: " » ";
-  opacity: .8;
-  transition: all 150ms linear;
-}
-a.learn-more:hover::after {
-  right: 0;
-  opacity: 1;
-}
-
-/* HELPER CLASSES */
-.vertical-align {
-  display: flex;
-  align-items: center;
-}
-
-/* CODE / SYNTAX */
-pre code {
-  white-space:pre;
-}
diff --git a/themes/hugo-sustain/assets/scss/default.scss b/themes/hugo-sustain/assets/scss/default.scss
index bf98e5a..7d8cc08 100755
--- a/themes/hugo-sustain/assets/scss/default.scss
+++ b/themes/hugo-sustain/assets/scss/default.scss
@@ -1,199 +1,356 @@
-/* Main page with stikky-footer */
+/* Main page with sticky footer */
 html, body {
   height: 100%;
   background-color: #fff;
   font-family: 'Source Sans Pro', sans-serif;
-  /* The html and body elements cannot have any padding or margin. */
-  border-top: 3px solid #27A822;
+  border-top: 3px solid #0D76EC;
 }
 
-/* Wrapper for page content to push down footer */
 #wrap {
   padding-bottom: 50px;
   min-height: 100%;
   height: auto;
-  /* Negative indent footer by its height */
   margin: 0 auto -65px;
-  /* Pad bottom by footer height */
-  /*padding: 0 0 60px;*/
+
+  // Avoid scrollbar jumps in centering
+  margin-left: calc(100vw - 100%);
 }
 
 /* Navbar */
 .navbar-static-top {
   margin-bottom: 10px;
 }
+
 .navbar-default {
-  background-color: #ffffff;
-  border-color: #ffffff;
-}
-.navbar-default .navbar-brand {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-text {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-nav > li > a {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
-  color: #6b6b6b;
-  background-color: #ffffff;
-}
-.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
-  color: #6b6b6b;
-  background-color: #ffffff;
-}
-.navbar-default .navbar-toggle {
-  border-color: #ffffff;
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-  background-color: #ffffff;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #6b6b6b;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #6b6b6b;
-}
-.navbar-default .navbar-link {
-  color: #6b6b6b;
-}
-.navbar-default .navbar-link:hover {
-  color: #6b6b6b;
-}
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+  background-color: #fff;
+  border-color: #fff;
+
+  .navbar-brand,
+  .navbar-text,
+  .navbar-nav>li>a,
+  .navbar-nav>.active>a,
+  .navbar-nav>.open>a,
+  .navbar-link {
     color: #6b6b6b;
   }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+
+  .navbar-brand:hover,
+  .navbar-brand:focus,
+  .navbar-nav>li>a:hover,
+  .navbar-nav>li>a:focus,
+  .navbar-nav>.active>a:hover,
+  .navbar-nav>.active>a:focus,
+  .navbar-nav>.open>a:hover,
+  .navbar-nav>.open>a:focus,
+  .navbar-link:hover {
     color: #6b6b6b;
   }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #6b6b6b;
-    background-color: #ffffff;
+
+  .navbar-nav {
+
+    >.active>a,
+    >.open>a {
+      background-color: #fff;
+    }
+  }
+
+  .navbar-toggle {
+    border-color: #fff;
+
+    &:hover,
+    &:focus {
+      background-color: #fff;
+    }
+
+    .icon-bar {
+      background-color: #6b6b6b;
+    }
+  }
+
+  .navbar-collapse,
+  .navbar-form {
+    border-color: #6b6b6b;
+  }
+
+  @media (max-width: 767px) {
+    .navbar-nav .open .dropdown-menu {
+      >li>a {
+        color: #6b6b6b;
+
+        &:hover,
+        &:focus {
+          color: #6b6b6b;
+        }
+      }
+
+      >.active>a,
+      >.active>a:hover,
+      >.active>a:focus {
+        color: #6b6b6b;
+        background-color: #fff;
+      }
+    }
   }
 }
 
-/* Custom page CSS */
+/* Content containers */
 .container {
   width: auto;
   max-width: 800px;
   text-align: center;
+
+  .text-muted {
+    margin: 20px 0;
+  }
+
+  a {
+    color: #0D76EC;
+
+    &:hover {
+      color: #12437A;
+    }
+
+    &.label-rss {
+      background-color: rgba(242, 101, 34, 0.8);
+      color: #fff;
+
+      &:hover {
+        background-color: rgba(242, 101, 34, 1);
+      }
+    }
+  }
+
+  .label-success {
+    background-color: rgba(92, 139, 184, 0.6);
+    color: #fff;
+
+    &:hover,
+    &.active {
+      background-color: rgba(92, 139, 184, 0.9);
+      color: #fff;
+    }
+  }
+
+  h1 {
+    font-weight: bold;
+    color: #0D76EC;
+  }
+
+  h4 a {
+    color: #0D76EC;
+
+    &:hover {
+      color: #0060CC;
+    }
+  }
 }
-.container .text-muted {
-  margin: 20px 0;
-}
-.container a {
-  color: #27A822;
-}
-.container a:hover {
-  color: #267723;
-}
-.container p img, .img-responsive {
+
+/* Images */
+.container p img,
+.img-responsive {
   display: block;
   height: auto;
   margin: 2rem auto;
   max-width: 100%;
 }
-.panel-default h4 {
-  text-align: left;
-  line-height: 24px;
-  font-size: 22px;
-}
-.panel-default h5 {
-  text-align: left;
-  line-height: 30px;
-  font-size: 18px;
-}
-.panel-default h6 {
-  font-size: 15px;
-}
-.panel-default h4 a, h5 a {
-  color: #27A822;
-}
-.panel-default h4 a:hover, h5 a:hover {
-  color: #267723;
-}
-.panel{
+
+/* Panels */
+.panel {
   border-style: none;
+  box-shadow: none;
+  -webkit-box-shadow: none;
+
+  &-body {
+    padding-top: -10px;
+    text-align: left;
+  }
+
+  &-default {
+    h4, h5 {
+      text-align: left;
+    }
+
+    h4 {
+      line-height: 24px;
+      font-size: 22px;
+    }
+
+    h5 {
+      line-height: 30px;
+      font-size: 18px;
+    }
+
+    h6 {
+      font-size: 15px;
+    }
+  }
 }
-.panel-body {
-  padding-top: -10px;
-  text-align: left;
-}
+
+/* Social */
 .social-links {
-  display: block;
-  margin: 0 auto;
-  margin-top: 40px;
-  padding: 0px;
+  display: flex;
+  justify-content: center;
+  margin: 40px auto 0;
+  padding: 0;
   width: 100%;
   text-align: center;
   animation: fade 1s ease 1s both;
+
+  li {
+    display: inline-block;
+    padding: 0 5px;
+    text-align: center;
+
+    a {
+      font-size: 26px;
+      color: #000;
+      padding: 10px 10px 4px;
+      transition: all 0.4s ease;
+
+      &:hover {
+        color: #000;
+      }
+
+      i {
+        transform: scale(0.8);
+        transition: transform 0.3s;
+
+        &:hover {
+          transform: scale(1);
+        }
+      }
+    }
+  }
 }
-.social-links li {
-  display: inline-block;
-  padding: 5px;
-  padding-top: 0;
-  text-align: center;
-}
-.social-links li a {
-  font-size: 20px;
-  color: #000;
-  padding: 10px;
-  padding-bottom: 4px;
-  transition: all .4s ease;
-}
-.social-links li a:hover {
-  color: #000;
-}
+
+/* Layout tweaks */
 .avatar {
   padding-top: 5%;
+
+  img {
+    max-height: 190px;
+  }
 }
-.blog-post{
+
+.blog-post {
   padding-top: 15px;
 }
-.blog-title{
+
+.blog-title {
   padding-top: 2px;
 }
+
 .label {
   display: inline-block;
   margin-bottom: 5px;
 }
+
 .related-posts h4 {
   text-align: center;
 }
+
 .page-not-found {
   padding-top: 20%;
 }
+
 .disqus {
   padding-bottom: 15px;
 }
-.blogpost{
+
+/* Blog content */
+.blogpost {
   text-align: left;
   line-height: 30px;
   font-size: 18px;
+
+  .header-image {
+    img {
+      width: 100%;
+      height: auto;
+      padding-bottom: 2px;
+    }
+
+    p {
+      opacity: 0.7;
+      font-size: 0.8em;
+      text-align: center;
+      line-height: 1em;
+      margin-bottom: 1.5em;
+    }
+  }
 }
 
-/* Footer  */
-.footer {
+/* Metadata */
+.metadata-page {
+  font-size: 18px;
+  text-align: left;
+  margin: 3em 0 2em;
+
+  .row {
+    padding-bottom: 0;
+  }
+}
+
+.metadata-summary {
+  font-size: 0.8em;
+  opacity: 0.7;
+}
+
+.blog-summary {
+  padding-bottom: 1em;
+}
+
+/* Learn more link */
+a.learn-more {
+  font-size: 1.8em;
+  line-height: 0.8em;
+  font-weight: 700;
+  font-variant: small-caps;
+  text-transform: lowercase;
+  padding: 0 1em 0 0.3em;
+  position: absolute;
+
+  &::after {
+    position: absolute;
+    right: 0.3em;
+    content: " » ";
+    opacity: 0.8;
+    transition: all 150ms linear;
+  }
+
+  &:hover::after {
+    right: 0;
+    opacity: 1;
+  }
+}
+
+/* Footer */
+div.footer {
+  border-bottom: 5px solid #0D76EC;
   text-decoration: none !important;
-}
-.text-muted {
-	color: #6b6b6b;
-}
-div.footer{
-  border-bottom: 5px solid #27A822;;
-}
-/* Set the fixed height of the footer here */
-/*.footer {
-  height: 50px;
-  padding-bottom: 15px;
 
-}*/
+  .text-muted {
+    color: #6b6b6b;
+  }
+}
+
+/* Site specific */
+section#about p {
+  font-size: 18px;
+  margin-bottom: 20px;
+}
+
+div.contact p {
+  line-height: 1.5em;
+  margin-bottom: 30px;
+}
+
+/* Helpers */
+.vertical-align {
+  display: flex;
+  align-items: center;
+}
+
+pre code {
+  white-space: pre;
+}
diff --git a/themes/hugo-sustain/assets/scss/main.scss b/themes/hugo-sustain/assets/scss/main.scss
index 0df4ef9..c4788a5 100755
--- a/themes/hugo-sustain/assets/scss/main.scss
+++ b/themes/hugo-sustain/assets/scss/main.scss
@@ -1,4 +1,3 @@
 @import "default";
 @import "fonts";
 @import "luxbar";
-@import "custom";