diff --git a/composer.json b/composer.json
index f70e13b97255e73450469b2e3429092d66adbe71..cce60bfa935019c8341deac41b7b5f29738ffd6f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "php": ">=7.3",
         "cweagans/composer-patches": "^1.7",
         "drupal/core": "^8.9 || ^9.1",
-        "openeuropa/oe_bootstrap_theme": "0.1.202202031130"
+        "openeuropa/oe_bootstrap_theme": "0.1.202202072010"
     },
     "require-dev": {
         "composer/installers": "^1.11",
diff --git a/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEcLogoBlock.php b/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEcLogoBlock.php
index a3b67708e8fadbc9382e10530519f14a8185a0c5..0f1223e52eb6f41029eab86485140654ca666430 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEcLogoBlock.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEcLogoBlock.php
@@ -86,6 +86,9 @@ class CorporateEcLogoBlock extends BlockBase implements ContainerFactoryPluginIn
       '#uri' => $logo_path . '/logo-ec--' . $language . '.svg',
       '#alt' => $title,
       '#title' => $title,
+      '#attributes' => [
+        'class' => ['d-none', 'd-lg-block'],
+      ],
     ];
 
     $build = [
diff --git a/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEuLogoBlock.php b/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEuLogoBlock.php
index c8ec3f64465bf7d3646340137b22000e1f54a592..9caba366b040637f451b4c42e385f95f1fe6d599 100644
--- a/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEuLogoBlock.php
+++ b/modules/oe_whitelabel_helper/src/Plugin/Block/CorporateEuLogoBlock.php
@@ -86,6 +86,9 @@ class CorporateEuLogoBlock extends BlockBase implements ContainerFactoryPluginIn
       '#uri' => $logo_path . '/logo-eu--' . $language . '.svg',
       '#alt' => $title,
       '#title' => $title,
+      '#attributes' => [
+        'class' => ['d-none', 'd-lg-block'],
+      ],
     ];
 
     $mobile_url = file_create_url($logo_path . '/mobile/logo-eu--' . $language . '.svg');
diff --git a/templates/overrides/navigation/block--system-branding-block.html.twig b/templates/overrides/navigation/block--system-branding-block.html.twig
index f48ee7a5732f343d12702d765e8a582f0f98e888..e81f319c5ad72840c75298e12519780bb6572fdc 100644
--- a/templates/overrides/navigation/block--system-branding-block.html.twig
+++ b/templates/overrides/navigation/block--system-branding-block.html.twig
@@ -44,11 +44,11 @@
     </a>
   {% endif %}
   {% if site_name %}
-    <p class="site-name">
+    <div class="site-name bcl-header__site-name">
       <a {{ site_name_attr.addClass(name_classes).setAttribute('rel', 'Home') }} href="{{ path('<front>') }}">
         {{ site_name }}
       </a>
-    </p>
+    </div>
   {% endif %}
   {% if site_slogan %}
     <div class="site-slogan">{{ site_slogan }}</div>
diff --git a/templates/overrides/navigation/oe-corporate-blocks-ec-footer.html.twig b/templates/overrides/navigation/oe-corporate-blocks-ec-footer.html.twig
index ee165afbfa1a5abf064bcf7d59023316d7c0c035..5a4dd8bd7b8581210a43f030351c0844510ff44e 100644
--- a/templates/overrides/navigation/oe-corporate-blocks-ec-footer.html.twig
+++ b/templates/overrides/navigation/oe-corporate-blocks-ec-footer.html.twig
@@ -108,7 +108,7 @@
     'links': bcl_footer_links(corporate_footer.class_navigation),
   }
 ] %}
-<footer class="ec__footer bcl-footer mt-4">
+<footer class="bcl-footer bcl-footer--ec mt-4">
   <div class="container">
     {{ pattern('footer', {
       'variant': 'ec',
diff --git a/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig b/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
index 4003bb752a549b78bba4b3e4957fb545dd89d03a..6c7ce854708b2139a54f774e7b391650b5312b09 100644
--- a/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
+++ b/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
@@ -99,7 +99,7 @@
     'eu_institutions_links': bcl_footer_links(corporate_footer.institution_links)
   }
 ] %}
-<footer class="bcl-footer mt-4">
+<footer class="bcl-footer bcl-footer--eu mt-4">
   <div class="container">
     {{ pattern('footer', {
       'variant': 'eu',
diff --git a/templates/patterns/header/pattern-header--variant-ec.html.twig b/templates/patterns/header/pattern-header--variant-ec.html.twig
index 9753e036421bd30a00fd6c4af663c653b0870cae..1873aab3ed928edc471332c76579dac774a1ce77 100644
--- a/templates/patterns/header/pattern-header--variant-ec.html.twig
+++ b/templates/patterns/header/pattern-header--variant-ec.html.twig
@@ -6,6 +6,6 @@
 #}
 {% extends "pattern-header.html.twig" %}
 {% block header %}
-  {% set _header_attributes = create_attribute().addClass(['ec__header', 'bcl-header']) %}
+  {% set _header_attributes = create_attribute().addClass(['bcl-header--ec', 'bcl-header']) %}
   {{ parent() }}
 {% endblock %}
diff --git a/templates/patterns/header/pattern-header--variant-eu.html.twig b/templates/patterns/header/pattern-header--variant-eu.html.twig
index 2be78adc20e4916c33e5618066b91d3e691a4e6a..d39c1b062ea100ac0214a27143709a8650d4ea32 100644
--- a/templates/patterns/header/pattern-header--variant-eu.html.twig
+++ b/templates/patterns/header/pattern-header--variant-eu.html.twig
@@ -6,6 +6,6 @@
 #}
 {% extends "pattern-header.html.twig" %}
 {% block header %}
-  {% set _header_attributes = create_attribute().addClass(['bcl-header']) %}
+  {% set _header_attributes = create_attribute().addClass(['bcl-header--eu', 'bcl-header']) %}
   {{ parent() }}
 {% endblock %}