diff --git a/css/dist/base/base.css b/css/dist/base/base.css
index 321d124..11999f5 100644
--- a/css/dist/base/base.css
+++ b/css/dist/base/base.css
@@ -11,7 +11,7 @@ html{
   font-size:100%;
   font-weight:normal;
   font-style:normal;
-  line-height:1.5;
+  line-height:18px;
 }
 
 body{
diff --git a/css/dist/components/form-text.css b/css/dist/components/form-text.css
index 35f406b..a310f26 100644
--- a/css/dist/components/form-text.css
+++ b/css/dist/components/form-text.css
@@ -3,7 +3,7 @@
   min-height:54px;
   color:#313637;
   font-size:16px;
-  line-height:1.5;
+  line-height:18px;
   -webkit-appearance:none;
   -moz-appearance:none;
   appearance:none;
diff --git a/css/src/base/variables.css b/css/src/base/variables.css
index 8006903..2ff29dd 100644
--- a/css/src/base/variables.css
+++ b/css/src/base/variables.css
@@ -30,7 +30,7 @@
   --font-size-l: 18px;
   --font-size-s: 14px;
   --font-size-xs: 13px;
-  --line-height-base: 1.5;
+  --line-height-base: 18px;
   --line-height-s: 1.3;
 
   /* Layout */
diff --git a/css/src/components/button.css b/css/src/components/button.css
index 1bbcac0..d7bc684 100644
--- a/css/src/components/button.css
+++ b/css/src/components/button.css
@@ -6,7 +6,7 @@
 @import "../base/variables.css";
 
 :root {
-  --button-border-width: 2px;
+  --button-border-width: var(--form-element-border-size-base);
 }
 
 .button {
diff --git a/olivero.info.yml b/olivero.info.yml
index 0186889..f011141 100644
--- a/olivero.info.yml
+++ b/olivero.info.yml
@@ -35,7 +35,7 @@ regions:
   featured_bottom_second: 'Featured bottom second'
   footer: 'Footer'
 libraries-override:
+  core/drupal.checkbox: false
 libraries-extend:
   core/drupal.message:
     - olivero/messages
-  core/drupal.checkbox: false
diff --git a/olivero.theme b/olivero.theme
index 9aca5e2..663021d 100644
--- a/olivero.theme
+++ b/olivero.theme
@@ -332,7 +332,7 @@ function olivero_preprocess_menu_local_task(&$variables) {
 /**
  * Implements template_preprocess_HOOK() for fieldset.
  */
-function claro_preprocess_fieldset(&$variables) {
+function olivero_preprocess_fieldset(&$variables) {
   $element = $variables['element'];
   $composite_types = ['checkboxes', 'radios'];
 
diff --git a/templates/form/fieldset.html.twig b/templates/form/fieldset.html.twig
index 3609aba..4cd7c6a 100644
--- a/templates/form/fieldset.html.twig
+++ b/templates/form/fieldset.html.twig
@@ -4,7 +4,7 @@
  * Theme override for a fieldset element and its children.
  *
  * @see template_preprocess_fieldset()
- * @see claro_preprocess_fieldset()
+ * @see olivero_preprocess_fieldset()
  */
 #}
 {%