diff --git a/core/profiles/demo_umami/themes/umami/css/base.css b/core/profiles/demo_umami/themes/umami/css/base.css
index 85606b48e1..1bcb663ad7 100644
--- a/core/profiles/demo_umami/themes/umami/css/base.css
+++ b/core/profiles/demo_umami/themes/umami/css/base.css
@@ -131,52 +131,6 @@ blockquote a:focus {
   background-color: #fdfcf9;
 }
 
-button,
-.button,
-.button[type="submit"],
-[type="reset"],
-[type="submit"] {
-  display: inline-block;
-  min-width: inherit;
-  max-width: inherit;
-  margin: 0;
-  padding: 0.7rem 1.3rem;
-  cursor: pointer;
-  transition: background-color 0.5s ease;
-  text-align: center;
-  text-decoration: none;
-  color: #fff;
-  border: 2px solid #008068;
-  border-radius: 3px;
-  background-color: #008068;
-  font-family: "Scope One", Georgia, serif;
-  font-size: 1.2rem;
-}
-button:hover,
-button:active,
-button:focus,
-.button:hover,
-.button:active,
-.button:focus {
-  transition: background-color 0.5s ease;
-  text-decoration: none;
-  color: #000;
-  border: 2px solid #008068;
-  background-color: #e6eee0;
-}
-button[disabled]:hover,
-button[disabled]:active,
-button[disabled]:focus,
-button[disabled],
-.button[disabled]:hover,
-.button[disabled]:active,
-.button[disabled]:focus,
-.button[disabled] {
-  cursor: default;
-  color: #464646;
-  background: #767775;
-}
-
 h1 {
   margin: 0 0 1.07rem 0;
   font-family: "Scope One", Georgia, serif;
@@ -260,53 +214,6 @@ img {
   height: auto;
 }
 
-.form-select {
-  margin: 0.25rem 0;
-  color: #000;
-  border: 2px solid #767775;
-  background: #fff;
-  font-size: 1rem;
-}
-
-.form-select:focus {
-  margin-bottom: 2px;
-  border: 2px solid #00836d;
-}
-
-input {
-  min-width: 100%;
-  max-width: 100%;
-  margin: 0.25rem 0;
-  padding: 0.8rem 0.4rem;
-  color: #000;
-  border: 2px solid #767775;
-  font-size: 1rem;
-}
-input:focus {
-  border: 2px solid #008068;
-}
-input[type="checkbox"] {
-  min-width: inherit;
-  max-width: none;
-}
-
-textarea {
-  padding: 0.8rem 0.4rem;
-  color: #000;
-  border: 2px solid #767775;
-}
-textarea:focus {
-  border: 2px solid #008068;
-}
-
-label {
-  display: block;
-  margin: 0.25rem 0;
-  color: #464646;
-  font-size: 1rem;
-  font-weight: 700;
-}
-
 /**
  * Prevent regression due to fieldset styling that was removed in normalize.css
  * 6.0.0.
diff --git a/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css b/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css
deleted file mode 100644
index 16fb1223f0..0000000000
--- a/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file
- * Visual styles for tabs.
- */
-
-div.tabs {
-  margin: 1em 0;
-}
-ul.tabs {
-  margin: 0 0 0.5em;
-  padding: 0;
-  list-style: none;
-}
-.tabs > li {
-  display: inline-block;
-  margin-right: 0.3em; /* LTR */
-}
-[dir="rtl"] .tabs > li {
-  margin-right: 0;
-  margin-left: 0.3em;
-}
-.tabs a {
-  display: block;
-  padding: 0.2em 1em;
-  text-decoration: none;
-}
-.tabs a.is-active {
-  background-color: #eee;
-}
-.tabs a:focus,
-.tabs a:hover {
-  background-color: #f5f5f5;
-}
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 fb87a67ccb..b2626e9140 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,6 +16,27 @@
   margin-bottom: 1.28rem;
 }
 
+.footer-promo-block__link.footer-promo-block__link {
+  color: #fff;
+  background-color: inherit;
+  font-weight: 700;
+}
+
+.footer-promo-block__link.footer-promo-block__link:active,
+.footer-promo-block__link.footer-promo-block__link:focus,
+footer a.footer-promo-block__link:hover {
+  background-color: transparent;
+}
+
+.footer-promo-block__link.footer-promo-block__link:after {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  content: "";
+  vertical-align: middle;
+  background: url("../../../../images/svg/pointer--white.svg") no-repeat center center;
+}
+
 @media screen and (min-width: 60rem) {
   .block-type-footer-promo-block {
     overflow: hidden;
diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search-results.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search-results.css
index 7f3ef696ea..d0b62efa77 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search-results.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search-results.css
@@ -54,6 +54,19 @@
   display: block;
 }
 
+.search-form .form-search {
+  min-width: 100%;
+  max-width: 100%;
+  margin: 0.25rem 0;
+  padding: 0.8rem 0.4rem;
+  color: #000;
+  border: 2px solid #767775;
+  font-size: 1rem;
+}
+.search-form .form-search:focus {
+  border: 2px solid #008068;
+}
+
 .search-form .form-search {
   margin: 0;
 }
diff --git a/core/profiles/demo_umami/themes/umami/css/components/forms/buttons.css b/core/profiles/demo_umami/themes/umami/css/components/forms/buttons.css
index 9f8258bb71..63f7932724 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/forms/buttons.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/forms/buttons.css
@@ -3,6 +3,42 @@
  * This file is used to style form buttons generically, with overrides per form
  */
 
+.button {
+  display: inline-block;
+  min-width: inherit;
+  max-width: inherit;
+  margin: 0;
+  padding: 0.7rem 1.3rem;
+  cursor: pointer;
+  transition: background-color 0.5s ease;
+  text-align: center;
+  text-decoration: none;
+  color: #fff;
+  border: 2px solid #008068;
+  border-radius: 3px;
+  background-color: #008068;
+  font-family: "Scope One", Georgia, serif;
+  font-size: 1.2rem;
+}
+
+.button:hover,
+.button:active,
+.button:focus {
+  transition: background-color 0.5s ease;
+  text-decoration: none;
+  color: #000;
+  background-color: #e6eee0;
+}
+
+.button[disabled]:hover,
+.button[disabled]:active,
+.button[disabled]:focus,
+.button[disabled] {
+  cursor: default;
+  color: #464646;
+  background: #767775;
+}
+
 .form-actions {
   display: flex;
   flex-wrap: wrap;
diff --git a/core/profiles/demo_umami/themes/umami/css/components/forms/form-items.css b/core/profiles/demo_umami/themes/umami/css/components/forms/form-items.css
new file mode 100644
index 0000000000..849503dc1e
--- /dev/null
+++ b/core/profiles/demo_umami/themes/umami/css/components/forms/form-items.css
@@ -0,0 +1,52 @@
+/**
+ * @file Generic CSS for form items.
+ */
+
+.form-label {
+  display: block;
+  margin: 0.25rem 0;
+  color: #464646;
+  font-size: 1rem;
+  font-weight: 700;
+}
+
+.form-text,
+.form-email {
+  min-width: 100%;
+  max-width: 100%;
+  margin: 0.25rem 0;
+  padding: 0.8rem 0.4rem;
+  color: #000;
+  border: 2px solid #767775;
+  font-size: 1rem;
+}
+.form-text:focus,
+.form-email:focus {
+  border: 2px solid #008068;
+}
+.form-text[type="checkbox"] {
+  min-width: inherit;
+  max-width: none;
+}
+
+.form-textarea {
+  padding: 0.8rem 0.4rem;
+  color: #000;
+  border: 2px solid #767775;
+}
+.form-textarea:focus {
+  border: 2px solid #008068;
+}
+
+.form-select {
+  margin: 0.25rem 0;
+  color: #000;
+  border: 2px solid #767775;
+  background: #fff;
+  font-size: 1rem;
+}
+
+.form-select:focus {
+  margin-bottom: 2px;
+  border: 2px solid #00836d;
+}
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 9c6f50c938..8c38affda0 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
@@ -10,28 +10,25 @@
   padding: 0;
   list-style: none;
 }
-.tabs .tab {
+.tabs__tab {
   margin: 0; /* LTR */
   background-color: #e6eee0;
 }
-[dir=rtl] .tabs .tab {
-  margin: 0;
-}
-.tabs .tab.is-active {
+.tabs__tab.is-active {
   background-color: #fff;
 }
-.tabs a {
+.tabs__link {
   display: block;
   padding: 0.75rem 1rem;
   text-decoration: none;
   color: inherit;
   background-color: inherit;
 }
-.tabs a.is-active {
+.tabs__link.is-active {
   background-color: inherit;
 }
-.tabs a:focus,
-.tabs a:hover {
+.tabs__link:focus,
+.tabs__link:hover {
   outline-offset: -5px;
   background-color: #fff;
 }
diff --git a/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/form/form-element-label.html.twig
similarity index 97%
rename from core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig
rename to core/profiles/demo_umami/themes/umami/templates/components/form/form-element-label.html.twig
index 7c2f8f2223..bb4aac4133 100644
--- a/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/form/form-element-label.html.twig
@@ -14,6 +14,7 @@
 #}
 {%
   set classes = [
+    'form-label',
     title_display == 'after' ? 'option',
     title_display == 'invisible' ? 'visually-hidden',
     required ? 'js-form-required',
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.libraries.yml b/core/profiles/demo_umami/themes/umami/umami.libraries.yml
index 934d3f5e82..168a58b15e 100644
--- a/core/profiles/demo_umami/themes/umami/umami.libraries.yml
+++ b/core/profiles/demo_umami/themes/umami/umami.libraries.yml
@@ -26,6 +26,7 @@ global:
       css/components/fields/summary.css: {}
       css/components/forms/buttons.css: {}
       css/components/forms/container-inline.module.css: {}
+      css/components/forms/form-items.css: {}
       css/components/views/promoted-items.css: {}
       css/components/views/frontpage.css: {}
       css/components/navigation/menu-footer/menu-footer.css: {}
@@ -150,7 +151,6 @@ classy.base:
       css/classy/components/tabledrag.css: { weight: -10 }
       css/classy/components/tableselect.css: { weight: -10 }
       css/classy/components/tablesort.css: { weight: -10 }
-      css/classy/components/tabs.css: { weight: -10 }
       css/classy/components/textarea.css: { weight: -10 }
       css/classy/components/ui-dialog.css: { weight: -10 }
 
diff --git a/core/profiles/demo_umami/themes/umami/umami.theme b/core/profiles/demo_umami/themes/umami/umami.theme
index cd53e63530..73ef30f82d 100644
--- a/core/profiles/demo_umami/themes/umami/umami.theme
+++ b/core/profiles/demo_umami/themes/umami/umami.theme
@@ -9,6 +9,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\search\SearchPageInterface;
 use Drupal\views\Form\ViewsForm;
+use Drupal\Core\Render\Element;
 
 /**
  * Implements hook_preprocess_HOOK() for HTML document templates.
@@ -63,6 +64,17 @@ function umami_theme_suggestions_block_alter(array &$suggestions, array $variabl
   }
 }
 
+/**
+ * Implements hook_umami_preprocess_block__bundle__footer_promo_block().
+ */
+function umami_preprocess_block__bundle__footer_promo_block(&$variables) {
+  if (isset($variables['content']['field_content_link'])) {
+    foreach (Element::children($variables['content']['field_content_link']) as $key) {
+      $variables['content']['field_content_link'][$key]['#attributes']['class'][] = 'footer-promo-block__link';
+    }
+  }
+}
+
 /**
  * Implements hook_preprocess_breadcrumb().
  */
@@ -88,6 +100,13 @@ function umami_preprocess_breadcrumb(&$variables) {
   $variables['#cache']['contexts'][] = 'url';
 }
 
+/**
+ * Implements hook_preprocess_menu_local_task().
+ */
+function umami_preprocess_menu_local_task(&$variables) {
+  $variables['link']['#options']['attributes']['class'][] = 'tabs__link';
+}
+
 /**
  * Implements hook_form_FORM_ID_alter().
  */