diff --git a/css/theme-ebi-industry.css b/css/theme-ebi-industry.css
index a7c043319fd2e358d1b796f51e776be3ca9965aa..0d2804812677669ea2136ed745e43165dd20ccc0 100644
--- a/css/theme-ebi-industry.css
+++ b/css/theme-ebi-industry.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,11 +21,10 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(0,134,180);
+  background-color: rgb(0,134,180);
 }
 .button.primary:hover,
 .button.primary:focus,
diff --git a/css/theme-ebi-research.css b/css/theme-ebi-research.css
index c5206508e90195e7bcfd58400bdbdc5a12b2608e..6b743f96bd98a0d2dc6a50b7885a920f263a706d 100644
--- a/css/theme-ebi-research.css
+++ b/css/theme-ebi-research.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,12 +21,11 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(109,171,73);
-}   
+  background-color: rgb(109,171,73);
+}
 .button.primary:hover,
 .button.primary:focus,
 .button:hover,
diff --git a/css/theme-ebi-services-about.css b/css/theme-ebi-services-about.css
index e4b598f9b03757203350c5f7f41ad4541d46fe45..96801851f611bd6f16ca9677f3981bc17b5eb459 100644
--- a/css/theme-ebi-services-about.css
+++ b/css/theme-ebi-services-about.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,11 +21,10 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(56,145,152);
+  background-color: rgb(56,145,152);
 }
 .button.primary:hover,
 .button.primary:focus,
diff --git a/css/theme-ebi-training.css b/css/theme-ebi-training.css
index 3829e1706e19e86ea398f31f61df72f1c3de6ade..2c0773ff5cc799baa5d2a95840d97fa147733acc 100644
--- a/css/theme-ebi-training.css
+++ b/css/theme-ebi-training.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,12 +21,11 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(233,180,0);
-}   
+  background-color: rgb(233,180,0);
+}
 .button.primary:hover,
 .button.primary:focus,
 .button:hover,
diff --git a/css/theme-embl-petrol.css b/css/theme-embl-petrol.css
index 5a9bd2d6e036482b34113ee86712024035ce90f8..f32b3267b8e54e11f2df2a07e49b7e23a6ccdc94 100644
--- a/css/theme-embl-petrol.css
+++ b/css/theme-embl-petrol.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,12 +21,11 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(0,124,130);
-}   
+  background-color: rgb(0,124,130);
+}
 .button.primary:hover,
 .button.primary:focus,
 .button:hover,
diff --git a/css/theme-pdbe-green.css b/css/theme-pdbe-green.css
index 16703b6c16fe1a04ce106eb320e6734d46e89d00..25bfde7f2e2dc970a81e10776f035528b605ede1 100644
--- a/css/theme-pdbe-green.css
+++ b/css/theme-pdbe-green.css
@@ -6,6 +6,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -19,12 +21,11 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(116,179,96);
-}   
+  background-color: rgb(116,179,96);
+}
 .button.primary:hover,
 .button.primary:focus,
 .button:hover,
diff --git a/css/theme-template.css b/css/theme-template.css
index 960a9aaf0cc0b6fa2fe637546bdfbe36c01a02f7..59027f8a28ed1ec71ee57487fe118a63ef85ef7a 100644
--- a/css/theme-template.css
+++ b/css/theme-template.css
@@ -7,6 +7,8 @@ a {
   color: #222;
 }
 
+a.label,
+.label,
 a:hover,
 a:focus,
 a:active {
@@ -20,12 +22,11 @@ h3 { color: #444444; }
 a.special { background-color: #7cd17c; }
 
 .menu .active > a,
-a.label,
-.label,
+.tag,
 .button,
 .button.primary {
-  color: rgb(0,124,130);
-}   
+  background-color: rgb(0,124,130);
+}
 .button.primary:hover,
 .button.primary:focus,
 .button:hover,