diff --git a/lib/gollum/templates/commit.mustache b/lib/gollum/templates/commit.mustache
index 8e4d2379..fe5c9266 100644
--- a/lib/gollum/templates/commit.mustache
+++ b/lib/gollum/templates/commit.mustache
@@ -1,6 +1,8 @@
 <div id="wiki-wrapper" class="compare">
   <div id="head">
-    <h1 class="py-4">{{message}}</h1>
+    <h1 class="header-title text-center text-md-left py-4">
+      {{message}}
+    </h1>
     {{author}} commited {{authored_date}}
     <span class="px-2 float-right">commit <code>{{version}}</code></span>
   </div>
diff --git a/lib/gollum/templates/compare.mustache b/lib/gollum/templates/compare.mustache
index bd5950e3..b26e84e7 100644
--- a/lib/gollum/templates/compare.mustache
+++ b/lib/gollum/templates/compare.mustache
@@ -1,8 +1,14 @@
 <div id="wiki-wrapper" class="compare">
-	<div id="head">
-		{{>navbar}}
-	  <h1 class="py-4"><span class="f1-light text-gray-light">Comparing versions of</span> {{name}}</h1>
-	</div>
+  <div id="head">
+    {{>navbar}}
+
+    <h1 class="header-title text-center text-md-left py-4">
+      <span class="f1-light text-gray-light">
+        Comparing versions of
+      </span>
+      {{name}}
+    </h1>
+  </div>
 
 {{#message}}
 	<p>{{message}}</p>
diff --git a/lib/gollum/templates/create.mustache b/lib/gollum/templates/create.mustache
index 53793b29..ff2bcc07 100644
--- a/lib/gollum/templates/create.mustache
+++ b/lib/gollum/templates/create.mustache
@@ -1,8 +1,11 @@
 <div id="wiki-wrapper" class="create">
-<div id="head">
-	{{>navbar}}
-  <h1 class="py-4">Create New Page</h1>
-</div>
+  <div id="head">
+    {{>navbar}}
+
+    <h1 class="header-title text-center text-md-left py-4">
+      Create New Page
+    </h1>
+  </div>
 <div id="wiki-content" class="create edit">
   <div class="tabnav">
     <nav class="tabnav-tabs" aria-label="Toggle edit or preview mode">
diff --git a/lib/gollum/templates/edit.mustache b/lib/gollum/templates/edit.mustache
index c85b2800..f72fac44 100644
--- a/lib/gollum/templates/edit.mustache
+++ b/lib/gollum/templates/edit.mustache
@@ -1,8 +1,11 @@
 <div id="wiki-wrapper" class="edit">
-<div id="head">
-	{{>navbar}}
-  <h1 class="py-4">Editing <strong>{{title}}</strong></h1>
-</div>
+  <div id="head">
+    {{>navbar}}
+
+    <h1 class="header-title text-center text-md-left py-4">
+      Editing <strong>{{title}}</strong>
+    </h1>
+  </div>
 <div class="tabnav">
   <nav class="tabnav-tabs">
     <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
diff --git a/lib/gollum/templates/history.mustache b/lib/gollum/templates/history.mustache
index ffdfcdbc..7f17a290 100644
--- a/lib/gollum/templates/history.mustache
+++ b/lib/gollum/templates/history.mustache
@@ -1,8 +1,15 @@
 <div id="wiki-wrapper" class="history">
 <div id="head">
-	{{>navbar}}
-  <h1 class="py-4"><span class="f1-light text-gray-light">History for</span> {{name}}</h1>
+  {{>navbar}}
+
+  <h1 class="header-title text-center text-md-left py-4">
+    <span class="f1-light text-gray-light">
+      History for
+    </span>
+    {{name}}
+  </h1>
 </div>
+
 <div id="page-history">
 
   {{>pagination}}
diff --git a/lib/gollum/templates/latest_changes.mustache b/lib/gollum/templates/latest_changes.mustache
index 20455663..e550e608 100644
--- a/lib/gollum/templates/latest_changes.mustache
+++ b/lib/gollum/templates/latest_changes.mustache
@@ -1,8 +1,11 @@
 <div id="wiki-wrapper" class="history">
-<div id="head">
-	{{>navbar}}
-  <h1 class="py-4">{{title}}</h1>
-</div>
+  <div id="head">
+    {{>navbar}}
+
+    <h1 class="header-title text-center text-md-left py-4">
+      {{title}}
+    </h1>
+  </div>
 
 {{>pagination}}
 
diff --git a/lib/gollum/templates/overview.mustache b/lib/gollum/templates/overview.mustache
index d1a65274..f714621d 100644
--- a/lib/gollum/templates/overview.mustache
+++ b/lib/gollum/templates/overview.mustache
@@ -1,8 +1,11 @@
 <div id="wiki-wrapper" class="results">
-<div id="head" class="overview">
-	{{>navbar}}
-  <h1 class="py-4">{{title}}</h1>
-</div>
+  <div id="head" class="overview">
+    {{>navbar}}
+
+    <h1 class="header-title text-center text-md-left py-4">
+      {{title}}
+    </h1>
+  </div>
 <div id="overview">
 
 {{#has_results}}
diff --git a/lib/gollum/templates/search.mustache b/lib/gollum/templates/search.mustache
index 1b04a528..365a6f17 100644
--- a/lib/gollum/templates/search.mustache
+++ b/lib/gollum/templates/search.mustache
@@ -1,7 +1,13 @@
 <div id="wiki-wrapper" class="results">
   <div id="head">
     {{>navbar}}
-    <h1 class="py-4"><span class="f1-light text-gray-light">Search results for</span> {{name}}</h1>
+
+    <h1 class="header-title text-center text-md-left py-4">
+      <span class="f1-light text-gray-light">
+        Search results for
+      </span>
+      {{name}}
+    </h1>
   </div>
 
 {{#has_results}}
diff --git a/lib/gollum/templates/wiki_content.mustache b/lib/gollum/templates/wiki_content.mustache
index 50fe5d5d..6a8c881b 100644
--- a/lib/gollum/templates/wiki_content.mustache
+++ b/lib/gollum/templates/wiki_content.mustache
@@ -1,5 +1,7 @@
 <div id="wiki-content" class="px-2 px-lg-0">
-	<h1 class="pt-4">{{page_header}}</h1>
+  <h1 class="header-title text-center text-md-left pt-4">
+    {{page_header}}
+  </h1>
 	<div class="breadcrumb">{{{breadcrumb}}}</div>
 
 	<div class="{{#has_header}}has-header{{/has_header}}{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}} has-sidebar has-{{bar_side}}bar{{/has_sidebar}}{{#has_toc}} has-toc{{/has_toc}}">