diff --git a/webapp/public/style_domjudge.css b/webapp/public/style_domjudge.css
index 8884a7441e..22e03c303d 100644
--- a/webapp/public/style_domjudge.css
+++ b/webapp/public/style_domjudge.css
@@ -630,3 +630,8 @@ blockquote {
     padding-left: .5em;
     color: darkgrey;
 }
+
+.category-best {
+    margin-right: 2em;
+    font-weight: normal;
+}
diff --git a/webapp/templates/partials/scoreboard_table.html.twig b/webapp/templates/partials/scoreboard_table.html.twig
index 84fcb20138..7e2ab04023 100644
--- a/webapp/templates/partials/scoreboard_table.html.twig
+++ b/webapp/templates/partials/scoreboard_table.html.twig
@@ -201,7 +201,7 @@
                 <a {% if extra is not null %}{{ extra | raw }}{% endif %} {% if link is not null %}href="{{ link }}"{% endif %}>
                     <span class="forceWidth">
                         {% if usedCategories | length > 1 and scoreboard.bestInCategory(score.team, limitToTeamIds) %}
-                            <span class="badge text-bg-warning" style="margin-right: 2em; font-weight: normal;">
+                            <span class="badge text-bg-warning category-best">
                             {{ score.team.category.name }}
                         </span>
                         {% endif %}
@@ -330,7 +330,7 @@
             </thead>
             <tbody>
             {% for category in scoreboard.categories | filter(category => usedCategories[category.categoryid] is defined) %}
-                <tr {% if category.color %}style="background: {{ category.color }};"{% endif %}>
+                <tr {% if category.color %}class="cl{{ category.color | replace({"#": "_"}) }}"{% endif %}>
                     <td>
                         {% set link = null %}
                         {% if jury %}