diff --git a/templates/product.html.twig b/templates/product.html.twig
index 6444b01..35ba9ac 100644
--- a/templates/product.html.twig
+++ b/templates/product.html.twig
@@ -11,8 +11,7 @@
                 <td>
                     <a href='{{ path('app_product', {'productId': product.id}) }}'
                        class="text-decoration-none">{{ product.name }}</a>
-                    <span class="badge text-bg-light"><a href="{{ path('app_search', {'search': product.subTitle}) }}"
-                                                         class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
+                    <a href="{{ path('app_search', {'search': product.subTitle}) }}"><span class="badge text-bg-secondary">{{ product.subTitle }}</span></a>
                     {% if product.promotions is not null and product.promotions.hasPromotion %}<a
                         href="{{ path('app_promos', {'promo': product.promotions.slug}) }}"><span class="badge bg-info">PROMO: {{ product.promotions.tag }}</span>
                         </a>{% endif %}
diff --git a/templates/productList.html.twig b/templates/productList.html.twig
index 0f5f595..1b23d67 100644
--- a/templates/productList.html.twig
+++ b/templates/productList.html.twig
@@ -48,22 +48,19 @@
                                    class="text-decoration-none">{{ product.name }}</a>
                                 <br>
                                 {% if product.stock > 0 %}
-                                    <span class="badge text-bg-light">stock: {{ product.stock }}</span>
+                                    <span class="badge text-bg-secondary">stock: {{ product.stock }}</span>
                                 {% else %}
                                     <span class="badge text-bg-warning">out of stock</span>
                                 {% endif %}
                                 {% if product.isDiscontinued() %}
-                                <a href="{{ path('app_discontinued') }}"><span class="badge text-bg-secondary" data-bs-toggle="tooltip"
-                                                                      data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span></a>
+                                <a href="{{ path('app_discontinued') }}"><span class="badge text-bg-secondary" data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span></a>
                                 {% endif %}
                                 {% if product.isNew() %}
                                     <a href="{{ path('app_new') }}"><span class="badge text-bg-success">is new</span></a>
                                 {% endif %}
-                                <span class="badge text-bg-light"><a
-                                            href="{{ path('app_search', {'search': product.subTitle}) }}"
-                                            class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
+                                <a href="{{ path('app_search', {'search': product.subTitle}) }}"><span class="badge text-bg-secondary">{{ product.subTitle }}</span></a>
                                 {% if product.promotions is not null and product.promotions.hasPromotion %}<a href="{{ path('app_promos', {'promo': product.promotions.slug}) }}"><span class="badge bg-info">PROMO: {{ product.promotions.tag }}</span></a>{% endif %}
-                                <span class="badge text-bg-light">{{ product.country.countryName }}</span>
+                                <span class="badge text-bg-secondary">{{ product.country.countryName }}</span>
                             </td>
                             <td class="align-middle">
                                 <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">