diff --git a/forwardport/data/views.xml b/forwardport/data/views.xml
index f9d7f378..36d427f7 100644
--- a/forwardport/data/views.xml
+++ b/forwardport/data/views.xml
@@ -36,7 +36,7 @@
                     <t t-foreach="groups" t-as="group">
                         <span>
                             <t t-if="group == current_group">
-                                <span class="bg-primary">
+                                <span class="bg-primary text-bg-primary">
                                     <t t-out="group.display_name"/>
                                     (<t t-out="outstanding_per_group[group]"/>)
                                 </span>
@@ -57,7 +57,7 @@
                         <t t-set="created" t-value="outstanding_per_author[culprit]"/>
                         <a t-att-href="link(partner=culprit.id)"
                            t-attf-title="approved {{approved}}, created {{created}}"
-                           t-att-class="'bg-primary' if culprit == env.user.partner_id else None"
+                           t-att-class="'bg-primary text-bg-primary' if culprit == env.user.partner_id else None"
                         ><t t-out="culprit.name"/>:
                             <t t-if="approved" t-out="approved"/>
                             <t t-if="approved and created"> + </t>
diff --git a/runbot_merge/static/scss/primary_variables.scss b/runbot_merge/static/scss/primary_variables.scss
index 1a10edb4..bb953494 100644
--- a/runbot_merge/static/scss/primary_variables.scss
+++ b/runbot_merge/static/scss/primary_variables.scss
@@ -22,14 +22,14 @@ $o-community-color: $primary;
 $o-enterprise-color: $primary;
 
 $font-size-root:              null;
-$font-size-base:              1rem;
+$font-size-base:              0.875rem;
 $font-size-sm:                $font-size-base * .875;
 $font-size-lg:                $font-size-base * 1.25;
 
 $font-weight-lighter:         lighter;
 $font-weight-light:           300;
 $font-weight-normal:          400;
-$font-weight-bold:            700;
+$font-weight-bold:            500;
 $font-weight-bolder:          bolder;
 
 $font-weight-base:            $font-weight-normal;
diff --git a/runbot_merge/static/scss/runbot_merge.scss b/runbot_merge/static/scss/runbot_merge.scss
index bb845233..eead8e18 100644
--- a/runbot_merge/static/scss/runbot_merge.scss
+++ b/runbot_merge/static/scss/runbot_merge.scss
@@ -1,8 +1,6 @@
-// FIX: bs4 shit-heap colors and styles
 html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   color: #666666;
-  font-size: 14px;
 }
 body {
   color: inherit;