diff --git a/addons/website/static/src/css/bootswatch/amelia.fix.css b/addons/website/static/src/css/bootswatch/amelia.fix.css
new file mode 100644
index 00000000000..38d71852a0a
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/amelia.fix.css
@@ -0,0 +1,27 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #ad1d28;
+}
+.oe_product section {
+    background: rgba(16, 138, 147, 0.75) !important;
+}
+.oe_product section .text-info {
+    color: #DFD6F5;
+}
+ul.wizard li {
+    background: #debb27 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #debb27 !important;
+}
+ul.wizard .text-primary {
+    color: #ad1d28 !important;
+}
+ul.wizard .text-success {
+    color: #ffffff !important;
+}
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before {
+    color: #79D5DB !important;
+}
+.input-group-addon .fa {
+    color: #444;
+}
diff --git a/addons/website/static/src/css/bootswatch/cosmo.fix.css b/addons/website/static/src/css/bootswatch/cosmo.fix.css
new file mode 100644
index 00000000000..5801cc0d7a4
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cosmo.fix.css
@@ -0,0 +1,7 @@
+#website-top-navbar button.btn-primary {
+    color: #fff;
+    border: 2px solid #0061c2;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
new file mode 100644
index 00000000000..e93b2aa8ded
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -0,0 +1,30 @@
+.oe_product section {
+    background: rgba(40, 40, 40, 0.85) !important;
+}
+.oe_product section .text-info {
+    color: #BA66E4;
+}
+ul.wizard li {
+    background: #222 !important;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #222 !important;
+}
+.popover, .modal-content {
+    border: 1px solid rgba(200,200,200,0.5);
+}
+.close {
+    color: #fff;
+}
+.popover.bottom .arrow:after {
+    border-bottom-color: #333;
+}
+.popover.top .arrow:after {
+    border-top-color: #333;
+}
+.popover.left .arrow:after {
+    border-left-color: #333;
+}
+.popover.right .arrow:after {
+    border-right-color: #333;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/flatly.fix.css b/addons/website/static/src/css/bootswatch/flatly.fix.css
new file mode 100644
index 00000000000..fe4a2e73ed1
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/flatly.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #2c3e50;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/journal.fix.css b/addons/website/static/src/css/bootswatch/journal.fix.css
new file mode 100644
index 00000000000..a7f93fa312f
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/journal.fix.css
@@ -0,0 +1,6 @@
+#website-top-navbar button.btn-primary {
+    border: 2px solid #e4332e;
+}
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/readable.fix.css b/addons/website/static/src/css/bootswatch/readable.fix.css
new file mode 100644
index 00000000000..8e22d318615
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/readable.fix.css
@@ -0,0 +1,3 @@
+.oe_product section .text-info {
+    color: #2A9CBE;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
new file mode 100644
index 00000000000..c87f0de237b
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -0,0 +1,3 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
new file mode 100644
index 00000000000..c2e1a999b03
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -0,0 +1,21 @@
+.oe_product section {
+    background: rgba(40, 40, 45, 0.80) !important;
+}
+ul.wizard li {
+    background-image: -webkit-linear-gradient(#8a9196,#7a8288 60%,#788084) !important;
+    background-image: linear-gradient(#8a9196,#7a8288 60%,#788084 ) !important;
+    color: #ccc;
+}
+ul.wizard .chevron:before {
+    border-left: 10px solid #7C8386 !important;
+}
+ul.wizard li.text-primary {
+    color: #fff;
+}
+.close {
+    color: #fff;
+}
+.popover  {
+    -webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+    box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+}
diff --git a/addons/website/static/src/css/bootswatch/spacelab.fix.css b/addons/website/static/src/css/bootswatch/spacelab.fix.css
new file mode 100644
index 00000000000..6d01e9a2485
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/spacelab.fix.css
@@ -0,0 +1,8 @@
+.carousel .carousel-caption.content,
+.carousel .carousel-caption.content h1,
+.carousel .carousel-caption.content h2,
+.carousel .carousel-caption.content h3,
+.carousel .carousel-caption.content h4,
+.carousel .carousel-caption.content h5 {
+    color: #ccc;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
new file mode 100644
index 00000000000..a2835886465
--- /dev/null
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -0,0 +1,6 @@
+#website-top-navbar [data-action="cancel"] {
+    color: #fff;
+}
+.popover .close {
+    color: #fff;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 81b40ce7aca..6f69f554bd1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -120,6 +120,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: 100%;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a9ae82cee3a..200401023a6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: 100%
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index f56ab2b5dd7..82f5105adcd 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -206,6 +206,7 @@
     <template id="website.theme_amelia" name="Amelia" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
@@ -218,48 +219,56 @@
     <template id="website.theme_cosmo" name="Cosmo" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_cyborg" name="Cyborg" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_flatly" name="Flatly" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_journal" name="Journal" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_readable" name="Readable" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_simplex" name="Simplex" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_slate" name="Slate" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
     <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
@@ -272,6 +281,7 @@
     <template id="website.theme_yeti" name="Yeti" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index d9880bd7025..3e5e692304e 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -54,10 +54,9 @@
   bottom: 0;
   overflow: hidden;
   padding: 0 15px 24px 0;
-  max-height: 110px;
   min-height: 56px;
   border-top: 1px solid rgba(255, 255, 255, 0.2);
-  background: rgba(100, 100, 100, 0.1);
+  background: rgba(255, 255, 255, 0.75);
   z-index: 5;
 }
 .oe_product .product_price {
@@ -72,9 +71,8 @@
 }
 .oe_product .oe_subdescription {
   font-size: 0.8em;
-  max-height: 42px;
   overflow: hidden;
-  margin-bottom: 30px;
+  margin-bottom: 10px;
 }
 
 .oe_mycart .input-group-addon {
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 7c5bde43509..128b1a25d43 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -48,10 +48,9 @@
         bottom: 0
         overflow: hidden
         padding: 0 15px 24px 0
-        max-height: 110px
         min-height: 56px
         border-top: 1px solid rgba(255,255,255,0.2)
-        background: rgba(100, 100, 100, 0.1)
+        background: rgba(255, 255, 255, 0.75)
         z-index: 5
     .product_price
         padding: 5px 0
@@ -63,9 +62,8 @@
         height: 100%
     .oe_subdescription
         font-size: 0.8em
-        max-height: 42px
         overflow: hidden
-        margin-bottom: 30px
+        margin-bottom: 10px
 
 .oe_mycart
     .input-group-addon