diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
index 8476f1a6a8..96e6c450ff 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
@@ -16,19 +16,19 @@
   margin-bottom: 1.28rem;
 }
 
-.block-type-footer-promo-block .footer-promo-content a {
+.footer-promo-block__link {
   background-color: inherit;
   color: #fff;
   font-weight: 700;
 }
 
-.block-type-footer-promo-block .footer-promo-content a:active,
-.block-type-footer-promo-block .footer-promo-content a:focus,
-.block-type-footer-promo-block .footer-promo-content a:hover {
+.footer-promo-block__link:active,
+.footer-promo-block__link:focus,
+.footer-promo-block__link:hover {
   background-color: transparent;
 }
 
-.block-type-footer-promo-block .footer-promo-content a:after {
+.footer-promo-block__link:after {
   display: inline-block;
   width: 14px;
   height: 14px;
diff --git a/core/profiles/demo_umami/themes/umami/css/components/navigation/tabs/tabs.css b/core/profiles/demo_umami/themes/umami/css/components/navigation/tabs/tabs.css
index 79cc1194cd..577277b810 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/navigation/tabs/tabs.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/tabs/tabs.css
@@ -12,24 +12,24 @@
   margin: 0 0 0.5em;
   padding: 0;
 }
-.tabs .tab {
+.tabs__tab {
   margin: 0;
   background-color: #e6eee0;
 }
-.tabs .tab.is-active {
+.tabs__tab.is-active {
   background-color: #fff;
 }
-.tabs a {
+.tabs__link {
   display: block;
   padding: 0.75rem 1rem;
   background-color: inherit;
   color: inherit;
   text-decoration: none;
 }
-.tabs a.is-active {
+.tabs__link.is-active {
   background-color: inherit;
 }
-.tabs a:focus,
-.tabs a:hover {
+.tabs__link:focus,
+.tabs__link:hover {
   background-color: #fff;
 }
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-task.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-task.html.twig
index 567c331d69..b1d11d5458 100644
--- a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-task.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-task.html.twig
@@ -14,4 +14,4 @@
  * @see template_preprocess_menu_local_task()
  */
 #}
-<li{{ attributes.addClass('tab', is_active ? 'is-active') }}>{{ link }}</li>
+<li{{ attributes.addClass('tabs__tab', is_active ? 'is-active') }}>{{ link }}</li>
diff --git a/core/profiles/demo_umami/themes/umami/umami.info.yml b/core/profiles/demo_umami/themes/umami/umami.info.yml
index c38daa7bb6..98fb466fd6 100644
--- a/core/profiles/demo_umami/themes/umami/umami.info.yml
+++ b/core/profiles/demo_umami/themes/umami/umami.info.yml
@@ -11,6 +11,10 @@ libraries:
 
 libraries-override:
   classy/messages: false
+  classy/base:
+    css:
+      component:
+        css/components/tabs.css: false
 
 regions:
   pre_header: Pre-header
diff --git a/core/profiles/demo_umami/themes/umami/umami.theme b/core/profiles/demo_umami/themes/umami/umami.theme
index d8b61ff515..f632e722fd 100644
--- a/core/profiles/demo_umami/themes/umami/umami.theme
+++ b/core/profiles/demo_umami/themes/umami/umami.theme
@@ -38,6 +38,20 @@ function umami_preprocess_field(&$variables, $hook) {
       $element['#field_name'] == 'field_difficulty') {
       $variables['attributes']['class'] = 'label-items';
     }
+    if ($element['#field_name'] == 'field_content_link') {
+      // Prepare var to keep parent block name.
+      $bundle = $element['#bundle'];
+      // Define BEM block class name.
+      $bem_block_class= 'link';
+      // Define BEM element class name.
+      $bem_element_class = Html::getClass($bundle . '__link');
+      // Iterate through the items if field is multiple,
+      // and attach classes.
+      foreach ($variables['items'] as $key => $item) {
+        $variables['items'][$key]['content']['#options']['attributes']['class'][] = 'link';
+        $variables['items'][$key]['content']['#options']['attributes']['class'][] = $bem_element_class;
+      }
+    }
   }
 }
 
@@ -94,3 +108,10 @@ function umami_preprocess_breadcrumb(&$variables) {
 function umami_form_search_block_form_alter(&$form, FormStateInterface $form_state) {
   $form['keys']['#attributes']['placeholder'] = t('Search by keyword, ingredient, dish');
 }
+
+/**
+ * Implements hook_preprocess_menu_local_task().
+ */
+function umami_preprocess_menu_local_task(&$variables) {
+  $variables['link']['#options']['attributes']['class'][] = 'tabs__link';
+}