diff --git a/addons/theme_bootswatch/views/theme_bootswatch_templates.xml b/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
index 3b3688073af..44e061ea406 100644
--- a/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
+++ b/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <!-- Remove Odoo bootstrap overridde -->
+    <template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
+        <xpath expr="//link[@href='/web_editor/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
+        <xpath expr="//link[@href='/website/static/src/scss/bootstrap_overridden.scss']" position="replace"/>
+    </template>
+
     <template id="theme_customize" inherit_id="website.theme_customize">
         <xpath expr="//div" position="replace">
             <div>
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index a397cda6dce..bdf752325ba 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -56,14 +56,18 @@ $-font-numbers: (
     // anyway. Automatically mimic navbar-dark if the user's menu color is dark.
     // Note: this only works because navbar-light is defined before navbar-dark,
     // we may want to use a safest way when possible.
-    background-color: color('menu') !important;
-    @if (color-yiq(color('menu')) != $yiq-text-dark) {
-        @extend .navbar-dark;
+    @if color('menu') {
+        background-color: color('menu') !important;
+        @if (color-yiq(color('menu')) != $yiq-text-dark) {
+            @extend .navbar-dark;
+        }
     }
 }
 
 .o_footer {
-    @include o-bg-color(color('footer'));
+    @if color('footer') {
+        @include o-bg-color(color('footer'));
+    }
 
     > #footer {
         // FIXME needed to prevent the dropzone at the bottom of the #wrap element