diff --git a/tools/jsdoc/hifi-jsdoc-template/static/scripts/vue b/tools/jsdoc/hifi-jsdoc-template/static/scripts/vue.min.js
similarity index 100%
rename from tools/jsdoc/hifi-jsdoc-template/static/scripts/vue
rename to tools/jsdoc/hifi-jsdoc-template/static/scripts/vue.min.js
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/scripts/vuetify.js b/tools/jsdoc/hifi-jsdoc-template/static/scripts/vuetify.js
index baf24e76bd..00922b503b 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/scripts/vuetify.js
+++ b/tools/jsdoc/hifi-jsdoc-template/static/scripts/vuetify.js
@@ -41070,4 +41070,3 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_vue__;
 
 /******/ })["default"];
 });
-//# sourceMappingURL=vuetify.js.map
\ No newline at end of file
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index c62f4ff626..7af55da7d5 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -198,12 +198,12 @@ article li {
 
 nav {
     position: fixed;
-    top: 260px;
+    top: 275px;
     bottom: 0;
     left: 0;
     right: 0;
     width: 300px;
-    background-color: #000000;
+    background-color: #27343B;
     border-right: 1px solid #ccc;
     overflow-y: scroll;
     padding-left: 20px;
@@ -232,9 +232,9 @@ nav #nav-search {
     position: fixed;
     top: 0;
     left: 0;
-    height: 260px;
+    height: 275px;
     width: 300px;
-    background-color: #000000;
+    background-color: #27343B;
     color: #FFFFFF;
     text-align: center;
     margin-top: 0px;    
@@ -374,11 +374,12 @@ nav > h2 > a {
 .search-input
 {
     font-family: 'Graphik Regular', sans-serif;
-    font-size: 80%;    
+    font-size: 90%;    
     border: 1px solid #ddd;
     box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);
     border-radius: 0;    
-    color: #3A3F3E;
+	background: rgba(76,76,76,0.47) !important;
+	color: white;
     width: 70%;
     padding: 10px;
 }
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/night.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/night.css
index 1e95cb34d6..ab73c7b3c0 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/night.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/night.css
@@ -3,7 +3,7 @@ html {
 }
 
 body h1 {
-	color: white;
+	color: #eaeaea;
 }
 
 body {
@@ -63,5 +63,5 @@ table tr:nth-child(2n) {
 }
 
 .important {
-	color: #BF2424 !important;
+	color: #F91E1E !important;
 }
\ No newline at end of file
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
index e954eb915a..760f78d683 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <title><?js= title ?></title>
 	
-	<script src="scripts/vue_dev.js"></script>
+	<script src="scripts/vue.min.js"></script>
 	<script src="scripts/vuetify.js"></script>
     
     <script src="scripts/prettify/prettify.js"></script>
@@ -31,6 +31,11 @@
 <body>
 
 <div class="nav-header">
+    <p><a href="https://projectathena.io"><img src="images/project-athena-logo.png" width="214px" /></a></p>
+    <?js if (env.conf.docdash.search) { ?>
+    <input type="text" class="search-input" id="nav-search" placeholder="Search API Docs ..." />
+    <?js } ?>
+    <p><a href="https://docs.projectathena.dev">Looking for <strong>Project Athena</strong><br /> Documentation?</a></p>
 	<div id="app">
 		<v-app dark>
 			<v-btn @click="toggleNightMode" text dark>
@@ -39,11 +44,6 @@
 			</v-btn>
 		</v-app>
 	</div>
-    <p><a href="https://projectathena.io"><img src="images/project-athena-logo.png" width="214px" /></a></p>
-    <?js if (env.conf.docdash.search) { ?>
-    <input type="text" class="search-input" id="nav-search" placeholder="Search API Docs ..." />
-    <?js } ?>
-    <p><a href="https://docs.projectathena.dev">Looking for <strong>Project Athena</strong><br /> Documentation?</a></p>
 </div>
 
 <nav>
@@ -102,14 +102,25 @@
 			},
 		}),
 		data: () => ({
-			nightMode: false,
+
 		}),
+		created: function () {
+			var darkDisabled = JSON.parse(localStorage.getItem('darkDisabled'));
+			if (darkDisabled == null) {
+				localStorage.setItem('darkDisabled', JSON.stringify("false"));
+			}
+		},
 		methods: {
 			toggleNightMode: function() {
-				this.darkDisabled = !this.darkDisabled;
+				var darkDisabled = JSON.parse(localStorage.getItem('darkDisabled'));
+				localStorage.setItem('darkDisabled', JSON.stringify(!darkDisabled));
+				darkDisabled = !darkDisabled;
+				
+				console.info("Dark mode disabled state is now...", darkDisabled);
+				
 				var nightSheet = document.querySelector('[href="styles/night.css"]');
 				nightSheet.removeAttribute('disabled');
-				nightSheet.disabled = this.darkDisabled;
+				nightSheet.disabled = darkDisabled;
 			}
 		},
 	})