diff --git a/site/layouts/partials/navbar.html b/site/layouts/partials/navbar.html
new file mode 100644
index 000000000..52a015d8e
--- /dev/null
+++ b/site/layouts/partials/navbar.html
@@ -0,0 +1,3 @@
+<nav class="navbar is-dark is-size-6 is-fixed-top" role="navigation" aria-label="main navigation">
+    {{ partial "layout/navbar_contents" . }}
+</nav>
\ No newline at end of file
diff --git a/src/js/hero.js b/src/js/hero.js
index cc0c44ced..c83e7066e 100644
--- a/src/js/hero.js
+++ b/src/js/hero.js
@@ -1,11 +1,14 @@
 const navbar = document.getElementById('hero-navbar');
+const navbarBaseColor = 'is-dark';
 
 if (navbar) {
     window.addEventListener('scroll', () => {
         if (window.scrollY > 0) {
             navbar.classList.add('is-freestanding');
+            navbar.classList.add(navbarBaseColor);
         } else {
             navbar.classList.remove('is-freestanding');
+            navbar.classList.remove(navbarBaseColor);
         }
     });
 }
diff --git a/src/scss/yuzu.scss b/src/scss/citra/citra.scss
similarity index 100%
rename from src/scss/yuzu.scss
rename to src/scss/citra/citra.scss
diff --git a/src/scss/citra/citra_after_derived.scss b/src/scss/citra/citra_after_derived.scss
new file mode 100644
index 000000000..a7b741011
--- /dev/null
+++ b/src/scss/citra/citra_after_derived.scss
@@ -0,0 +1 @@
+$navbar-background-color: $light;
\ No newline at end of file
diff --git a/src/scss/citra/citra_before_derived.scss b/src/scss/citra/citra_before_derived.scss
new file mode 100644
index 000000000..e7bb5f1a9
--- /dev/null
+++ b/src/scss/citra/citra_before_derived.scss
@@ -0,0 +1 @@
+$primary: #ff8e03;
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 36f897c07..dbde7edf8 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -3,9 +3,9 @@
 @import "./node_modules/bulma/sass/utilities/initial-variables.sass";
 
 /* 2. Set the derived variables */
-@import "./yuzu_before_derived.scss";
+@import "./yuzu/yuzu_before_derived.scss";
 @import "./node_modules/bulma/sass/utilities/derived-variables.sass";
-@import "./yuzu_after_derived.scss";
+@import "./yuzu/yuzu_after_derived.scss";
 
 /* 3. Misc customization of Bulma */
 $body-background-color: $background;
@@ -20,4 +20,4 @@ $navbar-item-img-max-height: 2.75rem;
 /* 4. Import the rest of Bulma */
 @import "./node_modules/bulma/bulma.sass";
 @import "./shared.scss";
-@import "./yuzu.scss";
\ No newline at end of file
+@import "./yuzu/yuzu.scss";
\ No newline at end of file
diff --git a/src/scss/yuzu/yuzu.scss b/src/scss/yuzu/yuzu.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/scss/yuzu_after_derived.scss b/src/scss/yuzu/yuzu_after_derived.scss
similarity index 100%
rename from src/scss/yuzu_after_derived.scss
rename to src/scss/yuzu/yuzu_after_derived.scss
diff --git a/src/scss/yuzu_before_derived.scss b/src/scss/yuzu/yuzu_before_derived.scss
similarity index 100%
rename from src/scss/yuzu_before_derived.scss
rename to src/scss/yuzu/yuzu_before_derived.scss
diff --git a/update_submodules.sh b/update_submodules.sh
index eaa70713d..d6e103589 100755
--- a/update_submodules.sh
+++ b/update_submodules.sh
@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
+rm -rf ./site/themes/shared-bulma-theme/
 git submodule update --remote --merge
+git add ./site/themes/shared-bulma-theme/
+git commit -m "Updated shared-bulma-theme."
+git push