diff --git a/bootstrap/layouts/cloud.html b/bootstrap/layouts/cloud.html
index ae19d7e..8357a6c 100644
--- a/bootstrap/layouts/cloud.html
+++ b/bootstrap/layouts/cloud.html
@@ -2,7 +2,7 @@
 {{if .Meta.TagState.Tags}}
 <div>
     {{range .Meta.TagState.Tags}}
-    <a class="badge badge-default" href="/{{(index $.Meta.TagState.Info .).Path}}">{{.}}</a>
+    <a class="badge badge-secondary" href="/{{(index $.Meta.TagState.Info .).Path}}">{{.}}</a>
     {{end}}
 </div>
 {{end}}
diff --git a/bootstrap/layouts/outer.html b/bootstrap/layouts/outer.html
index 5a71269..6dfb725 100644
--- a/bootstrap/layouts/outer.html
+++ b/bootstrap/layouts/outer.html
@@ -21,10 +21,7 @@
 {{end}}
 
 {{define "navbar"}}
-<nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
-    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup">
-        <span class="navbar-toggler-icon"></span>
-    </button>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
     <a class="navbar-brand" href="/">Goldsmith Sample</a>
     <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
         <div class="navbar-nav">
@@ -35,6 +32,9 @@
             <a class="nav-item nav-link {{if $area}}{{if eq $area "tags"}}active{{end}}{{end}}" href="/tags/">Tags</a>
         </div>
     </div>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup">
+        <span class="navbar-toggler-icon"></span>
+    </button>
 </nav>
 {{end}}
 
diff --git a/bootstrap/main.go b/bootstrap/main.go
index ba1a81f..a8d7caa 100644
--- a/bootstrap/main.go
+++ b/bootstrap/main.go
@@ -46,7 +46,7 @@ import (
 )
 
 func fixup(doc *goquery.Document) error {
-	doc.Find("table").AddClass("table")
+	doc.Find("table").AddClass("table", "table-dark")
 	doc.Find("blockquote").AddClass("blockquote")
 	doc.Find("img[src*='thumb']").Each(func(i int, s *goquery.Selection) {
 		thumbLink := s.ParentFiltered("a")