diff --git a/data/panaetius-theme/assets.json b/data/panaetius-theme/assets.json
index 6471344..c9b275a 100644
--- a/data/panaetius-theme/assets.json
+++ b/data/panaetius-theme/assets.json
@@ -9,7 +9,7 @@
     "js": "2.lazyload.1168fc21175de558d316.min.js"
   },
   "main": {
-    "css": "main.7ec8eedcf4dbffc5a912.min.css",
+    "css": "main.793c393487568a4fd1c3.min.css",
     "js": "main.de04e43a25a1ed226095.min.js"
   },
   "vendors~app": {
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 35078df..806c57b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
     {{- if or .Title .Content -}}
     <div class="row py-3">
         <div class="col">
-            {{ with .Title }}<h3 class="display-4">{{ . }}</h3>{{ end }}
+            {{ with .Title }}<h1>{{ . }}</h1>{{ end }}
             {{- with .Content -}}
             <div class="content">
                 {{ . }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 6b025d5..ae6f4e1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -2,25 +2,32 @@
 <nav class="navbar navbar-expand-md navbar-light bg-light fixed-top" id="navbar-main-menu">
     <div class="container">
 
-        <a class="navbar-brand" href="{{ .Site.BaseURL }}"><img src="/images/DUCK_256.png" width="30" height="30" class="mr-3 rotate-a-20"/>{{ .Site.Title }}</a>
-        <!-- <a class="navbar-brand font-weight-bold" href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> -->
+        <a class="navbar-brand" href="{{ .Site.BaseURL }}"><img src="/images/DUCK_256.png" width="30" height="30" class="mr-3 rotate-a-20" />{{ .Site.Title }}</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="main-menu">
             <ul class="navbar-nav ml-auto">
-            {{- if .Site.Params.showLanguageSwitcher -}}
+                {{- if .Site.Params.showLanguageSwitcher -}}
                 {{ partial "i18nlist.html" . }}
-            {{- end -}}
-            {{ with .Site.Menus.main }}
+                {{- end -}}
+                {{ with .Site.Menus.main }}
                 {{ range . }}
-                    <li class="nav-item{{ if $current.IsMenuCurrent "main" . }} active{{ end }}"><a class="nav-link" href="{{ .URL | relLangURL }}">{{ .Name }}</a></li>
+                <li class="nav-item{{ if or (eq $current.URL .URL) ($current.HasMenuCurrent "main" .) }} active{{ end }}"><a class="nav-link" href="{{ .URL | relLangURL }}">{{ .Name }}</a></li>
                 {{ end }}
-            {{ end }}
-            <li class="nav-item">
-
-                <i class="fas fa-search" data-fa-transform="down-5"></i>
-            </li>
+                {{ end }}
+                <li class="nav-item" id="nav-search">
+                    <form id="search-form" method="get" action="/search" method="POST" class="form-inline">
+                        <input type="text" name="q" id="search" class="form-control form-control-sm" placeholder="Search">
+                        <div class="input-group">
+                            <div class="input-group-append">
+                                <!-- <div> -->
+                                <button type="submit" id="search-button" class="btn btn-primary"> <i class="fa fa-search fa-sm"></i></button>
+                                <!-- <button type="submit" id="search-button" class="btn btn-primary form-control form-control-sm"> <i class="fa fa-search"></i></button> -->
+                            </div>
+                    </form>
+                    <!-- <i class="fas fa-search" data-fa-transform="down-5"></i> -->
+                </li>
             </ul>
         </div>
     </div>
diff --git a/layouts/search/single.html b/layouts/search/single.html
index 1da0685..e5b7fc8 100644
--- a/layouts/search/single.html
+++ b/layouts/search/single.html
@@ -1,22 +1,25 @@
 {{ define "main" }}
+{{ .Scratch.Set "IsSingle" true }}
 <main class="content-page container pt-7 pb-5">
     <div class="container">
         <div class="row">
             <div class="col">
-                {{ .Content }}
+                <h1>Search</h1>
             </div>
         </div>
         <div class="row">
             <div class="col">
-              <form id="search-form" method="get" action="/search" method="POST" class="form-inline">
-                <input type="text" name="q" id="search" class="form-control" placeholder="Search" style="width: 20%;">
-                <div class="input-group">
-                <div class="input-group-append">
-                <button type="submit" id="search-button" class="btn btn-secondary"><i class="fa fa-search"></i></button>
+                <div class="d-flex justify-content-center">
+                    <form id="search-form" method="get" action="/search" method="POST" class="form-inline form-single">
+                        <input type="text" name="q" id="search" class="form-control form-control-sm" placeholder="Search">
+                        <div class="input-group">
+                            <div class="input-group-append">
+                                <button type="submit" id="search-button" class="btn btn-primary" style="margin-left: -5px;"> <span class="fa fa-search form-control-feedback"></span></button>
+                            </div>
+                    </form>
                 </div>
-              </form>
-              </div>
-              <!-- <div class="search-input-wrap">
+            </div>
+            <!-- <div class="search-input-wrap">
                     <form id="search-form" method="get" action="">
                         <input id="search" name="q" type="text" />
                         <br>
@@ -24,54 +27,54 @@
                         <a id="search-clear" href="/search/">Clear</a>
                     </form>
                 </div> -->
-                <br>
-                <div id="app-search" class="row listrecent"></div>
-            </div>
+            <br>
+            <div id="app-search" class="row listrecent"></div>
         </div>
-        <div id="app-search" class="row listrecent"></div>
+    </div>
+    <div id="app-search" class="row listrecent"></div>
 
 
-        <div class="row">
-            {{ $p := slice }}
-            {{ range (where .Site.RegularPages "Section" "==" "post") }}
-            {{ $.Scratch.Set "image" .RelPermalink }}
-            {{ $.Scratch.Add "image" (index .Params.images 0) }}
-            {{ $post := dict "link" .RelPermalink "author" (index .Params.authors 0) "tags" .Params.tags "title" .Title "date" (.Params.date.Format "January 2, 2006") "image" ($.Scratch.Get "image") "content" (substr .Plain 0 200) -}}
-            {{ $p = $p | append $post -}}
-            {{ end }}
-            {{ $p | jsonify }}
-        </div>
-        <script src="{{ print "dist/" "lunr.b93de9e9609074d666f5123e866e25ed.min.js" | relURL }}"></script>
-<script>
-const posts = JSON.parse(
-    {{ $p | jsonify }}
-  );
-  const query = new URLSearchParams(window.location.search);
-  console.log(query)
-  const searchString = query.get('q');
-  document.querySelector('#search').value = searchString;
-  const $target = document.querySelector('#app-search');
+    <div class="row">
+        {{ $p := slice }}
+        {{ range (where .Site.RegularPages "Section" "==" "post") }}
+        {{ $.Scratch.Set "image" .RelPermalink }}
+        {{ $.Scratch.Add "image" (index .Params.images 0) }}
+        {{ $post := dict "link" .RelPermalink "author" (index .Params.authors 0) "tags" .Params.tags "title" .Title "date" (.Params.date.Format "January 2, 2006") "image" ($.Scratch.Get "image") "content" (substr .Plain 0 200) -}}
+        {{ $p = $p | append $post -}}
+        {{ end }}
+        {{ $p | jsonify }}
+    </div>
+    <script src="{{ print "dist/" "lunr.b93de9e9609074d666f5123e866e25ed.min.js" | relURL }}"></script>
+    <script>
+        const posts = JSON.parse({{$p | jsonify}});
+        const query = new URLSearchParams(window.location.search);
+        console.log(query)
+        const searchString = query.get('q');
+        document.querySelector('#search').value = searchString;
+        const $target = document.querySelector('#app-search');
 
-  // Our index uses title as a reference
-  const postsByTitle = posts.reduce((acc, curr) => {
-    acc[curr.title] = curr;
-    return acc;
-  }, {});
+        // Our index uses title as a reference
+        const postsByTitle = posts.reduce((acc, curr) => {
+            acc[curr.title] = curr;
+            return acc;
+        }, {});
 
-  fetch('/search-index.json').then(function (res) {
-    return res.json();
-  }).then(function (data) {
-    const index = lunr.Index.load(data);
-    const matches = index.search(searchString);
-    const matchPosts = [];
-    matches.forEach((m) => {
-      matchPosts.push(postsByTitle[m.ref]);
-    });
-    matchPosts[0].tags.forEach(p => {console.log(p)})
-    console.log(matchPosts[0].tags)
-    try {
-      $target.innerHTML = matchPosts.map(p => {
-          return `<br><div class="col-lg-4 col-md-6 mb-30px card-group">
+        fetch('/search-index.json').then(function(res) {
+            return res.json();
+        }).then(function(data) {
+            const index = lunr.Index.load(data);
+            const matches = index.search(searchString);
+            const matchPosts = [];
+            matches.forEach((m) => {
+                matchPosts.push(postsByTitle[m.ref]);
+            });
+            matchPosts[0].tags.forEach(p => {
+                console.log(p)
+            })
+            console.log(matchPosts[0].tags)
+            try {
+                $target.innerHTML = matchPosts.map(p => {
+                    return `<br><div class="col-lg-4 col-md-6 mb-30px card-group">
             <div class="card h-100">
                 <div class="maxthumb">
                     <a href="${p.link}">
@@ -97,13 +100,13 @@ const posts = JSON.parse(
                 </div>
             </div>
         </div>`;
-      }).join('');
-    } catch(TypeError) {
-      $target.innerHTML = `<div>No search results found.</div>`;
-      console.error(TypeError)
-    }
-  });
-  </script>
+                }).join('');
+            } catch (TypeError) {
+                $target.innerHTML = `<div>No search results found.</div>`;
+                console.error(TypeError)
+            }
+        });
+    </script>
     </div>
 </main>
 {{ end }}
diff --git a/layouts/tags/terms.html b/layouts/tags/terms.html
index 919f0d1..ba98937 100644
--- a/layouts/tags/terms.html
+++ b/layouts/tags/terms.html
@@ -3,7 +3,7 @@
     {{- if or .Title .Content -}}
     <div class="row py-3">
         <div class="col">
-            {{ with .Title }}<h3 class="display-4">{{ . }}</h3>{{ end }}
+            {{ with .Title }}<h1>{{ . }}</h1>{{ end }}
             {{- with .Content -}}
             <div class="content">
                 {{ . }}
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 05ab066..25fdda5 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -11,60 +11,64 @@ $gray-700: #264d61;
 $gray-800: #0c344b;
 $gray-900: #082333;
 
+$font-grey: #343a40;
+
+$primary: #a02f2f;
+$secondary: #1B1725;
+
 $text-muted: $gray-400;
-$body-color: $gray-800;
+$body-color: $font-grey;
 $light: $white;
 $dark: $gray-900;
-$headings-color: $gray-900;
-// $headings-font-family: 'Open Sans', sans-serif;
-$headings-font-family: "Rotunda", sans-serif;
+$headings-color: $font-grey;
+$headings-font-family: "Rotunda",
+sans-serif;
 $headings-font-weight: 500;
 
-// $font-family-sans-serif: 'Roboto', sans-serif;
-$font-family-sans-serif: "Rotunda", sans-serif;
-$font-family-monospace: "Realtime", monospace;
-$font-family-serif: "Roboto Slab", serif;
+// $nav-link-disabled-color: $font-grey;
+// $nav-tabs-link-active-color: $font-grey;
+$navbar-light-color: $font-grey;
+$navbar-light-hover-color: $primary;
+$navbar-light-active-color: $primary;
+
+$font-family-sans-serif: "Rotunda",
+sans-serif;
+$font-family-monospace: "Realtime",
+monospace;
+$font-family-serif: "Roboto Slab",
+serif;
 
 $font-weight-normal: 400;
 $font-weight-base: 400;
 
 $code-font-size: 100%;
 
-$link-color: $gray-800;
-$link-decoration: underline;
+$link-color: $primary;
+$link-decoration: none;
 
 $font-size-base: 1.125rem;
 
 $headings-margin-bottom: 1.25rem;
 $paragraph-margin-bottom: 1.5rem;
 $spacer: 1.125rem;
-$spacers: (
-  0: 0,
-  1: (
-    $spacer * 0.25,
-  ),
-  2: (
-    $spacer * 0.5,
-  ),
-  3: $spacer,
-  4: (
-    $spacer * 1.5,
-  ),
-  5: (
-    $spacer * 3,
-  ),
-  6: (
-    $spacer * 5,
-  ),
-  7: (
-    $spacer * 6,
-  ),
-  8: (
-    $spacer * 7,
-  ),
-  9: (
-    $spacer * 8,
-  ),
+$spacers: (0: 0,
+    1: ($spacer * 0.25,
+    ),
+    2: ($spacer * 0.5,
+    ),
+    3: $spacer,
+    4: ($spacer * 1.5,
+    ),
+    5: ($spacer * 3,
+    ),
+    6: ($spacer * 5,
+    ),
+    7: ($spacer * 6,
+    ),
+    8: ($spacer * 7,
+    ),
+    9: ($spacer * 8,
+    ),
 );
 
 $border-radius: 0.45rem;
@@ -80,4 +84,3 @@ $navbar-padding-y: 0.4rem;
 // Overrides
 
 $body-bg: #f9f9f9;
-
diff --git a/src/scss/panaetius-theme.scss b/src/scss/panaetius-theme.scss
index f68cb24..8170b67 100644
--- a/src/scss/panaetius-theme.scss
+++ b/src/scss/panaetius-theme.scss
@@ -101,3 +101,7 @@ img.front-background {
     object-fit: cover;
     position: fixed;
 }
+
+a.navbar-brand {
+    color: $font-grey !important;
+}
diff --git a/src/scss/search-bar.scss b/src/scss/search-bar.scss
new file mode 100644
index 0000000..8a4cef3
--- /dev/null
+++ b/src/scss/search-bar.scss
@@ -0,0 +1,22 @@
+// li#nav-search {
+form#search-form {
+    margin-top: 2px;
+
+    & input {
+        width: 80%;
+        padding-top: 10px;
+    }
+
+    & button {
+        margin-left: -5px;
+        height: calc(1.5em + .5rem - 1px);
+
+        & .fa-search {
+            margin-bottom: 2px !important;
+        }
+    }
+}
+
+form.form-single {
+    width: 80% !important;
+}
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 57bfa64..5f95f30 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -4,4 +4,6 @@
 @import "panaetius-theme";
 @import "sticky-footer";
 @import "search";
+@import "search-bar";
+@import "toc";
 @import "fonts";