diff --git a/templates/includes/individual-identities.twig b/templates/includes/individual-identities.twig
index 14a7738c184436bde223b62644a5240ed74a0a0c..7896af8414be191416fe454d4f05a2f2f4c360af 100644
--- a/templates/includes/individual-identities.twig
+++ b/templates/includes/individual-identities.twig
@@ -18,9 +18,9 @@
 
     {% for idp in configuration.identities %}
         <div class="{% if muni_jvs %}margin-bottom-12{% endif %}{% if loop.index0 >= configuration.number_shown %} idp-hidden d-none vhide{% endif %}">
-            <button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-{{ configuration.priority }} btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
+            <button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-light border-{{ configuration.priority }} border-2 btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
                 {% if muni_jvs %}<span class="no-uppercase color-{{ configuration.priority }} individual-identity-span-wrap">{% endif %}
-                    <img class="individual-identity-logo" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}"{% endif %} src="{{ idp.logo }}" alt=""/>
+                    <img class="individual-identity-logo{% if not muni_jvs %} border-end border-2 border-{{ configuration.priority }}{% endif %}" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}"{% endif %} src="{{ idp.logo }}" alt=""/>
                     <span class="idp-text">{{ '{campusmultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }}
                         {% elseif idp.name is defined and idp.name is iterable and idp.name is not empty %}{{ idp.name | first }}
                         {% else %}{{ idp.name }}
@@ -37,7 +37,7 @@
 {% if configuration.identities|length > configuration.number_shown %}
     <div class="text-center">
         <button class="btn more-options {% if muni_jvs %}btn-primary btn-s btn-white hover-none-primary{% else %}btn-outline-{{ configuration.priority }} btn-lg text-center border-0 text-decoration-underline{% endif %}" type="button" data-targetform="external-{{ component_index }}">
-            <span class="no-uppercase padding-zero">{{ '{campusmultiauth:more_options}'|trans }}{% if muni_jvs %}<span class="btn-icon icon icon-angle-down"></span>{% else %} <i class="fas fa-arrow-down"></i>{% endif %}</span>
+            <span class="no-uppercase {% if muni_jvs %}u-pt-0 u-pr-0 u-pb-0 u-pl-0{% else %}p-0{% endif %}">{{ '{campusmultiauth:more_options}'|trans }}{% if muni_jvs %}<span class="btn-icon icon icon-angle-down"></span>{% else %} <i class="fas fa-arrow-down"></i>{% endif %}</span>
         </button>
     </div>
 {% endif %}
diff --git a/templates/includes/searchbox.twig b/templates/includes/searchbox.twig
index 536050cfe03144e4a87bf1b53a8dae6b0193e3a4..5291f0326985afc4af269e0e934f72297884f2fe 100644
--- a/templates/includes/searchbox.twig
+++ b/templates/includes/searchbox.twig
@@ -103,8 +103,8 @@
             {% for idp in idps.items %}
                 {% if muni_jvs %}
                     <button class="metaentry list-group-item" type="submit" name="idpentityid" value="{{ idp.idpentityid }}">
-                        <div class="box-vcards-list__item box-vcard--compact searchbox-result side-padding-zero">
-                            <div class="box-vcards-list__inner side-padding-zero">
+                        <div class="box-vcards-list__item box-vcard--compact searchbox-result u-pr-0 u-pl-0">
+                            <div class="box-vcards-list__inner u-pr-0 u-pl-0">
                                 <p class="box-vcards-list__img center">
                                     <img src="{{ idp.image }}" class="img-searchbox">
                                 </p>
diff --git a/templates/selectsource.twig b/templates/selectsource.twig
index 5560f0889f3a3a9d6612511a7024252418171072..8097199fd3d11f9db44ac7c0b6df7911380210e2 100644
--- a/templates/selectsource.twig
+++ b/templates/selectsource.twig
@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block contentwrapper %}
-    <div class="window {% if muni_jvs %}framework_muni{% else %}framework_bootstrap5{% endif %}">
+    <div class="window {% if muni_jvs %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
         <h3 class="margin-bottom-12 header-text">
             {{ '{campusmultiauth:login_title}'|trans }}
         </h3>
@@ -48,11 +48,11 @@
 
                             {% if not loop.last and (component_configuration.end_col is not defined or component_configuration.end_col != true) %}
                                 <div class="hrline color-secondary">
-                                    <span>{{ '{campusmultiauth:or}'|trans }}</span>
+                                    <span{% if not muni_jvs %} class="bg-light"{% endif %}>{{ '{campusmultiauth:or}'|trans }}</span>
                                 </div>
                             {% elseif not loop.last and (component_configuration.end_col is defined and component_configuration.end_col == true) %}
                                 <div class="hrline last-col-component color-secondary">
-                                    <span>{{ '{campusmultiauth:or}'|trans }}</span>
+                                    <span{% if not muni_jvs %} class="bg-light"{% endif %}>{{ '{campusmultiauth:or}'|trans }}</span>
                                 </div>
                             {% endif %}
                         {% endfor %}
diff --git a/www/resources/campus-idp.css b/www/resources/campus-idp.css
index 0aa81ef91cb665590649a99c668a4bc8801d00ad..a5c7bc4221d4966d44a99da8c82579f3957c00c4 100644
--- a/www/resources/campus-idp.css
+++ b/www/resources/campus-idp.css
@@ -107,10 +107,13 @@ html, body {
 }
 
 .hrline span {
-    background-color: #FFFFFF;
     padding: 0 20px;
 }
 
+.framework_muni .hrline span {
+    background-color: #FFFFFF;
+}
+
 .individual-identity-logo-box {
     flex-shrink: 0;
     display: inline-block;
@@ -230,10 +233,6 @@ html, body {
     background: #FFFFFF;
 }
 
-.padding-zero.padding-zero {
-    padding: 0 0 0 0;
-}
-
 .searchbox-result.searchbox-result {
     color: #000000;
     background-color: #FFFFFF;
@@ -244,11 +243,6 @@ html, body {
     background-color: #EEEEEE;
 }
 
-.side-padding-zero.side-padding-zero {
-    padding-left: 0;
-    padding-right: 0;
-}
-
 .framework_bootstrap5 .selectize-input.items.not-full:after {
     content:"\f002";
     font-family: "Font Awesome 5 Free";
@@ -502,3 +496,7 @@ body {
         margin-bottom: 200px;
     }
 }
+
+.border-muted {
+    color: #6c757d !important;
+}
diff --git a/www/resources/campus-idp.js b/www/resources/campus-idp.js
index 5f374de568e337044745aa9e178173b4b1d9b8ef..e31ad81ae9f780d0e1413f17856c5f196f697888 100644
--- a/www/resources/campus-idp.js
+++ b/www/resources/campus-idp.js
@@ -25,8 +25,8 @@ function selectizeRenderOption(item, escape) {
 
     if (is_muni_framework) {
         return (
-            '<div class="box-vcards-list__item box-vcard--compact searchbox-result side-padding-zero">' +
-            '<div class="box-vcards-list__inner side-padding-zero">' +
+            '<div class="box-vcards-list__item box-vcard--compact searchbox-result u-pr-0 u-pl-0">' +
+            '<div class="box-vcards-list__inner u-pr-0 u-pl-0">' +
             '<p class="box-vcards-list__img center">' +
             '<img src="' + escapedImage + '" class="img-searchbox" alt=""/>' +
             '</p>' +