diff --git a/bootstrap_barrio.theme b/bootstrap_barrio.theme
index 73260f1103328854bb4a0965bdf984cf4a3bc7c5..fc091c162fe944d1b803f1d98c79bd606423860f 100644
--- a/bootstrap_barrio.theme
+++ b/bootstrap_barrio.theme
@@ -59,7 +59,7 @@ function bootstrap_barrio_preprocess_html(&$variables) {
   if (isset($path_args[0]) && isset($path_args[1]) && ($path_args[0] == 'user')) {
     $variables['attributes']['class'][] = 'page-user-' . $path_args[1];
   }
-  if (isset($path_args[0]) && isset($path_args[1]) && isset($path_args[2]) && 
+  if (isset($path_args[0]) && isset($path_args[1]) && isset($path_args[2]) &&
     $path_args[0] == 'taxonomy' && $path_args[1] == 'term') {
     $variables['attributes']['class'][] = 'page-taxonomy-term-' . $path_args[2];
     $term = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->load($path_args[2]);
@@ -152,11 +152,11 @@ function bootstrap_barrio_preprocess_page(&$variables) {
 	  'role' => [ 'main' ],
   ];
   $variables['sidebar_first_attributes'] = [
-    'class' =>  [ 'sidebar', $sidebar_first_width ],
+    'class' =>  [ 'sidebar_first sidebar', $sidebar_first_width ],
 	  'id' => [ 'sidebar_first' ],
   ];
   $variables['sidebar_second_attributes'] = [
-    'class' => [ 'sidebar', $sidebar_second_width ],
+    'class' => [ 'sidebar_second sidebar', $sidebar_second_width ],
 	  'id' => [ 'sidebar_second' ],
   ];
 
diff --git a/css/colors/messages/messages-dark.css b/css/colors/messages/messages-dark.css
index a176b752579470f7fc9e8f7725a3dc9d8e1af03e..c616204cb916f0a234d266a533ca8173a93f244e 100644
--- a/css/colors/messages/messages-dark.css
+++ b/css/colors/messages/messages-dark.css
@@ -5,17 +5,17 @@
 
 .alert-success {
   color: white;
-  background-color: #007E33;
-  border-color: #00C851;
+  background-color: #007e33;
+  border-color: #00c851;
 }
 .alert-warning {
   color: white;
-  background-color: #FF8800;
+  background-color: #ff8800;
   border-color: #ffbb33;
 }
 .alert-danger {
   color: white;
-  background-color: #CC0000;
+  background-color: #cc0000;
   border-color: #ff4444;
 }
 .alert-dismissible .close {
diff --git a/css/colors/messages/messages-light.css b/css/colors/messages/messages-light.css
index 599004683558587b3d165c5fc1ede1da65ae1461..0e0baea3f6c8fd81d53f2f0e08d60fcdb485d8cd 100644
--- a/css/colors/messages/messages-light.css
+++ b/css/colors/messages/messages-light.css
@@ -5,18 +5,18 @@
 
 .alert-success {
   color: white;
-  background-color: #00C851;
-  border-color: #007E33;
+  background-color: #00c851;
+  border-color: #007e33;
 }
 .alert-warning {
   color: white;
   background-color: #ffbb33;
-  border-color: #FF8800;
+  border-color: #ff8800;
 }
 .alert-danger {
   color: white;
   background-color: #ff4444;
-  border-color: #CC0000;
+  border-color: #cc0000;
 }
 .alert-dismissible .close {
   opacity: 0.6;
diff --git a/css/components/alerts.css b/css/components/alerts.css
index c4d2dc3183d60a32a05f0149b5076dc7dba44042..3af239c20f6b9ec230fd7cccda9945d2a3c7cb14 100644
--- a/css/components/alerts.css
+++ b/css/components/alerts.css
@@ -18,4 +18,4 @@
   top: 0;
   right: 0;
   z-index: 9999;
-}
\ No newline at end of file
+}
diff --git a/css/components/breadcrumb.css b/css/components/breadcrumb.css
index af48419dddff4e2702151fb742203d57c3df38af..d6a1a0d2207cca0757b8fd68170d20c5bcf5041d 100644
--- a/css/components/breadcrumb.css
+++ b/css/components/breadcrumb.css
@@ -4,5 +4,5 @@
  */
 
 .breadcrumb {
-    font-size: 0.929em;
-}
\ No newline at end of file
+  font-size: 0.929em;
+}
diff --git a/css/components/comments.css b/css/components/comments.css
index 6cf3a9eb0c15def7d0ebd53c76962f3eabaa4df1..5f7ccdbac234319f3b969fa7a4913a6a85bf3721 100644
--- a/css/components/comments.css
+++ b/css/components/comments.css
@@ -4,10 +4,7 @@
  */
 
 /* This is required to win over specificity of #content h2 */
-#content .comment-wrapper h2 {
-  margin-bottom: 1em;
-}
-#content .comment-wrapper h2.comment-form__title {
+.main-content .comment-wrapper .comment-form__title {
   margin-bottom: 1em;
 }
 .field-node--comment {
@@ -43,14 +40,16 @@
   margin: 4px 0;
   line-height: 1.2;
 }
-.comment__time, .comment__permalink {
+.comment__time,
+.comment__permalink {
   margin-bottom: 4px;
   color: #68696b;
   font-size: 0.733em;
   line-height: 1.2;
   padding: 0 0.5em 0 0; /* LTR */
 }
-[dir="rtl"] .comment__time, .comment__permalink {
+[dir="rtl"] .comment__time,
+.comment__permalink {
   padding: 0 0 0 0.5em;
 }
 .comment__permalink {
diff --git a/css/components/commerce.css b/css/components/commerce.css
index c4fef962b3831432adaff6bb748a9090af268d3f..82387d202b3eb04c60dd5d309471f7d41d189a25 100644
--- a/css/components/commerce.css
+++ b/css/components/commerce.css
@@ -3,26 +3,26 @@
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  align-items: center; 
+  align-items: center;
 }
 
 .views-field-variations > span > div > div {
-  display: inline-block; 
+  display: inline-block;
 }
 
 .views-field-variations {
-  margin-bottom: 0; 
+  margin-bottom: 0;
 }
 
 .views-field-variations .field--name-price {
   display: inline-block;
   width: 70px;
   text-align: right;
-  padding-bottom: 1.2rem; 
+  padding-bottom: 1.2rem;
 }
 
 .views-field-variations .field--type-entity-reference {
-  padding-left: 1rem; 
+  padding-left: 1rem;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form {
@@ -30,32 +30,32 @@
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  max-width: 100%; 
+  max-width: 100%;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form .field--name-purchased-entity {
   padding: 0;
-  margin: 0; 
+  margin: 0;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form .field--name-quantity {
   display: inline-block;
   margin-bottom: 0;
-  padding: 0; 
+  padding: 0;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form .field--name-quantity label {
-  display: none; 
+  display: none;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form .field--name-quantity input {
-  width: 50px; 
+  width: 50px;
 }
 
 .views-field-variations .commerce-order-item-variation-cart-form-form .form-actions {
   display: inline-block;
   margin-bottom: 0;
-  padding: 0; 
+  padding: 0;
 }
 
 #edit-shipping-information .col-auto,
@@ -63,15 +63,15 @@
 #edit-payment-information-billing-information.col-auto,
 #edit-order-summary .col-auto,
 #edit-order-summary.col-auto {
-  padding: 0; 
+  padding: 0;
 }
 
 #edit-shipping-information #edit-shipping-information-shipping-profile-field-ruc-wrapper {
-  display: none; 
+  display: none;
 }
 
 .view-id-listado_de_productos .views-row > div {
-  display: inline-block; 
+  display: inline-block;
 }
 
 .view-id-listado_de_productos .views-row {
@@ -79,7 +79,7 @@
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
-  display: flex; 
+  display: flex;
 }
 
 .view-id-listado_de_productos .views-row .views-field-title {
@@ -93,45 +93,44 @@
 
 .cart-block--contents {
   font-size: 0.75rem;
-  width: auto; 
+  width: auto;
 }
 
 .cart-block--contents .cart-block--contents__items {
   max-height: inherit;
   overflow-y: hidden;
-  overflow-x: hidden; 
+  overflow-x: hidden;
 }
 
 .cart--cart-offcanvas {
-  font-size: 0.75rem; 
+  font-size: 0.75rem;
 }
 
 .cart--cart-offcanvas .cart-block--offcanvas-contents__links {
-  padding: 0.5rem 1rem; 
+  padding: 0.5rem 1rem;
 }
 
 .cart--cart-offcanvas .cart-block--offcanvas-contents__links a {
-  text-decoration: none; 
+  text-decoration: none;
 }
 
 .cart--cart-offcanvas .close {
-  padding: 0.25rem; 
+  padding: 0.25rem;
 }
 
 .cart--cart-offcanvas table td.cart-block--offcanvas-cart-table__title,
 .cart--cart-offcanvas table td.cart-block--offcanvas-cart-table__price {
-  padding: 0.5rem 0.25rem !important; 
+  padding: 0.5rem 0.25rem !important;
 }
 
 .cart--cart-offcanvas table td.cart-block--offcanvas-cart-table__quantity {
-  padding: 0.25rem !important; 
+  padding: 0.25rem !important;
 }
 
 .cart--cart-offcanvas table .btn {
-  font-size: 0.75rem; 
+  font-size: 0.75rem;
 }
-  
 .cart--cart-offcanvas table tfoot .btn {
   font-size: 0.75rem;
-  margin-top: 0.5rem; 
+  margin-top: 0.5rem;
 }
diff --git a/css/components/dropbutton.component.css b/css/components/dropbutton.component.css
index b50619598cb0e14e635ca406ab56e8956686d333..8bf8c71a4c0af84a3636defc8fbdfa1ccc1532db 100644
--- a/css/components/dropbutton.component.css
+++ b/css/components/dropbutton.component.css
@@ -4,66 +4,66 @@
  */
 
 .js .dropbutton-wrapper .dropbutton-widget {
-    /* This is required to win over specifity of .js td .dropbutton-widget */
-    position: relative;
+  /* This is required to win over specifity of .js td .dropbutton-widget */
+  position: relative;
 }
 
 .js .dropbutton-widget {
-    border: 1px solid;
-    border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
-    background-color: #fff;
-    background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
-    background-image: linear-gradient(to bottom, #f3f3f3, #e8e8e8);
-    color: #3a3a3a;
-    cursor: pointer;
-    text-align: center;
-    margin: 0.125em 0;
-    border-radius: 1em;
-    overflow: hidden;
+  border: 1px solid;
+  border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
+  background-color: #fff;
+  background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
+  background-image: linear-gradient(to bottom, #f3f3f3, #e8e8e8);
+  color: #3a3a3a;
+  cursor: pointer;
+  text-align: center;
+  margin: 0.125em 0;
+  border-radius: 1em;
+  overflow: hidden;
 }
 
 .js .dropbutton-widget:hover {
-    border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
+  border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
 }
 
 .js .dropbutton-widget .button {
-    border: none;
-    margin: 0;
-    padding: 0.32em 1em;
-    background: transparent none;
-    color: inherit;
+  border: none;
+  margin: 0;
+  padding: 0.32em 1em;
+  background: transparent none;
+  color: inherit;
 }
 
 .js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
-    margin-right: 0;
-    /* LTR */
+  margin-right: 0;
+  /* LTR */
 }
 
 [dir="rtl"].js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
-    margin-left: 0;
+  margin-left: 0;
 }
 
 .js .dropbutton .secondary-action {
-    border-top-color: #ccc;
+  border-top-color: #ccc;
 }
 
 .js .dropbutton-toggle button {
-    background-color: #e8e8e8;
-    background-image: -webkit-linear-gradient(top, #e8e8e8, #d2d2d2);
-    background-image: linear-gradient(to bottom, #e8e8e8, #d2d2d2);
+  background-color: #e8e8e8;
+  background-image: -webkit-linear-gradient(top, #e8e8e8, #d2d2d2);
+  background-image: linear-gradient(to bottom, #e8e8e8, #d2d2d2);
 }
 
 .js .dropbutton-toggle .dropbutton-arrow:hover {
-    background: #ccc;
+  background: #ccc;
 }
 
 .js .dropbutton a {
-    color: #3a3a3a;
-    border-bottom: 0 none;
+  color: #3a3a3a;
+  border-bottom: 0 none;
 }
 
 .js .dropbutton .dropbutton-action:hover,
 .js .dropbutton a:hover {
-    background: #dedede;
-    border-bottom: 0 none;
-}
\ No newline at end of file
+  background: #dedede;
+  border-bottom: 0 none;
+}
diff --git a/css/components/dropbutton.css b/css/components/dropbutton.css
index a6d9abc16393f814a384e8079e3f69d2d4389f46..54f0d8a516b002ea67b1591899d0c50da8655e3b 100644
--- a/css/components/dropbutton.css
+++ b/css/components/dropbutton.css
@@ -1,62 +1,50 @@
-    /**
+/**
  * @file
  * General styles for dropbuttons.
  */
-    
-    .js .dropbutton-widget {
-        background-color: white;
-        border: 1px solid #cccccc;
-    }
-    
-    .js .dropbutton-widget:hover {
-        border-color: #b8b8b8;
-    }
-    
-    .dropbutton .dropbutton-action>* {
-        padding: 0.1em 0.5em;
-        white-space: nowrap;
-    }
-    
-    .dropbutton .secondary-action {
-        border-top: 1px solid #e8e8e8;
-    }
-    
-    .dropbutton-multiple .dropbutton {
-        border-right: 1px solid #e8e8e8;
-        /* LTR */
-    }
-    
-    [dir="rtl"] .dropbutton-multiple .dropbutton {
-        border-left: 1px solid #e8e8e8;
-        border-right: 0 none;
-    }
-    
-    .dropbutton-multiple .dropbutton .dropbutton-action>* {
-        margin-right: 0.25em;
-        /* LTR */
-    }
-    
-    [dir="rtl"] .dropbutton-multiple .dropbutton .dropbutton-action>* {
-        margin-left: 0.25em;
-        margin-right: 0;
-    }
-    
-    .js td .dropbutton-multiple {
-        padding-right: 10em;
-        margin-right: 2em;
-        max-width: 100%;
-    }
-    
-    .js td .dropbutton-wrapper {
-        min-height: 2em;
-    }
-    
-    .js .dropbutton-wrapper,
-    .js .dropbutton-widget {
-        display: block;
-        position: relative;
-    }
-    
-    .js td .dropbutton-widget {
-        position: absolute;
-    }
\ No newline at end of file
+.js .dropbutton-widget {
+  background-color: white;
+  border: 1px solid #cccccc;
+}
+.js .dropbutton-widget:hover {
+  border-color: #b8b8b8;
+}
+.dropbutton .dropbutton-action>* {
+  padding: 0.1em 0.5em;
+  white-space: nowrap;
+}
+.dropbutton .secondary-action {
+  border-top: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton {
+  border-right: 1px solid #e8e8e8;
+  /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton {
+  border-left: 1px solid #e8e8e8;
+  border-right: 0 none;
+}
+.dropbutton-multiple .dropbutton .dropbutton-action>* {
+  margin-right: 0.25em;
+  /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton .dropbutton-action>* {
+  margin-left: 0.25em;
+  margin-right: 0;
+}
+.js td .dropbutton-multiple {
+  padding-right: 10em;
+  margin-right: 2em;
+  max-width: 100%;
+}
+.js td .dropbutton-wrapper {
+  min-height: 2em;
+}
+.js .dropbutton-wrapper,
+.js .dropbutton-widget {
+  display: block;
+  position: relative;
+}
+.js td .dropbutton-widget {
+  position: absolute;
+}
diff --git a/css/components/field.css b/css/components/field.css
index df968392c1d762f31609d1f25b3b579acaa68946..b1e886ca2baee332a588b50a3ffba2ef3086904d 100644
--- a/css/components/field.css
+++ b/css/components/field.css
@@ -82,6 +82,7 @@
   padding: 0 0 0 1em;
   float: right;
 }
-.field--label-inline .field__label, .field--label-inline .field__item {
-  display: inline-block
+.field--label-inline .field__label,
+.field--label-inline .field__item {
+  display: inline-block;
 }
diff --git a/css/components/form.css b/css/components/form.css
index d882ca0f9854ec9f8424cbe56a72f526c112334a..afa9445a9dbf4ed451f5f5790a09589eb8aff475 100644
--- a/css/components/form.css
+++ b/css/components/form.css
@@ -4,37 +4,37 @@
  */
 
 .form-required::after {
-    content: '';
-    vertical-align: super;
-    display: inline-block;
-    background-image: url(../../images/required.svg);
-    background-repeat: no-repeat;
-    background-size: 7px 7px;
-    width: 7px;
-    height: 7px;
-    margin: 0 0.3em;
+  content: '';
+  vertical-align: super;
+  display: inline-block;
+  background-image: url(../../images/required.svg);
+  background-repeat: no-repeat;
+  background-size: 7px 7px;
+  width: 7px;
+  height: 7px;
+  margin: 0 0.3em;
 }
 
 .form-row>fieldset,
 .form-row>div {
-    padding-right: 5px;
-    padding-left: 5px;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: none;
+  padding-right: 5px;
+  padding-left: 5px;
+  flex: 0 0 auto;
+  width: auto;
+  max-width: none;
 }
 
 .form-row .form-actions {
-    align-self: flex-end;
+  align-self: flex-end;
 }
 
 form .filter-wrapper {
-    padding-left: 0;
-    padding-right: 0;
-    margin-left: 1rem;
-    margin-right: 1rem;
+  padding-left: 0;
+  padding-right: 0;
+  margin-left: 1rem;
+  margin-right: 1rem;
 }
 
 form .form-type-textarea {
-    margin-bottom: 0;
-}
\ No newline at end of file
+  margin-bottom: 0;
+}
diff --git a/css/components/header.css b/css/components/header.css
index 417dbc10d4c1e0c6a5d2fb053cdcabed0f4c56fe..c59ef89ed16fb0e89b208bce4f3e3eb8a4e32ab0 100644
--- a/css/components/header.css
+++ b/css/components/header.css
@@ -1,39 +1,39 @@
 /* ------------------ Header ------------------ */
 
-#navbar-top.navbar-dark .nav-link:hover,
-#navbar-top.navbar-dark .nav-link:focus {
-    color: rgba(255, 255, 255, 0.75);
+.navbar-dark .nav-link:hover,
+.navbar-dark .nav-link:focus {
+  color: rgba(255, 255, 255, 0.75);
 }
 
-#navbar-top.navbar-dark .nav-link {
-    color: rgba(255, 255, 255, 0.5);
+.navbar-dark .nav-link {
+  color: rgba(255, 255, 255, 0.5);
 }
 
-#navbar-top.navbar-light .nav-link:hover,
-#navbar-top.navbar-light .nav-link:focus {
-    color: rgba(0, 0, 0, 0.7);
+.navbar-light .nav-link:hover,
+.navbar-light .nav-link:focus {
+  color: rgba(0, 0, 0, 0.7);
 }
 
-#navbar-top.navbar-light .nav-link {
-    color: rgba(0, 0, 0, 0.5);
+.navbar-light .nav-link {
+  color: rgba(0, 0, 0, 0.5);
 }
 
 .navbar-brand .site-logo {
-    margin-right: 1rem;
+  margin-right: 1rem;
 }
 
 @media (max-width: 33.9em) {
-    .navbar-toggleable-xs .navbar-nav .nav-item+.nav-item,
-    .navbar-toggleable-xs.collapse.in .navbar-nav .nav-item {
-        margin-left: 0;
-        float: none;
-    }
+  .navbar-toggleable-xs .navbar-nav .nav-item+.nav-item,
+  .navbar-toggleable-xs.collapse.in .navbar-nav .nav-item {
+    margin-left: 0;
+    float: none;
+  }
 }
 
 @media (max-width: 47.9em) {
-    .navbar-toggleable-sm .navbar-nav .nav-item+.nav-item,
-    .navbar-toggleable-xs.collapse.in .navbar-nav .nav-item {
-        margin-left: 0;
-        float: none;
-    }
-}
\ No newline at end of file
+  .navbar-toggleable-sm .navbar-nav .nav-item+.nav-item,
+  .navbar-toggleable-xs.collapse.in .navbar-nav .nav-item {
+    margin-left: 0;
+    float: none;
+  }
+}
diff --git a/css/components/icons.css b/css/components/icons.css
index 5a0e1af7d29237e1b36faba8f7191dfe0cef6a4e..361c91fb511587d72e0fa330021608d27960defd 100644
--- a/css/components/icons.css
+++ b/css/components/icons.css
@@ -21,5 +21,6 @@
   text-indent: -9999px;
   display: block;
   width: 16px;
+  direction: ltr;
   height: 16px;
-}
\ No newline at end of file
+}
diff --git a/css/components/indented.css b/css/components/indented.css
index c702161da4ac5c12ff91a453a4cd91e243e9c621..b41bfd3ebdc4413f9de964c8dd66f528103d0d53 100644
--- a/css/components/indented.css
+++ b/css/components/indented.css
@@ -1,4 +1,3 @@
-
 /**
  * @file
  * Basic styling for comment module.
diff --git a/css/components/page.css b/css/components/page.css
index 4c32d065404df83b64237245893ec5536c5ade5c..8f9417e56f31e415a9b1205b3777cf1372dee619 100644
--- a/css/components/page.css
+++ b/css/components/page.css
@@ -2,4 +2,3 @@
  * @file
  * Styles for Bootstrap Barrio page.
  */
-
diff --git a/css/components/search-form.css b/css/components/search-form.css
index 2a5075fafcb65e4f3c7908c71481fe45ac8af448..e2ce69226d66fb6757d71dd662c11a1022e36fd6 100644
--- a/css/components/search-form.css
+++ b/css/components/search-form.css
@@ -4,14 +4,14 @@
  */
 
 input[type="search"] {
-    box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 header #search-block-form {
-    padding: 5px 15px;
-    flex-flow: row wrap;
+  padding: 5px 15px;
+  flex-flow: row wrap;
 }
 
 #search-block-form {
-    display: flex;
-}
\ No newline at end of file
+  display: flex;
+}
diff --git a/css/components/sidebar-collapse.css b/css/components/sidebar-collapse.css
index 46d3af5365393a2f2b11b6687d8b5c281ba64c49..f3a71a80bdcb54f4ffcd46bd7fed863569cc52b2 100644
--- a/css/components/sidebar-collapse.css
+++ b/css/components/sidebar-collapse.css
@@ -14,13 +14,11 @@
     -moz-transition: all 0.25s ease-out;
     transition: all 0.25s ease-out;
   }
-  .row-offcanvas-right
-  .sidebar-offcanvas {
+  .row-offcanvas-right  .sidebar-offcanvas {
     right: -41.6%;
   }
 
-  .row-offcanvas-left
-  .sidebar-offcanvas {
+  .row-offcanvas-left  .sidebar-offcanvas {
     left: -41.6%;
   }
   .row-offcanvas-right.active {
@@ -34,8 +32,7 @@
     top: 0;
     width: 41.6%;
   }
-  #sidebar_first {
-    padding-top:0;
+  .sidebar_first {
+    padding-top: 0;
   }
 }
-
diff --git a/css/components/sidebar.css b/css/components/sidebar.css
index db5e0ada7536f2bc9435fff70f02bda89688eed3..dd6b3ca433605be1a4183beb4a92f49a5c9e68dd 100644
--- a/css/components/sidebar.css
+++ b/css/components/sidebar.css
@@ -1,36 +1,36 @@
 /* ------------------ Sidebar ----------------- */
 
 .sidebar .block {
-    border-style: solid;
-    border-width: 1px;
-    padding: 15px 15px;
-    margin: 0 0 20px;
+  border-style: solid;
+  border-width: 1px;
+  padding: 15px 15px;
+  margin: 0 0 20px;
 }
 
 .sidebar h2 {
-    margin: 0 0 0.5em;
-    border-bottom: 1px solid #d6d6d6;
-    padding-bottom: 5px;
-    text-shadow: 0 1px 0 #fff;
-    font-size: 1.071em;
-    line-height: 1.2;
+  margin: 0 0 0.5em;
+  border-bottom: 1px solid #d6d6d6;
+  padding-bottom: 5px;
+  text-shadow: 0 1px 0 #fff;
+  font-size: 1.071em;
+  line-height: 1.2;
 }
 
 .sidebar .block .content {
-    font-size: 0.914em;
-    line-height: 1.4;
+  font-size: 0.914em;
+  line-height: 1.4;
 }
 
 .sidebar tbody {
-    border: none;
+  border: none;
 }
 
-.sidebar tr.even,
-.sidebar tr.odd {
-    background: none;
-    border-bottom: 1px solid #d6d6d6;
+.sidebar .even,
+.sidebar .odd {
+  background: none;
+  border-bottom: 1px solid #d6d6d6;
 }
 
-.sidebar nav ul.nav {
-    margin: 0 -1rem;
-}
\ No newline at end of file
+.sidebar nav .nav {
+  margin: 0 -1rem;
+}
diff --git a/css/components/tablesort-indicator.css b/css/components/tablesort-indicator.css
index a45e9f1ed932401739732aa6646f134f9f38b8c6..e6fe1cd1a052bd7a299c6b638e6bb55bc27ce2cf 100644
--- a/css/components/tablesort-indicator.css
+++ b/css/components/tablesort-indicator.css
@@ -16,4 +16,4 @@
 
 .tablesort--desc {
   background-image: url(/core/misc/icons/ffffff/twistie-up.svg);
-}
\ No newline at end of file
+}
diff --git a/css/components/user.css b/css/components/user.css
index f4be647d6b00251ac0b7751bb08b30487a434279..1edfb67b417813d5888d40f6820347a51d3053ea 100644
--- a/css/components/user.css
+++ b/css/components/user.css
@@ -66,7 +66,8 @@
 }
 
 /* Login page stype */
-.page-user-login main .region-content, .page-user-password main .region-content {
+.page-user-login main .region-content,
+.page-user-password main .region-content {
   max-width: 400px;
   background: white;
   padding: 15px 25px;
diff --git a/css/components/vertical-tabs.css b/css/components/vertical-tabs.css
index 24e5d84df5fac3adcf6049ae410d4ad25941e4ad..865ca607e41c91f6f9d0789cd4d2a7ab7f2cd1ff 100644
--- a/css/components/vertical-tabs.css
+++ b/css/components/vertical-tabs.css
@@ -4,89 +4,89 @@
  */
 
 .vertical-tabs {
-    margin: 0;
-    /* LTR */
-    border: 1px solid #ccc;
-    display: flex;
-    flex-direction: row;
-    font-size: 0.875rem;
+  margin: 0;
+  /* LTR */
+  border: 1px solid #ccc;
+  display: flex;
+  flex-direction: row;
+  font-size: 0.875rem;
 }
 
 [dir="rtl"] .vertical-tabs {
-    flex-direction: row-reverse;
-    margin-left: 0;
-    margin-right: 0;
+  flex-direction: row-reverse;
+  margin-left: 0;
+  margin-right: 0;
 }
 
 .vertical-tabs__menu {
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    /* LTR */
-    width: 15em;
-    margin: 0;
-    /* LTR */
-    padding: 0;
-    border-top: 1px solid #ccc;
-    list-style: none;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  /* LTR */
+  width: 15em;
+  margin: 0;
+  /* LTR */
+  padding: 0;
+  border-top: 1px solid #ccc;
+  list-style: none;
 }
 
 [dir="rtl"] .vertical-tabs__menu {
-    margin-left: 0;
-    margin-right: -15em;
+  margin-left: 0;
+  margin-right: -15em;
 }
 
 .vertical-tabs__pane {
-    margin: 0;
-    border: 0;
+  margin: 0;
+  border: 0;
 }
 
 .vertical-tabs__pane>summary {
-    display: none;
+  display: none;
 }
 
 
 /* Layout of each tab. */
 
 .vertical-tabs__menu-item {
-    border: 1px solid #ccc;
-    border-top: 0;
-    background: #eee;
+  border: 1px solid #ccc;
+  border-top: 0;
+  background: #eee;
 }
 
 .vertical-tabs__menu-item a {
-    display: block;
-    padding: 0.5em 0.6em;
-    text-decoration: none;
+  display: block;
+  padding: 0.5em 0.6em;
+  text-decoration: none;
 }
 
 .vertical-tabs__menu-item a:focus .vertical-tabs__menu-item-title,
 .vertical-tabs__menu-item a:active .vertical-tabs__menu-item-title,
 .vertical-tabs__menu-item a:hover .vertical-tabs__menu-item-title {
-    text-decoration: underline;
+  text-decoration: underline;
 }
 
 .vertical-tabs__menu-item a:hover {
-    outline: 1px dotted;
+  outline: 1px dotted;
 }
 
 .vertical-tabs__menu-item.is-selected {
-    border-right-width: 0;
-    /* LTR */
-    background-color: #fff;
+  border-right-width: 0;
+  /* LTR */
+  background-color: #fff;
 }
 
 [dir="rtl"] .vertical-tabs__menu-item.is-selected {
-    border-left-width: 0;
-    border-right-width: 1px;
+  border-left-width: 0;
+  border-right-width: 1px;
 }
 
 .vertical-tabs__menu-item.is-selected .vertical-tabs__menu-item-title {
-    color: #000;
+  color: #000;
 }
 
 .vertical-tabs__menu-item-summary {
-    display: block;
-    margin-bottom: 0;
-    line-height: normal;
-}
\ No newline at end of file
+  display: block;
+  margin-bottom: 0;
+  line-height: normal;
+}
diff --git a/css/components/views.css b/css/components/views.css
index 61712577e8b4589af8d431d812ce7c20d551e067..1e45f5795399892c987a6d26d552ff1378e8fa99 100644
--- a/css/components/views.css
+++ b/css/components/views.css
@@ -9,7 +9,7 @@
 }
 .views-displays .tabs .open > a:hover,
 .views-displays .tabs .open > a:focus {
-  color: #0071B3;
+  color: #0071b3;
 }
 .views-displays .secondary .form-submit {
   font-size: 0.846em;
@@ -22,14 +22,14 @@
 
 /* Contextual filter options styles */
 .views-filterable-options .filterable-option:nth-of-type(even) .form-type-checkbox {
-  background-color: #F9F9F9;
+  background-color: #f9f9f9;
 }
 
 /* Views action dropbutton styles */
 .views-ui-display-tab-actions .dropbutton .form-submit {
-  color: #0071B3;
+  color: #0071b3;
 }
 .views-ui-display-tab-actions .dropbutton .form-submit:hover,
 .views-ui-display-tab-actions .dropbutton .form-submit:focus {
-  color: #018FE2;
+  color: #018fe2;
 }
diff --git a/css/print.css b/css/print.css
index 4b58dd9dcc64e8ed179897adc29ba10b489c5885..ea438dda2257652db119fa9cea02d3cc228ffc79 100644
--- a/css/print.css
+++ b/css/print.css
@@ -1,4 +1,3 @@
-
 /* ---------- General Layout ---------- */
 
 body,
@@ -8,9 +7,9 @@ select {
   color: #000;
   background: none;
 }
-body.two-sidebars,
-body.sidebar-first,
-body.sidebar-second,
+.two-sidebars,
+.sidebar-first,
+.sidebar-second,
 body {
   width: 640px;
 }
diff --git a/fonts/alegreya_roboto.css b/fonts/alegreya_roboto.css
index 0492171ce6898ac022038598176d0c3480f02feb..10dc55d3347fa1dceba8b929d2412cff7790d266 100644
--- a/fonts/alegreya_roboto.css
+++ b/fonts/alegreya_roboto.css
@@ -1,23 +1,36 @@
-
 /* ---------- Alegreya, Roboto Condensed, Roboto ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: 'Alegreya', serif;
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: 'Alegreya', serif;
+}
+h1,
+h1 a {
+  font-family: 'Alegreya', serif;
+  font-weight: 700;
+}
+h2,
+h2 a {
+  font-family: 'Alegreya', serif;
+  font-weight: 700;
+}
+h4,
+h5,
+h6 {
+  font-family: 'Roboto Condensed', sans-serif;
+}
+h3,
+h3 a {
+  font-family: 'Roboto Condensed', sans-serif;
+  font-weight: normal;
+  text-transform: uppercase;
+  letter-spacing: 2px;
 }
-h1, h1 a {
-	font-weight: 700;
-    }
-h2, h2 a {
-	font-weight: 700;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: 'Roboto Condensed', sans-serif;
+body,
+p,
+a,
+li {
+  font-family: 'Roboto', sans-serif;
 }
-h3 {
-    font-weight: normal;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    }
-body, p, a, li {
-    font-family: 'Roboto', sans-serif;
-    }
\ No newline at end of file
diff --git a/fonts/amatic_josefin.css b/fonts/amatic_josefin.css
index bf2fe3378d0aa0abce91385455dadb9312b1c01f..2c6c6b2c7ab4c66794697fa6005d8ab66472b279 100644
--- a/fonts/amatic_josefin.css
+++ b/fonts/amatic_josefin.css
@@ -1,13 +1,22 @@
-
 /* ---------- Amatic SC, Josefin Sans ---------- */
 
-h1, h1 a {
-    font-family: 'Amatic SC', cursive;
-    font-weight: 700;
-    }
-h2, h3, h4, h5, h6, h2 a, h3 a {
-    font-family: 'Amatic SC', cursive;
+h1,
+h1 a {
+  font-family: 'Amatic SC', cursive;
+  font-weight: 700;
+}
+h2,
+h3,
+h4,
+h5,
+h6,
+h2 a,
+h3 a {
+  font-family: 'Amatic SC', cursive;
+}
+body,
+p,
+li,
+a {
+  font-family: 'Josefin Sans', sans-serif;
 }
-body, p, li, a {
-    font-family: 'Josefin Sans', sans-serif;
-  }
diff --git a/fonts/coustard_leckerli.css b/fonts/coustard_leckerli.css
index c686cb2634f3f7a2959d6601426f07fbd899425c..735dc918ffe9b7f848cc4defd856dfad3ab07972 100644
--- a/fonts/coustard_leckerli.css
+++ b/fonts/coustard_leckerli.css
@@ -1,14 +1,23 @@
-
 /* ---------- Coustard Ultra, Leckerli One ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: 'Coustard', serif;
-    font-weight: 900;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: 'Coustard', serif;
-    }
-body, p, a, li {
-    font-family: 'Leckerli One', cursive;
-    font-weight: 400;
-    }
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: 'Coustard', serif;
+  font-weight: 900;
+}
+h3,
+h4,
+h5,
+h6,
+h3 a {
+  font-family: 'Coustard', serif;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Leckerli One', cursive;
+  font-weight: 400;
+}
diff --git a/fonts/dancing_garamond.css b/fonts/dancing_garamond.css
index ec3b680cd65f13cd56f3c2d8f082d10fc2005b32..bec1e8fab849b84383fc35cb904f3cfab885a3e2 100644
--- a/fonts/dancing_garamond.css
+++ b/fonts/dancing_garamond.css
@@ -1,15 +1,24 @@
-
 /* ---------- Dancing Script, EB Garamond ---------- */
 
-h1, h1 a {
-    font-family: 'Dancing Script', cursive;
-    font-weight: 700;
-    }
-h2, h3, h4, h5, h6, h2 a, h3 a {
-    font-family: 'EB Garamond', serif;
-    font-weight: normal;
-    text-transform: uppercase;
-    }
-body, p, a, li {
-    font-family: 'EB Garamond', serif;
-    }
\ No newline at end of file
+h1,
+h1 a {
+  font-family: 'Dancing Script', cursive;
+  font-weight: 700;
+}
+h2,
+h3,
+h4,
+h5,
+h6,
+h2 a,
+h3 a {
+  font-family: 'EB Garamond', serif;
+  font-weight: normal;
+  text-transform: uppercase;
+}
+body,
+p,
+a,
+li {
+  font-family: 'EB Garamond', serif;
+}
diff --git a/fonts/dosis_opensans.css b/fonts/dosis_opensans.css
index 1457a21dbcb913c0e3c8f9983044823692b4faca..53cbc8c65728b1f174caa16a8b72bbcde4af5494 100644
--- a/fonts/dosis_opensans.css
+++ b/fonts/dosis_opensans.css
@@ -1,13 +1,22 @@
-
 /* ---------- Dosis, Open Sans ---------- */
 
-h1, h1 a {
-    font-family: 'Dosis', serif;
-    font-weight: 900;
-    }
-h2, h3, h4, h5, h6, h2 a, h3 a {
-    font-family: 'Dosis', serif;
-    }
-body, p, a, li {
-    font-family: 'Open Sans', serif;
-    }
+h1,
+h1 a {
+  font-family: 'Dosis', serif;
+  font-weight: 900;
+}
+h2,
+h3,
+h4,
+h5,
+h6,
+h2 a,
+h3 a {
+  font-family: 'Dosis', serif;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Open Sans', serif;
+}
diff --git a/fonts/fjalla_cantarell.css b/fonts/fjalla_cantarell.css
index 690f475f339e0b0a5889a3100c5d4ef00d057fb2..fb419dbb397c17f92fea808c06a97a53fef7f963 100644
--- a/fonts/fjalla_cantarell.css
+++ b/fonts/fjalla_cantarell.css
@@ -1,17 +1,26 @@
-
 /* ---------- Fjalla One, Cantarell ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: 'Fjalla One', sans-serif;
-    font-weight: normal;
-    text-transform: uppercase;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: 'Cantarell', sans-serif;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: -1px;
-    }
-body, p, a, li {
-    font-family: 'Cantarell', sans-serif;
-    }
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: 'Fjalla One', sans-serif;
+  font-weight: normal;
+  text-transform: uppercase;
+}
+h3,
+h4,
+h5,
+h6,
+h3 a {
+  font-family: 'Cantarell', sans-serif;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: -1px;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Cantarell', sans-serif;
+}
diff --git a/fonts/lato_hotel.css b/fonts/lato_hotel.css
index 0b3d5d15153c78fb4fd75843a406eec7d3f91f57..16edc41d7f76071df6785bf24f7b73148aac1460 100644
--- a/fonts/lato_hotel.css
+++ b/fonts/lato_hotel.css
@@ -1,14 +1,23 @@
-
 /* ---------- Lato, Grand Hotel ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: 'Lato', sans-serif;
-    font-weight: 300;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: 'Grand Hotel', cursive;
-    font-weight: normal;
-    }
-body, p, a, li {
-    font-family: 'Lato', sans-serif;
-    }
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: 'Lato', sans-serif;
+  font-weight: 300;
+}
+h3,
+h4,
+h5,
+h6,
+h3 a {
+  font-family: 'Grand Hotel', cursive;
+  font-weight: normal;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Lato', sans-serif;
+}
diff --git a/fonts/medula_abel.css b/fonts/medula_abel.css
index 0e2c3211db0ae828d0140f964848cebaad1607a9..b78dc394812cfb0a4bd0e5d43003492bddbf7fd5 100644
--- a/fonts/medula_abel.css
+++ b/fonts/medula_abel.css
@@ -1,9 +1,19 @@
-
 /* ---------- Medula One, Abel ---------- */
 
-h1, h2, h3, h4, h5, h6, h1 a, h2 a, h3 a {
-    font-family: 'Medula One', cursive;
-    }
-body, p, a, li {
-    font-family: 'Abel', sans-serif;
-    }
\ No newline at end of file
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+h1 a,
+h2 a,
+h3 a {
+  font-family: 'Medula One', cursive;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Abel', sans-serif;
+}
diff --git a/fonts/monserrat_lato.css b/fonts/monserrat_lato.css
index 0da9a44e25a3842e234cb3baeb72203e23a2369a..e301d5acfbef3c0dec9ea1f6a54efdb04dfa846c 100644
--- a/fonts/monserrat_lato.css
+++ b/fonts/monserrat_lato.css
@@ -1,12 +1,22 @@
-
 /* ---------- Monserrat, Lato ---------- */
 
-body, p, a, li {
+body,
+p,
+a,
+li {
   font-family: 'Lato', arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-h1, h2, h3, h4, h5, h6, h1 a, h2 a, h3 a {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+h1 a,
+h2 a,
+h3 a {
   font-family: 'Montserrat', sans-serif;
   font-weight: 700;
-}
\ No newline at end of file
+}
diff --git a/fonts/oswald_droid.css b/fonts/oswald_droid.css
index cb9213362e7960fe1b38c1058aa6e1ff0de34cce..f0b8011d2539ef3a81a644ab6d7644f0b7df9257 100644
--- a/fonts/oswald_droid.css
+++ b/fonts/oswald_droid.css
@@ -1,20 +1,28 @@
-
 /* ---------- Oswald, Droid Serif ---------- */
 
-h1, h1 a {
-    font-family: 'Oswald', sans-serif;
-    font-weight: 700;
-    text-transform: uppercase;
-    }
-h2, h2 a {
-    font-family: 'Oswald', sans-serif;
-    text-transform: uppercase;
+h1,
+h1 a {
+  font-family: 'Oswald', sans-serif;
+  font-weight: 700;
+  text-transform: uppercase;
+}
+h2,
+h2 a {
+  font-family: 'Oswald', sans-serif;
+  text-transform: uppercase;
+}
+h3,
+h3 a {
+  font-family: 'Droid Serif', serif;
+  font-weight: 400;
+  font-style: italic;
+}
+body,
+p,
+h4,
+h5,
+h6,
+a,
+li {
+  font-family: 'Droid Serif', serif;
 }
-h3, h3 a {
-    font-family: 'Droid Serif', serif;
-    font-weight: 400;
-    font-style: italic;
-    }
-body, p, h4, h5, h6, a, li {
-    font-family: 'Droid Serif', serif;
-    }
diff --git a/fonts/philosopher_muli.css b/fonts/philosopher_muli.css
index f14cc250459aab1c221b21939c7fe14ac4da21f0..d11d4c4e1609e41a19d4cf7c4a465d250bafc98c 100644
--- a/fonts/philosopher_muli.css
+++ b/fonts/philosopher_muli.css
@@ -1,13 +1,22 @@
-
 /* ---------- Philosopher, Muli ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: "Philosopher",sans-serif;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: "Muli",sans-serif;
-    }
-body, p, a, li {
-    font-family: "Muli",sans-serif;
-    font-weight: 300;
-    }
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: "Philosopher",sans-serif;
+}
+h3,
+h4,
+h5,
+h6,
+h3 a {
+  font-family: "Muli",sans-serif;
+}
+body,
+p,
+a,
+li {
+  font-family: "Muli",sans-serif;
+  font-weight: 300;
+}
diff --git a/fonts/playfair_alice.css b/fonts/playfair_alice.css
index 74793a83f2be5daf5e0ea49f5cf16d5ff5342fba..7d517258adceccf11bc70b17daa53b1095bea9d8 100644
--- a/fonts/playfair_alice.css
+++ b/fonts/playfair_alice.css
@@ -1,13 +1,22 @@
-
 /* ---------- Playfair Display, Alice ---------- */
 
-h1, h1 a {
-    font-family: 'Playfair Display', serif;
-    font-weight: 900;
-    }
-h2, h3, h4, h5, h6, h2 a, h3 a {
-    font-family: 'Playfair Display', serif;
-    }
-body, p, a, li {
-    font-family: 'Alice', serif;
-    }
\ No newline at end of file
+h1,
+h1 a {
+  font-family: 'Playfair Display', serif;
+  font-weight: 900;
+}
+h2,
+h3,
+h4,
+h5,
+h6,
+h2 a,
+h3 a {
+  font-family: 'Playfair Display', serif;
+}
+body,
+p,
+a,
+li {
+  font-family: 'Alice', serif;
+}
diff --git a/fonts/roboto.css b/fonts/roboto.css
index a78ac902ed1fda968614160ceb731c547b0f6ae9..536f23ce134ab6a67b3bdb488ba4a10887da52ee 100644
--- a/fonts/roboto.css
+++ b/fonts/roboto.css
@@ -1,23 +1,36 @@
-
 /* ---------- Alegreya, Roboto Condensed, Roboto ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: 'Roboto Condensed', sans-serif;
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: 'Roboto Condensed', sans-serif;
+}
+h1,
+h1 a {
+  font-family: 'Roboto Condensed', sans-serif;
+  font-weight: 700;
+}
+h2,
+h2 a {
+  font-family: 'Roboto Condensed', sans-serif;
+  font-weight: 700;
+}
+h4,
+h5,
+h6 {
+  font-family: 'Roboto Condensed', sans-serif;
+}
+h3,
+h3 a {
+  font-weight: normal;
+  text-transform: uppercase;
+  letter-spacing: 2px;
+  font-family: 'Roboto Condensed', sans-serif;
 }
-h1, h1 a {
-	font-weight: 700;
-    }
-h2, h2 a {
-	font-weight: 700;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: 'Roboto Condensed', sans-serif;
+body,
+p,
+a,
+li {
+  font-family: 'Roboto', sans-serif;
 }
-h3, h3 a {
-    font-weight: normal;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    }
-body, p, a, li {
-    font-family: 'Roboto', sans-serif;
-    }
\ No newline at end of file
diff --git a/fonts/vollkorn_exo.css b/fonts/vollkorn_exo.css
index 8e690f6cf75c28aa204215864bf4d05b5c9bd923..fda79624157b02f084466122fa029e0e339d97ef 100644
--- a/fonts/vollkorn_exo.css
+++ b/fonts/vollkorn_exo.css
@@ -1,14 +1,23 @@
-
 /* ---------- Vollkorn, Exo ---------- */
 
-h1, h2, h1 a, h2 a {
-    font-family: "Vollkorn",serif;
-    font-weight: 700;
-    }
-h3, h4, h5, h6, h3 a {
-    font-family: "Vollkorn",serif;
-    }
-body, p, a, li {
-    font-family: "Exo",sans-serif;
-    font-weight: 400;
-    }
+h1,
+h2,
+h1 a,
+h2 a {
+  font-family: "Vollkorn",serif;
+  font-weight: 700;
+}
+h3,
+h4,
+h5,
+h6,
+h3 a {
+  font-family: "Vollkorn",serif;
+}
+body,
+p,
+a,
+li {
+  font-family: "Exo",sans-serif;
+  font-weight: 400;
+}
diff --git a/js/affix.js b/js/affix.js
index e3101e4a4e0c7a9a36c60d1830f8f10cdfea33b3..5579d9e32612974245e8db80fbc6e68b969e7950 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -10,11 +10,11 @@
 
   Drupal.behaviors.bootstrap_barrio_affix = {
     attach: function (context, settings) {
-      var toggleAffix = function(affixElement, scrollElement, wrapper) {
-  
+      var toggleAffix = function (affixElement, scrollElement, wrapper) {
+
         var height = affixElement.outerHeight(),
             top = wrapper.offset().top;
-    
+
         if (scrollElement.scrollTop() >= top){
             wrapper.height(height);
             affixElement.addClass("affix");
@@ -23,18 +23,18 @@
             affixElement.removeClass("affix");
             wrapper.height('auto');
         }
-      
+
       };
 
-      $('[data-toggle="affix"]').once().each(function() {
+      $('[data-toggle="affix"]').once().each(function () {
         var ele = $(this),
             wrapper = $('<div></div>');
-    
+
         ele.before(wrapper);
-        $(window).on('scroll resize', function() {
+        $(window).on('scroll resize', function () {
             toggleAffix(ele, $(this), wrapper);
         });
-    
+
         // init
         toggleAffix(ele, $(window), wrapper);
       });
diff --git a/js/global.js b/js/global.js
index 1ea2e445b9cfc379dd1b41444926b1b7e45acf61..393f2eb33ab71177c73375d91698a876be52c8a0 100644
--- a/js/global.js
+++ b/js/global.js
@@ -11,8 +11,8 @@
     attach: function (context, settings) {
 
       var position = $(window).scrollTop();
-	    $(window).scroll(function() {
-        if ($(this).scrollTop() > 50){  
+        $(window).scroll(function () {
+        if ($(this).scrollTop() > 50){
           $('body').addClass("scrolled");
         }
         else{
diff --git a/js/sidebar-collapse.js b/js/sidebar-collapse.js
index 0c7e4cedadadab7a1e61c4f977e2d096a107b30b..810c655472be379fcc4c572a719a2b3ac4f329ec 100644
--- a/js/sidebar-collapse.js
+++ b/js/sidebar-collapse.js
@@ -10,7 +10,7 @@
 
   Drupal.behaviors.bootstrap_barrio_sidebar = {
     attach: function (context, settings) {
-      $('[data-toggle=offcanvas]').click(function() {
+      $('[data-toggle=offcanvas]').click(function () {
         $('.row-offcanvas').toggleClass('active');
       });
     }
diff --git a/subtheme/color/preview.css b/subtheme/color/preview.css
index 1128e6e5b0119f897b69cea89d07c2cca4f8f927..7b09fb26f1ae2c5e3835049c7513d9f23ffcea75 100644
--- a/subtheme/color/preview.css
+++ b/subtheme/color/preview.css
@@ -1,287 +1,287 @@
 /* ---------- Preview Styles ----------- */
 
 .js .color-preview {
-    clear: both;
-    float: none !important;
+  clear: both;
+  float: none !important;
 }
 
 .color-preview {
-    background-color: #fff;
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: 14px;
-    line-height: 1.5;
-    overflow: hidden;
-    word-wrap: break-word;
-    margin-bottom: 10px;
+  background-color: #fff;
+  font-family: Georgia, "Times New Roman", Times, serif;
+  font-size: 14px;
+  line-height: 1.5;
+  overflow: hidden;
+  word-wrap: break-word;
+  margin-bottom: 10px;
 }
 
 .color-preview-header-top {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    position: relative;
-    min-height: 40px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  position: relative;
+  min-height: 40px;
 }
 
 .color-preview-header {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    position: relative;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  position: relative;
 }
 
 .color-preview-logo {
-    float: left;
-    padding: 15px;
+  float: left;
+  padding: 15px;
 }
 
 .color-preview-site-name {
-    color: #686868;
-    font-weight: normal;
-    font-size: 1.821em;
-    line-height: 1;
-    margin-bottom: 30px;
-    margin-left: 15px;
-    /* LTR */
-    padding-top: 34px;
+  color: #686868;
+  font-weight: normal;
+  font-size: 1.821em;
+  line-height: 1;
+  margin-bottom: 30px;
+  margin-left: 15px;
+  /* LTR */
+  padding-top: 34px;
 }
 
 [dir="rtl"] .color-preview-site-name {
-    margin-left: 0;
-    margin-right: 15px;
+  margin-left: 0;
+  margin-right: 15px;
 }
 
 .color-preview-main-menu {
-    clear: both;
-    padding: 0 15px 3px;
+  clear: both;
+  padding: 0 15px 3px;
 }
 
 .color-preview-main-menu-links a {
-    color: #d9d9d9;
-    padding: 0.6em 1em 0.4em;
+  color: #d9d9d9;
+  padding: 0.6em 1em 0.4em;
 }
 
 .color-preview-main-menu-links {
-    font-size: 0.929em;
-    margin: 0;
-    padding: 0;
+  font-size: 0.929em;
+  margin: 0;
+  padding: 0;
 }
 
 .color-preview-main-menu-links a {
-    color: #333;
-    background: #ccc;
-    background: rgba(255, 255, 255, 0.7);
-    text-shadow: 0 1px #eee;
-    border-top-left-radius: 8px;
-    border-top-right-radius: 8px;
+  color: #333;
+  background: #ccc;
+  background: rgba(255, 255, 255, 0.7);
+  text-shadow: 0 1px #eee;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
 
 .color-preview-main-menu-links a:hover,
 .color-preview-main-menu-links a:focus {
-    background: #eee;
-    background: rgba(255, 255, 255, 0.95);
-    text-decoration: none;
-    cursor: pointer;
+  background: #eee;
+  background: rgba(255, 255, 255, 0.95);
+  text-decoration: none;
+  cursor: pointer;
 }
 
 .color-preview-main-menu-links li a.is-active {
-    background: #fff;
-    border-bottom: none;
+  background: #fff;
+  border-bottom: none;
 }
 
 .color-preview-main-menu-links li {
-    display: inline;
-    list-style-type: none;
-    padding: 0.6em 0 0.4em;
+  display: inline;
+  list-style-type: none;
+  padding: 0.6em 0 0.4em;
 }
 
 .preview-button {
-    display: inline-block;
-    min-width: 80px;
-    margin-top: 10px;
-    font-weight: 400;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    border: 1px solid transparent;
-    border-top-color: transparent;
-    border-right-color: transparent;
-    border-bottom-color: transparent;
-    border-left-color: transparent;
-    padding: .375rem .75rem;
-    font-size: 1rem;
-    line-height: 1.5;
-    border-radius: .25rem;
-    color: white !important;
-    transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+  display: inline-block;
+  min-width: 80px;
+  margin-top: 10px;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  border-top-color: transparent;
+  border-right-color: transparent;
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  padding: .375rem .75rem;
+  font-size: 1rem;
+  line-height: 1.5;
+  border-radius: .25rem;
+  color: white !important;
+  transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 }
 
 .color-preview-sidebar,
 .color-preview-content {
-    display: inline;
-    float: left;
-    /* LTR */
-    position: relative;
+  display: inline;
+  float: left;
+  /* LTR */
+  position: relative;
 }
 
 [dir="rtl"] .color-preview-sidebar,
 [dir="rtl"] .color-preview-content {
-    float: right;
+  float: right;
 }
 
 .color-preview-sidebar {
-    margin-left: 15px;
-    /* LTR */
-    width: 210px;
+  margin-left: 15px;
+  /* LTR */
+  width: 210px;
 }
 
 [dir="rtl"] .color-preview-sidebar {
-    margin-left: 0;
-    margin-right: 15px;
+  margin-left: 0;
+  margin-right: 15px;
 }
 
 .color-preview-content {
-    margin-left: 30px;
-    /* LTR */
-    width: 26.5em;
+  margin-left: 30px;
+  /* LTR */
+  width: 26.5em;
 }
 
 [dir="rtl"] .color-preview-content {
-    margin-left: 0;
-    margin-right: 30px;
+  margin-left: 0;
+  margin-right: 30px;
 }
 
 .color-preview-sidebar .preview-block {
-    border: 1px solid;
-    margin: 20px 0;
-    padding: 15px 20px;
+  border: 1px solid;
+  margin: 20px 0;
+  padding: 15px 20px;
 }
 
 .color-preview-sidebar h2 {
-    border-bottom: 1px solid #d6d6d6;
-    font-weight: normal;
-    margin-top: 0;
-    margin-right: 0;
-    margin-left: 0;
-    padding-bottom: 5px;
-    text-shadow: 0 1px 0 #fff;
+  border-bottom: 1px solid #d6d6d6;
+  font-weight: normal;
+  margin-top: 0;
+  margin-right: 0;
+  margin-left: 0;
+  padding-bottom: 5px;
+  text-shadow: 0 1px 0 #fff;
 }
 
 .color-preview .preview-block .preview-content {
-    margin-top: 1em;
+  margin-top: 1em;
 }
 
 .color-preview .preview-block-menu .preview-content,
 .color-preview .preview-block-menu .preview-content ul {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 .color-preview-main {
-    margin-bottom: 40px;
-    margin-top: 20px;
+  margin-bottom: 40px;
+  margin-top: 20px;
 }
 
 .color-preview-page-title {
-    font-size: 2em;
-    font-weight: normal;
-    line-height: 1;
-    margin: 1em 0 0.5em;
+  font-size: 2em;
+  font-weight: normal;
+  line-height: 1;
+  margin: 1em 0 0.5em;
 }
 
 .color-preview-footer-wrapper {
-    color: #c0c0c0;
-    color: rgba(255, 255, 255, 0.65);
-    display: block !important;
-    font-size: 0.857em;
-    padding: 20px 20px 25px;
+  color: #c0c0c0;
+  color: rgba(255, 255, 255, 0.65);
+  display: block !important;
+  font-size: 0.857em;
+  padding: 20px 20px 25px;
 }
 
 .color-preview-footer-wrapper a {
-    color: #fcfcfc;
-    color: rgba(255, 255, 255, 0.8);
+  color: #fcfcfc;
+  color: rgba(255, 255, 255, 0.8);
 }
 
 .color-preview-footer-wrapper a:hover,
 .color-preview-footer-wrapper a:focus {
-    color: #fefefe;
-    color: rgba(255, 255, 255, 0.95);
-    text-decoration: underline;
+  color: #fefefe;
+  color: rgba(255, 255, 255, 0.95);
+  text-decoration: underline;
 }
 
 .color-preview-footer-wrapper .preview-footer-column {
-    display: inline;
-    float: left;
-    /* LTR */
-    padding: 0 10px;
-    position: relative;
-    width: 220px;
+  display: inline;
+  float: left;
+  /* LTR */
+  padding: 0 10px;
+  position: relative;
+  width: 220px;
 }
 
 [dir="rtl"] .color-preview-footer-wrapper .preview-footer-column {
-    float: right;
+  float: right;
 }
 
 .color-preview-footer-wrapper .preview-block {
-    border: 1px solid #444;
-    border-color: rgba(255, 255, 255, 0.1);
-    margin: 20px 0;
-    padding: 10px;
+  border: 1px solid #444;
+  border-color: rgba(255, 255, 255, 0.1);
+  margin: 20px 0;
+  padding: 10px;
 }
 
 .color-preview-footer-columns .preview-block-menu {
-    border: none;
-    margin: 0;
-    padding: 0;
+  border: none;
+  margin: 0;
+  padding: 0;
 }
 
 .color-preview-footer-columns h2 {
-    border-bottom: 1px solid #555;
-    border-color: rgba(255, 255, 255, 0.15);
-    padding-bottom: 3px;
-    text-transform: uppercase;
+  border-bottom: 1px solid #555;
+  border-color: rgba(255, 255, 255, 0.15);
+  padding-bottom: 3px;
+  text-transform: uppercase;
 }
 
 .color-preview-footer-columns .preview-content {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 .color-preview-footer-columns .preview-content ul {
-    margin-left: 0;
-    /* LTR */
-    padding-left: 0;
-    /* LTR */
+  margin-left: 0;
+  /* LTR */
+  padding-left: 0;
+  /* LTR */
 }
 
 [dir="rtl"] .color-preview-footer-columns .preview-content ul {
-    margin-right: 0;
-    padding-right: 0;
+  margin-right: 0;
+  padding-right: 0;
 }
 
 .color-preview-footer-columns .preview-content li {
-    list-style: none;
-    list-style-image: none;
-    margin: 0;
-    padding: 0;
+  list-style: none;
+  list-style-image: none;
+  margin: 0;
+  padding: 0;
 }
 
 .color-preview-footer-columns .preview-content li a {
-    border-bottom: 1px solid #555;
-    border-color: rgba(255, 255, 255, 0.15);
-    display: block;
-    line-height: 1.2;
-    padding: 0.8em 2px 0.8em 20px;
-    /* LTR */
-    text-indent: -15px;
+  border-bottom: 1px solid #555;
+  border-color: rgba(255, 255, 255, 0.15);
+  display: block;
+  line-height: 1.2;
+  padding: 0.8em 2px 0.8em 20px;
+  /* LTR */
+  text-indent: -15px;
 }
 
 [dir="rtl"] .color-preview-footer-columns .preview-content li a {
-    padding-left: 2px;
-    padding-right: 20px;
+  padding-left: 2px;
+  padding-right: 20px;
 }
 
 .color-preview-footer-columns .preview-content li a:hover,
 .color-preview-footer-columns .preview-content li a:focus {
-    background-color: #1f1f21;
-    background-color: rgba(255, 255, 255, 0.05);
-    text-decoration: none;
-}
\ No newline at end of file
+  background-color: #1f1f21;
+  background-color: rgba(255, 255, 255, 0.05);
+  text-decoration: none;
+}
diff --git a/subtheme/color/preview.es6.js b/subtheme/color/preview.es6.js
index a41f1f2c205add43e6f6f1cfbf596c50a4a80ab4..b2b126d01da6f1ea3d28b10942e953b3cfabfb45 100644
--- a/subtheme/color/preview.es6.js
+++ b/subtheme/color/preview.es6.js
@@ -38,7 +38,7 @@
       const gradientStart = $colorPalette.find('input[name="palette[top]"]').val();
       const gradientEnd = $colorPalette.find('input[name="palette[bottom]"]').val();
 
-      $colorPreview.find('.color-preview-header').attr('style', `background-color: ${gradientStart}; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(${gradientStart}), to(${gradientEnd})); background-image: -moz-linear-gradient(-90deg, ${gradientStart}, ${gradientEnd});`);
+      $colorPreview.find('.color-preview-header').attr('style', `background - color: ${gradientStart}; background - image: -webkit - gradient(linear, 0 % 0 % , 0 % 100 % , from(${gradientStart}), to(${gradientEnd})); background - image: -moz - linear - gradient(-90deg, ${gradientStart}, ${gradientEnd});`);
 
       $colorPreview.find('.color-preview-site-name').css('color', $colorPalette.find('input[name="palette[titleslogan]"]').val());
     },
diff --git a/subtheme/color/preview.js b/subtheme/color/preview.js
index 9c2e322d24d559f619e713308ad08fcdfccf9316..9b62e4f8418a405f973dfd979734c547688ad2c1 100644
--- a/subtheme/color/preview.js
+++ b/subtheme/color/preview.js
@@ -5,7 +5,7 @@
  * @preserve
  **/
 
-(function($, Drupal, drupalSettings) {
+(function ($, Drupal, drupalSettings) {
     Drupal.color = {
         logoChanged: false,
         callback: function callback(context, settings, $form) {
@@ -27,10 +27,10 @@
             $colorPreview.find('.color-preview-content a').css('color', $colorPalette.find('input[name="palette[link]"]').val());
             $colorPreview.find('.preview-button').css('background-color', $colorPalette.find('input[name="palette[button]"]').val());
             $colorPreview.find('.preview-button').css('border-color', $colorPalette.find('input[name="palette[button]"]').val());
-            $colorPreview.find('.preview-button').hover(function() {
+            $colorPreview.find('.preview-button').hover(function () {
                     $(this).css('background-color', $colorPalette.find('input[name="palette[buttonhover]"]').val());
                 },
-                function() {
+                function () {
                     $(this).css('background-color', $colorPalette.find('input[name="palette[button]"]').val());
                 });
 
@@ -49,4 +49,4 @@
             $colorPreview.find('.color-preview-site-name').css('color', $colorPalette.find('input[name="palette[titleslogan]"]').val());
         }
     };
-})(jQuery, Drupal, drupalSettings);
\ No newline at end of file
+})(jQuery, Drupal, drupalSettings);
diff --git a/subtheme/css/colors.css b/subtheme/css/colors.css
index a5364202f1f3e8c57338e7e9e6d302a1983db9d6..06dab6c06fb7a2ccf5ed8f913e2ef3fc6c96321a 100644
--- a/subtheme/css/colors.css
+++ b/subtheme/css/colors.css
@@ -1,78 +1,78 @@
 /* ---------- Color Module Styles ----------- */
 
 body {
-    color: #3b3b3b;
-    background: #292929;
+  color: #3b3b3b;
+  background: #292929;
 }
 
 #page,
 #main-wrapper,
 .region-primary-menu .menu-item a.is-active,
 .region-primary-menu .menu-item--active-trail a {
-    background: #fff;
+  background: #fff;
 }
 
 .tabs ul.primary li a.is-active {
-    background-color: #fff;
+  background-color: #fff;
 }
 
 .tabs ul.primary li.is-active a {
-    background-color: #fff;
-    border-bottom-color: #fff;
+  background-color: #fff;
+  border-bottom-color: #fff;
 }
 
 #navbar-top {
-    background-color: #055a8e;
+  background-color: #055a8e;
 }
 
 #navbar-main {
-    background-color: #1d84c3;
+  background-color: #1d84c3;
 }
 
 a,
 .link {
-    color: #0071b3;
+  color: #0071b3;
 }
 
 a:hover,
 a:focus,
 .link:hover,
 .link:focus {
-    color: #018fe2;
+  color: #018fe2;
 }
 
 a:active,
 .link:active {
-    color: #23aeff;
+  color: #23aeff;
 }
 
 .page-item.active .page-link {
-    background-color: #0071b3;
-    border-color: #0071b3;
+  background-color: #0071b3;
+  border-color: #0071b3;
 }
 
 .page-link,
 .page-link:hover {
-    color: #0071b3;
+  color: #0071b3;
 }
 
 .sidebar .block {
-    background-color: #f6f6f2;
-    border-color: #f9f9f9;
+  background-color: #f6f6f2;
+  border-color: #f9f9f9;
 }
 
 .btn-primary {
-    background-color: #007bff;
-    border-color: #007bff;
+  background-color: #007bff;
+  border-color: #007bff;
 }
 
 .btn-primary:hover,
 .btn-primary:focus {
-    background-color: #0256b1;
+  background-color: #0256b1;
 }
 
 .site-footer {
-    background: #292929;
+  background: #292929;
 }
 
 .region-header,
@@ -84,22 +84,22 @@ a:active,
 .region-header .site-branding a,
 .region-secondary-menu .menu-item a,
 .region-secondary-menu .menu-item a.is-active {
-    color: #fffeff;
+  color: #fffeff;
 }
 
 
 /* ---------- Color Form ----------- */
 
 [dir="rtl"] .color-form .color-palette {
-    margin-left: 0;
-    margin-right: 20px;
+  margin-left: 0;
+  margin-right: 20px;
 }
 
 [dir="rtl"] .color-form .form-item label {
-    float: right;
+  float: right;
 }
 
 [dir="rtl"] .color-form .color-palette .lock {
-    right: -20px;
-    left: 0;
-}
\ No newline at end of file
+  right: -20px;
+  left: 0;
+}
diff --git a/subtheme/css/style.css b/subtheme/css/style.css
index 1cafda52573859659aafaf29c7f4661969651b09..8e6df0eaa5dfa825f2b9122405d8875a6096f295 100644
--- a/subtheme/css/style.css
+++ b/subtheme/css/style.css
@@ -2,4 +2,3 @@
  * @file
  * Subtheme specific CSS.
  */
-
diff --git a/theme-settings.php b/theme-settings.php
index 2e8af199bd999d6e39de90936dbadaa36f45735b..0b980c93be23040baef62ccdcdcf1809949a46bc 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * theme-settings.php
@@ -59,7 +60,7 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#group' => 'bootstrap',
   ];
 
-  //Container.
+  // Container.
   $form['layout']['container'] = [
     '#type' => 'details',
     '#title' => t('Container'),
@@ -71,7 +72,8 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Fluid container'),
     '#default_value' => theme_get_setting('bootstrap_barrio_fluid_container'),
     '#description' => t('Use <code>.container-fluid</code> class. See @bootstrap_fluid_containers_link.', [
-      '@bootstrap_fluid_containers_link' => Link::fromTextAndUrl('Containers in the Bootstrap 4 documentation' , Url::fromUri('https://getbootstrap.com/docs/4.3/layout/overview/' , ['absolute' => TRUE , 'fragment' => 'containers']))->toString(),    ]),
+      '@bootstrap_fluid_containers_link' => Link::fromTextAndUrl('Containers in the Bootstrap 4 documentation', Url::fromUri('https://getbootstrap.com/docs/4.3/layout/overview/', ['absolute' => TRUE, 'fragment' => 'containers']))->toString(),
+    ]),
   ];
 
   // List of regions.
@@ -89,7 +91,7 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     'sidebar_second',
   ];
 
-  //Region.
+  // Region.
   $form['layout']['region'] = [
     '#type' => 'details',
     '#title' => t('Region'),
@@ -254,7 +256,8 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Button with outline format'),
     '#default_value' => theme_get_setting('bootstrap_barrio_button_outline'),
     '#description' => t('Use <code>.btn-default-outline</code> class. See @bootstrap_outline_buttons_link.', [
-      '@bootstrap_outline_buttons_link' => Link::fromTextAndUrl('Outline buttons in the Bootstrap 4 documentation' , Url::fromUri('https://getbootstrap.com/docs/4.3/components/buttons/' , ['absolute' => TRUE , 'fragment' => 'outline-buttons']))->toString(),    ]),
+      '@bootstrap_outline_buttons_link' => Link::fromTextAndUrl('Outline buttons in the Bootstrap 4 documentation', Url::fromUri('https://getbootstrap.com/docs/4.3/components/buttons/', ['absolute' => TRUE, 'fragment' => 'outline-buttons']))->toString(),
+    ]),
   ];
 
   // Navbar.
@@ -353,21 +356,21 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     ],
     '#empty_option' => t('Default'),
   ];
-    // Allow custom classes on Navbars
-  $form['components']['navbar']['bootstrap_barrio_navbar_top_class'] = array(
+  // Allow custom classes on Navbars.
+  $form['components']['navbar']['bootstrap_barrio_navbar_top_class'] = [
     '#type' => 'textfield',
     '#title' => t('Custom classes for Navbar Top'),
     '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_class'),
     '#size' => 40,
     '#maxlength' => 40,
-  );
-  $form['components']['navbar']['bootstrap_barrio_navbar_class'] = array(
+  ];
+  $form['components']['navbar']['bootstrap_barrio_navbar_class'] = [
     '#type' => 'textfield',
     '#title' => t('Custom classes for Navbar'),
     '#default_value' => theme_get_setting('bootstrap_barrio_navbar_class'),
     '#size' => 40,
     '#maxlength' => 40,
-  );
+  ];
 
   // Messages.
   $form['components']['alerts'] = [
@@ -449,32 +452,34 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Affix navbar top'),
     '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_affix'),
   ];
-/*  $form['affix']['navbar_top']['bootstrap_barrio_navbar_top_affix_top'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix top'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_affix_top'),
-    '#prefix' => '<div id="navbar-top-affix">',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_navbar_top_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  );
-  $form['affix']['navbar_top']['bootstrap_barrio_navbar_top_affix_bottom'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix bottom'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_affix_bottom'),
-    '#suffix' => '</div>',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_navbar_top_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  ); */
+  /*
+  $form['affix']['navbar_top']['bootstrap_barrio_navbar_top_affix_top'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix top'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_affix_top'),
+  '#prefix' => '<div id="navbar-top-affix">',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_navbar_top_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+  $form['affix']['navbar_top']['bootstrap_barrio_navbar_top_affix_bottom'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix bottom'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_affix_bottom'),
+  '#suffix' => '</div>',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_navbar_top_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+   */
   $form['affix']['navbar'] = [
     '#type' => 'details',
     '#title' => t('Affix navbar'),
@@ -486,32 +491,34 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Affix navbar'),
     '#default_value' => theme_get_setting('bootstrap_barrio_navbar_affix'),
   ];
-/*  $form['affix']['navbar']['bootstrap_barrio_navbar_affix_top'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix top'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_navbar_affix_top'),
-    '#prefix' => '<div id="navbar-affix">',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_navbar_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  );
-  $form['affix']['navbar']['bootstrap_barrio_navbar_affix_bottom'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix bottom'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_navbar_affix_bottom'),
-    '#suffix' => '</div>',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_navbar_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  ); */
+  /*
+  $form['affix']['navbar']['bootstrap_barrio_navbar_affix_top'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix top'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_navbar_affix_top'),
+  '#prefix' => '<div id="navbar-affix">',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_navbar_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+  $form['affix']['navbar']['bootstrap_barrio_navbar_affix_bottom'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix bottom'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_navbar_affix_bottom'),
+  '#suffix' => '</div>',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_navbar_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+   */
   $form['affix']['sidebar_first'] = [
     '#type' => 'details',
     '#title' => t('Affix sidebar first'),
@@ -523,31 +530,32 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Affix sidebar first'),
     '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_first_affix'),
   ];
-/*  $form['affix']['sidebar_first']['bootstrap_barrio_sidebar_first_affix_top'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix top'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_first_affix_top'),
-    '#prefix' => '<div id="sidebar-first-affix">',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_sidebar_first_affix"]' => ['checked' => FALSE],
-      ],
-    ],
+  /*
+  $form['affix']['sidebar_first']['bootstrap_barrio_sidebar_first_affix_top'] = array(
+  '#type' => 'textfield',
+  '#title' => t('Affix top'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_first_affix_top'),
+  '#prefix' => '<div id="sidebar-first-affix">',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_sidebar_first_affix"]' => ['checked' => FALSE],
+  ],
+  ],
   );
   $form['affix']['sidebar_first']['bootstrap_barrio_sidebar_first_affix_bottom'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix bottom'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_first_affix_bottom'),
-    '#suffix' => '</div>',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_sidebar_first_affix"]' => ['checked' => FALSE],
-      ],
-    ],
+  '#type' => 'textfield',
+  '#title' => t('Affix bottom'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_first_affix_bottom'),
+  '#suffix' => '</div>',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_sidebar_first_affix"]' => ['checked' => FALSE],
+  ],
+  ],
   ); */
   $form['affix']['sidebar_second'] = [
     '#type' => 'details',
@@ -560,33 +568,34 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#title' => t('Affix sidebar second'),
     '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_second_affix'),
   ];
-/*  $form['affix']['sidebar_second']['bootstrap_barrio_sidebar_second_affix_top'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix top'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_second_affix_top'),
-    '#prefix' => '<div id="sidebar-second-affix">',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_sidebar_second_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  );
-  $form['affix']['sidebar_second']['bootstrap_barrio_sidebar_second_affix_bottom'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Affix bottom'),
-    '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_second_affix_bottom'),
-    '#suffix' => '</div>',
-    '#size' => 6,
-    '#maxlength' => 3,
-    '#states' => [
-      'invisible' => [
-        'input[name="bootstrap_barrio_sidebar_second_affix"]' => ['checked' => FALSE],
-      ],
-    ],
-  ); */
-
+  /*
+  $form['affix']['sidebar_second']['bootstrap_barrio_sidebar_second_affix_top'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix top'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_second_affix_top'),
+  '#prefix' => '<div id="sidebar-second-affix">',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_sidebar_second_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+  $form['affix']['sidebar_second']['bootstrap_barrio_sidebar_second_affix_bottom'] = [
+  '#type' => 'textfield',
+  '#title' => t('Affix bottom'),
+  '#default_value' => theme_get_setting('bootstrap_barrio_sidebar_second_affix_bottom'),
+  '#suffix' => '</div>',
+  '#size' => 6,
+  '#maxlength' => 3,
+  '#states' => [
+  'invisible' => [
+  'input[name="bootstrap_barrio_sidebar_second_affix"]' => ['checked' => FALSE],
+  ],
+  ],
+  ];
+   */
   // Scroll Spy.
   $form['scroll_spy'] = [
     '#type' => 'details',
@@ -596,7 +605,8 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
   $form['scroll_spy']['bootstrap_barrio_scroll_spy'] = [
     '#type' => 'textfield',
     '#title' => t('Scrollspy element ID'),
-    '#description' => t('Specify a valid jQuery ID for the element containing a .nav that will behave with scrollspy.'),    '#default_value' => theme_get_setting('bootstrap_barrio_scroll_spy'),
+    '#description' => t('Specify a valid jQuery ID for the element containing a .nav that will behave with scrollspy.'),
+    '#default_value' => theme_get_setting('bootstrap_barrio_scroll_spy'),
     '#size' => 40,
     '#maxlength' => 40,
   ];
@@ -619,20 +629,20 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#default_value' => theme_get_setting('bootstrap_barrio_google_fonts'),
     '#empty_option' => t('None'),
     '#options' => [
-      'roboto' => 'Roboto Condensed, Roboto',
-      'monserrat_lato' => 'Monserrat, Lato',
-      'alegreya_roboto' => 'Alegreya, Roboto Condensed, Roboto',
-      'dancing_garamond' => 'Dancing Script, EB Garamond',
-      'amatic_josefin' => 'Amatic SC, Josefin Sans',
-      'oswald_droid' => 'Oswald, Droid Serif',
-      'playfair_alice' => 'Playfair Display, Alice',
-      'dosis_opensans' => 'Dosis, Open Sans',
-      'lato_hotel' => 'Lato, Grand Hotel',
-      'medula_abel' => 'Medula One, Abel',
-      'fjalla_cantarell' => 'Fjalla One, Cantarell',
-      'coustard_leckerli' => 'Coustard Ultra, Leckerli One',
-      'philosopher_muli' => ' Philosopher, Muli ',
-      'vollkorn_exo' => 'Vollkorn, Exo',
+      'roboto' => t('Roboto Condensed, Roboto'),
+      'monserrat_lato' => t('Monserrat, Lato'),
+      'alegreya_roboto' => t('Alegreya, Roboto Condensed, Roboto'),
+      'dancing_garamond' => t('Dancing Script, EB Garamond'),
+      'amatic_josefin' => t('Amatic SC, Josefin Sans'),
+      'oswald_droid' => t('Oswald, Droid Serif'),
+      'playfair_alice' => t('Playfair Display, Alice'),
+      'dosis_opensans' => t('Dosis, Open Sans'),
+      'lato_hotel' => t('Lato, Grand Hotel'),
+      'medula_abel' => t('Medula One, Abel'),
+      'fjalla_cantarell' => t('Fjalla One, Cantarell'),
+      'coustard_leckerli' => t('Coustard Ultra, Leckerli One'),
+      'philosopher_muli' => t('Philosopher, Muli'),
+      'vollkorn_exo' => t('Vollkorn, Exo'),
     ],
   ];
   $form['fonts']['icons'] = [
@@ -647,8 +657,8 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
     '#default_value' => theme_get_setting('bootstrap_barrio_icons'),
     '#empty_option' => t('None'),
     '#options' => [
-      'material_design_icons' => 'Material Design Icons',
-      'fontawesome' => 'Font Awesome',
+      'material_design_icons' => t('Material Design Icons'),
+      'fontawesome' => t('Font Awesome'),
     ],
   ];