diff --git a/themes/mauro/layouts/partials/header.html b/themes/mauro/layouts/partials/header.html
index 7b1b573..2c091af 100644
--- a/themes/mauro/layouts/partials/header.html
+++ b/themes/mauro/layouts/partials/header.html
@@ -1,10 +1,10 @@
 <div class="container">
 <nav class="navbar navbar-expand-lg navbar-light">
   <a class="navbar-brand" href="{{ .Site.BaseURL }}"><i class="fa fa-home"></i></a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation">
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <div class="navbar-collapse collapse" id="navbarToggler">
+  <div class="collapse navbar-collapse" id="navbar-collapse" role="navigation">
     <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
       {{ if .Site.Menus.main }}
       {{ range sort .Site.Menus.main }}
diff --git a/themes/mauro/layouts/partials/js.html b/themes/mauro/layouts/partials/js.html
index c3d6f67..82f4483 100644
--- a/themes/mauro/layouts/partials/js.html
+++ b/themes/mauro/layouts/partials/js.html
@@ -2,7 +2,9 @@
 <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
 
 <!-- Bootstrap core JavaScript -->
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
 {{- range .Site.Params.custom_js -}}
 <script src="{{ $.Site.BaseURL }}{{ . }}"></script>
 {{ end }}
diff --git a/themes/mauro/static/css/sustain-main.css b/themes/mauro/static/css/sustain-main.css
index 21e706c..a6e17bc 100755
--- a/themes/mauro/static/css/sustain-main.css
+++ b/themes/mauro/static/css/sustain-main.css
@@ -24,69 +24,6 @@ html, body {
   /*padding: 0 0 60px;*/
 }
 
-/* Navbar */
-.navbar-static-top {
-  margin-bottom: 10px;
-}
-
-nav.navbar .navbar-brand {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-brand:hover, nav.navbar .navbar-brand:focus {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-text {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-nav > li > a {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-nav > li > a:hover, nav.navbar .navbar-nav > li > a:focus {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-nav > .active > a, nav.navbar .navbar-nav > .active > a:hover, nav.navbar .navbar-nav > .active > a:focus {
-  color: #6b6b6b;
-  background-color: #ffffff;
-}
-nav.navbar .navbar-nav > .open > a, nav.navbar .navbar-nav > .open > a:hover, nav.navbar .navbar-nav > .open > a:focus {
-  color: #6b6b6b;
-  background-color: #ffffff;
-}
-nav.navbar .navbar-toggle {
-  border-color: #ffffff;
-}
-nav.navbar .navbar-toggle:hover, nav.navbar .navbar-toggle:focus {
-  background-color: #ffffff;
-}
-nav.navbar .navbar-toggle .icon-bar {
-  background-color: #6b6b6b;
-}
-nav.navbar .navbar-collapse,
-nav.navbar .navbar-form {
-  border-color: #6b6b6b;
-}
-nav.navbar .navbar-link {
-  color: #6b6b6b;
-}
-nav.navbar .navbar-link:hover {
-  color: #6b6b6b;
-}
-@media (max-width: 767px) {
-  nav.navbar .navbar-nav .open .dropdown-menu > li > a {
-    color: #6b6b6b;
-  }
-  nav.navbar .navbar-nav .open .dropdown-menu > li > a:hover, nav.navbar .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #6b6b6b;
-  }
-  nav.navbar .navbar-nav .open .dropdown-menu > .active > a, nav.navbar .navbar-nav .open .dropdown-menu > .active > a:hover, nav.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #6b6b6b;
-    background-color: #ffffff;
-  }
-}
-
-#about .container {
-  max-width: 800px;
-}
 
 /* Custom page CSS */
 .container {
@@ -95,6 +32,14 @@ nav.navbar .navbar-link:hover {
   text-align: center;
 }
 
+.navbar-light .navbar-brand {
+    color: rgba(0,0,0,0.5);
+}
+
+#about .container {
+  max-width: 800px;
+}
+
 #about h1, #about h2, #about h3, #about h4, #about h5, #about h6 {
 margin-top: 1rem;
 margin-bottom: .5rem;
diff --git a/themes/mauro/static/css/vitae-layout.css b/themes/mauro/static/css/vitae-layout.css
index 82e4939..46ca1fe 100644
--- a/themes/mauro/static/css/vitae-layout.css
+++ b/themes/mauro/static/css/vitae-layout.css
@@ -108,8 +108,10 @@ em {
     /*margin-right: 6px;*/
 }
 
-.twocol {
-    column-count: 2;
+@media (min-width: 600px) {
+    .twocol {
+	column-count: 2;
+    }
 }
 
 .hanging {